Merge branch 'develop' into Robin-patch-1

assets/layers/bike_parking/bike_parking.json

@@ -401,6 +401,13 @@
             "uk": "Кронштейн з можливістю використання замка через вушко. Підсідельна труба може утримуватися на стійці за допомогою анкера",
             "ca": "Un suport inclinat amb possibilitat d'utilitzar un cadenat a través de l'ullet. El tub del seient es pot sostenir al suport amb un anclatge"
           }
+        },
+        {
+          "if": "bicycle_parking=anchors",
+          "then": {
+            "en": "An anchor - a metal loop wide enough for a bike lock attached to a wall, the floor or a boulder.",
+            "nl": "Een anker - een metalen lus waar een fietsslot door kan en vastgemaakt aan de muur of vloer"
+          }
         }
       ],
       "id": "Bicycle parking type"

assets/layers/maxspeed/maxspeed.json

@@ -102,7 +102,13 @@
         "render": "#000000",
         "mappings": [
           {
-            "if": "maxspeed=",
+            "if": {
+              "and": [
+                "maxspeed=",
+                "maxspeed:forward=",
+                "maxspeed:backward="
+              ]
+            },
             "then": "#ff0000"
           }
         ]
@@ -112,6 +118,7 @@
   ],
   "tagRenderings": [
     {
+      "id": "maxspeed-maxspeed",
       "render": {
         "en": "The maximum allowed speed on this road is {canonical(maxspeed)}",
         "de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße beträgt {canonical(maxspeed)}",
@@ -135,7 +142,10 @@
       },
       "freeform": {
         "key": "maxspeed",
-        "type": "pnat"
+        "type": "pnat",
+        "addExtraTags": [
+          "_forward_backward=no"
+        ]
       },
       "mappings": [
         {
@@ -162,9 +172,70 @@
             "maxspeed=20"
           ],
           "hideInAnswer": "_country!=be"
+        },
+        {
+          "if": {
+            "and": [
+              "maxspeed=",
+              "_forward_backward=yes"
+            ]
+          },
+          "then": {
+            "en": "The maximum allowed speed on this road depends on the direction a vehicle goes"
+          }
         }
       ],
-      "id": "maxspeed-maxspeed"
+      "condition": {
+        "or": [
+          "maxspeed~*",
+          {
+            "and": [
+              "maxspeed:forward=",
+              "maxspeed:backward="
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "id": "maxspeed-forward",
+      "condition": {
+        "or": [
+          "maxspeed:backward~*",
+          "maxspeed:forward~*",
+          "_forward_backward=yes"
+        ]
+      },
+      "question": {
+        "en": "What is the maximum allowed speed when travelling {direction_absolute()}?"
+      },
+      "render": {
+        "en": "The maximum allowed speed when travelling {direction_absolute()} on this road is {canonical(maxspeed:forward)}"
+      },
+      "freeform": {
+        "key": "maxspeed:forward",
+        "type": "pnat"
+      }
+    },
+    {
+      "id": "maxspeed-backward",
+      "condition": {
+        "or": [
+          "maxspeed:forward~*",
+          "maxspeed:backward~*",
+          "_forward_backward=yes"
+        ]
+      },
+      "question": {
+        "en": "What is the maximum allowed speed when travelling {direction_absolute(,180)}?"
+      },
+      "render": {
+        "en": "The maximum allowed speed when travelling {direction_absolute(,180)} on this road is {canonical(maxspeed:backward)}"
+      },
+      "freeform": {
+        "key": "maxspeed:backward",
+        "type": "pnat"
+      }
     }
   ],
   "allowMove": false,
@@ -177,6 +248,20 @@
         "denominations": [
           "mph"
         ]
+      },
+      "maxspeed:forward": {
+        "quantity": "speed",
+        "canonical": "kmh",
+        "denominations": [
+          "mph"
+        ]
+      },
+      "maxspeed:backward": {
+        "quantity": "speed",
+        "canonical": "kmh",
+        "denominations": [
+          "mph"
+        ]
       }
     }
   ]

assets/themes/surveillance/surveillance.json

@@ -58,7 +58,6 @@
     "ko": "감시 카메라 및 기타 감시 수단"
   },
   "icon": "./assets/themes/surveillance/logo.svg",
-  "defaultBackgroundId": "maptiler.carto",
   "layers": [
     "surveillance_camera",
     {