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 04ef1840 Rename the import classes
04ef1840 is described below
commit 04ef18406343c6456314f5321dc1337e127ddb56
Author: Bertil Chapuis <[email protected]>
AuthorDate: Tue Nov 14 15:19:32 2023 +0100
Rename the import classes
---
.../repository/{ChangeCopyImporter.java => CopyChangeImporter.java} | 6 +++---
.../repository/{ChangeImporter.java => PutChangeImporter.java} | 6 +++---
.../main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java | 4 ++--
.../java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeCopyImporter.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/CopyChangeImporter.java
similarity index 97%
rename from
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeCopyImporter.java
rename to
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/CopyChangeImporter.java
index 9e4475c3..c84288a2 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeCopyImporter.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/CopyChangeImporter.java
@@ -27,9 +27,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** A consumer for importing OpenStreetMap changes in a database. */
-public class ChangeCopyImporter implements Consumer<Change> {
+public class CopyChangeImporter implements Consumer<Change> {
- private static final Logger logger =
LoggerFactory.getLogger(ChangeCopyImporter.class);
+ private static final Logger logger =
LoggerFactory.getLogger(CopyChangeImporter.class);
private final Repository<Long, Node> nodeRepository;
private final Repository<Long, Way> wayRepository;
@@ -42,7 +42,7 @@ public class ChangeCopyImporter implements Consumer<Change> {
* @param wayRepository the way table
* @param relationRepository the relation table
*/
- public ChangeCopyImporter(
+ public CopyChangeImporter(
Repository<Long, Node> nodeRepository,
Repository<Long, Way> wayRepository,
Repository<Long, Relation> relationRepository) {
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/PutChangeImporter.java
similarity index 95%
rename from
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
rename to
baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/PutChangeImporter.java
index 67d5c44a..9ff23dd2 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/PutChangeImporter.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** A consumer for importing OpenStreetMap changes in a database. */
-public class ChangeImporter implements Consumer<Change> {
+public class PutChangeImporter implements Consumer<Change> {
- private static final Logger logger =
LoggerFactory.getLogger(ChangeImporter.class);
+ private static final Logger logger =
LoggerFactory.getLogger(PutChangeImporter.class);
private final Repository<Long, Node> nodeRepository;
private final Repository<Long, Way> wayRepository;
@@ -43,7 +43,7 @@ public class ChangeImporter implements Consumer<Change> {
* @param wayRepository the way table
* @param relationRepository the relation table
*/
- public ChangeImporter(
+ public PutChangeImporter(
Repository<Long, Node> nodeRepository,
Repository<Long, Way> wayRepository,
Repository<Long, Relation> relationRepository) {
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
index a71c8c27..b16fff32 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
@@ -31,7 +31,7 @@ import org.apache.baremaps.database.type.PairDataType;
import org.apache.baremaps.database.type.geometry.LonLatDataType;
import org.apache.baremaps.openstreetmap.function.*;
import org.apache.baremaps.openstreetmap.postgres.*;
-import org.apache.baremaps.openstreetmap.repository.ChangeCopyImporter;
+import org.apache.baremaps.openstreetmap.repository.CopyChangeImporter;
import org.apache.baremaps.openstreetmap.xml.XmlChangeReader;
import org.apache.baremaps.utils.Compression;
import org.apache.baremaps.utils.FileUtils;
@@ -100,7 +100,7 @@ public record ImportOsmOsc(
.andThen(buildGeometry)
.andThen(reprojectGeometry);
var prepareChange = consumeThenReturn(new
ChangeEntitiesHandler(prepareGeometries));
- var importChange = new ChangeCopyImporter(nodeRepository, wayRepository,
relationRepository);
+ var importChange = new CopyChangeImporter(nodeRepository, wayRepository,
relationRepository);
try (var changeInputStream =
new
BufferedInputStream(compression.decompress(Files.newInputStream(path)))) {
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 47b052ff..df08d1af 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
@@ -40,7 +40,7 @@ import
org.apache.baremaps.openstreetmap.postgres.PostgresReferenceMap;
import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
import org.apache.baremaps.openstreetmap.repository.*;
-import org.apache.baremaps.openstreetmap.repository.ChangeImporter;
+import org.apache.baremaps.openstreetmap.repository.PutChangeImporter;
import org.apache.baremaps.openstreetmap.state.StateReader;
import org.apache.baremaps.openstreetmap.xml.XmlChangeReader;
import org.apache.baremaps.workflow.Task;
@@ -96,7 +96,7 @@ public record UpdateOsmDatabase(Object database, Integer
databaseSrid,
var reprojectGeometry = new EntityProjectionTransformer(4326,
databaseSrid);
var prepareGeometries = new
ChangeEntitiesHandler(createGeometry.andThen(reprojectGeometry));
var prepareChange = consumeThenReturn(prepareGeometries);
- var importChange = new ChangeImporter(nodeRepository, wayRepository,
relationRepository);
+ var importChange = new PutChangeImporter(nodeRepository, wayRepository,
relationRepository);
var changeUrl = resolve(replicationUrl, sequenceNumber, "osc.gz");
logger.info("Updating the database with the changeset: {}", changeUrl);
