Merge branches

assets/layers/advertising/advertising.json

@@ -31,7 +31,6 @@
     "it": "Completeremo i dati da caratteristiche pubblicitarie, con referenza, operatore e illuminazione",
     "fr": "Nous allons compléter les information sur la publicité avec la référence, l'opérateur et l'éclairage"
   },
-  "enableMorePrivacy": true,
   "source": {
     "osmTags": {
       "and": [
@@ -1643,5 +1642,6 @@
   "allowMove": {
     "enableImproveAccuracy": true,
     "enableRelocation": false
-  }
+  },
+  "enableMorePrivacy": true
 }

assets/layers/atm/atm.json

@@ -644,4 +644,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": false
   }
-}
+}

assets/layers/brothel/brothel.json

@@ -11,7 +11,6 @@
   "source": {
     "osmTags": "amenity=brothel"
   },
-  "enableMorePrivacy": true,
   "minzoom": 6,
   "title": {
     "render": {
@@ -95,5 +94,6 @@
     "omitDefaultDeleteReasons": false
   },
   "allowMove": true,
-  "allowSplit": false
+  "allowSplit": false,
+  "enableMorePrivacy": true
 }

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": {
+  "pointRendering": [
-    "en": "A charging station",
+    {
-    "nl": "Oplaadpunten",
+      "location": [
-    "ca": "Una estació de càrrega",
+        "point",
-    "de": "Eine Ladestation",
+        "centroid"
-    "fr": "Une station de recharge"
+      ],
-  },
+      "marker": [
-  "#": "no-question-hint-check",
+        {
+          "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",
     {
@@ -2747,109 +2849,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",
@@ -3097,6 +3096,19 @@
       ]
     }
   ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "amenity=",
+        "disused:amenity=charging_station"
+      ]
+    },
+    "neededChangesets": 10
+  },
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  },
   "units": [
     {
       "maxstay": {
@@ -3291,17 +3303,5 @@
       }
     }
   ],
-  "allowMove": {
+  "#": "no-question-hint-check"
-    "enableRelocation": false,
+}
-    "enableImproveAccuracy": true
-  },
-  "deletion": {
-    "softDeletionTags": {
-      "and": [
-        "amenity=",
-        "disused:amenity=charging_station"
-      ]
-    },
-    "neededChangesets": 10
-  }
-}

assets/layers/love_hotel/love_hotel.json

@@ -8,7 +8,6 @@
     "en": "A love hotel is a type of short-stay hotel found around the world operated primarily for the purpose of allowing guests privacy for sexual activities",
     "de": "Ein Love Hotel ist eine Art Kurzzeithotel, das in erster Linie zu dem Zweck betrieben wird, den Gästen Privatsphäre für sexuelle Aktivitäten zu bieten"
   },
-  "enableMorePrivacy": true,
   "source": {
     "osmTags": "amenity=love_hotel"
   },
@@ -84,5 +83,6 @@
     },
     "contact"
   ],
+  "enableMorePrivacy": true,
   "credits": "Asteliks"
 }

assets/layers/parcel_lockers/parcel_lockers.json

@@ -290,4 +290,4 @@
   "allowMove": {
     "enableImproveAccuracy": true
   }
-}
+}

assets/layers/postoffices/postoffices.json

@@ -658,4 +658,4 @@
       ]
     }
   ]
-}
+}

assets/layers/stripclub/stripclub.json

@@ -8,7 +8,6 @@
     "en": "A venue where erotic dance, striptease, or lap dances are performed commercially. ",
     "de": "Ein Ort, an dem erotische Tanz-, Striptease- oder Lapdances kommerziell durchgeführt werden. "
   },
-  "enableMorePrivacy": true,
   "source": {
     "osmTags": "amenity=stripclub"
   },
@@ -88,5 +87,6 @@
     },
     "opening_hours",
     "contact"
-  ]
+  ],
+  "enableMorePrivacy": true
 }

assets/layers/surveillance_camera/surveillance_camera.json

@@ -22,7 +22,6 @@
     "cs": "Tato vrstva zobrazuje sledovací kamery a umožňuje přispěvateli aktualizovat informace a přidávat nové kamery",
     "sl": "Ta sloj prikazuje nadzorne kamere in urednikom omogoča posodabljanje informacij obstoječih in dodajanje novih kamer"
   },
-  "enableMorePrivacy": true,
   "source": {
     "osmTags": {
       "and": [
@@ -856,5 +855,6 @@
       "id": "camera:mount"
     }
   ],
-  "deletion": true
+  "deletion": true,
+  "enableMorePrivacy": true
 }

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

@@ -1,4 +1,4 @@
-{
+²{
   "id": "mapcomplete-changes",
   "title": {
     "en": "Changes made with MapComplete"
@@ -9,11 +9,12 @@
   "description": {
     "en": "This maps shows all the changes made with MapComplete"
   },
+  "shortDescription": {
+    "en": "Shows changes made by MapComplete",
+    "de": "Änderungen von MapComplete anzeigen"
+  },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
-  "startLat": 0,
-  "startLon": 0,
-  "startZoom": 1,
   "layers": [
     {
       "id": "mapcomplete-changes",
@@ -685,4 +686,4 @@
       }
     }
   ]
-}
+}

assets/themes/openlovemap/openlovemap.json

@@ -12,7 +12,6 @@
   },
   "icon": "./assets/layers/stripclub/stripclub.svg",
   "hideFromOverview": true,
-  "enableMorePrivacy": true,
   "layers": [
     "brothel",
     "stripclub",
@@ -272,5 +271,6 @@
         ]
       }
     ]
-  }
+  },
+  "enableMorePrivacy": true
 }

assets/themes/surveillance/surveillance.json

@@ -52,7 +52,6 @@
   },
   "icon": "./assets/themes/surveillance/logo.svg",
   "defaultBackgroundId": "maptiler.carto",
-  "enableMorePrivacy": true,
   "layers": [
     "surveillance_camera",
     {
@@ -61,5 +60,6 @@
         "minzoom": 12
       }
     }
-  ]
+  ],
+  "enableMorePrivacy": true
 }

assets/themes/velopark/velopark.json

@@ -4,7 +4,6 @@
     "en": "Velopark to OpenStreetMap synchronisation tool",
     "nl": "Velopark naar OpenStreetMap sync tool"
   },
-  "customCss": "./assets/themes/velopark/velopark.css",
   "mustHaveLanguage": [
     "nl",
     "en"
@@ -534,6 +533,7 @@
       }
     ]
   },
+  "customCss": "./assets/themes/velopark/velopark.css",
   "lockLocation": [
     [
       2.51357303225,