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 ac863089 Add replication url to task
ac863089 is described below

commit ac863089e1bca1f23f67a46346e47de6b3d9ee37
Author: Bertil Chapuis <[email protected]>
AuthorDate: Mon Nov 13 16:54:52 2023 +0100

    Add replication url to task
---
 .../org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java | 11 ++++++-----
 basemap/update.js                                             |  1 +
 2 files changed, 7 insertions(+), 5 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 5e0707e6..d87ff355 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,7 +49,7 @@ import org.locationtech.jts.geom.Coordinate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public record UpdateOsmDatabase(Object database, Integer databaseSrid) 
implements Task {
+public record UpdateOsmDatabase(Object database, Integer databaseSrid, String 
replicationUrl) implements Task {
 
   private static final Logger logger = 
LoggerFactory.getLogger(UpdateOsmDatabase.class);
 
@@ -69,21 +69,22 @@ public record UpdateOsmDatabase(Object database, Integer 
databaseSrid) implement
         nodeRepository,
         wayRepository,
         relationRepository,
-        databaseSrid);
+        databaseSrid,
+            replicationUrl);
   }
 
   public static void execute(DataMap<Long, Coordinate> coordinateMap,
       DataMap<Long, List<Long>> referenceMap,
       HeaderRepository headerRepository, Repository<Long, Node> nodeRepository,
       Repository<Long, Way> wayRepository, Repository<Long, Relation> 
relationRepository,
-      int srid) throws Exception {
+      Integer databaseSrid,
+      String replicationUrl) throws Exception {
 
     var header = headerRepository.selectLatest();
-    var replicationUrl = header.getReplicationUrl();
     var sequenceNumber = header.getReplicationSequenceNumber() + 1;
 
     var createGeometry = new EntityGeometryBuilder(coordinateMap, 
referenceMap);
-    var reprojectGeometry = new EntityProjectionTransformer(4326, srid);
+    var reprojectGeometry = new EntityProjectionTransformer(4326, 
databaseSrid);
     var prepareGeometries = new 
ChangeEntitiesHandler(createGeometry.andThen(reprojectGeometry));
     var prepareChange = consumeThenReturn(prepareGeometries);
     var importChange = new ChangeImporter(nodeRepository, wayRepository, 
relationRepository);
diff --git a/basemap/update.js b/basemap/update.js
index dff0b449..ad38deae 100644
--- a/basemap/update.js
+++ b/basemap/update.js
@@ -24,6 +24,7 @@ export default {
             "tasks": [
                 {
                     "type": "UpdateOsmDatabase",
+                    "replicationUrl": 
"https://planet.osm.org/replication/hour/";,
                     "database": config.database,
                     "databaseSrid": 3857,
                 },

Reply via email to