Make external geojson optional (#45)

* Make exteranl geojson optinal

* Add flags to docker-compose

* Spelling correction

---------

Co-authored-by: zstadler <zeev.stadler@gmail.com>

Author: HarelM

README.md

@@ -15,7 +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` |
+| `external-file-path` | External geojson file path to allow adding non OSM features to the search and POIs. these features should have a specific format | "empty" |
 
 To run using docker (While having a local elasticsearch running at 9200):
 

docker-compose.yml

@@ -10,6 +10,7 @@ services:
     command:
       - --es-address=http://localhost:9200
       - --download
+      - --external-file-path=data/sources/external.geojson
     depends_on:
       - elasticsearch
 

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

@@ -32,19 +32,21 @@ static void run(Arguments args) throws Exception {
             var pointsIndexAlias = args.getString("es-points-index-alias", "Elasticsearch index to populate points", "points");
             var bboxIndexAlias = args.getString("es-bbox-index-alias", "Elasticsearch index to populate bounding boxes", "bbox");
             var supportedLanguages = args.getString("languages", "Languages to support", "en,he,ru,ar").split(",");
-            var externalFilePath = Path.of(args.getString("external-file-path", "Extranl file path", "data/sources/external.geojson"));
+            var externalFilePath = args.getString("external-file-path", "Extranl file path", "");
             var targetPointsIndex = ElasticsearchHelper.createPointsIndex(esClient, pointsIndexAlias, supportedLanguages);
             var targetBBoxIndex = ElasticsearchHelper.createBBoxIndex(esClient, bboxIndexAlias, supportedLanguages);
             var profile = new PlanetSearchProfile(planetiler.config(), esClient, targetPointsIndex, targetBBoxIndex, supportedLanguages);
 
             String area = args.getString("area", "geofabrik area to download", "israel-and-palestine");
-            planetiler.setProfile(profile)
+            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", externalFilePath)
+            planetiler.addOsmSource("osm", Path.of("data", "sources", area + ".osm.pbf"), "geofabrik:" + area);
+            if ("" != externalFilePath) {
+                planetiler.addGeoJsonSource("external", Path.of(externalFilePath));
+            }
             // override this default with mbtiles="path/to/output.mbtiles"
-            .overwriteOutput(Path.of("data", "target", PlanetSearchProfile.POINTS_LAYER_NAME + ".pmtiles"))
-            .run();
+            planetiler.overwriteOutput(Path.of("data", "target", PlanetSearchProfile.POINTS_LAYER_NAME + ".pmtiles"));
+            planetiler.run();
 
             ElasticsearchHelper.switchAlias(esClient, pointsIndexAlias, targetPointsIndex);
             ElasticsearchHelper.switchAlias(esClient, bboxIndexAlias, targetBBoxIndex);