allowing to select offline maps even without osmscout installed

Without OSM Scout Server, if user selects offline profile, (s)he can get stuck into the case where none of the maps are available for selected profile. To avoid this case and handle absence of OSM Scout Server via GUI, the corresponding styles are allowed. In the absence of the server, user will get a choice to choose other profile or map provider
rinigus · Aug 20, 2019 · 2f8747b · 2f8747b
1 parent e13657d
commit 2f8747b
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 16 deletions.
diff --git a/geocoders/osmscout.json b/geocoders/osmscout.json
@@ -6,6 +6,5 @@
   },
   "_description": "Search based on open data sources. Supports autocomplete",
   "name": "OSM Scout",
-  "profiles": ["mixed", "offline"],
-  "requires": ["harbour-osmscout-server", "osmscout-server"]
+  "profiles": ["mixed", "offline"]
 }
diff --git a/guides/osmscout.json b/guides/osmscout.json
@@ -7,6 +7,5 @@
   "_description": "Points of interest from OpenStreetMap data",
   "geocoder": "osmscout",
   "name": "OSM Scout",
-  "profiles": ["mixed", "offline"],
-  "requires": ["harbour-osmscout-server", "osmscout-server"]
+  "profiles": ["mixed", "offline"]
 }
diff --git a/maps/osmscout_0_day.json b/maps/osmscout_0_day.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Day",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright",
     "type": "default"
 }
diff --git a/maps/osmscout_0_day_english.json b/maps/osmscout_0_day_english.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Day English",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright-en",
     "type": "default"
 }
diff --git a/maps/osmscout_0_night.json b/maps/osmscout_0_night.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Night",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=mc",
     "style_gui": {
         "fg": "white",

diff --git a/maps/osmscout_0_night_english.json b/maps/osmscout_0_night_english.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Night English",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=mc-en",
     "style_gui": {
         "fg": "white",

diff --git a/maps/osmscout_4_car_day.json b/maps/osmscout_4_car_day.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Car Day",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright-car",
     "type": "preview",
     "vehicle": "car"

diff --git a/maps/osmscout_4_car_day_english.json b/maps/osmscout_4_car_day_english.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Car Day English",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright-car-en",
     "type": "preview",
     "vehicle": "car"

diff --git a/maps/osmscout_4_car_night.json b/maps/osmscout_4_car_night.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Car Night",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=mc-car",
     "style_gui": {
         "fg": "white",

diff --git a/maps/osmscout_4_car_night_english.json b/maps/osmscout_4_car_night_english.json
@@ -10,7 +10,6 @@
     "name": "OSM Scout Car Night English",
     "profiles": ["mixed", "offline"],
     "provider": "OSM Scout",
-    "requires": ["harbour-osmscout-server", "osmscout-server"],
     "style_url": "http://localhost:8553/v1/mbgl/style?style=mc-car-en",
     "style_gui": {
         "fg": "white",

diff --git a/routers/gpx_osmscout.json b/routers/gpx_osmscout.json
@@ -13,6 +13,5 @@
   "can_reroute": false,
   "from_needed": false,
   "to_needed": false,
-  "profiles": ["mixed", "offline", "online"],
-  "requires": ["harbour-osmscout-server", "osmscout-server"]
+  "profiles": ["mixed", "offline", "online"]
 }
diff --git a/routers/osmscout.json b/routers/osmscout.json
@@ -9,6 +9,5 @@
   "_modes": ["car", "bicycle", "foot"],
   "name": "OSM Scout",
   "offline": true,
-  "profiles": ["mixed", "offline"],
-  "requires": ["harbour-osmscout-server", "osmscout-server"]
+  "profiles": ["mixed", "offline"]
 }