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 aa8e8789 Improve naming
aa8e8789 is described below
commit aa8e8789ad64df1ed1c94e0712c4a8421cf4bf12
Author: Bertil Chapuis <[email protected]>
AuthorDate: Tue Nov 7 22:24:38 2023 +0100
Improve naming
---
.../java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java | 3 ++-
baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java | 4 ++--
.../workflow/tasks/{ImportOsmChange.java => ImportOsmOsc.java} | 4 ++--
.../tasks/{UpdateOpenStreetMap.java => UpdateOsmDatabase.java} | 4 ++--
.../java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java | 2 +-
.../org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java | 2 +-
.../baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java | 6 +++---
daylight/workflow.js | 4 ++--
8 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java
index 3585353d..6007be7f 100644
---
a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java
+++
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java
@@ -22,6 +22,7 @@ package org.apache.baremaps.cli.database;
import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.workflow.WorkflowContext;
+import org.apache.baremaps.workflow.tasks.UpdateOsmDatabase;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
@@ -42,7 +43,7 @@ public class UpdateOpenStreetMap implements Callable<Integer>
{
@Override
public Integer call() throws Exception {
- new org.apache.baremaps.workflow.tasks.UpdateOpenStreetMap(database, srid)
+ new UpdateOsmDatabase(database, srid)
.execute(new WorkflowContext());
return 0;
}
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
index 012b4475..06fdad9e 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
@@ -39,14 +39,14 @@ import org.apache.baremaps.workflow.tasks.*;
@JsonSubTypes.Type(value = ExportVectorTiles.class, name =
"ExportVectorTiles"),
@JsonSubTypes.Type(value = ImportGeoPackage.class, name =
"ImportGeoPackage"),
@JsonSubTypes.Type(value = ImportOsmPbf.class, name = "ImportOsmPbf"),
- @JsonSubTypes.Type(value = ImportOsmChange.class, name =
"ImportOsmChange"),
+ @JsonSubTypes.Type(value = ImportOsmOsc.class, name = "ImportOsmOsc"),
@JsonSubTypes.Type(value = ImportShapefile.class, name =
"ImportShapefile"),
@JsonSubTypes.Type(value = LogMessage.class, name = "LogMessage"),
@JsonSubTypes.Type(value = UnzipFile.class, name = "UnzipFile"),
@JsonSubTypes.Type(value = UngzipFile.class, name = "UngzipFile"),
@JsonSubTypes.Type(value = DecompressBZip2.class, name =
"DecompressBZip2"),
@JsonSubTypes.Type(value = DecompressFile.class, name = "DecompressFile"),
- @JsonSubTypes.Type(value = UpdateOpenStreetMap.class, name =
"UpdateOpenStreetMap"),
+ @JsonSubTypes.Type(value = UpdateOsmDatabase.class, name =
"UpdateOsmDatabase"),
@JsonSubTypes.Type(value = CreateGeonamesIndex.class, name =
"CreateGeonamesIndex"),
@JsonSubTypes.Type(value = CreateIplocIndex.class, name =
"CreateIplocIndex"),
@JsonSubTypes.Type(value = ImportDaylightTranslations.class,
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
similarity index 98%
rename from
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
rename to
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
index 8b0174d5..9fa52786 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmChange.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOsmOsc.java
@@ -40,14 +40,14 @@ import org.apache.baremaps.workflow.WorkflowContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public record ImportOsmChange(
+public record ImportOsmOsc(
Path file,
Path cache,
Object database,
Integer srid,
Compression compression) implements Task {
- private static final Logger logger =
LoggerFactory.getLogger(ImportOsmChange.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ImportOsmOsc.class);
@Override
public void execute(WorkflowContext context) throws Exception {
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/UpdateOsmDatabase.java
similarity index 97%
rename from
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java
rename to
baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOsmDatabase.java
index 72409a37..0b195a27 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/UpdateOsmDatabase.java
@@ -49,9 +49,9 @@ import org.locationtech.jts.geom.Coordinate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public record UpdateOpenStreetMap(Object database, Integer databaseSrid)
implements Task {
+public record UpdateOsmDatabase(Object database, Integer databaseSrid)
implements Task {
- private static final Logger logger =
LoggerFactory.getLogger(UpdateOpenStreetMap.class);
+ private static final Logger logger =
LoggerFactory.getLogger(UpdateOsmDatabase.class);
@Override
public void execute(WorkflowContext context) throws Exception {
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 705108c0..85796989 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
@@ -75,7 +75,7 @@ class ImportMonacoTest extends PostgresRepositoryTest {
while (replicationSequenceNumber < 3075) {
new DiffService(coordinateMap, referenceMap, headerRepository,
nodeRepository, wayRepository,
relationRepository, 3857, 14).call();
- UpdateOpenStreetMap.execute(coordinateMap, referenceMap,
headerRepository, nodeRepository,
+ UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository, relationRepository, 3857);
long nextReplicationSequenceNumber =
headerRepository.selectLatest().getReplicationSequenceNumber();
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 d462d05c..60e517ab 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
@@ -94,7 +94,7 @@ class ImportUpdateDataTest extends PostgresRepositoryTest {
assertNotNull(way);
// Update the database
- UpdateOpenStreetMap.execute(new PostgresCoordinateMap(dataSource()),
+ UpdateOsmDatabase.execute(new PostgresCoordinateMap(dataSource()),
new PostgresReferenceMap(dataSource()), headerRepository,
nodeRepository, wayRepository,
relationRepository, 3857);
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 3df9452b..dfc8585c 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
@@ -75,7 +75,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
wayRepository, relationRepository, 3857, 14).call().size());
// Update the database
- UpdateOpenStreetMap.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
+ UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
relationRepository, 3857);
assertEquals(2435l,
headerRepository.selectLatest().getReplicationSequenceNumber());
@@ -83,7 +83,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
assertEquals(2, new DiffService(coordinateMap, referenceMap,
headerRepository, nodeRepository,
wayRepository, relationRepository, 3857, 14).call().size());
- UpdateOpenStreetMap.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
+ UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
relationRepository, 3857);
assertEquals(2436l,
headerRepository.selectLatest().getReplicationSequenceNumber());
@@ -91,7 +91,7 @@ class ImportUpdateLiechtensteinTest extends
PostgresRepositoryTest {
assertEquals(0, new DiffService(coordinateMap, referenceMap,
headerRepository, nodeRepository,
wayRepository, relationRepository, 3857, 14).call().size());
- UpdateOpenStreetMap.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
+ UpdateOsmDatabase.execute(coordinateMap, referenceMap, headerRepository,
nodeRepository,
wayRepository,
relationRepository, 3857);
assertEquals(2437l,
headerRepository.selectLatest().getReplicationSequenceNumber());
diff --git a/daylight/workflow.js b/daylight/workflow.js
index 43f50cd2..3c387b64 100644
--- a/daylight/workflow.js
+++ b/daylight/workflow.js
@@ -52,7 +52,7 @@ export default {
"path": "data/roads.osc.gz"
},
{
- "type": "ImportOsmChange",
+ "type": "ImportOsmOsc",
"file": "data/roads.osc.gz",
"cache": "cache/",
"cleanCache": false,
@@ -66,7 +66,7 @@ export default {
"path": "data/admin.osc.gz"
},
{
- "type": "ImportOsmChange",
+ "type": "ImportOsmOsc",
"file": "data/admin.osc.gz",
"cache": "cache/",
"cleanCache": false,
