Merge branch 'develop'

pietervdvn · Sep 14, 2024 · c77325a · c77325a
2 parents 7d809c3 + 9faaad0
commit c77325a
Show file tree

Hide file tree

Showing 26 changed files with 581 additions and 363 deletions.
diff --git a/.versionrc.json b/.versionrc.json
@@ -3,6 +3,13 @@
       {"type": "feat", "section": "Features"},
       {"type": "fix", "section": "Bug Fixes"},
       {"type": "themes", "section": "Theme improvements"},
+      {"type": "UX",
+        "section": "User experience improvements"
+      },
+      {
+        "type": "UI",
+        "section": "User interface improvements"
+      },
       {"type": "chore", "hidden": true},
       {"type": "docs", "hidden": true},
       {"type": "style", "hidden": true},

diff --git a/assets/layers/caravansites/caravansites.json b/assets/layers/caravansites/caravansites.json
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
@@ -5,7 +5,13 @@
     "nl": "Oplaadpunten",
     "de": "Ladestationen"
   },
-  "minzoom": 10,
+  "description": {
+    "en": "A charging station",
+    "nl": "Oplaadpunten",
+    "ca": "Una estació de càrrega",
+    "de": "Eine Ladestation",
+    "fr": "Une station de recharge"
+  },
   "source": {
     "osmTags": {
       "and": [
@@ -20,6 +26,7 @@
       ]
     }
   },
+  "minzoom": 10,
   "title": {
     "render": {
       "en": "Charging station",
@@ -65,14 +72,109 @@
       }
     ]
   },
-  "description": {
-    "en": "A charging station",
-    "nl": "Oplaadpunten",
-    "ca": "Una estació de càrrega",
-    "de": "Eine Ladestation",
-    "fr": "Une station de recharge"
-  },
-  "#": "no-question-hint-check",
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "pin",
+          "color": "#fff"
+        },
+        {
+          "icon": {
+            "render": "./assets/themes/charging_stations/plug.svg",
+            "mappings": [
+              {
+                "if": "bicycle=yes",
+                "then": "./assets/themes/charging_stations/bicycle.svg"
+              },
+              {
+                "if": {
+                  "or": [
+                    "car=yes",
+                    "motorcar=yes"
+                  ]
+                },
+                "then": "./assets/themes/charging_stations/car.svg"
+              }
+            ]
+          }
+        }
+      ],
+      "iconBadges": [
+        {
+          "if": {
+            "or": [
+              "disused:amenity=charging_station",
+              "operational_status=broken"
+            ]
+          },
+          "then": "close:#c22;"
+        },
+        {
+          "if": {
+            "or": [
+              "proposed:amenity=charging_station",
+              "planned:amenity=charging_station"
+            ]
+          },
+          "then": "./assets/layers/charging_station/under_construction.svg"
+        },
+        {
+          "if": {
+            "and": [
+              "bicycle=yes",
+              {
+                "or": [
+                  "motorcar=yes",
+                  "car=yes"
+                ]
+              }
+            ]
+          },
+          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
+        }
+      ],
+      "anchor": "bottom",
+      "iconSize": "50,50"
+    }
+  ],
+  "lineRendering": [
+    {
+      "color": "black",
+      "width": 2,
+      "fillColor": "#80808080"
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=charging_station",
+        "motorcar=no",
+        "bicycle=yes"
+      ],
+      "title": {
+        "en": "charging station for electrical bikes",
+        "nl": "oplaadpunt voor elektrische fietsen",
+        "de": "Ladestation für Elektrofahrräder"
+      }
+    },
+    {
+      "tags": [
+        "amenity=charging_station",
+        "motorcar=yes",
+        "bicycle=no"
+      ],
+      "title": {
+        "en": "charging station for cars",
+        "nl": "oplaadstation voor elektrische auto's",
+        "de": "Ladestation für Autos"
+      }
+    }
+  ],
   "tagRenderings": [
     "images",
     {
@@ -2778,109 +2880,6 @@
       }
     }
   ],
-  "lineRendering": [
-    {
-      "color": "black",
-      "width": 2,
-      "fillColor": "#80808080"
-    }
-  ],
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "pin",
-          "color": "#fff"
-        },
-        {
-          "icon": {
-            "render": "./assets/themes/charging_stations/plug.svg",
-            "mappings": [
-              {
-                "if": "bicycle=yes",
-                "then": "./assets/themes/charging_stations/bicycle.svg"
-              },
-              {
-                "if": {
-                  "or": [
-                    "car=yes",
-                    "motorcar=yes"
-                  ]
-                },
-                "then": "./assets/themes/charging_stations/car.svg"
-              }
-            ]
-          }
-        }
-      ],
-      "iconBadges": [
-        {
-          "if": {
-            "or": [
-              "disused:amenity=charging_station",
-              "operational_status=broken"
-            ]
-          },
-          "then": "close:#c22;"
-        },
-        {
-          "if": {
-            "or": [
-              "proposed:amenity=charging_station",
-              "planned:amenity=charging_station"
-            ]
-          },
-          "then": "./assets/layers/charging_station/under_construction.svg"
-        },
-        {
-          "if": {
-            "and": [
-              "bicycle=yes",
-              {
-                "or": [
-                  "motorcar=yes",
-                  "car=yes"
-                ]
-              }
-            ]
-          },
-          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
-        }
-      ],
-      "anchor": "bottom",
-      "iconSize": "50,50"
-    }
-  ],
-  "presets": [
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=no",
-        "bicycle=yes"
-      ],
-      "title": {
-        "en": "charging station for electrical bikes",
-        "nl": "oplaadpunt voor elektrische fietsen",
-        "de": "Ladestation für Elektrofahrräder"
-      }
-    },
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=yes",
-        "bicycle=no"
-      ],
-      "title": {
-        "en": "charging station for cars",
-        "nl": "oplaadstation voor elektrische auto's",
-        "de": "Ladestation für Autos"
-      }
-    }
-  ],
   "filter": [
     {
       "id": "vehicle-type",
@@ -3128,6 +3127,19 @@
       ]
     }
   ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "amenity=",
+        "disused:amenity=charging_station"
+      ]
+    },
+    "neededChangesets": 10
+  },
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  },
   "units": [
     {
       "maxstay": {
@@ -3322,17 +3334,5 @@
       }
     }
   ],
-  "allowMove": {
-    "enableRelocation": false,
-    "enableImproveAccuracy": true
-  },
-  "deletion": {
-    "softDeletionTags": {
-      "and": [
-        "amenity=",
-        "disused:amenity=charging_station"
-      ]
-    },
-    "neededChangesets": 10
-  }
-}
+  "#": "no-question-hint-check"
+}
diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json
@@ -34,9 +34,6 @@
       ]
     }
   },
-  "snapName": {
-    "en": "a wall, cliff or rock"
-  },
   "minzoom": 18,
   "title": {
     "render": {
@@ -152,5 +149,8 @@
     }
   ],
   "allowMove": false,
+  "snapName": {
+    "en": "a wall, cliff or rock"
+  },
   "doCount": false
 }
diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -9,10 +9,6 @@
     "ca": "Vies ciclistes i carreteres",
     "cs": "Cyklostezky a silnice"
   },
-  "snapName": {
-    "en": "a road or a cycleway",
-    "nl": "een weg, straat of fietspad"
-  },
   "description": {
     "en": "All infrastructure that someone can cycle over, accompanied with questions about this infrastructure",
     "nl": "Alle infrastructuur waar je over kunt fietsen, met vragen over die infrastructuur",
@@ -1917,5 +1913,9 @@
     }
   ],
   "allowMove": false,
-  "allowSplit": true
+  "allowSplit": true,
+  "snapName": {
+    "en": "a road or a cycleway",
+    "nl": "een weg, straat of fietspad"
+  }
 }