Merge master

assets/themes/artwork/artwork.json

@@ -8,7 +8,7 @@
     "de": "Freie Kunstwerk-Karte"
   },
   "description": {
-    "en": "Welcome to Open Artwork Map, a map of statues, busts, grafittis, ... all over the world",
+    "en": "Welcome to Open Artwork Map, a map of statues, busts, grafittis and other artwork all over the world",
     "nl": "Welkom op de Open Kunstwerken Kaart",
     "fr": "Bienvenue sur la carte ouverte des œuvres d'art, une carte des statues, fresques, ... du monde entier",
     "de": "Willkommen bei der Freien Kunstwerk-Karte, einer Karte von Statuen, Büsten, Grafitti, ... auf der ganzen Welt"

assets/themes/benches/benches.json

@@ -29,7 +29,7 @@
   "widenFactor": 0.05,
   "socialImage": "",
   "layers": [
-  "bench","bench_at_pt","picnic_tables"
+  "bench","bench_at_pt","picnic_table"
   ],
   "roamingRenderings": []
 }

assets/themes/bookcases/Bookcases.json

@@ -28,6 +28,6 @@
   "widenFactor": 0.05,
   "roamingRenderings": [],
   "layers": [
-    "public_bookcases"
+    "public_bookcase"
   ]
 }

assets/themes/cyclestreets/cyclestreets.json

@@ -165,7 +165,13 @@
         "nl": "Laag waar je een straat als fietsstraat kan markeren"
       },
       "source": {
-        "osmTags": "highway~residential|tertiary|unclassified"
+        "osmTags": {
+          "or": [
+            "highway=residential",
+            "highway=tertiary",
+            "highway=unclassified"
+          ]
+        }
       },
       "minzoom": 18,
       "wayHandling": 0,

assets/themes/cyclofix/cyclofix.json

@@ -32,8 +32,8 @@
   "widenFactor": 0.05,
   "socialImage": "assets/themes/cyclofix/logo.svg",
   "layers": [
-    "bike_cafes",
-    "bike_shops",
+    "bike_cafe",
+    "bike_shop",
     {
       "builtin": "bicycle_library",
       "override": {

assets/themes/maps/maps.json

@@ -29,7 +29,7 @@
   "widenFactor": 0.05,
   "socialImage": "",
   "layers": [
-   "maps"
+   "map"
   ],
   "roamingRenderings": []
 }

assets/themes/nature/nature.json

@@ -22,10 +22,10 @@
   "socialImage": "",
   "layers": [
     "drinking_water",
-    "birdhides",
-    "maps",
-    "information_boards",
-    "nature_reserves"
+    "birdhide",
+    "map",
+    "information_board",
+    "nature_reserve"
   ],
   "roamingRenderings": []
 }

assets/themes/sport_pitches/sport_pitches.json

@@ -1,16 +1,20 @@
 {
   "id": "sport_pitches",
   "title": {
-    "nl": "Sportvelden"
+    "nl": "Sportvelden",
+    "en": "Sport pitches"
   },
   "shortDescription": {
-    "nl": "Deze kaart toont sportvelden"
+    "nl": "Deze kaart toont sportvelden",
+    "en": "A map showing sport pitches"
   },
   "description": {
-    "nl": "Een sportveld is een ingerichte plaats met infrastructuur om een sport te beoefenen"
+    "nl": "Een sportveld is een ingerichte plaats met infrastructuur om een sport te beoefenen",
+    "en": "A sport pitch is an area where sports are played"
   },
   "language": [
-    "nl"
+    "nl",
+    "en"
   ],
   "maintainer": "",
   "icon": "./assets/layers/sport_pitch/tabletennis.svg",

assets/themes/surveillance_cameras/surveillance_cameras.json

@@ -27,7 +27,7 @@
   "defaultBackgroundId": "osm",
   "layers": [
     "direction",
-    "surveillance_cameras"
+    "surveillance_camera"
   ],
   "roamingRenderings": []
 }

assets/themes/toilets/toilets.json

@@ -23,6 +23,6 @@
   "widenFactor": 0.05,
   "icon": "./assets/themes/toilets/toilets.svg",
   "layers": [
-    "toilets"
+    "toilet"
   ]
 }

assets/themes/trees/trees.json

@@ -28,7 +28,7 @@
     "maxZoom": 18
   },
   "layers": [
-    "tree_nodes"
+    "tree_node"
   ],
   "roamingRenderings": [],
   "defaultBackgroundId": "AGIV"