diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index d16d782a7..0f190af93 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -23,7 +23,7 @@ "id": "mapillary", "description": "Shows a button to open Mapillary on this location", "render": { - "*": "{mapillary()}" + "*": "{mapillary_link()}" } }, { diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index e2d5bf078..7873f6b66 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -317,6 +317,10 @@ "if": "theme=lighthouses", "then": "./assets/themes/lighthouses/lighthouse.svg" }, + { + "if": "theme=mapcomplete-changes", + "then": "./assets/svg/logo.svg" + }, { "if": "theme=maproulette", "then": "./assets/layers/maproulette/logomark.svg" @@ -397,10 +401,6 @@ "if": "theme=shops", "then": "./assets/themes/shops/shop.svg" }, - { - "if": "theme=sidewalks", - "then": "./assets/svg/bug.svg" - }, { "if": "theme=ski", "then": "./assets/layers/aerialway/chair_lift.svg" diff --git a/assets/themes/sidewalks/sidewalks.json b/assets/themes/sidewalks/sidewalks.json deleted file mode 100644 index 770adfa74..000000000 --- a/assets/themes/sidewalks/sidewalks.json +++ /dev/null @@ -1,317 +0,0 @@ -{ - "id": "sidewalks", - "title": { - "en": "Sidewalks", - "ru": "Тротуары", - "nl": "Voetpaden", - "de": "Gehwege", - "ca": "Voreres", - "es": "Aceras", - "fr": "Trottoirs", - "nb_NO": "Fortau", - "it": "Marciapiedi", - "da": "Fortove", - "pa_PK": "فُٹ‌پاتھ", - "cs": "Chodníky", - "zh_Hant": "人行道", - "eu": "Espaloiak", - "pl": "Chodniki" - }, - "description": { - "en": "Experimental theme", - "ru": "Экспериментальная тема", - "ca": "Petició experimental", - "de": "Experimentelles Thema", - "es": "Tema experimental", - "nl": "Experimenteel thema", - "fr": "Thème expérimental", - "nb_NO": "Eksperimentelt tema", - "da": "Eksperimentelt tema", - "pa_PK": "آزمائش تھیم", - "cs": "Experimentální téma", - "zh_Hant": "實驗性的主題", - "pl": "Temat eksperymentalny", - "it": "Tema sperimentale" - }, - "shortDescription": { - "en": "Sidewalk mapping", - "ca": "Mapejat de voreres", - "de": "Kartierung von Bürgersteigen", - "es": "Mapeo de aceras", - "nl": "Voetpaden in kaart brengen", - "fr": "Cartographier des trottoirs", - "it": "Mappatura del marciapiede", - "da": "Kortlægning af fortov", - "pa_PK": "فُت‌پیتھ دا نقشہ بݨاؤݨ", - "cs": "Mapování chodníků", - "pl": "Mapowanie chodnika" - }, - "icon": "./assets/svg/bug.svg", - "hideFromOverview": true, - "layers": [ - { - "id": "sidewalks", - "name": { - "en": "Sidewalks", - "ru": "Тротуары", - "de": "Gehwege", - "ca": "Voreres", - "es": "Aceras", - "nb_NO": "Fortau", - "nl": "Voetpaden", - "fr": "Trottoirs", - "it": "Marciapiedi", - "da": "Fortove", - "pa_PK": "فُٹ‌پاتھ", - "cs": "Chodníky", - "zh_Hant": "人行道", - "eu": "Espaloiak", - "pl": "Chodniki" - }, - "minzoom": 12, - "source": { - "osmTags": { - "or": [ - "highway=residential", - "highway=unclassified", - "highway=tertiary", - "highway=secondary" - ] - } - }, - "title": { - "render": { - "en": "{name}", - "ru": "{name}", - "de": "{name}", - "ca": "{name}", - "es": "{name}", - "nl": "{name}", - "fr": "{name}", - "it": "{name}", - "da": "{name}", - "cs": "{name}", - "eu": "{name}", - "pl": "{name}", - "zh_Hant": "{name}" - }, - "mappings": [ - { - "if": "name=", - "then": "Nameless street" - } - ] - }, - "description": { - "en": "Layer showing sidewalks of highways", - "de": "Ebene mit Bürgersteigen", - "es": "Una capa que muestra las aceras de las vías", - "nl": "Laag die voetpaden naast wegen toont", - "fr": "Calque montrant les trottoirs", - "da": "Lag, der viser fortove på motorveje", - "ca": "Una capa que mostra les voreres de les vies", - "cs": "Vrstva zobrazující chodníky silnic", - "zh_Hant": "顯示道路的人行穿越道的圖層", - "pl": "Warstwa pokazująca chodniki przy drogach" - }, - "tagRenderings": [ - { - "id": "streetname", - "render": { - "en": "This street is named {name}", - "de": "Diese Straße heißt {name}", - "es": "Esta calle se llama {name}", - "nl": "Deze straat heet {name}", - "fr": "Cette rue s’appelle {name}", - "nb_NO": "Denne gaten heter {name}", - "it": "La strada si chiama {name}", - "da": "Denne gade hedder {name}", - "ca": "El carrer s'anomena {name}", - "cs": "Tato ulice se jmenuje {name}", - "pl": "Nazwa ulicy to {name}" - } - }, - { - "id": "left-right-questions", - "rewrite": { - "sourceString": [ - "left|right" - ], - "into": [ - [ - "left" - ], - [ - "right" - ] - ] - }, - "renderings": [ - { - "id": "sidewalk_minimap_left|right", - "render": "{sided_minimap(left|right):height:8rem;border-radius:0.5rem;overflow:hidden}" - }, - { - "id": "has_sidewalk_left|right", - "question": { - "en": "Is there a sidewalk on this side of the road?", - "de": "Gibt es auf dieser Straßenseite einen Bürgersteig?", - "da": "Er der et fortov på denne side af vejen?", - "nl": "Is er een stoep aan deze kant van de weg?", - "fr": "Y a-t-il 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": "Je na této straně silnice chodník?", - "pl": "Czy po tej stronie drogi jest chodnik?" - }, - "mappings": [ - { - "if": "sidewalk:left|right=yes", - "then": { - "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": "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ć" - } - }, - { - "if": "sidewalk:left|right=separate", - "then": { - "en": "There is a separately mapped sidewalk to walk on", - "de": "Es gibt einen separat kartierten Bürgersteig für Fußgänger", - "da": "Der er et særskilt kortlagt fortov at gå på", - "nl": "Er is een apart ingetekende stoep om op te lopen", - "fr": "Il y a un trottoir où marcher cartographié séparément", - "ca": "Hi ha una vorera mapejada separadament per on caminar", - "es": "Hay una acera mapeada por separado por la que caminar", - "cs": "Na mapě je vyznačen samostatný chodník", - "pl": "Jest oddzielnie oznaczony chodnik" - } - } - ] - }, - { - "id": "sidewalk_width_left|right", - "question": { - "en": "What is the width of the sidewalk on this side of the road?", - "de": "Wie breit ist der Bürgersteig auf dieser Straßenseite?", - "da": "Hvad er bredden af fortovet på denne side af vejen?", - "nl": "Hoe breed is de stoep aan deze kant van de weg?", - "fr": "Quelle est la largeur du trottoir de ce côté de la route ?", - "ca": "Quina és l'amplada de la vorera a aquest costat de la calçada?", - "es": "¿Cuál es la anchura de la acera en este lado de la calzada?", - "cs": "Jaká je šířka chodníku na této straně silnice?", - "pl": "Jaka jest szerokość chodnika po tej stronie drogi?" - }, - "render": { - "en": "This sidewalk is {sidewalk:left|right:width}m wide", - "de": "Dieser Bürgersteig ist {sidewalk:left|right:width}m breit", - "da": "Dette fortov er {sidewalk:left|right:width}m bredt", - "nl": "Deze stoep is {sidewalk:left|right:width}m breed", - "fr": "Ce trottoir fait {sidewalk:left|right:width} m de large", - "ca": "Aquesta vorera té {sidewalk:left|right:width} m d'ample", - "es": "Esta acera tiene {sidewalk:left|right:width} m de ancho", - "cs": "Tento chodník je široký {sidewalk:left|right:width}m", - "pl": "Ten chodnik ma {sidewalk:left|right:width}m szerokości" - }, - "condition": "sidewalk:left|right=yes", - "freeform": { - "key": "sidewalk:left|right:width", - "type": "distance", - "helperArgs": [ - "21", - "map" - ] - } - } - ] - } - ], - "allowSplit": true, - "pointRendering": [ - { - "location": [ - "start", - "end" - ], - "marker": [ - { - "icon": "circle:#ccc" - } - ], - "iconSize": "3,3", - "anchor": "center" - } - ], - "lineRendering": [ - { - "#": "The center line", - "color": "#ffffff55", - "width": 8, - "lineCap": "butt" - }, - { - "#": "left", - "color": "#888", - "width": { - "render": 6, - "mappings": [ - { - "if": { - "or": [ - "sidewalk:left=no", - "sidewalk:left=separate" - ] - }, - "then": 0 - } - ] - }, - "offset": -6, - "lineCap": "butt" - }, - { - "color": "#888", - "width": { - "render": 6, - "mappings": [ - { - "if": { - "or": [ - "sidewalk:right=no", - "sidewalk:right=separate" - ] - }, - "then": 0 - } - ] - }, - "lineCap": "butt", - "offset": 6 - } - ] - } - ], - "widenFactor": 0.05 -} diff --git a/langs/themes/ca.json b/langs/themes/ca.json index da525e2ff..2c6f6e1d4 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -1068,47 +1068,6 @@ "shortDescription": "Un mapa editable amb informació bàsica sobre botigues", "title": "Botigues" }, - "sidewalks": { - "description": "Petició experimental", - "layers": { - "0": { - "description": "Una capa que mostra les voreres de les vies", - "name": "Voreres", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Hi ha una vorera a aquest costat del carrer" - }, - "1": { - "then": "No hi ha vorera per la que caminar" - }, - "2": { - "then": "Hi ha una vorera mapejada separadament per on caminar" - } - }, - "question": "Hi ha una vorera a aquest costat del carrer?" - }, - "2": { - "question": "Quina és l'amplada de la vorera a aquest costat de la calçada?", - "render": "Aquesta vorera té {sidewalk:left|right:width} m d'ample" - } - } - }, - "streetname": { - "render": "El carrer s'anomena {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Mapejat de voreres", - "title": "Voreres" - }, "sport_pitches": { "description": "Una pista d'esports és un àrea on es practiquen esports", "shortDescription": "Un mapa que mostra pistes d'esports", diff --git a/langs/themes/cs.json b/langs/themes/cs.json index 8e4b6f321..43f92a39e 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -1069,47 +1069,6 @@ "shortDescription": "Upravitelná mapa se základními informacemi o obchodech", "title": "Obchody" }, - "sidewalks": { - "description": "Experimentální téma", - "layers": { - "0": { - "description": "Vrstva zobrazující chodníky silnic", - "name": "Chodníky", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Na této straně silnice je chodník" - }, - "1": { - "then": "Není tu žádný chodník" - }, - "2": { - "then": "Na mapě je vyznačen samostatný chodník" - } - }, - "question": "Je na této straně silnice chodník?" - }, - "2": { - "question": "Jaká je šířka chodníku na této straně silnice?", - "render": "Tento chodník je široký {sidewalk:left|right:width}m" - } - } - }, - "streetname": { - "render": "Tato ulice se jmenuje {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Mapování chodníků", - "title": "Chodníky" - }, "sport_pitches": { "description": "Sportovní hřiště je plocha, na které se provozují sporty", "shortDescription": "Mapa sportovních hřišť", diff --git a/langs/themes/da.json b/langs/themes/da.json index b3e5c929d..ee6476af6 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -927,47 +927,6 @@ "shortDescription": "Et redigerbart kort med grundlæggende butiksoplysninger", "title": "Butikker" }, - "sidewalks": { - "description": "Eksperimentelt tema", - "layers": { - "0": { - "description": "Lag, der viser fortove på motorveje", - "name": "Fortove", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Der er et fortov på denne side af vejen" - }, - "1": { - "then": "Der er ikke noget fortov at gå på" - }, - "2": { - "then": "Der er et særskilt kortlagt fortov at gå på" - } - }, - "question": "Er der et fortov på denne side af vejen?" - }, - "2": { - "question": "Hvad er bredden af fortovet på denne side af vejen?", - "render": "Dette fortov er {sidewalk:left|right:width}m bredt" - } - } - }, - "streetname": { - "render": "Denne gade hedder {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Kortlægning af fortov", - "title": "Fortove" - }, "ski": { "title": "Skiløjper og skilifte" }, diff --git a/langs/themes/de.json b/langs/themes/de.json index ed7118b36..55a5568b6 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1262,47 +1262,6 @@ "shortDescription": "Eine bearbeitbare Karte mit grundlegenden Geschäftsinformationen", "title": "Geschäfte" }, - "sidewalks": { - "description": "Experimentelles Thema", - "layers": { - "0": { - "description": "Ebene mit Bürgersteigen", - "name": "Gehwege", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Es gibt einen Bürgersteig auf dieser Straßenseite" - }, - "1": { - "then": "Es gibt keinen Bürgersteig für Fußgänger" - }, - "2": { - "then": "Es gibt einen separat kartierten Bürgersteig für Fußgänger" - } - }, - "question": "Gibt es auf dieser Straßenseite einen Bürgersteig?" - }, - "2": { - "question": "Wie breit ist der Bürgersteig auf dieser Straßenseite?", - "render": "Dieser Bürgersteig ist {sidewalk:left|right:width}m breit" - } - } - }, - "streetname": { - "render": "Diese Straße heißt {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Kartierung von Bürgersteigen", - "title": "Gehwege" - }, "ski": { "description": "Alles, was Sie zum Skifahren brauchen", "title": "Skipisten und Seilbahnen" diff --git a/langs/themes/en.json b/langs/themes/en.json index 1d8484151..0dfcddf70 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1443,47 +1443,6 @@ "shortDescription": "An editable map with basic shop information", "title": "Shops" }, - "sidewalks": { - "description": "Experimental theme", - "layers": { - "0": { - "description": "Layer showing sidewalks of highways", - "name": "Sidewalks", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "There is a sidewalk on this side of the road" - }, - "1": { - "then": "There is no sidewalk to walk on" - }, - "2": { - "then": "There is a separately mapped sidewalk to walk on" - } - }, - "question": "Is there a sidewalk on this side of the road?" - }, - "2": { - "question": "What is the width of the sidewalk on this side of the road?", - "render": "This sidewalk is {sidewalk:left|right:width}m wide" - } - } - }, - "streetname": { - "render": "This street is named {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Sidewalk mapping", - "title": "Sidewalks" - }, "ski": { "description": "Everything you need to go skiing", "title": "Ski pistes and aerialways" diff --git a/langs/themes/es.json b/langs/themes/es.json index 0512529aa..707711210 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -1210,47 +1210,6 @@ "shortDescription": "Un mapa editable con información básica sobre tiendas", "title": "Tiendas" }, - "sidewalks": { - "description": "Tema experimental", - "layers": { - "0": { - "description": "Una capa que muestra las aceras de las vías", - "name": "Aceras", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Hay una acera en este lado de la calle" - }, - "1": { - "then": "No hay acera por la que caminar" - }, - "2": { - "then": "Hay una acera mapeada por separado por la que caminar" - } - }, - "question": "¿Hay una acera en este lado de la calle?" - }, - "2": { - "question": "¿Cuál es la anchura de la acera en este lado de la calzada?", - "render": "Esta acera tiene {sidewalk:left|right:width} m de ancho" - } - } - }, - "streetname": { - "render": "Esta calle se llama {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Mapeo de aceras", - "title": "Aceras" - }, "ski": { "description": "Todo lo que necesitas para esquiar", "title": "Pistas de esquí y vías aéreas" diff --git a/langs/themes/eu.json b/langs/themes/eu.json index 81adab57b..e9d2bb645 100644 --- a/langs/themes/eu.json +++ b/langs/themes/eu.json @@ -277,17 +277,6 @@ "shops": { "title": "Denda" }, - "sidewalks": { - "layers": { - "0": { - "name": "Espaloiak", - "title": { - "render": "{name}" - } - } - }, - "title": "Espaloiak" - }, "sports": { "title": "Kirolak" }, diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 330125093..eb18a018f 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -1031,47 +1031,6 @@ "shortDescription": "Carte modifiable affichant les informations de base des magasins", "title": "Commerces" }, - "sidewalks": { - "description": "Thème expérimental", - "layers": { - "0": { - "description": "Calque montrant les trottoirs", - "name": "Trottoirs", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Il y a un trottoir de ce côté de la route" - }, - "1": { - "then": "Il n'y a pas de trottoir où marcher" - }, - "2": { - "then": "Il y a un trottoir où marcher cartographié séparément" - } - }, - "question": "Y a-t-il un trottoir de ce côté de la route ?" - }, - "2": { - "question": "Quelle est la largeur du trottoir de ce côté de la route ?", - "render": "Ce trottoir fait {sidewalk:left|right:width} m de large" - } - } - }, - "streetname": { - "render": "Cette rue s’appelle {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Cartographier des trottoirs", - "title": "Trottoirs" - }, "ski": { "title": "Pistes de ski et remontées mécaniques" }, diff --git a/langs/themes/it.json b/langs/themes/it.json index 498422a85..97b0c4e48 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -796,38 +796,6 @@ "shortDescription": "Una cartina modificabile con informazioni di base dei negozi", "title": "Negozi" }, - "sidewalks": { - "description": "Tema sperimentale", - "layers": { - "0": { - "name": "Marciapiedi", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "C'è un marciapiede su questo lato della strada" - }, - "1": { - "then": "Non c'è un marciapiede su cui camminare" - } - } - } - } - }, - "streetname": { - "render": "La strada si chiama {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Mappatura del marciapiede", - "title": "Marciapiedi" - }, "sport_pitches": { "description": "Un campo sportivo è un'area dove vengono praticati degli sport", "shortDescription": "Una cartina che mostra i campi sportivi", diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index 859a3bb64..7b7708b22 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -610,20 +610,6 @@ "shops": { "title": "Kart over åpne butikker" }, - "sidewalks": { - "description": "Eksperimentelt tema", - "layers": { - "0": { - "name": "Fortau", - "tagRenderings": { - "streetname": { - "render": "Denne gaten heter {name}" - } - } - } - }, - "title": "Fortau" - }, "stations": { "layers": { "3": { diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 7aaf35954..af1d1df75 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1099,47 +1099,6 @@ "shortDescription": "Een bewerkbare kaart met simpele informatie over winkels", "title": "Winkels" }, - "sidewalks": { - "description": "Experimenteel thema", - "layers": { - "0": { - "description": "Laag die voetpaden naast wegen toont", - "name": "Voetpaden", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Er is een stoep aan deze kant van de weg" - }, - "1": { - "then": "Er is geen stoep om op te lopen" - }, - "2": { - "then": "Er is een apart ingetekende stoep om op te lopen" - } - }, - "question": "Is er een stoep aan deze kant van de weg?" - }, - "2": { - "question": "Hoe breed is de stoep aan deze kant van de weg?", - "render": "Deze stoep is {sidewalk:left|right:width}m breed" - } - } - }, - "streetname": { - "render": "Deze straat heet {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Voetpaden in kaart brengen", - "title": "Voetpaden" - }, "speelplekken": { "description": "

Welkom bij de Groendoener!

De Zuidrand dat is spelen, ravotten, chillen, wandelen,… in het groen. Meer dan 200 grote en kleine speelplekken liggen er in parken, in bossen en op pleintjes te wachten om ontdekt te worden. De verschillende speelplekken werden getest én goedgekeurd door kinder- en jongerenreporters uit de Zuidrand. Met leuke challenges dagen de reporters jou uit om ook op ontdekking te gaan. Klik op een speelplek op de kaart, bekijk het filmpje en ga op verkenning!

Het project groendoener kadert binnen het strategisch project Beleefbare Open Ruimte in de Antwerpse Zuidrand en is een samenwerking tussen het departement Leefmilieu van provincie Antwerpen, Sportpret vzw, een OpenStreetMap-België Consultent en Createlli vzw. Het project kwam tot stand met steun van Departement Omgeving van de Vlaamse Overheid.
", "layers": { diff --git a/langs/themes/pa_PK.json b/langs/themes/pa_PK.json index 5ee6c4a50..50a1aad4d 100644 --- a/langs/themes/pa_PK.json +++ b/langs/themes/pa_PK.json @@ -219,16 +219,6 @@ "shortDescription": "ڈاک کوڈ", "title": "ڈاک کوڈ" }, - "sidewalks": { - "description": "آزمائش تھیم", - "layers": { - "0": { - "name": "فُٹ‌پاتھ" - } - }, - "shortDescription": "فُت‌پیتھ دا نقشہ بݨاؤݨ", - "title": "فُٹ‌پاتھ" - }, "sports": { "title": "کھیڈاں" }, diff --git a/langs/themes/pl.json b/langs/themes/pl.json index be020293a..139893cf9 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -1049,47 +1049,6 @@ "shortDescription": "Edytowalna mapa z podstawowymi informacjami o sklepach", "title": "Sklepy" }, - "sidewalks": { - "description": "Temat eksperymentalny", - "layers": { - "0": { - "description": "Warstwa pokazująca chodniki przy drogach", - "name": "Chodniki", - "tagRenderings": { - "left-right-questions": { - "renderings": { - "1": { - "mappings": { - "0": { - "then": "Jest chodnik z boku drogi" - }, - "1": { - "then": "Nie ma chodnika, którym można chodzić" - }, - "2": { - "then": "Jest oddzielnie oznaczony chodnik" - } - }, - "question": "Czy po tej stronie drogi jest chodnik?" - }, - "2": { - "question": "Jaka jest szerokość chodnika po tej stronie drogi?", - "render": "Ten chodnik ma {sidewalk:left|right:width}m szerokości" - } - } - }, - "streetname": { - "render": "Nazwa ulicy to {name}" - } - }, - "title": { - "render": "{name}" - } - } - }, - "shortDescription": "Mapowanie chodnika", - "title": "Chodniki" - }, "sport_pitches": { "description": "Boisko sportowe to teren, na którym uprawia się sport", "shortDescription": "Mapa przedstawiająca boiska sportowe", diff --git a/langs/themes/ru.json b/langs/themes/ru.json index e38d00477..bfddeb672 100644 --- a/langs/themes/ru.json +++ b/langs/themes/ru.json @@ -353,18 +353,6 @@ "shops": { "title": "Открытая карта магазинов" }, - "sidewalks": { - "description": "Экспериментальная тема", - "layers": { - "0": { - "name": "Тротуары", - "title": { - "render": "{name}" - } - } - }, - "title": "Тротуары" - }, "sport_pitches": { "description": "Спортивная площадка - пространство для занятий спортом", "shortDescription": "Карта, отображающая спортивные площадки", diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index b291c75af..9c23a9db9 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -555,19 +555,6 @@ "shortDescription": "有基本商家資訊的可編輯性的地圖", "title": "商店" }, - "sidewalks": { - "description": "實驗性的主題", - "layers": { - "0": { - "description": "顯示道路的人行穿越道的圖層", - "name": "人行道", - "title": { - "render": "{name}" - } - } - }, - "title": "人行道" - }, "sport_pitches": { "description": "運動場地是進行運動的地方", "shortDescription": "顯示運動場地的地圖", diff --git a/src/UI/SpecialVisualisationUtils.ts b/src/UI/SpecialVisualisationUtils.ts index 50d0410f1..3e04b10d3 100644 --- a/src/UI/SpecialVisualisationUtils.ts +++ b/src/UI/SpecialVisualisationUtils.ts @@ -56,7 +56,7 @@ export default class SpecialVisualisationUtils { knownSpecial = extraMappings.find(em => em.funcName === fName) } if(!knownSpecial){ - throw "Didn't find a special visualisation: "+fName + throw "Didn't find a special visualisation: "+fName+" in "+template } // Always a boring string diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index bf53b0f40..b71992d0c 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -781,9 +781,7 @@ export default class SpecialVisualizations { funcName: "list_reviews", docs: "Adds an overview of the mangrove-reviews of this object. Mangrove.Reviews needs - in order to identify the reviewed object - a coordinate and a name. By default, the name of the object is given, but this can be overwritten", needsUrls: [MangroveReviews.ORIGINAL_API], - example: - "`{reviews()}` for a vanilla review, `{reviews(name, play_forest)}` to review a play forest. If a name is known, the name will be used as identifier, otherwise 'play_forest' is used", - args: [ + args: [ { name: "subjectKey", defaultValue: "name", @@ -810,6 +808,32 @@ export default class SpecialVisualizations { return new SvelteUIElement(AllReviews, { reviews, state, tags, feature, layer }) }, }, + { + funcName:"reviews", + example: + "`{reviews()}` for a vanilla review, `{reviews(name, play_forest)}` to review a play forest. If a name is known, the name will be used as identifier, otherwise 'play_forest' is used", + docs:"A pragmatic combination of `create_review` and `list_reviews`", + args: [ + { + name: "subjectKey", + defaultValue: "name", + doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]", + }, + { + name: "fallback", + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", + }, + ], + constr(state: SpecialVisualizationState, tagSource: UIEventSource>, args: string[], feature: Feature, layer: LayerConfig): BaseUIElement { + return new Combine([ + SpecialVisualizations.specialVisualisationsDict["create_review"].constr(state, tagSource, args, feature, layer), + SpecialVisualizations.specialVisualisationsDict["list_reviews"].constr(state, tagSource, args, feature, layer) + + + ]) + } + + }, { funcName: "import_mangrove_key", docs: "Only makes sense in the usersettings. Allows to import a mangrove public key and to use this to make reviews", diff --git a/src/assets/editor-layer-index.bing.json b/src/assets/editor-layer-index.bing.json index 5ef287b81..7fbd7439a 100644 --- a/src/assets/editor-layer-index.bing.json +++ b/src/assets/editor-layer-index.bing.json @@ -1 +1 @@ -{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t0.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14634&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null} \ No newline at end of file +{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t1.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14634&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null} \ No newline at end of file