Merge remote-tracking branch 'origin/develop' into project/cycle-infra

assets/themes/bicyclelib/bicyclelib.json

@@ -33,7 +33,7 @@
     "fr": "Une vélothèque est un endroit où on peut emprunter des vélos, souvent moyennant une petite somme annuelle. Un cas d'utilisation notable est celui des vélothèques pour les enfants, qui leur permettent de passer à un vélo plus grand quand ils sont trop grands pour leur vélo actuel",
     "zh_Hant": "單車圖書館是指每年支付小額費用，然後可以租用單車的地方。最有名的單車圖書館案例是給小孩的，能夠讓長大的小孩用目前的單車換成比較大的單車"
   },
-  "icon": "./assets/themes/bicycle_library/logo.svg",
+  "icon": "./assets/themes/bicyclelib/logo.svg",
   "socialImage": null,
   "startLat": 0,
   "startLon": 0,

assets/themes/campersite/campersite.json

@@ -38,13 +38,13 @@
     "nb_NO"
   ],
   "maintainer": "joost schouppe",
-  "icon": "./assets/themes/campersites/caravan.svg",
+  "icon": "./assets/themes/campersite/caravan.svg",
   "version": "0",
   "startLat": 43.14,
   "startLon": 3.14,
   "startZoom": 14,
   "widenFactor": 0.05,
-  "socialImage": "./assets/themes/campersites/Bar%C3%9Fel_Wohnmobilstellplatz.jpg",
+  "socialImage": "./assets/themes/campersite/Bar%C3%9Fel_Wohnmobilstellplatz.jpg",
   "layers": [
     {
       "id": "caravansites",
@@ -522,7 +522,7 @@
         "reviews"
       ],
       "icon": {
-        "render": "circle:white;./assets/themes/campersites/caravan.svg",
+        "render": "circle:white;./assets/themes/campersite/caravan.svg",
         "mappings": [
           {
             "if": {
@@ -530,7 +530,7 @@
                 "fee=no"
               ]
             },
-            "then": "circle:white;./assets/themes/campersites/caravan_green.svg"
+            "then": "circle:white;./assets/themes/campersite/caravan_green.svg"
           }
         ]
       },
@@ -862,7 +862,7 @@
         }
       ],
       "icon": {
-        "render": "circle:white;./assets/themes/campersites/sanitary_dump_station.svg"
+        "render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
       },
       "width": {
         "render": "8"

assets/themes/cycle_infra/cycle_infra.json

@@ -25,7 +25,7 @@
   "startZoom": 11,
   "widenFactor": 0.05,
   "socialImage": "./assets/themes/cycle_infra/cycle-infra.svg",
-  "enableDownload": true,
+  "enableExportButton": true,
   "layers": [
     {
       "id": "cycleways",
@@ -51,6 +51,9 @@
           ]
         }
       },
+      "calculatedTags": [
+        "_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
+      ],
       "title": {
         "render": {
           "en": "Cycleways",
@@ -1025,7 +1028,6 @@
           ]
         }
       ],
-      "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
         "render": "./assets/themes/cycle_infra/bicycleway.svg"
       },
@@ -1122,6 +1124,9 @@
           ]
         }
       },
+      "calculatedTags": [
+        "_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
+      ],
       "minzoom": 14,
       "wayHandling": 0,
       "title": {

assets/themes/surveillance/surveillance.json

@@ -25,7 +25,7 @@
     "zh_Hant"
   ],
   "maintainer": "",
-  "icon": "./assets/themes/surveillance_cameras/logo.svg",
+  "icon": "./assets/themes/surveillance/logo.svg",
   "version": "0",
   "startLat": 0,
   "startLon": 0,