Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-11-27 16:05:41 +01:00
commit d0ebd0e233
187 changed files with 1201 additions and 22352 deletions

View file

@ -189,9 +189,6 @@
},
{
"id": "rating",
"labels": [
"defaults"
],
"icon": {
"class": "w-20 mx-1 flex items-center"
},

View file

@ -66,11 +66,11 @@
"marker": [
{
"icon": {
"render": "note",
"render": "./assets/svg/note.svg",
"mappings": [
{
"if": "closed_at~*",
"then": "resolved"
"then": "./assets/svg/resolved.svg"
}
]
}
@ -80,11 +80,11 @@
"iconBadges": [
{
"if": "_total_comments>1",
"then": "circle:white;speech_bubble"
"then": "circle:white;./assets/svg/speech_bubble.svg"
},
{
"if": "_is_import_note~*",
"then": "addSmall"
"then": "./assets/svg/addSmall.svg"
}
],
"anchor": "bottom"

View file

@ -160,7 +160,7 @@
"craft=key_cutter"
]
},
"then": "./assets/layers/id_presets/fas-key.svg"
"then": "circle:white;./assets/layers/id_presets/fas-key.svg"
}
],
"label": {

View file

@ -372,7 +372,7 @@
"mappings": [
{
"if": "mapcomplete-show_crosshair=yes",
"then": "Show a crosshair in the center of the map (when zoomed in above level 17)"
"then": "Show a crosshair in the center of the map when zoomed in above level 17"
},
{
"if": "mapcomplete-show_crosshair=no",
@ -382,6 +382,10 @@
"if": "mapcomplete-show_crosshair=",
"then": "Do not show a crosshair in the center of the map",
"hideInAnswer": true
},
{
"if": "mapcomplete-show_crosshair=always",
"then": "Always show a crosshair in the center of the map"
}
]
},

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<svg xmlns="http://www.w3.org/2000/svg" width="374px" height="259px" viewBox="0 0 374 259" version="1.1">
<g id="surface1"/>
</svg>

Before

Width:  |  Height:  |  Size: 189 B

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<svg xmlns="http://www.w3.org/2000/svg" width="375px" height="375px" viewBox="0 0 375 375" version="1.1">
<g id="surface1"/>
</svg>

Before

Width:  |  Height:  |  Size: 189 B

View file

@ -84,7 +84,7 @@
"eu": "Akanpatzeko tokiak",
"pl": "Miejsca kamperowe"
},
"minzoom": 10,
"minzoom": 7,
"source": {
"osmTags": {
"and": [
@ -967,7 +967,7 @@
"es": "Estaciones sanitarias",
"pl": "Stacje zrzutów sanitarnych"
},
"minzoom": 10,
"minzoom": 7,
"source": {
"osmTags": {
"and": [

View file

@ -40,8 +40,20 @@
"Originally created during Open Summer of Code by Pieter Fiers, Thibault Declercq, Pierre Barban, Joost Schouppe and Pieter Vander Vennet"
],
"layers": [
"bike_cafe",
"bike_shop",
{
"builtin": [
"bike_cafe",
"bike_shop",
"bike_repair_station",
"bicycle_tube_vending_machine",
"drinking_water",
"bike_themed_object",
"bike_cleaning"
],
"override": {
"minzoom": 11
}
},
{
"builtin": [
"bicycle_rental"
@ -113,11 +125,6 @@
"minzoom": 13
}
},
"bike_repair_station",
"bicycle_tube_vending_machine",
"drinking_water",
"bike_themed_object",
"bike_cleaning",
"bike_parking",
{
"builtin": [

View file

@ -785,7 +785,7 @@
}
],
"overrideAll": {
"minzoom": 18
"minzoom": 17
},
"widenFactor": 2,
"overpassMaxZoom": 15,

View file

@ -768,7 +768,7 @@
],
"marker": [
{
"icon": "statistics:black"
"icon": "./assets/svg/statistics.svg"
}
],
"iconSize": "30,30",
@ -778,4 +778,4 @@
}
}
]
}
}

View file

@ -294,7 +294,7 @@
],
"marker": [
{
"icon": "statistics:black"
"icon": "./assets/svg/statistics.svg"
}
],
"iconSize": "30,30",

View file

@ -467,7 +467,7 @@
],
"marker": [
{
"icon": "statistics"
"icon": "./assets/svg/statistics.svg"
}
]
}

View file

@ -166,31 +166,31 @@
{
"if": "sidewalk:left|right=yes",
"then": {
"en": "Yes, there is a sidewalk on this side of the road",
"de": "Ja, es gibt einen Bürgersteig auf dieser Straßenseite",
"da": "Ja, der er et fortov på denne side af vejen",
"nl": "Ja, er is een stoep aan deze kant van de weg",
"fr": "Oui, il y a un trottoir de ce côté de la route",
"ca": "Sí, hi ha una vorera a aquest costat del carrer",
"es": "Sí, hay una acera en este lado de la calle",
"cs": "Ano, na této straně silnice je chodník",
"it": "Sì, c'è un marciapiede su questo lato della strada",
"pl": "Tak, jest chodnik z boku drogi"
"en": "There is a sidewalk on this side of the road",
"de": "Es gibt einen Bürgersteig auf dieser Straßenseite",
"da": "Der er et fortov på denne side af vejen",
"nl": "Er is een stoep aan deze kant van de weg",
"fr": "Il y a un trottoir de ce côté de la route",
"ca": "Hi ha una vorera a aquest costat del carrer",
"es": "Hay una acera en este lado de la calle",
"cs": "Na této straně silnice je chodník",
"it": "C'è un marciapiede su questo lato della strada",
"pl": "Jest chodnik z boku drogi"
}
},
{
"if": "sidewalk:left|right=no",
"then": {
"en": "No, there is no sidewalk to walk on",
"de": "Nein, es gibt keinen Bürgersteig für Fußgänger",
"da": "Nej, der er ikke noget fortov at gå på",
"nl": "Nee, er is geen stoep om op te lopen",
"fr": "Non, il n'y a pas de trottoir où marcher",
"ca": "No, no hi ha vorera per la que caminar",
"es": "No, no hay acera por la que caminar",
"cs": "Ne, není tu žádný chodník",
"it": "No, non c'è un marciapiede su cui camminare",
"pl": "Nie, nie ma chodnika, którym można chodzić"
"en": "There is no sidewalk to walk on",
"de": "Es gibt keinen Bürgersteig für Fußgänger",
"da": "Der er ikke noget fortov at gå på",
"nl": "Er is geen stoep om op te lopen",
"fr": "Il n'y a pas de trottoir où marcher",
"ca": "No hi ha vorera per la que caminar",
"es": "No hay acera por la que caminar",
"cs": "Není tu žádný chodník",
"it": "Non c'è un marciapiede su cui camminare",
"pl": "Nie ma chodnika, którym można chodzić"
}
},
{