Merge develop

This commit is contained in:
Pieter Vander Vennet 2024-09-17 02:36:38 +02:00
commit 5a9f8f0a0a
62 changed files with 4448 additions and 710 deletions

View file

@ -43,6 +43,14 @@
"https://osoc.be/editions/2020/walk-by-brussels"
]
},
{
"path": "safe_loops.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Robbert Gurdeep Singh"
],
"sources": []
},
{
"path": "shed.svg",
"license": "CC-BY-SA-4.0",
@ -82,13 +90,5 @@
"sources": [
"https://osoc.be/editions/2020/walk-by-brussels"
]
},
{
"path": "safe_loops.svg",
"license": "CC-BY-SA",
"authors": [
"Robbert Gurdeep Singh"
],
"sources": [ ]
}
]
]

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Robbert Gurdeep Singh
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -344,34 +344,34 @@
"if": "cuisine=pizza",
"icon": "🍕",
"then": {
"en": "This is a pizzeria",
"nl": "Dit is een pizzeria",
"de": "Dies ist eine Pizzeria",
"es": "Esto es una pizzería",
"fr": "C'est une pizzéria",
"ca": "Això és una pizzeria",
"pl": "To jest pizzeria",
"cs": "Tohle je pizzerie"
"en": "Pizzeria",
"nl": "Pizzeria",
"de": "Pizzeria",
"es": "Pizzería",
"fr": "Pizzéria",
"ca": "Pizzeria",
"pl": "Pizzeria",
"cs": "Pizzerie"
}
},
{
"if": "cuisine=friture",
"icon": "🍟",
"then": {
"en": "This is a friture",
"nl": "Dit is een frituur",
"de": "Dies ist eine Pommesbude",
"fr": "C'est une friterie",
"ca": "Això és una fregiduria",
"cs": "Tohle je hranolkárna"
"en": "Friture",
"nl": "Frituur",
"de": "Pommesbude",
"fr": "Friterie",
"ca": "Fregiduria",
"cs": "Hranolkárna"
}
},
{
"if": "cuisine=pasta",
"icon": "🍝",
"then": {
"en": "Mainly serves pasta",
"nl": "Dit is een pastazaak",
"en": "Serves mainly pasta",
"nl": "Pastazaak",
"de": "Bietet vorwiegend Pastagerichte an",
"es": "Principalmente sirve pasta",
"fr": "Restaurant Italien",
@ -384,11 +384,11 @@
"if": "cuisine=kebab",
"icon": "🥙",
"then": {
"en": "This is kebab shop",
"nl": "Dit is een kebabzaak",
"de": "Das ist ein Dönerladen",
"es": "Esta es una tienda de kebak",
"fr": "C'est un resto kebab",
"en": "Kebab shop",
"nl": "Kebabzaak",
"de": "Dönerladen",
"es": "Tienda de kebak",
"fr": "Resto kebab",
"pl": "To jest stoisko z kebabem",
"ca": "Aquesta és una botiga de kebabs",
"cs": "Tohle je kebab"
@ -398,11 +398,11 @@
"if": "cuisine=sandwich",
"icon": "🥪",
"then": {
"en": "This is a sandwich shop",
"nl": "Dit is een broodjeszaak",
"de": "Dies ist ein Sandwichladen",
"fr": "C'est une sandwicherie",
"ca": "Això és una botiga d'entrepans",
"en": "Sandwich shop",
"nl": "Broodjeszaak",
"de": "Sandwichladen",
"fr": "Sandwicherie",
"ca": "Botiga d'entrepans",
"cs": "Toto je obchod se sendviči"
}
},
@ -410,10 +410,9 @@
"if": "cuisine=burger",
"icon": "🍔",
"then": {
"en": "Burgers are served here",
"nl": "Dit is een hamburgerrestaurant",
"de": "Hier werden Burger serviert",
"es": "Aquí se sirven hamburguesas",
"en": "Burgersrestaurant",
"nl": "Hamburgerrestaurant",
"es": "Hamburguesas",
"fr": "Des hamburgers sont servis ici",
"ca": "Aquí es serveixen hamburgueses",
"pl": "Są tu podawane burgery",
@ -424,8 +423,8 @@
"if": "cuisine=sushi",
"icon": "🍣",
"then": {
"en": "Sushi is served here",
"nl": "Dit is een sushirestaurant",
"en": "Sushi restaurant",
"nl": "Sushirestaurant",
"de": "Hier wird Sushi serviert",
"es": "Aquí se sirve sushi",
"fr": "Des sushis sont servis ici",
@ -437,8 +436,8 @@
"if": "cuisine=coffee",
"icon": "☕",
"then": {
"en": "Coffee is served here",
"nl": "Dit is een koffiezaak",
"en": "Coffeebar",
"nl": "Koffiezaak",
"de": "Hier wird Kaffee serviert",
"es": "Aquí se sirve café",
"fr": "C'est un café",
@ -450,8 +449,8 @@
"if": "cuisine=italian",
"icon": "🇮🇹",
"then": {
"en": "This is an Italian restaurant (which serves more than pasta and pizza)",
"nl": "Dit is een Italiaans restaurant (dat meer dan enkel pasta of pizza verkoopt)",
"en": "Italian restaurant (which serves more than pasta and pizza)",
"nl": "Italiaans restaurant (dat meer dan enkel pasta of pizza verkoopt)",
"de": "Dies ist ein italienisches Restaurant (das mehr als nur Pasta und Pizza serviert)",
"es": "Este es un restaurante italiano (que sirve algo más que pasta y pizza)",
"fr": "C'est un Restaurant Italien (qui sert plus que des pâtes et des pizzas)",
@ -463,8 +462,8 @@
"if": "cuisine=french",
"icon": "🇫🇷",
"then": {
"en": "French dishes are served here",
"nl": "Dit is een Frans restaurant",
"en": "French restaurant",
"nl": "Frans restaurant",
"de": "Hier werden französische Gerichte serviert",
"es": "Aquí se sirven platos Franceses",
"fr": "Des plats français sont servis ici",
@ -476,8 +475,8 @@
"if": "cuisine=chinese",
"icon": "🇨🇳",
"then": {
"en": "Chinese dishes are served here",
"nl": "Dit is een Chinees restaurant",
"en": "Chinese",
"nl": "Chinees restaurant",
"de": "Hier werden chinesische Gerichte serviert",
"es": "Aquí se sirven platos Chinos",
"fr": "Des plats chinois sont servis ici",
@ -489,8 +488,8 @@
"if": "cuisine=greek",
"icon": "🇬🇷",
"then": {
"en": "Greek dishes are served here",
"nl": "Dit is een Grieks restaurant",
"en": "Greek",
"nl": "Grieks restaurant",
"de": "Hier werden griechische Gerichte serviert",
"es": "Aquí se sirven platos Griegos",
"fr": "Des plats grecs sont servis ici",
@ -502,8 +501,8 @@
"if": "cuisine=indian",
"icon": "🇮🇳",
"then": {
"en": "Indian dishes are served here",
"nl": "Dit is een Indisch restaurant",
"en": "Indian",
"nl": "Indisch restaurant",
"de": "Hier werden indische Gerichte serviert",
"es": "Aquí se sirven platos Indios",
"fr": "Des plats indiens sont servis ici",
@ -515,8 +514,8 @@
"if": "cuisine=turkish",
"icon": "🇹🇷",
"then": {
"en": "Turkish dishes are served here",
"nl": "Dit is een Turks restaurant (dat meer dan enkel kebab verkoopt)",
"en": "Turkish restaurant",
"nl": "Turks restaurant",
"de": "Hier werden türkische Gerichte serviert",
"es": "Aquí se sirven platos Turcos",
"fr": "Des plats turcs sont servis ici",
@ -528,8 +527,8 @@
"if": "cuisine=thai",
"icon": "🇹🇭",
"then": {
"en": "Thai dishes are served here",
"nl": "Dit is een Thaïs restaurant",
"en": "Thai restaurant",
"nl": "Thaïs restaurant",
"de": "Hier werden thailändische Gerichte serviert",
"fr": "Des plats thaïlandais sont servis ici",
"ca": "Aquí es serveixen plats tailandesos",

View file

@ -0,0 +1,70 @@
{
"id": "geocoded_image",
"source": "special",
"name": null,
"tagRenderings": [],
"pointRendering": [
{
"location": [
"point",
"centroid"
],
"marker": [
{
"icon": "direction_gradient",
"color": {
"render": "#44cc22",
"mappings": [
{
"if": "selected=yes",
"then": "#cccc22"
}
]
}
}
],
"rotation": "{rotation}deg",
"rotationAlignment": "map",
"pitchAlignment": "map",
"iconSize": "60,60"
},
{
"location": [
"point",
"centroid"
],
"rotationAlignment": "map",
"pitchAlignment": "map",
"marker": [
{
"icon": "circle",
"color": {
"render": "#44cc22",
"mappings": [
{
"if": "selected=yes",
"then": "#cccc22"
}
]
}
}
],
"iconSize": "14,14"
},
{
"location": [
"point",
"centroid"
],
"rotationAlignment": "map",
"pitchAlignment": "map",
"marker": [
{
"icon": "ring",
"color": "#000"
}
],
"iconSize": "14,14"
}
]
}

View file

@ -13,18 +13,21 @@
"source": {
"osmTags": "date_created~*",
"geoJson": "https://api.openstreetmap.org/api/0.6/notes.json?limit=10000&closed=7&bbox={x_min},{y_min},{x_max},{y_max}",
"geoJsonZoomLevel": 12
"geoJsonZoomLevel": 10
},
"calculatedTags": [
"_total_comments:=get(feat)('comments').length",
"_first_comment:=get(feat)('comments')[0].text",
"_all_comments:=get(feat)('comments').map(c => c.text ?? '').join('\\n')",
"_all_usernames:=get(feat)('comments').map(c => c.user ?? 'Anonymous').join('\\n')",
"_opened_by_anonymous_user:=get(feat)('comments')[0].user === undefined",
"_first_user:=get(feat)('comments')[0].user",
"_last_user:=(() => {const comms = get(feat)('comments'); return comms[comms.length - 1].user})()",
"_last_change_date:=(() => {const comms = get(feat)('comments'); return comms[comms.length - 1].date})()",
"_first_user_id:=get(feat)('comments')[0].uid",
"_is_import_note:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.\\(osm.be|org\\)/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()"
],
"minzoom": 10,
"minzoom": 7,
"title": {
"render": {
"en": "Note",
@ -158,183 +161,6 @@
}
],
"filter": [
{
"id": "search",
"options": [
{
"osmTags": "_first_comment~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Should mention {search} in the first comment",
"nl": "Moet in de eerste opmerking \"{search}\" bevatten",
"de": "Sollte {search} im ersten Kommentar erwähnen",
"es": "Debe mencionar {search} en el primer comentario",
"ca": "Has de mencionar {search} en el primer comentari",
"cs": "Měl by se zmínit {search} v prvním komentáři"
}
}
]
},
{
"id": "not",
"options": [
{
"osmTags": "_first_comment!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Should <b>not</b> mention {search} in the first comment",
"nl": "Mag in de eerste opmerking <b>niet</b> \"{search}\" bevatten",
"de": "Sollte <b>nicht</b> {search} im ersten Kommentar erwähnen",
"es": "<b>No</b> debe mencionar {search} en el primer comentario",
"ca": "<b>No</b> s'ha de mencionar {search} al primer comentari",
"cs": "V prvním komentáři by jste <b>neměli</b> zmiňovat {search}"
}
}
]
},
{
"id": "opened_by",
"options": [
{
"osmTags": "_first_user~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Opened by contributor {search}",
"nl": "Geopend door bijdrager {search}",
"de": "Erstellt von {search}",
"es": "Abierto por el contributor {search}",
"fr": "Ouverte par {search}",
"ca": "Obert pel contribuïdor {search}",
"cs": "Otevřeno přispěvatelem {search}"
}
}
]
},
{
"id": "not_opened_by",
"options": [
{
"osmTags": "_first_user!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "<b>Not</b> opened by contributor {search}",
"nl": "<b>Niet</b> geopend door bijdrager {search}",
"de": "<b>Nicht</b> erstellt von {search}",
"es": "<b>No</b> abierto por el contributor {search}",
"ca": "<b>No</b> obert pel contribuïdor {search}",
"cs": "<b>Není</b> otevřeno přispěvatelem {search}",
"fr": "<b>Exclure</b>les notes ouvertes par {search}"
}
}
]
},
{
"id": "edited_by",
"options": [
{
"osmTags": "_last_user~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Last edited by contributor {search}",
"nl": "Laatst bewerkt door bijdrager {search}",
"de": "Zuletzt bearbeitet von {search}",
"es": "Editada por última vez por el contributor {search}",
"ca": "Editat per última vega pel contribuïdor {search}",
"cs": "Naposledy upravil přispěvatel {search}",
"da": "Senest redigeret af bidragsyder {search}",
"fr": "Dernière modification par {search}"
}
}
]
},
{
"id": "not_edited_by",
"options": [
{
"osmTags": "_last_user!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Opened after {search}",
"nl": "Geopend na {search}",
"de": "Zuletzt bearbeitet nach dem {search}",
"es": "Abierta después de {search}",
"ca": "Oberta després de {search}",
"cs": "Otevřeno po {search}",
"fr": "Ouverte après le {search}"
}
}
]
},
{
"id": "opened_before",
"options": [
{
"osmTags": "date_created<{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Created before {search}",
"nl": "Aangemaakt voor {search}",
"de": "Erstellt vor dem {search}",
"es": "Creada antes de {search}",
"ca": "Creada abans de {search}",
"cs": "Vytvořeno před {search}",
"fr": "Créée avant le {search}"
}
}
]
},
{
"id": "opened_after",
"options": [
{
"osmTags": "date_created>{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Created after {search}",
"nl": "Aangemaakt na {search}",
"de": "Erstellt nach dem {search}",
"es": "Creada después de {search}",
"ca": "Creada després de {search}",
"cs": "Vytvořeno po {search}",
"fr": "Créée après le {search}"
}
}
]
},
{
"id": "anonymous",
"options": [
@ -406,6 +232,244 @@
}
}
]
},
{
"id": "search",
"options": [
{
"osmTags": "_first_comment~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Should mention {search} in the first comment",
"nl": "Moet in de eerste opmerking \"{search}\" bevatten",
"de": "Sollte {search} im ersten Kommentar erwähnen",
"es": "Debe mencionar {search} en el primer comentario",
"ca": "Has de mencionar {search} en el primer comentari",
"cs": "Měl by se zmínit {search} v prvním komentáři"
}
}
]
},
{
"id": "search_any",
"options": [
{
"osmTags": "_all_comments~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Should mention {search} in any comment"
}
}
]
},
{
"id": "not",
"options": [
{
"osmTags": "_first_comment!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Should <b>not</b> mention {search} in the first comment",
"nl": "Mag in de eerste opmerking <b>niet</b> \"{search}\" bevatten",
"de": "Sollte <b>nicht</b> {search} im ersten Kommentar erwähnen",
"es": "<b>No</b> debe mencionar {search} en el primer comentario",
"ca": "<b>No</b> s'ha de mencionar {search} al primer comentari",
"cs": "V prvním komentáři by jste <b>neměli</b> zmiňovat {search}"
}
}
]
},
{
"id": "opened_by",
"options": [
{
"osmTags": "_first_user~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Opened by contributor {search}",
"nl": "Geopend door bijdrager {search}",
"de": "Erstellt von {search}",
"es": "Abierto por el contributor {search}",
"fr": "Ouverte par {search}",
"ca": "Obert pel contribuïdor {search}",
"cs": "Otevřeno přispěvatelem {search}"
}
}
]
},
{
"id": "not_opened_by",
"options": [
{
"osmTags": "_first_user!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "<b>Not</b> opened by contributor {search}",
"nl": "<b>Niet</b> geopend door bijdrager {search}",
"de": "<b>Nicht</b> erstellt von {search}",
"es": "<b>No</b> abierto por el contributor {search}",
"ca": "<b>No</b> obert pel contribuïdor {search}",
"cs": "<b>Není</b> otevřeno přispěvatelem {search}",
"fr": "<b>Exclure</b>les notes ouvertes par {search}"
}
}
]
},
{
"id": "edited_by_any",
"options": [
{
"osmTags": "_all_usernames~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Edited or commented on by any user with name {search}"
}
}
]
},
{
"id": "last_edited_by",
"options": [
{
"osmTags": "_last_user~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Last edited by contributor {search}",
"nl": "Laatst bewerkt door bijdrager {search}",
"de": "Zuletzt bearbeitet von {search}",
"es": "Editada por última vez por el contributor {search}",
"ca": "Editat per última vega pel contribuïdor {search}",
"cs": "Naposledy upravil přispěvatel {search}",
"da": "Senest redigeret af bidragsyder {search}",
"fr": "Dernière modification par {search}"
}
}
]
},
{
"id": "not_last_edited_by",
"options": [
{
"osmTags": "_last_user!~i~.*{search}.*",
"fields": [
{
"name": "search"
}
],
"question": {
"en": "Not edited as last by {search}"
}
}
]
},
{
"id": "opened_before",
"options": [
{
"osmTags": "date_created<{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Created before {search}",
"nl": "Aangemaakt voor {search}",
"de": "Erstellt vor dem {search}",
"es": "Creada antes de {search}",
"ca": "Creada abans de {search}",
"cs": "Vytvořeno před {search}",
"fr": "Créée avant le {search}"
}
}
]
},
{
"id": "opened_after",
"options": [
{
"osmTags": "date_created>{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Created after {search}",
"nl": "Aangemaakt na {search}",
"de": "Erstellt nach dem {search}",
"es": "Creada después de {search}",
"ca": "Creada després de {search}",
"cs": "Vytvořeno po {search}",
"fr": "Créée après le {search}"
}
}
]
},
{
"id": "last_edited_before",
"options": [
{
"osmTags": "_last_change_date<{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Last edited before {search}"
}
}
]
},
{
"id": "last_edited_after",
"options": [
{
"osmTags": "_last_change_date>{search}",
"fields": [
{
"name": "search",
"type": "date"
}
],
"question": {
"en": "Last edited after {search}"
}
}
]
}
],
"allowMove": false

View file

@ -551,6 +551,31 @@
}
]
},
{
"id": "scalebar",
"question": {
"en": "Should a scale bar be shown on the map?",
"nl": "Moet er een schaalbalk weergegeven worden?"
},
"mappings": [
{
"if": "mapcomplete-preference-show-scale=true",
"then": {
"en": "Show the scalebar",
"nl": "Toon de schaalbalk"
}
},
{
"if": "mapcomplete-preference-show-scale=false",
"alsoShowIf": "mapcomplete-preference-show-scale=",
"then": {
"en": "Hide the scalebar",
"nl": "Verberg de schaalbalk"
}
}
]
},
{
"id": "title-editing",
"render": {