Merge branch 'develop' into feature/maproulette

assets/themes/bicyclelib/bicyclelib.json

@@ -38,7 +38,7 @@
     {
       "builtin": "bicycle_library",
       "override": {
-        "minZoom": 0
+        "minzoom": 0
       }
     }
   ]

assets/themes/mapcomplete-changes/mapcomplete-changes.json

@@ -283,6 +283,10 @@
                 "if": "theme=postboxes",
                 "then": "./assets/themes/postboxes/postbox.svg"
               },
+              {
+                "if": "theme=rainbow_crossings",
+                "then": "./assets/themes/rainbow_crossings/logo.svg"
+              },
               {
                 "if": "theme=shops",
                 "then": "./assets/themes/shops/shop.svg"

assets/themes/onwheels/onwheels.json

@@ -30,7 +30,7 @@
     "doctors"
   ],
   "overrideAll" : {
-    "minZoom" : "15",
+    "minzoom" : "15",
     "mapRendering" : [
       {
         "label" : null

assets/themes/rainbow_crossings/crossing.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 600 600"
+   version="1.1"
+   id="svg20"
+   sodipodi:docname="crossing.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     id="namedview22"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="false"
+     inkscape:zoom="0.75881737"
+     inkscape:cx="-111.35749"
+     inkscape:cy="312.32812"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg20" />
+  <rect
+     style="fill:#959a99;fill-opacity:1;stroke-linecap:round"
+     id="rect845"
+     width="602.2915"
+     height="602.07373"
+     x="-1.5249536"
+     y="-1.9649721" />
+  <rect
+     x="51.805016"
+     y="120.82925"
+     width="100"
+     height="400"
+     fill="#ffffff"
+     stroke-width="2"
+     stroke="#000000"
+     id="rect14" />
+  <rect
+     x="251.80501"
+     y="120.82925"
+     width="100"
+     height="400"
+     fill="#ffffff"
+     stroke-width="2"
+     stroke="#000000"
+     id="rect16" />
+  <rect
+     x="451.80502"
+     y="120.82925"
+     width="100"
+     height="400"
+     fill="#ffffff"
+     stroke-width="2"
+     stroke="#000000"
+     id="rect18" />
+</svg>

assets/themes/rainbow_crossings/license_info.json

@@ -1,4 +1,12 @@
 [
+  {
+    "path": "crossing.svg",
+    "license": "CC0",
+    "authors": [
+      "bxl-forever"
+    ],
+    "sources": []
+  },
   {
     "path": "logo.svg",
     "license": "CC0",
@@ -7,4 +15,4 @@
     ],
     "sources": []
   }
-]
+]

assets/themes/rainbow_crossings/rainbow_crossings.json

@@ -15,7 +15,28 @@
   "startZoom": 16,
   "widenFactor": 2,
   "layers": [
-    "rainbow_crossings"
+    {
+      "builtin": "rainbow_crossings",
+      "override": {
+        "minzoom": 10,
+        "id": "rainbow_crossing_high_zoom",
+        "name": null,
+        "=presets": [],
+        "source": {
+          "osmTags": {
+            "and+": ["crossing:marking=rainbow"]
+          }
+        }
+      }
+    },
+    "rainbow_crossings",
+    {
+      "builtin": "cycleways_and_roads",
+      "override": {
+        "minzoom": 18,
+        "name": null
+      }
+    }
   ]
 }
 

assets/themes/street_lighting/street_lighting.json

@@ -51,7 +51,7 @@
           ]
         }
       },
-      "minZoom": 16,
+      "minzoom": 16,
       "title": {
         "render": {
           "en": "Lit street",
@@ -171,7 +171,7 @@
           ]
         }
       },
-      "minZoom": 19,
+      "minzoom": 19,
       "title": {
         "render": {
           "en": "Street",