Merge branch 'develop' into feature/nsi

2024-04-29 00:24:51 +02:00 · 2024-04-29 00:24:51 +02:00 · 572d85a6b5
commit 572d85a6b5
parent 90390c8a0f b4163897e8
375 changed files with 34341 additions and 44682 deletions
--- a/assets/layers/aerialway/aerialway.json
+++ b/assets/layers/aerialway/aerialway.json
@ -8,7 +8,6 @@
    "en": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. ",
    "de": "Alle Arten von seil- oder drahtgestütztem Personen- oder Gütertransport, wie Seilbahnen, Gondeln, Sessellifte, Schlepplifte. "
  },
-  "minzoom": 11,
  "source": {
    "osmTags": {
      "and": [
@ -18,6 +17,7 @@
      ]
    }
  },
+  "minzoom": 11,
  "title": {
    "render": {
      "en": "Aerialway {name}",
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@ -889,6 +889,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@ -934,7 +934,7 @@
            "en": "This bench does <span class='subtle'>(probably)</span> not have an inscription",
            "nl": "Deze bank heeft <span class='subtle'>(waarschijnlijk)</span> geen inscriptie",
            "de": "Diese Bank hat <span class='subtle'>(wahrscheinlich)</span> keine Inschrift",
-            "fr": "Ce banc n'a<span class='subtle'>(probablement)</span> pas d'inscription",
+            "fr": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription",
            "es": "Este banco <span class='subtle'>(probablemente)</span> no tiene inscripción",
            "ca": "Aquest banc <span class='subtle'>(probablement)</span> no té cap inscripció",
            "cs": "Tato lavička <span class='subtle'>(pravděpodobně)</span> nemá nápis",
@ -1020,7 +1020,8 @@
            "cs": "Tato lavička <span class=\"subtle\">pravděpodobně</span> nemá integrované umělecké dílo",
            "pt_BR": "Esse banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
            "es": "Este banco <span class=\"subtle\">probablemente</span> no tiene una obra de arte integrada",
-            "pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada"
+            "pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
+            "fr": "Ce banc ne comporte <span class=\"subtle\">probablement</span> pas d'œuvre d'art"
          },
          "hideInAnswer": true
        }
@ -1214,6 +1215,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
+++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
@ -465,6 +465,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/bike_cleaning/bike_cleaning.json
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@ -294,6 +294,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@ -692,6 +692,26 @@
        }
      ]
    },
+    {
+      "id": "charge",
+      "condition": "fee=yes",
+      "question": {
+        "en": "How much does it cost to park your bike here?",
+        "nl": "Hoeveel kost het om een fiets te stallen?"
+      },
+      "questionHint": {
+        "en": "This is the amount which is charged for a single bike",
+        "nl": "Dit is de kostprijs voor een enkele fiets"
+      },
+      "render": {
+        "en": "Parking your bike costs {charge}",
+        "nl": "Je fiets hier parkeren kost {charge}"
+      },
+      "freeform": {
+        "key": "charge",
+        "type": "currency"
+      }
+    },
    {
      "builtin": "opening_hours_24_7",
      "override": {
@ -956,18 +976,6 @@
      }
    }
  ],
-  "units": [
-    {
-      "maxstay": {
-        "quantity": "duration",
-        "denominations": [
-          "days",
-          "weeks",
-          "months"
-        ]
-      }
-    }
-  ],
  "deletion": {
    "softDeletionTags": {
      "and": [
@ -980,5 +988,17 @@
  "allowMove": {
    "enableRelocation": false,
    "enableImproveAccuracy": true
-  }
+  },
+  "units": [
+    {
+      "maxstay": {
+        "quantity": "duration",
+        "denominations": [
+          "days",
+          "weeks",
+          "months"
+        ]
+      }
+    }
+  ]
 }
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@ -1132,6 +1132,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/binocular/binocular.json
+++ b/assets/layers/binocular/binocular.json
@ -191,6 +191,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@ -5,7 +5,12 @@
    "nl": "Oplaadpunten",
    "de": "Ladestationen"
  },
-  "minzoom": 10,
+  "description": {
+    "en": "A charging station",
+    "nl": "Oplaadpunten",
+    "ca": "Una estació de càrrega",
+    "de": "Eine Ladestation"
+  },
  "source": {
    "osmTags": {
      "and": [
@ -20,6 +25,7 @@
      ]
    }
  },
+  "minzoom": 10,
  "title": {
    "render": {
      "en": "Charging station",
@ -65,13 +71,103 @@
      }
    ]
  },
-  "description": {
-    "en": "A charging station",
-    "nl": "Oplaadpunten",
-    "ca": "Una estació de càrrega",
-    "de": "Eine Ladestation"
-  },
-  "#": "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": [],
+  "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",
    {
@ -2413,103 +2509,6 @@
      }
    }
  ],
-  "lineRendering": [],
-  "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 Elektrofahrräder"
-      }
-    }
-  ],
  "filter": [
    {
      "id": "vehicle-type",
@ -2715,6 +2714,19 @@
      ]
    }
  ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "amenity=",
+        "disused:amenity=charging_station"
+      ]
+    },
+    "neededChangesets": 10
+  },
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  },
  "units": [
    {
      "maxstay": {
@ -2873,17 +2885,5 @@
      }
    }
  ],
-  "allowMove": {
-    "enableRelocation": false,
-    "enableImproveAccuracy": true
-  },
-  "deletion": {
-    "softDeletionTags": {
-      "and": [
-        "amenity=",
-        "disused:amenity=charging_station"
-      ]
-    },
-    "neededChangesets": 10
-  }
-}
+  "#": "no-question-hint-check"
+}
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@ -545,6 +545,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/elevator/elevator.json
+++ b/assets/layers/elevator/elevator.json
@ -186,7 +186,8 @@
          "alsoShowIf": "shape=",
          "then": {
            "en": "This elevator has a rectangular shape",
-            "de": "Dieser Aufzug hat eine rechteckige Form"
+            "de": "Dieser Aufzug hat eine rechteckige Form",
+            "fr": "Cet ascenseur est de forme rectangulaire"
          },
          "icon": "./assets/svg/square.svg"
        },
--- a/assets/layers/food_courts/food_courts.json
+++ b/assets/layers/food_courts/food_courts.json
@ -6,6 +6,10 @@
  "description": {
    "en": "Food courts with a variety of food options."
  },
+  "source": {
+    "osmTags": "amenity=food_court"
+  },
+  "minzoom": 12,
  "title": {
    "render": {
      "en": "Food Court"
@ -17,35 +21,6 @@
      }
    ]
  },
-  "source": {
-    "osmTags": "amenity=food_court"
-  },
-  "minzoom": 12,
-  "tagRenderings": [
-    {
-      "id": "name",
-      "question": {
-        "en": "What is the name of this food court?"
-      },
-      "freeform": {
-        "key": "name",
-        "type": "string",
-        "placeholder": {
-          "en": "Name of the food court"
-        }
-      },
-      "render": {
-        "en": "This food court is called <b>{name}</b>."
-      }
-    },
-    "reviews",
-    "images",
-    "opening_hours",
-    "wheelchair-access",
-    "website",
-    "phone",
-    "smoking"
-  ],
  "pointRendering": [
    {
      "location": [
@ -72,5 +47,30 @@
      "color": "#C77400",
      "fillColor": "#C774004D"
    }
+  ],
+  "tagRenderings": [
+    {
+      "id": "name",
+      "question": {
+        "en": "What is the name of this food court?"
+      },
+      "freeform": {
+        "key": "name",
+        "type": "string",
+        "placeholder": {
+          "en": "Name of the food court"
+        }
+      },
+      "render": {
+        "en": "This food court is called <b>{name}</b>."
+      }
+    },
+    "reviews",
+    "images",
+    "opening_hours",
+    "wheelchair-access",
+    "website",
+    "phone",
+    "smoking"
  ]
-}
+}
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@ -352,7 +352,8 @@
            "en": "This is a classroom",
            "de": "Dies ist ein Klassenzimmer",
            "ca": "Açò és una aula",
-            "cs": "Jedná se o učebnu"
+            "cs": "Jedná se o učebnu",
+            "fr": "C'est une salle de classe"
          },
          "icon": "./assets/layers/indoors/room_class.svg"
        },
@ -449,7 +450,8 @@
            "en": "This is an office",
            "de": "Dies ist ein Büro",
            "ca": "Açò és una oficina",
-            "cs": "Jedná se o kancelář"
+            "cs": "Jedná se o kancelář",
+            "fr": "C'est un bureau"
          },
          "icon": "./assets/layers/indoors/room_office.svg"
        },
--- a/assets/layers/information_board/information_board.json
+++ b/assets/layers/information_board/information_board.json
@ -98,6 +98,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@ -422,6 +422,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/memorial/memorial.json
+++ b/assets/layers/memorial/memorial.json
@ -1,5 +1,9 @@
 {
  "id": "memorial",
+  "name": {
+    "en": "Memorials",
+    "de": "Denkmäler"
+  },
  "description": "Layer showing memorial plaques, based upon a unofficial theme. Can be expanded to have multiple types of memorials later on",
  "source": {
    "osmTags": {
@ -9,11 +13,7 @@
      ]
    }
  },
-  "name": {
-    "en": "Memorials",
-    "de": "Denkmäler"
-  },
-  "defaultBackgroundId": "protomaps.white",
+  "minzoom": 9,
  "title": {
    "render": {
      "en": "Memorial plaque",
@ -68,6 +68,17 @@
    }
  ],
  "lineRendering": [],
+  "presets": [
+    {
+      "title": {
+        "en": "a memorial",
+        "de": "ein Denkmal"
+      },
+      "tags": [
+        "historic=memorial"
+      ]
+    }
+  ],
  "tagRenderings": [
    "images",
    {
@ -316,21 +327,10 @@
      }
    }
  ],
-  "presets": [
-    {
-      "title": {
-        "en": "a memorial",
-        "de": "ein Denkmal"
-      },
-      "tags": [
-        "historic=memorial"
-      ]
-    }
-  ],
-  "minzoom": 9,
  "deletion": true,
  "allowMove": {
    "enableImproveAccuracy": true,
    "enableRelocation": false
-  }
+  },
+  "defaultBackgroundId": "protomaps.white"
 }
--- a/assets/layers/observation_tower/observation_tower.json
+++ b/assets/layers/observation_tower/observation_tower.json
@ -358,7 +358,7 @@
  ],
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  },
  "units": [
    {
--- a/assets/layers/outdoor_seating/outdoor_seating.json
+++ b/assets/layers/outdoor_seating/outdoor_seating.json
@ -6,6 +6,10 @@
  "description": {
    "en": "Outdoor seating areas, usually located near cafes and restaurants."
  },
+  "source": {
+    "osmTags": "leisure=outdoor_seating"
+  },
+  "minzoom": 19,
  "title": {
    "render": {
      "en": "Outdoor Seating area"
@ -17,10 +21,26 @@
      }
    ]
  },
-  "source": {
-    "osmTags": "leisure=outdoor_seating"
-  },
-  "minzoom": 19,
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "./assets/layers/outdoor_seating/outdoor_seating.svg"
+        }
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "color": "green",
+      "fillColor": "#00FF004D",
+      "width": 2
+    }
+  ],
  "tagRenderings": [
    "images",
    {
@ -150,25 +170,5 @@
        ]
      }
    }
-  ],
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "./assets/layers/outdoor_seating/outdoor_seating.svg"
-        }
-      ]
-    }
-  ],
-  "lineRendering": [
-    {
-      "color": "green",
-      "fillColor": "#00FF004D",
-      "width": 2
-    }
  ]
-}
+}
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@ -162,6 +162,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/ski_piste/ski_piste.json
+++ b/assets/layers/ski_piste/ski_piste.json
@ -8,7 +8,6 @@
    "en": "Ski and snowboard pistes",
    "de": "Ski- und Snowboardpisten"
  },
-  "minzoom": 11,
  "source": {
    "osmTags": {
      "and": [
@ -22,6 +21,7 @@
      ]
    }
  },
+  "minzoom": 11,
  "title": {
    "render": {
      "en": "Ski piste {name}",
--- a/assets/layers/speed_camera/speed_camera.json
+++ b/assets/layers/speed_camera/speed_camera.json
@ -145,6 +145,10 @@
      "id": "camera_direction"
    }
  ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  },
  "units": [
    {
      "maxspeed": {
@ -155,9 +159,5 @@
        ]
      }
    }
-  ],
-  "allowMove": {
-    "enableImproveAccuracy": true,
-    "enableRelocation": false
-  }
+  ]
 }
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@ -950,6 +950,6 @@
  },
  "allowMove": {
    "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
  }
 }
--- a/assets/layers/unit/unit.json
+++ b/assets/layers/unit/unit.json
@ -422,6 +422,19 @@
            "en": "{quantity} months",
            "nl": "{quantity} maanden"
          }
+        },
+        {
+          "canonicalDenomination": "years",
+          "addSpace": true,
+          "canonicalDenominationSingular": "year",
+          "humanSingular": {
+            "en": "one year",
+            "nl": "één jaar"
+          },
+          "human": {
+            "en": "{quantity} years",
+            "nl": "{quantity} jaar"
+          }
        }
      ]
    }
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@ -29,6 +29,7 @@
    "_biggest_width_properties= /* Can be a list! */ get(feat)('_entrance_properties').filter(p => p.width === get(feat)('_biggest_width'))",
    "_biggest_width_id=get(feat)('_biggest_width_properties').id"
  ],
+  "isCounted": false,
  "minzoom": 18,
  "shownByDefault": false,
  "title": {
@ -121,7 +122,6 @@
      "condition": "_biggest_width_id~*"
    }
  ],
-  "isCounted": false,
  "units": [
    {
      "width": {