This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch 745-daylight
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/745-daylight by this push:
new 3120bceb Fix tests
3120bceb is described below
commit 3120bceba87102bdfb69fee1e2a6863ee9e71350
Author: Bertil Chapuis <[email protected]>
AuthorDate: Tue Oct 31 23:35:59 2023 +0100
Fix tests
---
.../apache/baremaps/openstreetmap/model/Node.java | 2 +-
.../tilestore/postgres/PostgresQueryGenerator.java | 2 +-
.../EntityDataTypeGeometryBuilderTest.java | 56 +++++++++++-----------
.../openstreetmap/repository/Constants.java | 50 +++++++++----------
4 files changed, 55 insertions(+), 55 deletions(-)
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java
index 086d3904..4b340cca 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java
@@ -63,7 +63,7 @@ public final class Node extends Element {
* @param lat the latitude
* @param geometry the geometry
*/
- public Node(long id, Info info, Map<String, Object> tags, Double lon, Double
lat,
+ public Node(Long id, Info info, Map<String, Object> tags, Double lon, Double
lat,
Geometry geometry) {
super(id, info, tags, geometry);
this.lon = lon;
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
index 5774bfba..3a89424b 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
@@ -54,7 +54,7 @@ public class PostgresQueryGenerator {
* @param dataSource the data source
*/
public PostgresQueryGenerator(DataSource dataSource) {
- this(dataSource, null, null, null, null, null);
+ this(dataSource, null, null, null, null);
}
/**
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/EntityDataTypeGeometryBuilderTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/EntityDataTypeGeometryBuilderTest.java
index 82693e37..1d707c3a 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/EntityDataTypeGeometryBuilderTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/EntityDataTypeGeometryBuilderTest.java
@@ -80,37 +80,37 @@ class EntityDataTypeGeometryBuilderTest {
static final Info INFO = new Info(0, TIMESTAMP, 0, 0);
- static final Node NODE_0 = new Node(0, INFO, ImmutableMap.of(), 0, 0);
+ static final Node NODE_0 = new Node(0L, INFO, ImmutableMap.of(), 0d, 0d);
- static final Node NODE_1 = new Node(1, INFO, ImmutableMap.of(), 0, 4);
+ static final Node NODE_1 = new Node(1L, INFO, ImmutableMap.of(), 0d, 4d);
- static final Node NODE_2 = new Node(2, INFO, ImmutableMap.of(), 4, 4);
+ static final Node NODE_2 = new Node(2L, INFO, ImmutableMap.of(), 4d, 4d);
- static final Node NODE_3 = new Node(3, INFO, ImmutableMap.of(), 4, 0);
+ static final Node NODE_3 = new Node(3L, INFO, ImmutableMap.of(), 4d, 0d);
- static final Node NODE_4 = new Node(4, INFO, ImmutableMap.of(), 1, 1);
+ static final Node NODE_4 = new Node(4L, INFO, ImmutableMap.of(), 1d, 1d);
- static final Node NODE_5 = new Node(5, INFO, ImmutableMap.of(), 1, 2);
+ static final Node NODE_5 = new Node(5L, INFO, ImmutableMap.of(), 1d, 2d);
- static final Node NODE_6 = new Node(6, INFO, ImmutableMap.of(), 2, 2);
+ static final Node NODE_6 = new Node(6L, INFO, ImmutableMap.of(), 2d, 2d);
- static final Node NODE_7 = new Node(7, INFO, ImmutableMap.of(), 2, 1);
+ static final Node NODE_7 = new Node(7L, INFO, ImmutableMap.of(), 2d, 1d);
- static final Node NODE_8 = new Node(8, INFO, ImmutableMap.of(), 4, 1);
+ static final Node NODE_8 = new Node(8L, INFO, ImmutableMap.of(), 4d, 1d);
- static final Node NODE_9 = new Node(9, INFO, ImmutableMap.of(), 4, 1);
+ static final Node NODE_9 = new Node(9L, INFO, ImmutableMap.of(), 4d, 1d);
- static final Node NODE_10 = new Node(10, INFO, ImmutableMap.of(), 5, 2);
+ static final Node NODE_10 = new Node(10L, INFO, ImmutableMap.of(), 5d, 2d);
- static final Node NODE_11 = new Node(11, INFO, ImmutableMap.of(), 5, 1);
+ static final Node NODE_11 = new Node(11L, INFO, ImmutableMap.of(), 5d, 1d);
- static final Node NODE_12 = new Node(12, INFO, ImmutableMap.of(), 2, 1);
+ static final Node NODE_12 = new Node(12L, INFO, ImmutableMap.of(), 2d, 1d);
- static final Node NODE_13 = new Node(13, INFO, ImmutableMap.of(), 2, 2);
+ static final Node NODE_13 = new Node(13L, INFO, ImmutableMap.of(), 2d, 2d);
- static final Node NODE_14 = new Node(14, INFO, ImmutableMap.of(), 3, 3);
+ static final Node NODE_14 = new Node(14L, INFO, ImmutableMap.of(), 3d, 3d);
- static final Node NODE_15 = new Node(15, INFO, ImmutableMap.of(), 3, 1);
+ static final Node NODE_15 = new Node(15L, INFO, ImmutableMap.of(), 3d, 1d);
static final DataMap<Long, Coordinate> COORDINATE_CACHE = new
MockDataMap(Arrays
.asList(NODE_0, NODE_1, NODE_2, NODE_3, NODE_4, NODE_5, NODE_6, NODE_7,
NODE_8, NODE_9,
@@ -118,43 +118,43 @@ class EntityDataTypeGeometryBuilderTest {
.stream()
.collect(Collectors.toMap(n -> n.getId(), n -> new
Coordinate(n.getLon(), n.getLat()))));
- static final Way WAY_0 = new Way(0, INFO, ImmutableMap.of(),
ImmutableList.of());
+ static final Way WAY_0 = new Way(0L, INFO, ImmutableMap.of(),
ImmutableList.of());
- static final Way WAY_1 = new Way(1, INFO, ImmutableMap.of(),
ImmutableList.of(0l, 1l, 2l, 3l));
+ static final Way WAY_1 = new Way(1L, INFO, ImmutableMap.of(),
ImmutableList.of(0l, 1l, 2l, 3l));
static final Way WAY_2 =
- new Way(2, INFO, ImmutableMap.of(), ImmutableList.of(0l, 1l, 2l, 3l,
0l));
+ new Way(2L, INFO, ImmutableMap.of(), ImmutableList.of(0l, 1l, 2l, 3l,
0l));
static final Way WAY_3 =
- new Way(3, INFO, ImmutableMap.of(), ImmutableList.of(8l, 9l, 10l, 11l,
8l));
+ new Way(3L, INFO, ImmutableMap.of(), ImmutableList.of(8l, 9l, 10l, 11l,
8l));
static final Way WAY_4 =
- new Way(4, INFO, ImmutableMap.of(), ImmutableList.of(4l, 5l, 6l, 7l,
4l));
+ new Way(4L, INFO, ImmutableMap.of(), ImmutableList.of(4l, 5l, 6l, 7l,
4l));
static final Way WAY_5 =
- new Way(5, INFO, ImmutableMap.of(), ImmutableList.of(12l, 13l, 14l, 15l,
12l));
+ new Way(5L, INFO, ImmutableMap.of(), ImmutableList.of(12l, 13l, 14l,
15l, 12l));
static final DataMap<Long, List<Long>> REFERENCE_CACHE =
new MockDataMap(Arrays.asList(WAY_0, WAY_1, WAY_2, WAY_3, WAY_4,
WAY_5).stream()
.collect(Collectors.toMap(w -> w.getId(), w -> w.getNodes())));
- static final Relation RELATION_0 = new Relation(0, INFO, ImmutableMap.of(),
Arrays.asList());
+ static final Relation RELATION_0 = new Relation(0L, INFO, ImmutableMap.of(),
Arrays.asList());
static final Relation RELATION_1 =
- new Relation(1, INFO, ImmutableMap.of("type", "multipolygon"),
Arrays.asList());
+ new Relation(1L, INFO, ImmutableMap.of("type", "multipolygon"),
Arrays.asList());
- static final Relation RELATION_2 = new Relation(2, INFO,
ImmutableMap.of("type", "multipolygon"),
+ static final Relation RELATION_2 = new Relation(2L, INFO,
ImmutableMap.of("type", "multipolygon"),
Arrays.asList(new Member(2l, MemberType.WAY, "outer")));
static final Relation RELATION_3 =
- new Relation(3, INFO, ImmutableMap.of("type", "multipolygon"),
Arrays.asList(
+ new Relation(3L, INFO, ImmutableMap.of("type", "multipolygon"),
Arrays.asList(
new Member(2l, MemberType.WAY, "outer"), new Member(3l,
MemberType.WAY, "inner")));
- static final Relation RELATION_4 = new Relation(4, INFO,
ImmutableMap.of("type", "multipolygon"),
+ static final Relation RELATION_4 = new Relation(4L, INFO,
ImmutableMap.of("type", "multipolygon"),
Arrays.asList(new Member(2l, MemberType.WAY, "outer"),
new Member(3l, MemberType.WAY, "inner"), new Member(4l,
MemberType.WAY, "outer")));
- static final Relation RELATION_5 = new Relation(5, INFO,
ImmutableMap.of("type", "multipolygon"),
+ static final Relation RELATION_5 = new Relation(5L, INFO,
ImmutableMap.of("type", "multipolygon"),
Arrays.asList(new Member(2l, MemberType.WAY, "outer"),
new Member(4l, MemberType.WAY, "inner"), new Member(5l,
MemberType.WAY, "inner")));
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
index de8cd50d..c6160043 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
@@ -42,80 +42,80 @@ public class Constants {
public static final Info INFO = new Info(0, TIMESTAMP, 0, 0);
- public static final Header HEADER_0 = new Header(1l, TIMESTAMP, "", "", "");
+ public static final Header HEADER_0 = new Header(1L, TIMESTAMP, "", "", "");
- public static final Header HEADER_1 = new Header(2l, TIMESTAMP, "", "", "");
+ public static final Header HEADER_1 = new Header(2L, TIMESTAMP, "", "", "");
- public static final Header HEADER_2 = new Header(3l, TIMESTAMP, "", "", "");
+ public static final Header HEADER_2 = new Header(3L, TIMESTAMP, "", "", "");
- public static final Node NODE_0 = new Node(0, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_0 = new Node(0L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(0, 0)));
- public static final Node NODE_1 = new Node(1, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_1 = new Node(1L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(0, 3)));
- public static final Node NODE_2 = new Node(2, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_2 = new Node(2L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(3, 3)));
- public static final Node NODE_3 = new Node(3, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_3 = new Node(3L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(3, 0)));
- public static final Node NODE_4 = new Node(4, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_4 = new Node(4L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(1, 1)));
- public static final Node NODE_5 = new Node(5, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_5 = new Node(5L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(1, 2)));
- public static final Node NODE_6 = new Node(6, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_6 = new Node(6L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(2, 2)));
- public static final Node NODE_7 = new Node(7, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_7 = new Node(7L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(2, 1)));
- public static final Node NODE_8 = new Node(8, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_8 = new Node(8L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(4, 1)));
- public static final Node NODE_9 = new Node(9, INFO, ImmutableMap.of(), 0, 0,
+ public static final Node NODE_9 = new Node(9L, INFO, ImmutableMap.of(), 0d,
0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(4, 2)));
- public static final Node NODE_10 = new Node(10, INFO, ImmutableMap.of(), 0,
0,
+ public static final Node NODE_10 = new Node(10L, INFO, ImmutableMap.of(),
0d, 0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(5, 2)));
- public static final Node NODE_11 = new Node(11, INFO, ImmutableMap.of(), 0,
0,
+ public static final Node NODE_11 = new Node(11L, INFO, ImmutableMap.of(),
0d, 0d,
GEOMETRY_FACTORY.createPoint(new Coordinate(5, 1)));
- public static final Way WAY_0 = new Way(0, INFO, ImmutableMap.of(),
ImmutableList.of(), null);
+ public static final Way WAY_0 = new Way(0L, INFO, ImmutableMap.of(),
ImmutableList.of(), null);
public static final Way WAY_1 =
- new Way(1, INFO, ImmutableMap.of(), ImmutableList.of(0l, 1l, 2l, 3l),
null);
+ new Way(1L, INFO, ImmutableMap.of(), ImmutableList.of(0L, 1L, 2L, 3L),
null);
public static final Way WAY_2 =
- new Way(2, INFO, ImmutableMap.of(), ImmutableList.of(0l, 1l, 2l, 3l,
0l), null);
+ new Way(2L, INFO, ImmutableMap.of(), ImmutableList.of(0L, 1L, 2L, 3L,
0L), null);
public static final Way WAY_3 =
- new Way(3, INFO, ImmutableMap.of(), ImmutableList.of(8l, 9l, 10l, 11l,
8l), null);
+ new Way(3L, INFO, ImmutableMap.of(), ImmutableList.of(8L, 9L, 10L, 11L,
8L), null);
public static final Way WAY_4 =
- new Way(4, INFO, ImmutableMap.of(), ImmutableList.of(4l, 5l, 6l, 7l,
4l), null);
+ new Way(4L, INFO, ImmutableMap.of(), ImmutableList.of(4L, 5L, 6L, 7L,
4L), null);
public static final Relation RELATION_0 =
- new Relation(0, INFO, ImmutableMap.of(), ImmutableList.of(), null);
+ new Relation(0L, INFO, ImmutableMap.of(), ImmutableList.of(), null);
public static final Relation RELATION_1 =
- new Relation(1, INFO, ImmutableMap.of("type", "multipolygon"),
ImmutableList.of(), null);
+ new Relation(1L, INFO, ImmutableMap.of("type", "multipolygon"),
ImmutableList.of(), null);
public static final Relation RELATION_2 =
- new Relation(2, INFO, ImmutableMap.of("type", "multipolygon"),
+ new Relation(2L, INFO, ImmutableMap.of("type", "multipolygon"),
ImmutableList.of(new Member(2, MemberType.WAY, "outer")), null);
public static final Relation RELATION_3 =
new Relation(
- 3, INFO, ImmutableMap.of("type", "multipolygon"), ImmutableList
+ 3L, INFO, ImmutableMap.of("type", "multipolygon"), ImmutableList
.of(new Member(2, MemberType.WAY, "outer"), new Member(3,
MemberType.WAY, "inner")),
null);
public static final Relation RELATION_4 =
- new Relation(4, INFO, ImmutableMap.of("type", "multipolygon"),
+ new Relation(4L, INFO, ImmutableMap.of("type", "multipolygon"),
ImmutableList.of(new Member(2, MemberType.WAY, "outer"),
new Member(3, MemberType.WAY, "inner"), new Member(4,
MemberType.WAY, "outer")),
null);
