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
commit 24c16af3e509f55e121296d47bd679ba4ee8c54a Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Aug 29 00:32:10 2023 +0200 Fix compilation error --- .../workflow/tasks/UpdateOpenStreetMap.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java index 7cb0f8dd..c95f826d 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java @@ -18,11 +18,16 @@ import java.io.BufferedInputStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; +import java.util.List; import java.util.zip.GZIPInputStream; +import org.apache.baremaps.database.collection.DataMap; import org.apache.baremaps.openstreetmap.function.ChangeEntitiesHandler; import org.apache.baremaps.openstreetmap.function.EntityGeometryBuilder; import org.apache.baremaps.openstreetmap.function.EntityProjectionTransformer; import org.apache.baremaps.openstreetmap.model.Header; +import org.apache.baremaps.openstreetmap.model.Node; +import org.apache.baremaps.openstreetmap.model.Relation; +import org.apache.baremaps.openstreetmap.model.Way; import org.apache.baremaps.openstreetmap.postgres.PostgresCoordinateMap; import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository; import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository; @@ -35,6 +40,7 @@ import org.apache.baremaps.openstreetmap.state.StateReader; import org.apache.baremaps.openstreetmap.xml.XmlChangeReader; import org.apache.baremaps.workflow.Task; import org.apache.baremaps.workflow.WorkflowContext; +import org.locationtech.jts.geom.Coordinate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,13 +57,27 @@ public record UpdateOpenStreetMap(Object database, Integer databaseSrid) impleme var nodeRepository = new PostgresNodeRepository(datasource); var wayRepository = new PostgresWayRepository(datasource); var relationRepository = new PostgresRelationRepository(datasource); + execute( + coordinateMap, + referenceMap, + headerRepository, + nodeRepository, + wayRepository, + relationRepository, + databaseSrid); + } + 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 { var header = headerRepository.selectLatest(); var replicationUrl = header.getReplicationUrl(); var sequenceNumber = header.getReplicationSequenceNumber() + 1; var createGeometry = new EntityGeometryBuilder(coordinateMap, referenceMap); - var reprojectGeometry = new EntityProjectionTransformer(4326, databaseSrid); + var reprojectGeometry = new EntityProjectionTransformer(4326, srid); var prepareGeometries = new ChangeEntitiesHandler(createGeometry.andThen(reprojectGeometry)); var prepareChange = consumeThenReturn(prepareGeometries); var saveChange = new ChangeImporter(nodeRepository, wayRepository, relationRepository);
