Merge master

assets/layers/bike_cafe/bike_cafe.json

@@ -1,5 +1,5 @@
 {
-  "id": "bike_cafes",
+  "id": "bike_cafe",
   "name": {
     "en": "Bike cafe",
     "nl": "Fietscafé",
@@ -11,12 +11,21 @@
   "source": {
     "osmTags": {
       "and": [
-        "amenity~pub|bar|cafe|restaurant",
+        {
+          "or": [
+            "amenity=pub",
+            "amenity=bar",
+            "amenity=cafe",
+            "amenity=restaurant"
+          ]
+        },
         {
           "#": "Note the double tilde in 'service:bicycle' which interprets the key as regex too",
           "or": [
-            "pub~cycling|bicycle",
-            "theme~cycling|bicycle",
+            "pub=cycling",
+            "pub=bicycle",
+            "theme=cycling",
+            "theme=bicycle",
             "service:bicycle:.*~~*"
           ]
         }

assets/layers/bike_shop/bike_shop.json

@@ -1,5 +1,5 @@
 {
-  "id": "bike_shops",
+  "id": "bike_shop",
   "name": {
     "en": "Bike repair/shop",
     "nl": "Fietszaak",

assets/layers/bike_themed_object/bike_themed_object.json

@@ -10,11 +10,16 @@
   "source": {
     "osmTags": {
       "or": [
-        "theme~cycling|bicycle",
+        "theme=bicycle",
+        "theme=cycling",
         "sport=cycling",
-        "association~cycling|bicycle",
-        "ngo~cycling|bicycle",
-        "club~bicycle|cycling"
+        "association=cycling",
+        "association=bicycle",
+        "ngo=cycling",
+        "ngo=bicycle",
+
+        "club=bicycle",
+        "club=cycling"
       ]
     }
   },
@@ -49,7 +54,7 @@
   ],
   "hideUnderlayingFeaturesMinPercentage": 0,
   "icon": {
-    "render": "./assets/layers/cycling_themed_object/other_services.svg"
+    "render": "./assets/layers/bike_themed_object/other_services.svg"
   },
   "width": {
     "render": "2"

assets/layers/birdhide/birdhide.json

@@ -1,5 +1,5 @@
 {
-  "id": "birdhides",
+  "id": "birdhide",
   "name": {
     "nl": "Vogelkijkhutten"
   },
@@ -178,7 +178,7 @@
   ],
   "icon": {
     "render": {
-      "nl": "./assets/layers/bird_hide/birdhide.svg"
+      "nl": "./assets/layers/birdhide/birdhide.svg"
     },
     "mappings": [
       {
@@ -189,7 +189,7 @@
             "amenity=shelter"
           ]
         },
-        "then": "./assets/layers/bird_hide/birdshelter.svg"
+        "then": "./assets/layers/birdhide/birdshelter.svg"
       }
     ]
   },

assets/layers/information_board/information_board.json

@@ -1,5 +1,5 @@
 {
-  "id": "information_boards",
+  "id": "information_board",
   "name": {
     "nl": "Informatieborden",
     "en": "Information boards"

assets/layers/map/map.json

@@ -1,5 +1,5 @@
 {
-  "id": "maps",
+  "id": "map",
   "name": {
     "en": "Maps",
     "nl": "Kaarten"
@@ -126,7 +126,7 @@
   ],
   "hideUnderlayingFeaturesMinPercentage": 0,
   "icon": {
-    "render": "./assets/layers/maps/map.svg",
+    "render": "./assets/layers/map/map.svg",
     "mappings": [
       {
         "if": {
@@ -135,7 +135,7 @@
             "map_source:attribution=sticker"
           ]
         },
-        "then": "./assets/layers/maps/map-stickered.svg"
+        "then": "./assets/layers/map/map-stickered.svg"
       },
       {
         "if": {
@@ -144,7 +144,7 @@
             "map_source:attribution=yes"
           ]
         },
-        "then": "./assets/layers/maps/osm-logo-white-bg.svg"
+        "then": "./assets/layers/map/osm-logo-white-bg.svg"
       },
       {
         "if": {
@@ -152,7 +152,7 @@
             "map_source=OpenStreetMap"
           ]
         },
-        "then": "./assets/layers/maps/osm-logo-buggy-attr.svg"
+        "then": "./assets/layers/map/osm-logo-buggy-attr.svg"
       }
     ]
   },

assets/layers/nature_reserve/nature_reserve.json

@@ -1,5 +1,5 @@
 {
-  "id": "nature_reserves",
+  "id": "nature_reserve",
   "name": {
     "nl": "Natuurgebied"
   },

assets/layers/picnic_table/picnic_table.json

@@ -1,5 +1,5 @@
 {
-  "id": "picnic_tables",
+  "id": "picnic_table",
   "name": {
     "en": "Picnic tables",
     "nl": "Picnictafels"
@@ -51,7 +51,7 @@
   ],
   "hideUnderlayingFeaturesMinPercentage": 0,
   "icon": {
-    "render": "circle:#e6cf39;./assets/layers/benches/picnic_table.svg"
+    "render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg"
   },
   "width": {
     "render": "8"

assets/layers/public_bookcase/public_bookcase.json

@@ -1,5 +1,5 @@
 {
-  "id": "public_bookcases",
+  "id": "public_bookcase",
   "name": {
     "en": "Bookcases",
     "nl": "Boekenruilkastjes",

assets/layers/surveillance_camera/surveillance_camera.json

@@ -1,5 +1,5 @@
 {
-  "id": "surveillance_cameras",
+  "id": "surveillance_camera",
   "name": {
     "en": "Surveillance camera's",
     "nl": "Bewakingscamera's"

assets/layers/toilet/toilet.json

@@ -1,5 +1,5 @@
 {
-  "id": "toilets",
+  "id": "toilet",
   "name": {
     "en": "Toilets",
     "de": "Toiletten",
@@ -16,15 +16,15 @@
     }
   },
   "icon": {
-    "render": "./assets/layers/toilets/toilets.svg",
+    "render": "./assets/layers/toilet/toilets.svg",
     "mappings": [
       {
         "if": "wheelchair=yes",
-        "then": "./assets/layers/toilets/wheelchair.svg"
+        "then": "./assets/layers/toilet/wheelchair.svg"
       },
       {
         "if": "toilets:position=urinals",
-        "then": "./assets/layers/toilets/urinal.svg"
+        "then": "./assets/layers/toilet/urinal.svg"
       }
     ]
   },

assets/layers/tree_node/tree_node.json

@@ -1,5 +1,5 @@
 {
-  "id": "tree_nodes",
+  "id": "tree_node",
   "name": {
     "nl": "Boom",
     "en": "Tree"
@@ -277,8 +277,8 @@
             ]
           },
           "then": {
-            "nl": "<img src=\"./assets/layers/trees/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Erkend als houtig erfgoed door Onroerend Erfgoed Vlaanderen",
-            "en": "<img src=\"./assets/layers/trees/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Registered as heritage by <i>Onroerend Erfgoed</i> Flanders"
+            "nl": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Erkend als houtig erfgoed door Onroerend Erfgoed Vlaanderen",
+            "en": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Registered as heritage by <i>Onroerend Erfgoed</i> Flanders"
           }
         },
         {
@@ -339,8 +339,8 @@
     },
     {
       "render": {
-        "nl": "<img src=\"./assets/layers/trees/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "en": "<img src=\"./assets/layers/trees/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+        "nl": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
+        "en": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
       },
       "question": {
         "nl": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",

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"