Import wikidata

.run/basemap-dev.run.xml

@@ -4,10 +4,10 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map dev --tileset tileset.js --style style.js" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="ENABLED" value="true" />
-      </pattern>
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
     </extension>
     <method v="2">
       <option name="Make" enabled="true" />

.run/basemap-mbtiles.run.xml

@@ -4,11 +4,6 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map mbtiles --mbtiles tiles.mbtiles --tilejson tileset.js --style style.js" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
       <option name="credential" />
       <option name="region" />

.run/basemap-serve.run.xml

@@ -4,10 +4,10 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map serve --tileset tileset.js --style style.js" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="ENABLED" value="true" />
-      </pattern>
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
     </extension>
     <method v="2">
       <option name="Make" enabled="true" />

.run/basemap-workflow.run.xml

@@ -4,10 +4,10 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="workflow execute --file workflow.js" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="ENABLED" value="true" />
-      </pattern>
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
     </extension>
     <method v="2">
       <option name="Make" enabled="true" />

.run/naturalearth-create.run.xml

@@ -4,6 +4,11 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="workflow execute --file workflow.json" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/naturalearth" />
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.run/naturalearth-dev.run.xml

@@ -4,6 +4,11 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map dev --tileset tileset.json --style style.json" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/naturalearth" />
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/Database.java

@@ -23,7 +23,7 @@
 import picocli.CommandLine.Command;
 
 @Command(name = "database", description = "Database commands.",
-    subcommands = {ExecuteSql.class, ImportOpenStreetMap.class, UpdateOpenStreetMap.class},
+    subcommands = {ExecuteSql.class, ImportOsmPbf.class, UpdateOpenStreetMap.class},
     sortOptions = false)
 public class Database implements Runnable {
 

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOpenStreetMap.java → baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsmPbf.java

@@ -28,7 +28,7 @@
 import picocli.CommandLine.Option;
 
 @Command(name = "import-osm", description = "Import OpenStreetMap data in Postgres.")
-public class ImportOpenStreetMap implements Callable<Integer> {
+public class ImportOsmPbf implements Callable<Integer> {
 
   @Mixin
   private Options options;
@@ -47,8 +47,13 @@ public class ImportOpenStreetMap implements Callable<Integer> {
 
   @Override
   public Integer call() throws Exception {
-    new org.apache.baremaps.workflow.tasks.ImportOpenStreetMap(file.toAbsolutePath(),
-        database, srid).execute(new WorkflowContext());
+    new org.apache.baremaps.workflow.tasks.ImportOsmPbf(
+        file.toAbsolutePath(),
+        null,
+        true,
+        database,
+        srid,
+        true).execute(new WorkflowContext());
     return 0;
   }
 }

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOpenStreetMap.java

@@ -22,6 +22,7 @@
 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;
   }

baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java

@@ -79,8 +79,9 @@ public Integer call() throws Exception {
     var tileStoreType = new TypeLiteral<Supplier<TileStore>>() {};
     var tileStoreSupplier = (Supplier<TileStore>) () -> {
       try {
+        var config = configReader.read(this.tilesetPath);
         var tilesetObject =
-            objectMapper.readValue(configReader.read(this.tilesetPath), Tileset.class);
+            objectMapper.readValue(config, Tileset.class);
         return new PostgresTileStore(datasource, tilesetObject);
       } catch (IOException e) {
         throw new RuntimeException(e);

baremaps-core/src/main/java/org/apache/baremaps/geocoderosm/GeocoderOsmDocumentMapper.java

@@ -41,7 +41,7 @@ public class GeocoderOsmDocumentMapper implements Function<Element, Document> {
   @Override
   public Document apply(Element element) {
     var document = new Document();
-    document.add(new StoredField("osm_id", element.id()));
+    document.add(new StoredField("osm_id", element.getId()));
     document.add(new StoredField("osm_type", element.getClass().getSimpleName()));
 
     if (element.getTags().containsKey(OsmTags.NAME.key())) {

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/DiffService.java

@@ -121,13 +121,13 @@ private Stream<Geometry> geometriesForPreviousVersion(Change change) {
   private Optional<Geometry> geometriesForPreviousVersion(Entity entity) {
     try {
       if (entity instanceof Node node) {
-        var previousNode = nodeRepository.get(node.id());
+        var previousNode = nodeRepository.get(node.getId());
         return Optional.ofNullable(previousNode).map(Node::getGeometry);
       } else if (entity instanceof Way way) {
-        var previousWay = wayRepository.get(way.id());
+        var previousWay = wayRepository.get(way.getId());
         return Optional.ofNullable(previousWay).map(Way::getGeometry);
       } else if (entity instanceof Relation relation) {
-        var previousRelation = relationRepository.get(relation.id());
+        var previousRelation = relationRepository.get(relation.getId());
         return Optional.ofNullable(previousRelation).map(Relation::getGeometry);
       } else {
         return Optional.empty();

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CoordinateMapBuilder.java

@@ -43,7 +43,7 @@ public CoordinateMapBuilder(DataMap<Long, Coordinate> coordinateMap) {
   @Override
   public void accept(Entity entity) {
     if (entity instanceof Node node) {
-      coordinateMap.put(node.id(), new Coordinate(node.getLon(), node.getLat()));
+      coordinateMap.put(node.getId(), new Coordinate(node.getLon(), node.getLat()));
     }
   }
 }

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/GeometryMapBuilder.java

@@ -50,7 +50,7 @@ public GeometryMapBuilder(DataMap<Long, Geometry> geometryMap, Predicate<Entity>
   @Override
   public void accept(Entity entity) {
     if (filter.test(entity) && entity instanceof Element element) {
-      geometryMap.put(element.id(), element.getGeometry());
+      geometryMap.put(element.getId(), element.getGeometry());
     }
   }
 }

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/OpenstreetmapDocumentMapper.java

@@ -39,7 +39,7 @@ public class OpenstreetmapDocumentMapper implements Function<Element, Document>
   public Document apply(Element element) {
     var document = new Document();
 
-    document.add(new StoredField("id", element.id()));
+    document.add(new StoredField("id", element.getId()));
 
     element.getTags().forEach((key, value) -> {
       document.add(new StoredField(key, value.toString()));

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ReferenceMapBuilder.java

@@ -43,7 +43,7 @@ public ReferenceMapBuilder(DataMap<Long, List<Long>> referenceMap) {
   @Override
   public void accept(Entity entity) {
     if (entity instanceof Way way) {
-      referenceMap.put(way.id(), way.getNodes());
+      referenceMap.put(way.getId(), way.getNodes());
     }
   }
 }

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/RelationGeometryBuilder.java

@@ -99,10 +99,10 @@ public void accept(Relation relation) {
       var end = System.currentTimeMillis();
       var duration = end - start;
       if (duration > 60 * 1000) {
-        logger.debug("Relation #{} processed in {} ms", relation.id(), duration);
+        logger.debug("Relation #{} processed in {} ms", relation.getId(), duration);
       }
     } catch (Exception e) {
-      logger.debug("Unable to build the geometry for relation #" + relation.id(), e);
+      logger.debug("Unable to build the geometry for relation #" + relation.getId(), e);
       relation.setGeometry(GEOMETRY_FACTORY_WGS84.createEmpty(0));
     }
   }

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/WayGeometryBuilder.java

@@ -66,7 +66,7 @@ public void accept(Way way) {
         }
       }
     } catch (Exception e) {
-      logger.debug("Unable to build the geometry for way #" + way.id(), e);
+      logger.debug("Unable to build the geometry for way #" + way.getId(), e);
       way.setGeometry(GEOMETRY_FACTORY_WGS84.createEmpty(0));
     }
   }

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Element.java

@@ -34,14 +34,18 @@ abstract class Element implements Entity
 permits Node, Way, Relation
 {
 
-  protected final long id;
+  protected Long id;
 
-  protected final Info info;
+  protected Info info;
 
-  protected final Map<String, Object> tags;
+  protected Map<String, Object> tags;
 
   protected Geometry geometry;
 
+  protected Element() {
+
+  }
+
   protected Element(long id, Info info, Map<String, Object> tags) {
     this(id, info, tags, null);
   }
@@ -66,10 +70,17 @@ protected Element(long id, Info info, Map<String, Object> tags, Geometry geometr
    *
    * @return the id
    */
-  public long id() {
+  public long getId() {
     return id;
   }
 
+  /**
+   * Sets the id.
+   */
+  public void setId(long id) {
+    this.id = id;
+  }
+
   /**
    * Returns the info.
    *
@@ -79,6 +90,15 @@ public Info getInfo() {
     return info;
   }
 
+  /**
+   * Sets the info.
+   *
+   * @param info the info
+   */
+  public void setInfo(Info info) {
+    this.info = info;
+  }
+
   /**
    * Returns the tags.
    *
@@ -88,6 +108,15 @@ public Map<String, Object> getTags() {
     return tags;
   }
 
+  /**
+   * Sets the tags.
+   *
+   * @param tags the tags
+   */
+  public void setTags(Map<String, Object> tags) {
+    this.tags = tags;
+  }
+
   /**
    * Returns the geometry.
    *

baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Node.java

@@ -27,9 +27,16 @@
 /** Represents a node element in an OpenStreetMap dataset. */
 public final class Node extends Element {
 
-  private final double lon;
+  private Double lon;
 
-  private final double lat;
+  private Double lat;
+
+  /**
+   * Constructs an OpenStreetMap {@code Node}.
+   */
+  public Node() {
+    super();
+  }
 
   /**
    * Constructs an OpenStreetMap {@code Node} with the specified parameters.
@@ -40,7 +47,7 @@ public final class Node extends Element {
    * @param lon the longitude
    * @param lat the latitude
    */
-  public Node(long id, Info info, Map<String, Object> tags, double lon, double lat) {
+  public Node(Long id, Info info, Map<String, Object> tags, Double lon, Double lat) {
     super(id, info, tags);
     this.lon = lon;
     this.lat = lat;
@@ -56,7 +63,7 @@ public Node(long id, Info info, Map<String, Object> tags, double lon, double lat
    * @param lat the latitude
    * @param geometry the geometry
    */
-  public Node(long id, Info info, Map<String, Object> tags, double lon, double lat,
+  public Node(Long id, Info info, Map<String, Object> tags, Double lon, Double lat,
       Geometry geometry) {
     super(id, info, tags, geometry);
     this.lon = lon;
@@ -68,19 +75,37 @@ public Node(long id, Info info, Map<String, Object> tags, double lon, double lat
    *
    * @return the longitude
    */
-  public double getLon() {
+  public Double getLon() {
     return lon;
   }
 
+  /**
+   * Sets the longitude.
+   *
+   * @param lon the longitude
+   */
+  public void setLon(Double lon) {
+    this.lon = lon;
+  }
+
   /**
    * Returns the latitude.
    *
    * @return the latitude
    */
-  public double getLat() {
+  public Double getLat() {
     return lat;
   }
 
+  /**
+   * Sets the latitude.
+   *
+   * @param lat the latitude
+   */
+  public void setLat(Double lat) {
+    this.lat = lat;
+  }
+
   /** {@inheritDoc} */
   @Override
   public boolean equals(Object o) {