This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch update-basemap
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/update-basemap by this push:
new 38a23117 Fix the tests
38a23117 is described below
commit 38a23117424353490188fb0ff65c90e59df9a7a7
Author: Bertil Chapuis <[email protected]>
AuthorDate: Mon Nov 13 17:03:14 2023 +0100
Fix the tests
---
.../apache/baremaps/workflow/tasks/UpdateOsmDatabase.java | 13 +++++++++++--
.../apache/baremaps/workflow/tasks/ImportMonacoTest.java | 2 +-
.../baremaps/workflow/tasks/ImportUpdateDataTest.java | 2 +-
.../workflow/tasks/ImportUpdateLiechtensteinTest.java | 6 +++---
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
index d87ff355..9bdd2ee7 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
@@ -49,10 +49,15 @@ import org.locationtech.jts.geom.Coordinate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public record UpdateOsmDatabase(Object database, Integer databaseSrid, String
replicationUrl) implements Task {
+public record UpdateOsmDatabase(Object database, Integer databaseSrid,
+ String replicationUrl) implements Task {
private static final Logger logger =
LoggerFactory.getLogger(UpdateOsmDatabase.class);
+ public UpdateOsmDatabase(Object database, Integer databaseSrid) {
+ this(database, databaseSrid, null);
+ }
+
@Override
public void execute(WorkflowContext context) throws Exception {
var datasource = context.getDataSource(database);
@@ -70,7 +75,7 @@ public record UpdateOsmDatabase(Object database, Integer
databaseSrid, String re
wayRepository,
relationRepository,
databaseSrid,
- replicationUrl);
+ replicationUrl);
}
public static void execute(DataMap<Long, Coordinate> coordinateMap,
@@ -83,6 +88,10 @@ public record UpdateOsmDatabase(Object database, Integer
databaseSrid, String re
var header = headerRepository.selectLatest();
var sequenceNumber = header.getReplicationSequenceNumber() + 1;
+ if (replicationUrl == null) {
+ replicationUrl = header.getReplicationUrl();
+ }
+
var createGeometry = new EntityGeometryBuilder(coordinateMap,
referenceMap);
var reprojectGeometry = new EntityProjectionTransformer(4326,
databaseSrid);
var prepareGeometries = new
ChangeEntitiesHandler(createGeometry.andThen(reprojectGeometry));
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
index 85796989..c9985d67 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
@@ -76,7 +76,7 @@ class ImportMonacoTest extends PostgresRepositoryTest {
new DiffService(coordinateMap, referenceMap, headerRepository,
nodeRepository, wayRepository,
relationRepository, 3857, 14).call();
UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
- wayRepository, relationRepository, 3857);
+ wayRepository, relationRepository, 3857, null);
long nextReplicationSequenceNumber =
headerRepository.selectLatest().getReplicationSequenceNumber();
assertEquals(replicationSequenceNumber + 1,
nextReplicationSequenceNumber);
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
index 60e517ab..db7eacb2 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
@@ -96,7 +96,7 @@ class ImportUpdateDataTest extends PostgresRepositoryTest {
// Update the database
UpdateOsmDatabase.execute(new PostgresCoordinateMap(dataSource()),
new PostgresReferenceMap(dataSource()), headerRepository,
nodeRepository, wayRepository,
- relationRepository, 3857);
+ relationRepository, 3857, null);
// Check deletions
assertNull(nodeRepository.get(0l));
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
index dfc8585c..a8d44aa4 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
@@ -77,7 +77,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
// Update the database
UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
- relationRepository, 3857);
+ relationRepository, 3857, null);
assertEquals(2435l,
headerRepository.selectLatest().getReplicationSequenceNumber());
assertEquals(2, new DiffService(coordinateMap, referenceMap,
headerRepository, nodeRepository,
@@ -85,7 +85,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
- relationRepository, 3857);
+ relationRepository, 3857, null);
assertEquals(2436l,
headerRepository.selectLatest().getReplicationSequenceNumber());
assertEquals(0, new DiffService(coordinateMap, referenceMap,
headerRepository, nodeRepository,
@@ -93,7 +93,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
- relationRepository, 3857);
+ relationRepository, 3857, null);
assertEquals(2437l,
headerRepository.selectLatest().getReplicationSequenceNumber());
}
}
