Split input and output, remove warnings and errors, add check at the end of the CI

Author: HarelM

.github/workflows/CI.yml

@@ -19,10 +19,13 @@ jobs:
           docker compose build planet-search
       - name: End to End tests using curl
         run: |-
-          mkdir -p ./data/sources
-          cp ./src/test/resources/extenal.geojson ./data/sources/external.geojson
+          mkdir -p ./data/input
+          cp ./src/test/resources/extenal.geojson ./data/input/external.geojson
           docker compose up planet-search 
           curl -s -X GET http://localhost:9200/points/_search?pretty -H 'Content-Type: application/json'
+      - name: Check that a PMTiles was created
+        if: ! exists('./data/output/global_points.pmtiles')
+        run: echo "File was not created" && exit 1
 
   Java:
     runs-on: ubuntu-latest

README.md

@@ -15,6 +15,7 @@ Additional arguments to this wrapper besides the Planetiler's arguments:
 | `es-address` | The address of the Elasticsearch database | `http://localhost:9200` |
 | `es-points-index-alias` | The alias of the index to insert points into, it will create "1" and "2" suffix for the relevant index before switching | `points` |
 | `es-bbox-index-alias` | The alias of the index to insert bounding boxes into, it will create "1" and "2" suffix for the relevant index before switching | `bbox` |
+| `external-file-path` | Extranl geojson file path to allow adding non OSM features to the search and POIs. these features should have a specific format | `data/sources/external.geojson` |
 
 To run using docker (While having a local elasticsearch running at 9200):
 

docker-compose.yml

@@ -3,7 +3,8 @@ services:
     build: .
     network_mode: host
     volumes:
-      - ./data:/app/data
+      - ./data/output:/app/data/sources
+      - ./data/input:/app/data/target
     environment:
       - JAVA_OPTS=-Xmx2g -Xms2g
     command:

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

@@ -39,7 +39,7 @@ static void run(Arguments args) throws Exception {
           .addOsmSource("osm", Path.of("data", "sources", area + ".osm.pbf"), "geofabrik:" + area)
           .addGeoJsonSource("external", externalFilePath)
           // override this default with mbtiles="path/to/output.mbtiles"
-          .overwriteOutput(Path.of("data", PlanetSearchProfile.POINTS_LAYER_NAME + ".pmtiles"))
+          .overwriteOutput(Path.of("data", "target", PlanetSearchProfile.POINTS_LAYER_NAME + ".pmtiles"))
           .run();
 
         ElasticsearchHelper.switchAlias(esClient, pointsIndexAlias, targetPointsIndex);

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

@@ -11,6 +11,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
+import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.geom.Point;
@@ -186,7 +187,7 @@ private void processExternalFeautre(SourceFeature sourceFeature, FeatureCollecto
       try {
         point = GeoUtils.point(sourceFeature.worldGeometry().getCoordinate());
       } catch (GeometryException e2) {
-        LOGGER.warn("Failed to process external feature: {}", docId);
+        // ignore bad geometries
         return;
       }
     }
@@ -382,7 +383,7 @@ private void processOtherSourceFeature(SourceFeature feature, FeatureCollector f
       try {
         point = GeoUtils.point(feature.worldGeometry().getCoordinate());
       } catch (GeometryException e2) {
-        LOGGER.warn("Failed to process feature: {} (this is usually a relations outside the area)", docId);
+        // ignore bad geometries
         return;
       }
     }
@@ -431,10 +432,17 @@ private void insertPointToElasticsearch(PointDocument pointDocument, String docI
   }
 
   private void insertBboxToElasticsearch(SourceFeature feature, String[] supportedLanguages) {
+    Envelope envelope;
+    try {
+      envelope = feature.polygon().getEnvelopeInternal();
+    } catch (GeometryException e) {
+      return;
+    }
     try {
       var bbox = new BBoxDocument();
       bbox.area = feature.areaMeters();
-      bbox.setBBox(GeoUtils.toLatLonBoundsBounds(feature.polygon().getEnvelopeInternal()));
+
+      bbox.setBBox(GeoUtils.toLatLonBoundsBounds(envelope));
       for (String lang : supportedLanguages) {
           bbox.name.put(lang, Coalesce(feature.getString("name:" + lang), feature.getString("name")));
       }
@@ -445,7 +453,7 @@ private void insertBboxToElasticsearch(SourceFeature feature, String[] supported
       );
     } catch (Exception e) {
       // swallow
-      LOGGER.error("Unable to insert" + e.getMessage());
+      LOGGER.error("Unable to insert: " + e.getMessage());
     }
   }