Add external geojson, testing is still needed.

Author: HarelM

.gitignore

@@ -24,3 +24,4 @@ hs_err_pid*
 replay_pid*
 target/
 data/
+dependency-reduced-pom.xml

src/main/java/il/org/osm/israelhiking/MainClass.java

@@ -36,6 +36,7 @@ static void run(Arguments args) throws Exception {
         planetiler.setProfile(profile)
           // override this default with osm_path="path/to/data.osm.pbf"
           .addOsmSource("osm", Path.of("data", "sources", area + ".osm.pbf"), "geofabrik:" + area)
+          .addGeoJsonSource("external",  Path.of("data", "sources", "external.geojson"))
           // override this default with mbtiles="path/to/output.mbtiles"
           .overwriteOutput(Path.of("data", PlanetSearchProfile.POINTS_LAYER_NAME + ".pmtiles"))
           .run();

src/main/java/il/org/osm/israelhiking/PlanetSearchProfile.java

@@ -109,6 +109,7 @@ public List<OsmRelationInfo> preprocessOsmRelation(OsmElement.Relation relation)
       pointDocument.name.put(language, Coalesce(relation.getString("name:" + language), relation.getString("name")));
       pointDocument.description.put(language, Coalesce(relation.getString("description:" + language), relation.getString("description")));
     }
+    pointDocument.poiSource = "OSM";
     pointDocument.wikidata = relation.getString("wikidata");
     pointDocument.image = relation.getString("image");
     pointDocument.wikimedia_commons = relation.getString("wikimedia_commons");
@@ -147,6 +148,10 @@ public void preprocessOsmWay(OsmElement.Way way) {
 
   @Override
   public void processFeature(SourceFeature sourceFeature, FeatureCollector features) {
+    if (sourceFeature.getSource() == "external") {
+      processExternalFeautre(sourceFeature, features);
+      return;
+    }
     if (isBBoxFeature(sourceFeature, supportedLanguages)) {
       insertBboxToElasticsearch(sourceFeature, supportedLanguages);
     }
@@ -160,6 +165,43 @@ public void processFeature(SourceFeature sourceFeature, FeatureCollector feature
     }
   }
 
+  private void processExternalFeautre(SourceFeature sourceFeature, FeatureCollector features) {
+    var pointDocument = new PointDocument();
+    pointDocument.poiIcon = sourceFeature.getString("poiIcon");
+    pointDocument.poiIconColor = sourceFeature.getString("poiIconColor");
+    pointDocument.poiCategory = sourceFeature.getString("poiCategory");
+    for (String language : supportedLanguages) {
+      pointDocument.name.put(language, Coalesce(sourceFeature.getString("name:" + language), sourceFeature.getString("name")));
+      pointDocument.description.put(language, Coalesce(sourceFeature.getString("description:" + language), sourceFeature.getString("description")));
+    }
+    pointDocument.poiSource = sourceFeature.getString("poiSource");
+    pointDocument.wikidata = sourceFeature.getString("wikidata");
+    pointDocument.image = sourceFeature.getString("image");
+    pointDocument.wikimedia_commons = sourceFeature.getString("wikimedia_commons");
+    Point point;
+    var docId = pointDocument.poiSource + "_" + sourceFeature.getString("identifier");
+    try {
+        point = (Point)sourceFeature.centroidIfConvex();
+    } catch (GeometryException e) {
+      try {
+        point = GeoUtils.point(sourceFeature.worldGeometry().getCoordinate());
+      } catch (GeometryException e2) {
+        LOGGER.warn("Failed to process external feature: {}", docId);
+        return;
+      }
+    }
+    var lngLatPoint = GeoUtils.worldToLatLonCoords(point).getCoordinate();
+    pointDocument.location = new double[]{lngLatPoint.getX(), lngLatPoint.getY()};
+    
+    insertPointToElasticsearch(pointDocument, docId);
+    
+    var tileFeature = features.geometry("external", point)
+        .setAttr("poiId", docId)
+        .setZoomRange(10, 14)
+        .setId(sourceFeature.id());
+    setFeaturePropertiesFromPointDocument(tileFeature, pointDocument);
+  }
+
   private void processOsmRelationFeature(SourceFeature sourceFeature, FeatureCollector features) {
     // get all the RouteRelationInfo instances we returned from preprocessOsmRelation that
     // this way belongs to
@@ -243,6 +285,7 @@ private void processMtbNameFeature(SourceFeature sourceFeature, FeatureCollector
         pointDocument.poiCategory = "Bicycle";
         pointDocument.poiIcon = "icon-bike";
         pointDocument.poiIconColor = "gray";
+        pointDocument.poiSource = "OSM";
         var lngLatPoint = GeoUtils.worldToLatLonCoords(point).getCoordinate();
         pointDocument.location = new double[]{lngLatPoint.getX(), lngLatPoint.getY()};
 
@@ -299,6 +342,7 @@ private void processWaterwayFeature(SourceFeature sourceFeature, FeatureCollecto
         pointDocument.poiCategory = "Water";
         pointDocument.poiIcon = "icon-waterfall";
         pointDocument.poiIconColor = "blue";
+        pointDocument.poiSource = "OSM";
         var lngLatPoint = GeoUtils.worldToLatLonCoords(point).getCoordinate();
         pointDocument.location = new double[]{lngLatPoint.getX(), lngLatPoint.getY()};
 
@@ -351,6 +395,7 @@ private void processOtherSourceFeature(SourceFeature feature, FeatureCollector f
     pointDocument.wikidata = feature.getString("wikidata");
     pointDocument.image = feature.getString("image");
     pointDocument.wikimedia_commons = feature.getString("wikimedia_commons");
+    pointDocument.poiSource = "OSM";
     var lngLatPoint = GeoUtils.worldToLatLonCoords(point).getCoordinate();
     pointDocument.location = new double[]{lngLatPoint.getX(), lngLatPoint.getY()};
 
@@ -444,7 +489,8 @@ private void setFeaturePropertiesFromPointDocument(Feature tileFeature, PointDoc
         .setAttr("image", pointDocument.image)
         .setAttr("poiIcon", pointDocument.poiIcon)
         .setAttr("poiIconColor", pointDocument.poiIconColor)
-        .setAttr("poiCategory", pointDocument.poiCategory);
+        .setAttr("poiCategory", pointDocument.poiCategory)
+        .setAttr("poiSource", pointDocument.poiSource);
     for (String lang : supportedLanguages) {
       tileFeature.setAttr("name:" + lang, pointDocument.name.get(lang));
       tileFeature.setAttr("description:" + lang, pointDocument.description.get(lang));

src/main/java/il/org/osm/israelhiking/PointDocument.java

@@ -12,5 +12,6 @@ class PointDocument {
     public String poiCategory;
     public String poiIcon;
     public String poiIconColor;
+    public String poiSource;
     public double[] location;
   }