From 6c0d54d7694292f3c7038ba336489d6de5231060 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 25 Jan 2025 02:06:29 +0100 Subject: [PATCH 01/59] Fix: fix wikimedia attribution, fix #2332 --- src/Logic/ImageProviders/WikimediaImageProvider.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Logic/ImageProviders/WikimediaImageProvider.ts b/src/Logic/ImageProviders/WikimediaImageProvider.ts index bf1e7a3677..3ccc96f150 100644 --- a/src/Logic/ImageProviders/WikimediaImageProvider.ts +++ b/src/Logic/ImageProviders/WikimediaImageProvider.ts @@ -138,7 +138,12 @@ export class WikimediaImageProvider extends ImageProvider { query: { pages: { title: string; imageinfo: { extmetadata }[] }[] } }>(url, 365 * 24 * 60 * 60) const licenseInfo = new LicenseInfo() - const pageInfo = data.query.pages.at(-1) + const pages = data.query.pages + /*jup, a literal "-1" in an object, not a list!*/ + let pageInfo = pages["-1"] + if (Array.isArray(pages)) { + pageInfo = pages.at(-1) + } if (pageInfo === undefined) { return undefined } From 2f7e35a16e9896216d3fc4fce5d93d4272dc6219 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 25 Jan 2025 18:37:09 +0100 Subject: [PATCH 02/59] Fix: don't check if someone is logged in for a taghint --- src/UI/Popup/TagHint.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/UI/Popup/TagHint.svelte b/src/UI/Popup/TagHint.svelte index e7eb543dc1..583fb76d94 100644 --- a/src/UI/Popup/TagHint.svelte +++ b/src/UI/Popup/TagHint.svelte @@ -11,19 +11,15 @@ * Depending on the options, it'll link through to the wiki or might be completely hidden */ export let tags: TagsFilter - export let state: SpecialVisualizationState - export let currentProperties: Record = {} /** * If given, this function will be called to embed the given tags hint into this translation */ export let embedIn: ((string: string) => Translation) | undefined = undefined - const userDetails = state?.osmConnection?.userDetails let tagsExplanation = "" $: tagsExplanation = tags?.asHumanString(true, false, currentProperties) -{#if !userDetails}
{#if tags === undefined} @@ -33,4 +29,3 @@ {/if}
-{/if} From 59dc9012c06765ba53c4652566b226c5128c141e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 01:42:41 +0100 Subject: [PATCH 03/59] UX: don't show the gray 'image loading' for wikimedia; assume there is none --- src/Logic/ImageProviders/AllImageProviders.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Logic/ImageProviders/AllImageProviders.ts b/src/Logic/ImageProviders/AllImageProviders.ts index 3c9ba228aa..76f96737c9 100644 --- a/src/Logic/ImageProviders/AllImageProviders.ts +++ b/src/Logic/ImageProviders/AllImageProviders.ts @@ -25,7 +25,7 @@ export default class AllImageProviders { "Category:" ]) - private static ImageAttributionSource: ImageProvider[] = [ + private static imageAttributionSources: ImageProvider[] = [ Imgur.singleton, Mapillary.singleton, WikidataImageProvider.singleton, @@ -34,10 +34,10 @@ export default class AllImageProviders { AllImageProviders.genericImageProvider ] public static apiUrls: string[] = [].concat( - ...AllImageProviders.ImageAttributionSource.map((src) => src.apiUrls()) + ...AllImageProviders.imageAttributionSources.map((src) => src.apiUrls()) ) public static defaultKeys = [].concat( - AllImageProviders.ImageAttributionSource.map((provider) => provider.defaultKeyPrefixes) + AllImageProviders.imageAttributionSources.map((provider) => provider.defaultKeyPrefixes) ) private static providersByName = { imgur: Imgur.singleton, @@ -52,7 +52,7 @@ export default class AllImageProviders { } public static async selectBestProvider(key: string, value: string): Promise { - for (const imageProvider of AllImageProviders.ImageAttributionSource) { + for (const imageProvider of AllImageProviders.imageAttributionSources) { try { const extracted = await Promise.all(await imageProvider.ExtractUrls(key, value)) if (extracted?.length > 0) { @@ -78,7 +78,13 @@ export default class AllImageProviders { public static estimateNumberOfImages(tags: Record, prefixes: string[] = undefined): number { let count = 0 - const allPrefixes = Utils.Dedup(prefixes ?? [].concat(...AllImageProviders.ImageAttributionSource.map(s => s.defaultKeyPrefixes))) + const sources = [Imgur.singleton, + Mapillary.singleton, + WikidataImageProvider.singleton, + WikimediaImageProvider.singleton, + Panoramax.singleton, + AllImageProviders.genericImageProvider] + const allPrefixes = Utils.Dedup(prefixes ?? [].concat(...sources.map(s => s.defaultKeyPrefixes))) for (const prefix of allPrefixes) { for (const k in tags) { if (k === prefix || k.startsWith(prefix + ":")) { @@ -108,7 +114,7 @@ export default class AllImageProviders { const source = new UIEventSource([]) const allSources: Store[] = [] - for (const imageProvider of AllImageProviders.ImageAttributionSource) { + for (const imageProvider of AllImageProviders.imageAttributionSources) { /* By default, 'GetRelevantUrls' uses the defaultKeyPrefixes. However, we override them if a custom image tag is set, e.g. 'image:menu' From 640fe62440f3a3fa68a8b41d588814b6b38572c8 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 01:42:55 +0100 Subject: [PATCH 04/59] Chore: remove obsolete import --- src/UI/Image/ImageCarousel.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/UI/Image/ImageCarousel.svelte b/src/UI/Image/ImageCarousel.svelte index c071c1d1a0..22b3d2d884 100644 --- a/src/UI/Image/ImageCarousel.svelte +++ b/src/UI/Image/ImageCarousel.svelte @@ -3,7 +3,6 @@ import type { ProvidedImage } from "../../Logic/ImageProviders/ImageProvider" import type { SpecialVisualizationState } from "../SpecialVisualization" import DeletableImage from "./DeletableImage.svelte" - import Loading from "../Base/Loading.svelte" import LoadingPlaceholder from "../Base/LoadingPlaceholder.svelte" export let images: Store From 87ab165e58472c4c88cf44c45f823706f1969c93 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 03:32:03 +0100 Subject: [PATCH 05/59] Fix: actually don't show grey loading placeholder for wikidata/wikipedia, add tests --- src/Logic/ImageProviders/AllImageProviders.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Logic/ImageProviders/AllImageProviders.ts b/src/Logic/ImageProviders/AllImageProviders.ts index 76f96737c9..a9a5d416b1 100644 --- a/src/Logic/ImageProviders/AllImageProviders.ts +++ b/src/Logic/ImageProviders/AllImageProviders.ts @@ -73,6 +73,8 @@ export default class AllImageProviders { * Will simply count all image tags * * AllImageProviders.estimateNumberOfImages({image:"abc", "mapillary": "123", "panoramax:0": "xyz"}) // => 3 + * AllImageProviders.estimateNumberOfImages({wikidata:"Q123", "wikipedia": "nl:xyz"}) // => 0 + * * */ public static estimateNumberOfImages(tags: Record, prefixes: string[] = undefined): number { @@ -80,8 +82,6 @@ export default class AllImageProviders { const sources = [Imgur.singleton, Mapillary.singleton, - WikidataImageProvider.singleton, - WikimediaImageProvider.singleton, Panoramax.singleton, AllImageProviders.genericImageProvider] const allPrefixes = Utils.Dedup(prefixes ?? [].concat(...sources.map(s => s.defaultKeyPrefixes))) From 6d68ca7988bc6db0982ebae35efd90b5c829f435 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 03:32:51 +0100 Subject: [PATCH 06/59] Themes(education): move 'kindergarten' into 'school', add 'school:orientation' (only in Belgium), add more differentiated icons --- assets/layers/childcare/childcare.json | 157 +++++++++++ .../childcare.svg | 0 .../childcare.svg.license | 0 .../kindergarten.svg.license | 0 assets/layers/childcare/license_info.json | 12 + .../kindergarten_childcare.json | 243 ------------------ .../kindergarten_childcare/license_info.json | 25 -- .../kindergarten.svg | 0 assets/layers/school/kindergarten.svg.license | 2 + assets/layers/school/license_info.json | 37 +++ assets/layers/school/school.json | 242 +++++++++++++---- assets/layers/school/school_academic.svg | 74 ++++++ .../layers/school/school_academic.svg.license | 2 + assets/layers/school/school_primary.svg | 153 +++++++++++ .../layers/school/school_primary.svg.license | 2 + assets/themes/education/education.json | 9 +- langs/layers/ca.json | 69 ++--- langs/layers/cs.json | 98 +++---- langs/layers/de.json | 99 +++---- langs/layers/en.json | 146 ++++++----- langs/layers/es.json | 98 +++---- langs/layers/fr.json | 22 +- langs/layers/nl.json | 182 ++++++++----- langs/layers/pl.json | 85 +++--- langs/layers/ru.json | 14 +- langs/themes/nl.json | 114 +++++++- 26 files changed, 1147 insertions(+), 738 deletions(-) create mode 100644 assets/layers/childcare/childcare.json rename assets/layers/{kindergarten_childcare => childcare}/childcare.svg (100%) rename assets/layers/{kindergarten_childcare => childcare}/childcare.svg.license (100%) rename assets/layers/{kindergarten_childcare => childcare}/kindergarten.svg.license (100%) create mode 100644 assets/layers/childcare/license_info.json delete mode 100644 assets/layers/kindergarten_childcare/kindergarten_childcare.json delete mode 100644 assets/layers/kindergarten_childcare/license_info.json rename assets/layers/{kindergarten_childcare => school}/kindergarten.svg (100%) create mode 100644 assets/layers/school/kindergarten.svg.license create mode 100644 assets/layers/school/school_academic.svg create mode 100644 assets/layers/school/school_academic.svg.license create mode 100644 assets/layers/school/school_primary.svg create mode 100644 assets/layers/school/school_primary.svg.license diff --git a/assets/layers/childcare/childcare.json b/assets/layers/childcare/childcare.json new file mode 100644 index 0000000000..4502ec88df --- /dev/null +++ b/assets/layers/childcare/childcare.json @@ -0,0 +1,157 @@ +{ + "id": "childcare", + "name": { + "en": "Childcare", + "nl": "Kinderopvang", + "de": "Kinderkrippen", + "ca": "Guarderies d'infants" + }, + "description": "Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other", + "source": { + "osmTags": "amenity=childcare" + }, + "minzoom": 12, + "title": { + "mappings": [ + { + "if": "amenity=childcare", + "then": { + "en": "Childcare {name}", + "nl": "Kinderopvang {name}", + "de": "Kinderkrippe {name}", + "pl": "Żłobek {name}", + "cs": "Péče o děti {name}", + "es": "Guardería {name}" + } + } + ] + }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
" + } + ] + }, + "marker": [ + { + "icon": "circle", + "color": "white" + }, + { + "icon": { + "mappings": [ + { + "if": "amenity=childcare", + "then": "./assets/layers/childcare/childcare.svg" + } + ] + } + } + ] + } + ], + "lineRendering": [ + { + "color": "#62fc6c", + "width": 1 + } + ], + "presets": [ + { + "title": { + "en": "a childcare", + "nl": "een kinderopvang", + "de": "eine Kinderkrippe", + "ca": "una guarderia", + "pl": "żłobek", + "cs": "péče o děti", + "es": "una guardería" + }, + "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.", + "tags": [ + "amenity=childcare" + ] + } + ], + "tagRenderings": [ + { + "id": "name", + "question": { + "en": "What is the name of this facility?", + "de": "Wie lautet der Name dieser Einrichtung?", + "nl": "Wat is de naam van deze faciliteit?", + "ca": "Com s'anomena aquesta instal·lació?", + "pl": "Jaka jest nazwa tej placówki?", + "cs": "Jak se toto zařízení jmenuje?", + "es": "¿Cuál es el nombre de este centro?" + }, + "render": { + "en": "This facility is named {name}", + "de": "Diese Einrichtung hat den Namen {name}", + "ca": "Aquesta instal·lació s'anomena {name}", + "nl": "Deze faciliteit heet {name}", + "pl": "Ta placówka nazywa się {name}", + "cs": "Toto zařízení se jmenuje {name}", + "es": "Este centro se llama {name}" + }, + "freeform": { + "key": "name" + } + }, + "website", + "email", + "phone", + { + "builtin": "opening_hours", + "override": { + "question": { + "en": "When is this childcare opened?", + "nl": "Wanneer is deze kinderopvang geopend?", + "de": "Wann ist diese Kinderbetreuung geöffnet?", + "pl": "W jakich godzinach ten żłobek jest otwarty?", + "cs": "Kdy je tato péče o děti otevřena?", + "es": "¿Cuándo abre esta guardería?" + }, + "condition": "amenity=childcare" + } + }, + { + "id": "capacity", + "question": { + "en": "How much kids (at most) can be enrolled here?", + "nl": "Hoeveel kinderen kunnen hier terecht?", + "de": "Wie viele Kinder können hier maximal angemeldet werden?", + "ca": "Quants nens (com a màxim) es poden inscriure aquí?", + "pl": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", + "cs": "Kolik dětí (maximálně) zde může být zapsáno?", + "es": "¿Cuántos niños (como máximo) pueden inscribirse aquí?" + }, + "render": { + "en": "This facility has room for {capacity} kids", + "nl": "Hier kunnen {capacity} kinderen terecht", + "de": "Diese Einrichtung bietet Platz für {capacity} Kinder", + "ca": "Aquesta instal·lació té espai per a {capacity} nens", + "pl": "Ta placówka ma miejsce na {capacity} dzieci", + "cs": "Toto zařízení má prostor pro {capacity} dětí", + "es": "Este centro tiene capacidad para {capacity} niños" + }, + "freeform": { + "key": "capacity", + "type": "pnat" + } + } + ], + "deletion": true, + "allowMove": { + "enableRelocation": true, + "enableImproveAccuracy": true + } +} diff --git a/assets/layers/kindergarten_childcare/childcare.svg b/assets/layers/childcare/childcare.svg similarity index 100% rename from assets/layers/kindergarten_childcare/childcare.svg rename to assets/layers/childcare/childcare.svg diff --git a/assets/layers/kindergarten_childcare/childcare.svg.license b/assets/layers/childcare/childcare.svg.license similarity index 100% rename from assets/layers/kindergarten_childcare/childcare.svg.license rename to assets/layers/childcare/childcare.svg.license diff --git a/assets/layers/kindergarten_childcare/kindergarten.svg.license b/assets/layers/childcare/kindergarten.svg.license similarity index 100% rename from assets/layers/kindergarten_childcare/kindergarten.svg.license rename to assets/layers/childcare/kindergarten.svg.license diff --git a/assets/layers/childcare/license_info.json b/assets/layers/childcare/license_info.json new file mode 100644 index 0000000000..a60a3105ac --- /dev/null +++ b/assets/layers/childcare/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "childcare.svg", + "license": "CC-BY-4.0", + "authors": [ + "Diego Naive" + ], + "sources": [ + "https://thenounproject.com/icon/child-care-332981/" + ] + } +] \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/kindergarten_childcare.json b/assets/layers/kindergarten_childcare/kindergarten_childcare.json deleted file mode 100644 index 45d8c7baa5..0000000000 --- a/assets/layers/kindergarten_childcare/kindergarten_childcare.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "id": "kindergarten_childcare", - "name": { - "en": "Kindergartens and childcare", - "nl": "Kleuterscholen en kinderopvang", - "de": "Kindergärten und Kinderkrippen", - "ca": "Llars d'infants i guarderies", - "pl": "Przedszkola i żłobki", - "cs": "Mateřské školky a péče o děti", - "es": "Jardines de infancia y guarderías" - }, - "description": "Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other", - "source": { - "osmTags": { - "or": [ - "amenity=childcare", - "amenity=kindergarten", - "isced:level:2011=early_childhood" - ] - } - }, - "minzoom": 12, - "title": { - "mappings": [ - { - "if": "amenity=kindergarten", - "then": { - "en": "Kindergarten {name}", - "nl": "Kleuterschool {name}", - "de": "Kindergarten {name}", - "pl": "Przedszkole {name}", - "cs": "Mateřská škola {name}", - "es": "Jardín de infancia {name}" - } - }, - { - "if": "amenity=childcare", - "then": { - "en": "Childcare {name}", - "nl": "Kinderopvang {name}", - "de": "Kinderkrippe {name}", - "pl": "Żłobek {name}", - "cs": "Péče o děti {name}", - "es": "Guardería {name}" - } - } - ] - }, - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "label": { - "mappings": [ - { - "if": "name~*", - "then": "
{name}
" - } - ] - }, - "marker": [ - { - "icon": "circle", - "color": "white" - }, - { - "icon": { - "mappings": [ - { - "if": "amenity=kindergarten", - "then": "./assets/layers/kindergarten_childcare/kindergarten.svg" - }, - { - "if": "amenity=childcare", - "then": "./assets/layers/kindergarten_childcare/childcare.svg" - } - ] - } - } - ] - } - ], - "lineRendering": [ - { - "color": "#62fc6c", - "width": 1 - } - ], - "presets": [ - { - "title": { - "en": "a kindergarten", - "nl": "een kleuterschool", - "de": "einen Kindergarten", - "ru": "детский сад", - "ca": "una llar d'infants", - "pl": "przedszkole", - "cs": "mateřská školka", - "es": "un jardín de infancia" - }, - "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.", - "tags": [ - "amenity=kindergarten", - "isced:level=0", - "isced:2011:level=early_childhood" - ] - }, - { - "title": { - "en": "a childcare", - "nl": "een kinderopvang", - "de": "eine Kinderkrippe", - "ca": "una guarderia", - "pl": "żłobek", - "cs": "péče o děti", - "es": "una guardería" - }, - "description": "A childcare (also known as a nursery or daycare) is a facility which looks after small kids, but does not offer them an education program.", - "tags": [ - "amenity=kindergarten" - ] - } - ], - "tagRenderings": [ - { - "id": "childcare-type", - "question": { - "en": "What type of facility is this?", - "nl": "Wat voor faciliteit is dit?", - "de": "Um welche Art von Einrichtung handelt es sich?", - "pl": "Jaki to rodzaj placówki?", - "ca": "Quin tipus d'instal·lació és aquesta?", - "cs": "O jaký typ zařízení se jedná?", - "es": "¿Qué tipo de centro es este?" - }, - "mappings": [ - { - "if": "amenity=kindergarten", - "then": { - "en": "This is a kindergarten (also known as preschool) where small kids receive early education.", - "nl": "Dit is een kleuterschool waar kindjes (voorbereidend) onderwijs krijgen.", - "de": "Dies ist ein Kindergarten (auch bekannt als Vorschule), in dem kleine Kinder eine Früherziehung erhalten.", - "ca": "Aquesta és una llar d'infants (també coneguda com a preescolar) on els nens petits reben educació primerenca.", - "pl": "To jest przedszkole, gdzie małe dzieci otrzymują wczesną edukację.", - "cs": "Jedná se o mateřskou školu (známou také jako předškolní zařízení), kde se malým dětem dostává raného vzdělání.", - "es": "Se trata de un jardín de infancia (también conocido como preescolar) donde los niños pequeños reciben educación temprana." - }, - "addExtraTags": [ - "isced:level=0", - "isced:2011:level=early_childhood" - ] - }, - { - "if": "amenity=childcare", - "then": { - "en": "This is a childcare facility, such as a nursery or daycare where small kids are looked after. They do not offer an education and are ofter run as private businesses", - "nl": "Dit is een kinderopvang (ook een creche of onthaalmoeder genoemd) waar er voor kleine kinderen gezorgd wordt. Onderwijs is niet de hoofdfocus.", - "de": "Dies ist eine Kinderbetreuungseinrichtung, z. B. ein Kinderkrippe oder eine Tagesmutter, in der Kleinkinder betreut werden. Sie bieten keine Ausbildung an und werden oft als Privatunternehmen geführt", - "cs": "Jedná se o zařízení péče o děti, jako jsou jesle nebo školka, kde se starají o malé děti. Neposkytují vzdělání a jsou často provozovány jako soukromé podniky", - "es": "Se trata de un centro de cuidado infantil, como una guardería o una sala de juegos donde se cuida a los niños pequeños. No ofrecen educación y suelen ser empresas privadas" - }, - "addExtraTags": [ - "isced:level=", - "isced:2011:level=" - ] - } - ] - }, - { - "id": "name", - "question": { - "en": "What is the name of this facility?", - "de": "Wie lautet der Name dieser Einrichtung?", - "nl": "Wat is de naam van deze faciliteit?", - "ca": "Com s'anomena aquesta instal·lació?", - "pl": "Jaka jest nazwa tej placówki?", - "cs": "Jak se toto zařízení jmenuje?", - "es": "¿Cuál es el nombre de este centro?" - }, - "render": { - "en": "This facility is named {name}", - "de": "Diese Einrichtung hat den Namen {name}", - "ca": "Aquesta instal·lació s'anomena {name}", - "nl": "Deze faciliteit heet {name}", - "pl": "Ta placówka nazywa się {name}", - "cs": "Toto zařízení se jmenuje {name}", - "es": "Este centro se llama {name}" - }, - "freeform": { - "key": "name" - } - }, - "website", - "email", - "phone", - { - "builtin": "opening_hours", - "override": { - "question": { - "en": "When is this childcare opened?", - "nl": "Wanneer is deze kinderopvang geopend?", - "de": "Wann ist diese Kinderbetreuung geöffnet?", - "pl": "W jakich godzinach ten żłobek jest otwarty?", - "cs": "Kdy je tato péče o děti otevřena?", - "es": "¿Cuándo abre esta guardería?" - }, - "condition": "amenity=childcare" - } - }, - { - "id": "capacity", - "question": { - "en": "How much kids (at most) can be enrolled here?", - "nl": "Hoeveel kinderen kunnen hier terecht?", - "de": "Wie viele Kinder können hier maximal angemeldet werden?", - "ca": "Quants nens (com a màxim) es poden inscriure aquí?", - "pl": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", - "cs": "Kolik dětí (maximálně) zde může být zapsáno?", - "es": "¿Cuántos niños (como máximo) pueden inscribirse aquí?" - }, - "render": { - "en": "This facility has room for {capacity} kids", - "nl": "Hier kunnen {capacity} kinderen terecht", - "de": "Diese Einrichtung bietet Platz für {capacity} Kinder", - "ca": "Aquesta instal·lació té espai per a {capacity} nens", - "pl": "Ta placówka ma miejsce na {capacity} dzieci", - "cs": "Toto zařízení má prostor pro {capacity} dětí", - "es": "Este centro tiene capacidad para {capacity} niños" - }, - "freeform": { - "key": "capacity", - "type": "pnat" - } - } - ], - "deletion": true, - "allowMove": { - "enableRelocation": true, - "enableImproveAccuracy": true - } -} diff --git a/assets/layers/kindergarten_childcare/license_info.json b/assets/layers/kindergarten_childcare/license_info.json deleted file mode 100644 index 9da793cbef..0000000000 --- a/assets/layers/kindergarten_childcare/license_info.json +++ /dev/null @@ -1,25 +0,0 @@ -[ - { - "path": "childcare.svg", - "license": "CC-BY-4.0", - "authors": [ - "Diego Naive" - ], - "sources": [ - "https://thenounproject.com/icon/child-care-332981/" - ] - }, - { - "path": "kindergarten.svg", - "license": "CC-BY-4.0", - "authors": [ - "Diego Naive", - "VideoPlasty", - "Pietervdvn" - ], - "sources": [ - "https://thenounproject.com/icon/child-care-332981/", - "https://commons.wikimedia.org/wiki/File:Blackboard_Flat_Icon_Vector.svg" - ] - } -] \ No newline at end of file diff --git a/assets/layers/kindergarten_childcare/kindergarten.svg b/assets/layers/school/kindergarten.svg similarity index 100% rename from assets/layers/kindergarten_childcare/kindergarten.svg rename to assets/layers/school/kindergarten.svg diff --git a/assets/layers/school/kindergarten.svg.license b/assets/layers/school/kindergarten.svg.license new file mode 100644 index 0000000000..5f03c70c71 --- /dev/null +++ b/assets/layers/school/kindergarten.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Diego Naive; VideoPlasty; Pietervdvn +SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/assets/layers/school/license_info.json b/assets/layers/school/license_info.json index 595580ece0..32e1284963 100644 --- a/assets/layers/school/license_info.json +++ b/assets/layers/school/license_info.json @@ -9,6 +9,19 @@ "https://labs.mapbox.com/maki-icons/" ] }, + { + "path": "kindergarten.svg", + "license": "CC-BY-4.0", + "authors": [ + "Diego Naive", + "VideoPlasty", + "Pietervdvn" + ], + "sources": [ + "https://thenounproject.com/icon/child-care-332981/", + "https://commons.wikimedia.org/wiki/File:Blackboard_Flat_Icon_Vector.svg" + ] + }, { "path": "school.svg", "license": "CC0-1.0", @@ -19,5 +32,29 @@ "https://github.com/ideditor/temaki", "https://ideditor.github.io/temaki/docs/" ] + }, + { + "path": "school_academic.svg", + "license": "CC0-1.0", + "authors": [ + "Temaki", + "Pietervdvn" + ], + "sources": [ + "https://github.com/ideditor/temaki", + "https://ideditor.github.io/temaki/docs/" + ] + }, + { + "path": "school_primary.svg", + "license": "CC0-1.0", + "authors": [ + "Temaki", + "Pietervdvn" + ], + "sources": [ + "https://github.com/ideditor/temaki", + "https://ideditor.github.io/temaki/docs/" + ] } ] \ No newline at end of file diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 7b83fb6a77..c461de29e7 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -11,7 +11,12 @@ }, "description": "Schools giving primary and secondary education and post-secondary, non-tertiary education. Note that this level of education does not imply an age of the pupiles", "source": { - "osmTags": "amenity=school" + "osmTags": { + "or": [ + "amenity=school", + "amenity=kindergarten" + ] + } }, "calculatedTags": [ "_enclosing=enclosingFeatures(feat)('school').map(f => f.feat.properties.id)", @@ -58,7 +63,32 @@ "color": "white" }, { - "icon": "./assets/layers/school/school.svg" + "icon": { + "render": "./assets/layers/school/school.svg", + "mappings": [ + { + "if": { + "or": [ + "amenity=kindergarten", + "school=kindergarten" + ] + }, + "then": "./assets/layers/school/kindergarten.svg" + }, + { + "if": "school:orientation=academic", + "then": "./assets/layers/school/school_academic.svg" + }, + { + "if": "school~.*secondary.*", + "then": "./assets/layers/school/school.svg" + }, + { + "if": "school~.*primary.*", + "then": "./assets/layers/school/school_primary.svg" + } + ] + } } ] } @@ -70,6 +100,25 @@ } ], "presets": [ + { + "title": { + "en": "a primary or secondary school", + "nl": "een lagere of middelbare school", + "de": "eine Grundschule oder weiterführende Schule", + "ru": "детский сад", + "ca": "una escola de primària o secundària", + "pl": "przedszkole", + "cs": "základní nebo střední škola", + "es": "una escuela primaria o secundaria", + "fr": "une école primaire ou secondaire" + }, + "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.", + "tags": [ + "amenity=kindergarten", + "school=kindergarten", + "isced:level=0" + ] + }, { "tags": [ "amenity=school", @@ -156,10 +205,10 @@ "cs": "Jaký stupeň vzdělání se na této škole poskytuje?", "es": "¿Qué nivel de educación se imparte en esta escuela?" }, - "filter": true, "mappings": [ { "if": "school=kindergarten", + "alsoShowIf": "amenity=kindergarten", "then": { "en": "This is a school with a kindergarten section where young kids receive some education which prepares reading and writing.", "nl": "Dit is een school die ook een kleuterschool bevat", @@ -172,6 +221,9 @@ }, { "if": "school=primary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a school where one learns primary skills such as basic literacy and numerical skills.
Pupils typically enroll from 6 years old till 12 years old
", "nl": "Dit is een lagere school", @@ -184,6 +236,9 @@ }, { "if": "school=secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which offers all grades", "nl": "Dit is een middelbare school die alle schooljaren aanbiedt (dus van het eerste tot en met het zesde middelbaar)", @@ -196,6 +251,9 @@ }, { "if": "school=lower_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers first and second grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het eerste en tweede middelbaar", @@ -208,6 +266,9 @@ }, { "if": "school=middle_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers third and fourth grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het derde en vierde middelbaar", @@ -220,6 +281,9 @@ }, { "if": "school=upper_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This is a secondary school which does not have all grades, but offers fifth and sixth grade", "nl": "Dit is een middelbare school die niet alle schooljaren aanbiedt, maar wel het vijfde en zesde middelbaar", @@ -232,6 +296,9 @@ }, { "if": "school=post_secondary", + "addExtraTags": [ + "amenity=school" + ], "then": { "en": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)", "nl": "Deze school biedt post-secundair onderwijs (bijvoorbeeld specialisatiejaren)", @@ -245,6 +312,43 @@ ], "multiAnswer": true }, + { + "id": "orientation_belgium", + "question": { + "en": "What does this school train pupils for?", + "nl": "Waarop wordt een leerling voorbereid?" + }, + "condition": { + "or": [ + "school~i~(.+;)?upper_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + }, + "multiAnswer": true, + "mappings": [ + { + "if": "school:orientation=academic", + "then": { + "en": "Prepares for an academic study at university", + "nl": "Doorstroomfinaliteit: een opleiding hier bereidt voor op universitaire studies" + } + }, + { + "if": "school:orientation=professional", + "then": { + "en": "Prepares for a professional study at a college", + "nl": "Dubbele finaliteit: een opleiding hier bereidt voor op verdere studie (bv. aan een hogeschool of secundair-na-secundair) of op de arbeidsmarkt" + } + }, + { + "if": "school:orientation=vocational", + "then": { + "en": "Prepares for a job", + "nl": "Arbeidsfinaliteit: een opleiding hier bereidt voor op de arbeidsmarkt" + } + } + ] + }, { "id": "gender", "question": { @@ -410,7 +514,6 @@ }, { "id": "target-audience", - "condition": "school:for~*", "question": { "en": "Does this school target students with a special need? Which structural facilities does this school have?", "nl": "Richt deze school zich op leerlingen met een speciale zorgbehoefte? Welke structurele faciliteiten heeft deze school voor leerlingen met een extra zorgbehoefte?", @@ -435,21 +538,9 @@ "inline": true }, "mappings": [ - { - "if": "school:for=", - "then": { - "en": "This is a school where students study skills at their age-adequate level.
There are little or no special facilities to cater for students with special needs or facilities are ad-hoc
", - "nl": "Deze school richt zich op studenten zonder extra zorgbehoefte.
Il y a peu ou pas d'adaptations spéciales pour aider les étudiants ayant des besoins particuliers, ou les installations sont ad-hoc
Remark: isn't it contradictory to say there's no special facility + the facilities are ad-hoc?", - "ca": "Aquesta és una escola on els estudiants estudien habilitats al nivell adequat per a la seva edat.
Hi ha poques o cap instal·lació especial per atendre els estudiants amb necessitats especials o les instal·lacions són ad-hoc
", - "cs": "Jedná se o školu, kde studenti studují dovednosti na úrovni odpovídající jejich věku.
Existuje málo nebo žádná speciální zařízení pro studenty se speciálními potřebami nebo zařízení jsou ad hoc
", - "es": "Esta es una escuela donde los alumnos estudian habilidades en su nivel adecuado para su edad.
Hay pocas o ninguna instalación especial para atender a alumnos con necesidades especiales o las instalaciones son improvisadas
" - }, - "hideInAnswer": true - }, { "if": "school:for=mainstream", + "alsoShowIf": "school:for=", "then": { "en": "This is a school for students without special needs
This includes students who can follow the courses with small, ad hoc measurements
", "nl": "Deze school richt zich op studenten zonder extra zorgbehoefte
Esto incluye alumnos que pueden seguir los cursos con pequeñas medidas improvisadas
" } }, - { - "if": "school:for=adults", - "then": { - "en": "This is a school where adults are taught skills on the level as specified.", - "nl": "Deze school richt zich op volwassenen", - "de": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden.", - "fr": "C'est un établissement où des adultes sont formés au niveau mentionné.", - "ca": "Aquesta és una escola on els adults reben competències al nivell especificat.", - "cs": "Jedná se o školu, kde se dospělí učí dovednostem na stanovené úrovni.", - "es": "Esta es una escuela donde se enseñan habilidades a adultos en el nivel especificado." - } - }, - { - "if": "school:for=autism", - "then": { - "en": "This is a school for students with autism", - "nl": "Deze school richt zich op studenten in het autisme-spectrum", - "de": "Dies ist eine Schule für Schüler mit Autismus", - "fr": "C'est un établissement scolaire pour les étudiants ayant un trouble du spectre de l’autisme (TSA)", - "ca": "Aquesta és una escola per a estudiants amb autisme", - "pl": "To jest szkoła dla uczniów z autyzmem", - "cs": "Jedná se o školu pro studenty s autismem", - "es": "Esta es una escuela para alumnos con autismo" - } - }, { "if": "school:for=learning_disabilities", "then": { @@ -606,7 +672,97 @@ } ], "filter": [ - "pedagogy" + "pedagogy", + { + "id": "level", + "options": [ + { + "question": { + "en": "All levels of education" + } + }, + { + "question": { + "en": "Has a kindergarten", + "nl": "Kleuterafdeling" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?kindergarten(;.+)?", + "amenity=kindergarten" + ] + } + }, + { + "question": { + "en": "Primary school", + "nl": "Lagere school" + }, + "osmTags": "school~i~(.+;)?primary(;.+)?" + }, + { + "question": { + "en": "Secondary school with all grades", + "nl": "Secundaire school met alle graden" + }, + "osmTags": "school~i~(.+;)?secondary(;.+)?" + }, + { + "question": { + "en": "Has first grade", + "nl": "Heeft eerste graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?lower_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "Has second grade", + "nl": "Heeft tweede graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?middle_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "Has third grade", + "nl": "Heeft derde graad" + }, + "osmTags": { + "or": [ + "school~i~(.+;)?upper_secondary(;.+)?", + "school~i~(.+;)?secondary(;.+)?" + ] + } + }, + { + "question": { + "en": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)", + "nl": "Heeft specialisatiejaar" + }, + "osmTags": "school~i~.+;)?post_secondary(;.+" + }, + { + "question": { + "en": "Unknown school level" + }, + "osmTags": { + "and": [ + "school=", + "amenity!=kindergarten" + ] + } + } + ] + } ], "allowMove": { "enableImproveAccuracy": true, diff --git a/assets/layers/school/school_academic.svg b/assets/layers/school/school_academic.svg new file mode 100644 index 0000000000..83bf866dfd --- /dev/null +++ b/assets/layers/school/school_academic.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/assets/layers/school/school_academic.svg.license b/assets/layers/school/school_academic.svg.license new file mode 100644 index 0000000000..1456fdbd68 --- /dev/null +++ b/assets/layers/school/school_academic.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki; Pietervdvn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/school/school_primary.svg b/assets/layers/school/school_primary.svg new file mode 100644 index 0000000000..5e712ffdc6 --- /dev/null +++ b/assets/layers/school/school_primary.svg @@ -0,0 +1,153 @@ + + diff --git a/assets/layers/school/school_primary.svg.license b/assets/layers/school/school_primary.svg.license new file mode 100644 index 0000000000..1456fdbd68 --- /dev/null +++ b/assets/layers/school/school_primary.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Temaki; Pietervdvn +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/education/education.json b/assets/themes/education/education.json index 6a03421b9f..5573a045ca 100644 --- a/assets/themes/education/education.json +++ b/assets/themes/education/education.json @@ -36,9 +36,8 @@ }, "icon": "./assets/layers/school/college.svg", "layers": [ - "tertiary_education", + "childcare", "school", - "kindergarten_childcare" - ], - "#layers:note": "kindergarten_childcare must be _below_ school, as it can 'catch' primary schools which do have an integrated preschool" -} \ No newline at end of file + "tertiary_education" + ] +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 00e8634299..771d597f2e 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -2150,6 +2150,24 @@ } } }, + "childcare": { + "name": "Guarderies d'infants", + "presets": { + "0": { + "title": "una guarderia" + } + }, + "tagRenderings": { + "capacity": { + "question": "Quants nens (com a màxim) es poden inscriure aquí?", + "render": "Aquesta instal·lació té espai per a {capacity} nens" + }, + "name": { + "question": "Com s'anomena aquesta instal·lació?", + "render": "Aquesta instal·lació s'anomena {name}" + } + } + }, "climbing": { "description": "Una capa fictícia que conté renderització d'etiquetes compartides entre les capes d'escalada", "tagRenderings": { @@ -4865,35 +4883,6 @@ "render": "Vorada" } }, - "kindergarten_childcare": { - "name": "Llars d'infants i guarderies", - "presets": { - "0": { - "title": "una llar d'infants" - }, - "1": { - "title": "una guarderia" - } - }, - "tagRenderings": { - "capacity": { - "question": "Quants nens (com a màxim) es poden inscriure aquí?", - "render": "Aquesta instal·lació té espai per a {capacity} nens" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Aquesta és una llar d'infants (també coneguda com a preescolar) on els nens petits reben educació primerenca." - } - }, - "question": "Quin tipus d'instal·lació és aquesta?" - }, - "name": { - "question": "Com s'anomena aquesta instal·lació?", - "render": "Aquesta instal·lació s'anomena {name}" - } - } - }, "last_click": { "pointRendering": { "0": { @@ -6976,6 +6965,9 @@ "presets": { "0": { "title": "una escola de primària o secundària" + }, + "1": { + "title": "una escola de primària o secundària" } }, "tagRenderings": { @@ -7043,30 +7035,21 @@ "target-audience": { "mappings": { "0": { - "then": "Aquesta és una escola on els estudiants estudien habilitats al nivell adequat per a la seva edat.
Hi ha poques o cap instal·lació especial per atendre els estudiants amb necessitats especials o les instal·lacions són ad-hoc
" - }, - "1": { "then": "Aquesta és una escola per a estudiants sense necessitats especials
Açò inclou alumnes que poden seguir les classes amb petites mesures
" }, - "2": { - "then": "Aquesta és una escola on els adults reben competències al nivell especificat." - }, - "3": { - "then": "Aquesta és una escola per a estudiants amb autisme" - }, - "4": { + "1": { "then": "Aquesta és una escola per a estudiants amb dificultats de l'aprenentatge" }, - "5": { + "2": { "then": "Aquesta és una escola per a estudiants cecs o estudiants amb deficiències visuals" }, - "6": { + "3": { "then": "Aquesta és una escola per a estudiants sords o amb dificultats auditives" }, - "7": { + "4": { "then": "Aquesta és una escola per a estudiants amb discapacitats" }, - "8": { + "5": { "then": "Aquesta és una escola per a estudiants amb necessitats especials" } }, diff --git a/langs/layers/cs.json b/langs/layers/cs.json index a08e559d7b..915c4e972e 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -2588,6 +2588,35 @@ } } }, + "childcare": { + "presets": { + "0": { + "title": "péče o děti" + } + }, + "tagRenderings": { + "capacity": { + "question": "Kolik dětí (maximálně) zde může být zapsáno?", + "render": "Toto zařízení má prostor pro {capacity} dětí" + }, + "name": { + "question": "Jak se toto zařízení jmenuje?", + "render": "Toto zařízení se jmenuje {name}" + }, + "opening_hours": { + "override": { + "question": "Kdy je tato péče o děti otevřena?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Péče o děti {name}" + } + } + } + }, "cinema": { "name": "Kino", "tagRenderings": { @@ -5750,53 +5779,6 @@ "render": "Obrubník" } }, - "kindergarten_childcare": { - "name": "Mateřské školky a péče o děti", - "presets": { - "0": { - "title": "mateřská školka" - }, - "1": { - "title": "péče o děti" - } - }, - "tagRenderings": { - "capacity": { - "question": "Kolik dětí (maximálně) zde může být zapsáno?", - "render": "Toto zařízení má prostor pro {capacity} dětí" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Jedná se o mateřskou školu (známou také jako předškolní zařízení), kde se malým dětem dostává raného vzdělání." - }, - "1": { - "then": "Jedná se o zařízení péče o děti, jako jsou jesle nebo školka, kde se starají o malé děti. Neposkytují vzdělání a jsou často provozovány jako soukromé podniky" - } - }, - "question": "O jaký typ zařízení se jedná?" - }, - "name": { - "question": "Jak se toto zařízení jmenuje?", - "render": "Toto zařízení se jmenuje {name}" - }, - "opening_hours": { - "override": { - "question": "Kdy je tato péče o děti otevřena?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Mateřská škola {name}" - }, - "1": { - "then": "Péče o děti {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -7965,6 +7947,9 @@ "presets": { "0": { "title": "základní nebo střední škola" + }, + "1": { + "title": "základní nebo střední škola" } }, "tagRenderings": { @@ -8065,30 +8050,21 @@ "target-audience": { "mappings": { "0": { - "then": "Jedná se o školu, kde studenti studují dovednosti na úrovni odpovídající jejich věku.
Existuje málo nebo žádná speciální zařízení pro studenty se speciálními potřebami nebo zařízení jsou ad hoc
" - }, - "1": { "then": "Toto je škola pro studenty bez speciálních potřeb
To zahrnuje studenty, kteří mohou absolvovat kurzy s malými, ad hoc měřeními
" }, - "2": { - "then": "Jedná se o školu, kde se dospělí učí dovednostem na stanovené úrovni." - }, - "3": { - "then": "Jedná se o školu pro studenty s autismem" - }, - "4": { + "1": { "then": "Jedná se o školu pro žáky s poruchami učení" }, - "5": { + "2": { "then": "Jedná se o školu pro nevidomé studenty nebo studenty se zrakovým postižením" }, - "6": { + "3": { "then": "Jedná se o školu pro neslyšící studenty nebo studenty se sluchovým postižením" }, - "7": { + "4": { "then": "Jedná se o školu pro studenty se zdravotním postižením" }, - "8": { + "5": { "then": "Jedná se o školu pro žáky se speciálními potřebami" } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index fc5d6a000f..f829711d44 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -2874,6 +2874,36 @@ "render": "Ladestation" } }, + "childcare": { + "name": "Kinderkrippen", + "presets": { + "0": { + "title": "eine Kinderkrippe" + } + }, + "tagRenderings": { + "capacity": { + "question": "Wie viele Kinder können hier maximal angemeldet werden?", + "render": "Diese Einrichtung bietet Platz für {capacity} Kinder" + }, + "name": { + "question": "Wie lautet der Name dieser Einrichtung?", + "render": "Diese Einrichtung hat den Namen {name}" + }, + "opening_hours": { + "override": { + "question": "Wann ist diese Kinderbetreuung geöffnet?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Kinderkrippe {name}" + } + } + } + }, "cinema": { "description": "Ein Ort, an dem Filme gezeigt werden, die der Öffentlichkeit gegen Gebühr zugänglich sind.", "name": "Kino", @@ -6573,53 +6603,6 @@ "render": "Bordstein" } }, - "kindergarten_childcare": { - "name": "Kindergärten und Kinderkrippen", - "presets": { - "0": { - "title": "einen Kindergarten" - }, - "1": { - "title": "eine Kinderkrippe" - } - }, - "tagRenderings": { - "capacity": { - "question": "Wie viele Kinder können hier maximal angemeldet werden?", - "render": "Diese Einrichtung bietet Platz für {capacity} Kinder" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Dies ist ein Kindergarten (auch bekannt als Vorschule), in dem kleine Kinder eine Früherziehung erhalten." - }, - "1": { - "then": "Dies ist eine Kinderbetreuungseinrichtung, z. B. ein Kinderkrippe oder eine Tagesmutter, in der Kleinkinder betreut werden. Sie bieten keine Ausbildung an und werden oft als Privatunternehmen geführt" - } - }, - "question": "Um welche Art von Einrichtung handelt es sich?" - }, - "name": { - "question": "Wie lautet der Name dieser Einrichtung?", - "render": "Diese Einrichtung hat den Namen {name}" - }, - "opening_hours": { - "override": { - "question": "Wann ist diese Kinderbetreuung geöffnet?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kindergarten {name}" - }, - "1": { - "then": "Kinderkrippe {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9456,6 +9439,9 @@ "presets": { "0": { "title": "eine Grundschule oder weiterführende Schule" + }, + "1": { + "title": "eine Grundschule oder weiterführende Schule" } }, "tagRenderings": { @@ -9556,30 +9542,21 @@ "target-audience": { "mappings": { "0": { - "then": "Es handelt sich um eine Schule, in der die Schüler Fähigkeiten auf ihrem altersgemäßen Niveau erlernen.
Es gibt wenig oder keine speziellen Einrichtungen für Schüler mit besonderen Bedürfnissen oder die Einrichtungen sind ad-hoc
" - }, - "1": { "then": "Dies ist eine Schule für Schüler ohne besondere Bedürfnisse
Dazu gehören auch Schüler, die den Kursen mit kleinen Ad-hoc-Maßnahmen folgen können
" }, - "2": { - "then": "Dies ist eine Schule, in der Erwachsene auf dem angegebenen Niveau unterrichtet werden." - }, - "3": { - "then": "Dies ist eine Schule für Schüler mit Autismus" - }, - "4": { + "1": { "then": "Dies ist eine Schule für Schüler mit Lernschwierigkeiten" }, - "5": { + "2": { "then": "Dies ist eine Schule für blinde oder sehbehinderte Schüler" }, - "6": { + "3": { "then": "Dies ist eine Schule für gehörlose oder hörgeschädigte Schüler" }, - "7": { + "4": { "then": "Dies ist eine Schule für Schüler mit Behinderungen" }, - "8": { + "5": { "then": "Dies ist eine Schule für Schüler mit besonderen Bedürfnissen" } }, diff --git a/langs/layers/en.json b/langs/layers/en.json index ac91e90a73..1e7167df1e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -2874,6 +2874,36 @@ "render": "Charging station" } }, + "childcare": { + "name": "Childcare", + "presets": { + "0": { + "title": "a childcare" + } + }, + "tagRenderings": { + "capacity": { + "question": "How much kids (at most) can be enrolled here?", + "render": "This facility has room for {capacity} kids" + }, + "name": { + "question": "What is the name of this facility?", + "render": "This facility is named {name}" + }, + "opening_hours": { + "override": { + "question": "When is this childcare opened?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Childcare {name}" + } + } + } + }, "cinema": { "description": "A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US.", "name": "Cinema", @@ -6604,53 +6634,6 @@ "render": "Kerb" } }, - "kindergarten_childcare": { - "name": "Kindergartens and childcare", - "presets": { - "0": { - "title": "a kindergarten" - }, - "1": { - "title": "a childcare" - } - }, - "tagRenderings": { - "capacity": { - "question": "How much kids (at most) can be enrolled here?", - "render": "This facility has room for {capacity} kids" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "This is a kindergarten (also known as preschool) where small kids receive early education." - }, - "1": { - "then": "This is a childcare facility, such as a nursery or daycare where small kids are looked after. They do not offer an education and are ofter run as private businesses" - } - }, - "question": "What type of facility is this?" - }, - "name": { - "question": "What is the name of this facility?", - "render": "This facility is named {name}" - }, - "opening_hours": { - "override": { - "question": "When is this childcare opened?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kindergarten {name}" - }, - "1": { - "then": "Childcare {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9483,10 +9466,46 @@ } }, "school": { + "filter": { + "1": { + "options": { + "0": { + "question": "All levels of education" + }, + "1": { + "question": "Has a kindergarten" + }, + "2": { + "question": "Primary school" + }, + "3": { + "question": "Secondary school with all grades" + }, + "4": { + "question": "Has first grade" + }, + "5": { + "question": "Has second grade" + }, + "6": { + "question": "Has third grade" + }, + "7": { + "question": "This school offers post-secondary education (e.g. a seventh or eight specialisation year)" + }, + "8": { + "question": "Unknown school level" + } + } + } + }, "name": "Primary and secondary schools", "presets": { "0": { "title": "a primary or secondary school" + }, + "1": { + "title": "a primary or secondary school" } }, "tagRenderings": { @@ -9537,6 +9556,20 @@ }, "question": "Which genders can enroll at this school?" }, + "orientation_belgium": { + "mappings": { + "0": { + "then": "Prepares for an academic study at university" + }, + "1": { + "then": "Prepares for a professional study at a college" + }, + "2": { + "then": "Prepares for a job" + } + }, + "question": "What does this school train pupils for?" + }, "pedagogy": { "mappings": { "0": { @@ -9587,30 +9620,21 @@ "target-audience": { "mappings": { "0": { - "then": "This is a school where students study skills at their age-adequate level.
There are little or no special facilities to cater for students with special needs or facilities are ad-hoc
" - }, - "1": { "then": "This is a school for students without special needs
This includes students who can follow the courses with small, ad hoc measurements
" }, - "2": { - "then": "This is a school where adults are taught skills on the level as specified." - }, - "3": { - "then": "This is a school for students with autism" - }, - "4": { + "1": { "then": "This is a school for students with learning disabilities" }, - "5": { + "2": { "then": "This is a school for blind students or students with sight impairments" }, - "6": { + "3": { "then": "This is a school for deaf students or students with hearing impairments" }, - "7": { + "4": { "then": "This is a school for students with disabilities" }, - "8": { + "5": { "then": "This is a school for students with special needs" } }, diff --git a/langs/layers/es.json b/langs/layers/es.json index db6281c6a8..4e006e807a 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2815,6 +2815,35 @@ "render": "Punto de carga" } }, + "childcare": { + "presets": { + "0": { + "title": "una guardería" + } + }, + "tagRenderings": { + "capacity": { + "question": "¿Cuántos niños (como máximo) pueden inscribirse aquí?", + "render": "Este centro tiene capacidad para {capacity} niños" + }, + "name": { + "question": "¿Cuál es el nombre de este centro?", + "render": "Este centro se llama {name}" + }, + "opening_hours": { + "override": { + "question": "¿Cuándo abre esta guardería?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Guardería {name}" + } + } + } + }, "cinema": { "description": "Un lugar donde se proyectan películas (cine), generalmente abierto al público por una tarifa Comúnmente conocido como cine en Estados Unidos.", "name": "Cine", @@ -6416,53 +6445,6 @@ "render": "Bordillo" } }, - "kindergarten_childcare": { - "name": "Jardines de infancia y guarderías", - "presets": { - "0": { - "title": "un jardín de infancia" - }, - "1": { - "title": "una guardería" - } - }, - "tagRenderings": { - "capacity": { - "question": "¿Cuántos niños (como máximo) pueden inscribirse aquí?", - "render": "Este centro tiene capacidad para {capacity} niños" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Se trata de un jardín de infancia (también conocido como preescolar) donde los niños pequeños reciben educación temprana." - }, - "1": { - "then": "Se trata de un centro de cuidado infantil, como una guardería o una sala de juegos donde se cuida a los niños pequeños. No ofrecen educación y suelen ser empresas privadas" - } - }, - "question": "¿Qué tipo de centro es este?" - }, - "name": { - "question": "¿Cuál es el nombre de este centro?", - "render": "Este centro se llama {name}" - }, - "opening_hours": { - "override": { - "question": "¿Cuándo abre esta guardería?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Jardín de infancia {name}" - }, - "1": { - "then": "Guardería {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -9269,6 +9251,9 @@ "presets": { "0": { "title": "una escuela primaria o secundaria" + }, + "1": { + "title": "una escuela primaria o secundaria" } }, "tagRenderings": { @@ -9369,30 +9354,21 @@ "target-audience": { "mappings": { "0": { - "then": "Esta es una escuela donde los alumnos estudian habilidades en su nivel adecuado para su edad.
Hay pocas o ninguna instalación especial para atender a alumnos con necesidades especiales o las instalaciones son improvisadas
" - }, - "1": { "then": "Esta es una escuela para alumnos sin necesidades especiales
Esto incluye alumnos que pueden seguir los cursos con pequeñas medidas improvisadas
" }, - "2": { - "then": "Esta es una escuela donde se enseñan habilidades a adultos en el nivel especificado." - }, - "3": { - "then": "Esta es una escuela para alumnos con autismo" - }, - "4": { + "1": { "then": "Esta es una escuela para alumnos con dificultades de aprendizaje" }, - "5": { + "2": { "then": "Esta es una escuela para alumnos ciegos o con discapacidad visual" }, - "6": { + "3": { "then": "Esta es una escuela para alumnos sordos o con discapacidad auditiva" }, - "7": { + "4": { "then": "Esta es una escuela para alumnos con discapacidad" }, - "8": { + "5": { "then": "Esta es una escuela para alumnos con necesidades especiales" } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 863e132847..14599fc6ff 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -5693,6 +5693,9 @@ "presets": { "0": { "title": "une école primaire ou secondaire" + }, + "1": { + "title": "une école primaire ou secondaire" } }, "tagRenderings": { @@ -5760,30 +5763,21 @@ "target-audience": { "mappings": { "0": { - "then": "C'est un établissement scolaire où les étudiants acquièrent des compétences à un niveau adapté à leur âge.
Il y a peu ou pas d'adaptations spéciales pour aider les étudiants ayant des besoins particuliers, ou les installations sont ad-hoc
Remark: isn't it contradictory to say there's no special facility + the facilities are ad-hoc?" - }, - "1": { "then": "C'est un établissement scolaire pour étudiants sans besoins particuliers.
Sont inclus les étudiants qui peuvent suivre les cours avec de petites adaptations.
" }, - "2": { - "then": "C'est un établissement où des adultes sont formés au niveau mentionné." - }, - "3": { - "then": "C'est un établissement scolaire pour les étudiants ayant un trouble du spectre de l’autisme (TSA)" - }, - "4": { + "1": { "then": "C'est un établissement scolaire pour les étudiants ayant des troubles d’apprentissage" }, - "5": { + "2": { "then": "C'est un établissement scolaire pour les étudiants aveugles ou malvoyants" }, - "6": { + "3": { "then": "C'est un établissement scolaire pour les étudiants sourds ou malentendants" }, - "7": { + "4": { "then": "C'est un établissement scolaire pour les étudiants en situation de handicap" }, - "8": { + "5": { "then": "C'est un établissement scolaire pour les étudiants ayant des besoins particuliers" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 347a5ca909..95b55731d2 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2049,6 +2049,9 @@ }, "title": { "mappings": { + "0": { + "then": "{name}" + }, "1": { "then": "Vogelkijkhut {name}" }, @@ -2816,6 +2819,36 @@ "render": "Oplaadpunt" } }, + "childcare": { + "name": "Kinderopvang", + "presets": { + "0": { + "title": "een kinderopvang" + } + }, + "tagRenderings": { + "capacity": { + "question": "Hoeveel kinderen kunnen hier terecht?", + "render": "Hier kunnen {capacity} kinderen terecht" + }, + "name": { + "question": "Wat is de naam van deze faciliteit?", + "render": "Deze faciliteit heet {name}" + }, + "opening_hours": { + "override": { + "question": "Wanneer is deze kinderopvang geopend?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Kinderopvang {name}" + } + } + } + }, "cinema": { "description": "Een plaats die films toont, meestal open voor het publiek tegen een vergoeding.", "name": "Bioscoop", @@ -5915,53 +5948,6 @@ "render": "Stoeprand" } }, - "kindergarten_childcare": { - "name": "Kleuterscholen en kinderopvang", - "presets": { - "0": { - "title": "een kleuterschool" - }, - "1": { - "title": "een kinderopvang" - } - }, - "tagRenderings": { - "capacity": { - "question": "Hoeveel kinderen kunnen hier terecht?", - "render": "Hier kunnen {capacity} kinderen terecht" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "Dit is een kleuterschool waar kindjes (voorbereidend) onderwijs krijgen." - }, - "1": { - "then": "Dit is een kinderopvang (ook een creche of onthaalmoeder genoemd) waar er voor kleine kinderen gezorgd wordt. Onderwijs is niet de hoofdfocus." - } - }, - "question": "Wat voor faciliteit is dit?" - }, - "name": { - "question": "Wat is de naam van deze faciliteit?", - "render": "Deze faciliteit heet {name}" - }, - "opening_hours": { - "override": { - "question": "Wanneer is deze kinderopvang geopend?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Kleuterschool {name}" - }, - "1": { - "then": "Kinderopvang {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -6373,6 +6359,11 @@ } }, "title": { + "mappings": { + "0": { + "then": "{name}" + } + }, "render": "Natuurgebied" } }, @@ -6904,6 +6895,21 @@ "render": "Picknicktafel" } }, + "play_forest": { + "description": "Een speelbos is een vrij toegankelijke zone in een bos", + "name": "Speelbossen", + "title": { + "mappings": { + "0": { + "then": "{name}" + }, + "1": { + "then": "Speelbos {name}" + } + }, + "render": "Speelbos" + } + }, "playground": { "deletion": { "nonDeleteMappings": { @@ -8082,10 +8088,40 @@ } }, "school": { + "filter": { + "1": { + "options": { + "1": { + "question": "Kleuterafdeling" + }, + "2": { + "question": "Lagere school" + }, + "3": { + "question": "Secundaire school met alle graden" + }, + "4": { + "question": "Heeft eerste graad" + }, + "5": { + "question": "Heeft tweede graad" + }, + "6": { + "question": "Heeft derde graad" + }, + "7": { + "question": "Heeft specialisatiejaar" + } + } + } + }, "name": "Lagere en middelbare scholen", "presets": { "0": { "title": "een lagere of middelbare school" + }, + "1": { + "title": "een lagere of middelbare school" } }, "tagRenderings": { @@ -8136,6 +8172,20 @@ }, "question": "Mogen jongens en meisjes les volgen op deze school?" }, + "orientation_belgium": { + "mappings": { + "0": { + "then": "Doorstroomfinaliteit: een opleiding hier bereidt voor op universitaire studies" + }, + "1": { + "then": "Dubbele finaliteit: een opleiding hier bereidt voor op verdere studie (bv. aan een hogeschool of secundair-na-secundair) of op de arbeidsmarkt" + }, + "2": { + "then": "Arbeidsfinaliteit: een opleiding hier bereidt voor op de arbeidsmarkt" + } + }, + "question": "Waarop wordt een leerling voorbereid?" + }, "school-language": { "render": { "special": { @@ -8151,30 +8201,21 @@ "target-audience": { "mappings": { "0": { - "then": "Deze school richt zich op studenten zonder extra zorgbehoefte.
Dit omvat leerlingen waarbij kleine, ad-hoc maatregelen volstaan om de lessen te volgen.
" }, - "2": { - "then": "Deze school richt zich op volwassenen" - }, - "3": { - "then": "Deze school richt zich op studenten in het autisme-spectrum" - }, - "4": { + "1": { "then": "Deze school richt zich op leerlingen met een leerprobleem" }, - "5": { + "2": { "then": "Deze school richt zich op blinde en slechtziende studenten" }, - "6": { + "3": { "then": "Deze school richt zich op dove en hardhorende studenten" }, - "7": { + "4": { "then": "Deze school richt zich op studenten met een beperking" }, - "8": { + "5": { "then": "Deze school richt zich op studenten met extra zorgbehoeften" } }, @@ -8470,6 +8511,9 @@ }, "title": { "mappings": { + "0": { + "then": "{name}" + }, "1": { "then": "Voetpad" }, @@ -10635,13 +10679,25 @@ } }, "village_green": { - "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)" + "description": "Een laag die dorpsgroen toont (gemeenschapsgroen, maar niet echt een park)", + "name": "Speelweide", + "title": { + "mappings": { + "0": { + "then": "{name}" + } + }, + "render": "Speelweide" + } }, "visitor_information_centre": { "description": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.", "name": "Bezoekerscentrum", "title": { "mappings": { + "0": { + "then": "{name:nl}" + }, "1": { "then": "{name}" } @@ -10871,4 +10927,4 @@ "render": "windturbine" } } -} +} \ No newline at end of file diff --git a/langs/layers/pl.json b/langs/layers/pl.json index c5671dfa7d..a9408413dd 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -1247,6 +1247,35 @@ } } }, + "childcare": { + "presets": { + "0": { + "title": "żłobek" + } + }, + "tagRenderings": { + "capacity": { + "question": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", + "render": "Ta placówka ma miejsce na {capacity} dzieci" + }, + "name": { + "question": "Jaka jest nazwa tej placówki?", + "render": "Ta placówka nazywa się {name}" + }, + "opening_hours": { + "override": { + "question": "W jakich godzinach ten żłobek jest otwarty?" + } + } + }, + "title": { + "mappings": { + "0": { + "then": "Żłobek {name}" + } + } + } + }, "climbing_area": { "tagRenderings": { "Rock type (crag/rock/cliff only)": { @@ -2377,50 +2406,6 @@ "render": "Krawężnik" } }, - "kindergarten_childcare": { - "name": "Przedszkola i żłobki", - "presets": { - "0": { - "title": "przedszkole" - }, - "1": { - "title": "żłobek" - } - }, - "tagRenderings": { - "capacity": { - "question": "Jak wiele dzieci (maksymalnie) może być tutaj zapisanych?", - "render": "Ta placówka ma miejsce na {capacity} dzieci" - }, - "childcare-type": { - "mappings": { - "0": { - "then": "To jest przedszkole, gdzie małe dzieci otrzymują wczesną edukację." - } - }, - "question": "Jaki to rodzaj placówki?" - }, - "name": { - "question": "Jaka jest nazwa tej placówki?", - "render": "Ta placówka nazywa się {name}" - }, - "opening_hours": { - "override": { - "question": "W jakich godzinach ten żłobek jest otwarty?" - } - } - }, - "title": { - "mappings": { - "0": { - "then": "Przedszkole {name}" - }, - "1": { - "then": "Żłobek {name}" - } - } - } - }, "last_click": { "pointRendering": { "0": { @@ -3466,6 +3451,11 @@ } }, "school": { + "presets": { + "0": { + "title": "przedszkole" + } + }, "tagRenderings": { "school-language": { "render": { @@ -3482,15 +3472,12 @@ "target-audience": { "mappings": { "3": { - "then": "To jest szkoła dla uczniów z autyzmem" - }, - "6": { "then": "To jest szkoła dla uczniów głuchych i słabosłyszących" }, - "7": { + "4": { "then": "To jest szkoła dla uczniów z niepełnosprawnościami" }, - "8": { + "5": { "then": "To jest szkoła dla uczniów z specjalnymi potrzebami" } } diff --git a/langs/layers/ru.json b/langs/layers/ru.json index f535b0dcb9..bf3110103f 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1284,13 +1284,6 @@ "render": "Бордюр" } }, - "kindergarten_childcare": { - "presets": { - "0": { - "title": "детский сад" - } - } - }, "map": { "name": "Карты", "presets": { @@ -1637,6 +1630,13 @@ } } }, + "school": { + "presets": { + "0": { + "title": "детский сад" + } + } + }, "shops": { "description": "Магазин", "name": "Магазин", diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8170fe8912..fc4637708f 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -653,8 +653,37 @@ "building type": { "question": "Wat voor soort gebouw is dit?" }, + "grb-fixme": { + "mappings": { + "0": { + "then": "Geen fixme" + } + }, + "question": "Wat zegt de fixme?", + "render": "De fixme is {fixme}" + }, + "grb-housenumber": { + "mappings": { + "0": { + "then": "Geen huisnummer" + } + }, + "question": "Wat is het huisnummer?", + "render": "Het huisnummer is {addr:housenumber}" + }, + "grb-min-level": { + "question": "Hoeveel verdiepingen ontbreken?", + "render": "Dit gebouw begint maar op de {building:min_level} verdieping" + }, "grb-reference": { "render": "Werd geïmporteerd vanuit GRB, het referentienummer is {source:geometry:ref}" + }, + "grb-street": { + "question": "Wat is de straat?", + "render": "De straat is {addr:street}" + }, + "grb-unit": { + "render": "De wooneenheid-aanduiding is {addr:unit} " } } }, @@ -671,8 +700,35 @@ } } } + }, + "5": { + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Geen omliggend OSM-gebouw gevonden" + } + } + }, + "3": { + "mappings": { + "0": { + "then": "Geen omliggend OSM-gebouw gevonden. Een omliggend gebouw is nodig om dit punt als adres punt toe te voegen.
Importeer eerst de gebouwen. Vernieuw dan de pagina om losse adressen toe te voegen
" + } + }, + "render": { + "special": { + "text": "Voeg dit adres als een nieuw adrespunt toe" + } + } + } + } + } } - } + }, + "shortDescription": "Grb import helper tool", + "title": "GRB import helper" }, "guideposts": { "description": "Wegwijzers (ook wel handwijzer genoemd) zijn vaak te vinden langs officiële wandel-, fiets-, ski- of paardrijroutes om de richtingen naar verschillende bestemmingen aan te geven. Vaak zijn ze vernoemd naar een regio of plaats en geven ze de hoogte aan.\n\nDe positie van een wegwijzer kan door een wandelaar/fietser/renner/skiër worden gebruikt als bevestiging van de huidige positie, vooral als ze een gedrukte kaart zonder GPS-ontvanger gebruiken. ", @@ -1100,6 +1156,11 @@ }, "title": "Dierenartsen, hondenloopzones en andere huisdiervriendelijke plaatsen" }, + "play_forests": { + "description": "Een speelbos is een zone in een bos die vrij toegankelijk is voor spelende kinderen. Deze wordt in bossen van het Agentschap Natuur en bos altijd aangeduid met het overeenkomstige bord.", + "shortDescription": "Deze kaart toont speelbossen", + "title": "Speelbossen" + }, "playgrounds": { "description": "Op deze kaart vind je speeltuinen en kan je zelf meer informatie en foto's toevoegen", "shortDescription": "Een kaart met speeltuinen", @@ -1173,6 +1234,47 @@ "description": "Alles om te skiën", "title": "Skipistes en kabelbanen" }, + "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": { + "6": { + "name": "Wandelroutes van provincie Antwerpen", + "tagRenderings": { + "walk-description": { + "render": "

Korte beschrijving:

{description}" + }, + "walk-length": { + "render": "Deze wandeling is {_length:km}km lang" + }, + "walk-operator": { + "question": "Wie beheert deze wandeling en plaatst dus de signalisatiebordjes?" + }, + "walk-operator-email": { + "question": "Naar wie kan men emailen bij problemen rond signalisatie?", + "render": "Bij problemen met signalisatie kan men emailen naar {operator:email}" + }, + "walk-type": { + "mappings": { + "0": { + "then": "Dit is een internationale wandelroute" + }, + "1": { + "then": "Dit is een nationale wandelroute" + }, + "2": { + "then": "Dit is een regionale wandelroute" + }, + "3": { + "then": "Dit is een lokale wandelroute" + } + } + } + } + } + }, + "shortDescription": "Speelplekken in de Antwerpse Zuidrand", + "title": "Welkom bij de groendoener!" + }, "sport_pitches": { "description": "Een sportveld is een ingerichte plaats met infrastructuur om een sport te beoefenen", "shortDescription": "Deze kaart toont sportvelden", @@ -1293,6 +1395,10 @@ }, "title": "Straatverlichting" }, + "street_lighting_assen": { + "description": "Op deze kaart vind je alles over straatlantaarns + een dataset van Assen", + "title": "Straatverlichting - Assen" + }, "surveillance": { "description": "Op deze open kaart kan je bewakingscamera's vinden.", "shortDescription": "Bewakingscameras en dergelijke", @@ -1406,9 +1512,13 @@ "description": "Kaart met afvalbakken en recyclingfaciliteiten.", "title": "Afval" }, + "waste_assen": { + "description": "Kaart met afvalbakken en recyclingfaciliteiten + een dataset voor Assen.", + "title": "Afval - Assen" + }, "waste_basket": { "description": "Op deze kaart vind je afvalbakken bij jou in de buurt. Als er een afvalbak ontbreekt op deze kaart, kun je deze zelf toevoegen", "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbakken" } -} +} \ No newline at end of file From 88ca77ab3823c832b33b24f3d84d251fc62e85b6 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 17:20:03 +0100 Subject: [PATCH 07/59] Fix build: move preset down --- assets/layers/school/school.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index c461de29e7..06bf0df757 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -100,6 +100,21 @@ } ], "presets": [ + { + "tags": [ + "amenity=school", + "fixme=Added with MapComplete, the precise geometry should still be drawn" + ], + "title": { + "en": "a primary or secondary school", + "nl": "een lagere of middelbare school", + "de": "eine Grundschule oder weiterführende Schule", + "fr": "une école primaire ou secondaire", + "ca": "una escola de primària o secundària", + "cs": "základní nebo střední škola", + "es": "una escuela primaria o secundaria" + } + }, { "title": { "en": "a primary or secondary school", @@ -118,21 +133,6 @@ "school=kindergarten", "isced:level=0" ] - }, - { - "tags": [ - "amenity=school", - "fixme=Added with MapComplete, the precise geometry should still be drawn" - ], - "title": { - "en": "a primary or secondary school", - "nl": "een lagere of middelbare school", - "de": "eine Grundschule oder weiterführende Schule", - "fr": "une école primaire ou secondaire", - "ca": "una escola de primària o secundària", - "cs": "základní nebo střední škola", - "es": "una escuela primaria o secundaria" - } } ], "tagRenderings": [ From 9836c299986564e2d8ed29e72fa52652d8a1a921 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 17:30:41 +0100 Subject: [PATCH 08/59] Fix build: fix translations --- assets/layers/school/school.json | 11 ++--------- langs/layers/ca.json | 3 --- langs/layers/cs.json | 3 --- langs/layers/de.json | 3 --- langs/layers/en.json | 2 +- langs/layers/es.json | 3 --- langs/layers/fr.json | 3 --- langs/layers/nl.json | 2 +- langs/layers/pl.json | 5 ----- langs/layers/ru.json | 7 ------- 10 files changed, 4 insertions(+), 38 deletions(-) diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 06bf0df757..23adb084d5 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -117,15 +117,8 @@ }, { "title": { - "en": "a primary or secondary school", - "nl": "een lagere of middelbare school", - "de": "eine Grundschule oder weiterführende Schule", - "ru": "детский сад", - "ca": "una escola de primària o secundària", - "pl": "przedszkole", - "cs": "základní nebo střední škola", - "es": "una escuela primaria o secundaria", - "fr": "une école primaire ou secondaire" + "en": "a kindergarten", + "nl": "een kleuterschool" }, "description": "A kindergarten (also known as preschool) is a school where small kids receive early education.", "tags": [ diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 771d597f2e..e86719019a 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -6965,9 +6965,6 @@ "presets": { "0": { "title": "una escola de primària o secundària" - }, - "1": { - "title": "una escola de primària o secundària" } }, "tagRenderings": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 915c4e972e..1e5103f83e 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -7947,9 +7947,6 @@ "presets": { "0": { "title": "základní nebo střední škola" - }, - "1": { - "title": "základní nebo střední škola" } }, "tagRenderings": { diff --git a/langs/layers/de.json b/langs/layers/de.json index f829711d44..5e447db3b2 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -9439,9 +9439,6 @@ "presets": { "0": { "title": "eine Grundschule oder weiterführende Schule" - }, - "1": { - "title": "eine Grundschule oder weiterführende Schule" } }, "tagRenderings": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 1e7167df1e..a5a0ee4850 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -9505,7 +9505,7 @@ "title": "a primary or secondary school" }, "1": { - "title": "a primary or secondary school" + "title": "a kindergarten" } }, "tagRenderings": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 4e006e807a..68aeb5f9b2 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -9251,9 +9251,6 @@ "presets": { "0": { "title": "una escuela primaria o secundaria" - }, - "1": { - "title": "una escuela primaria o secundaria" } }, "tagRenderings": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 14599fc6ff..e9349d50b3 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -5693,9 +5693,6 @@ "presets": { "0": { "title": "une école primaire ou secondaire" - }, - "1": { - "title": "une école primaire ou secondaire" } }, "tagRenderings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 95b55731d2..51ccfb3067 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -8121,7 +8121,7 @@ "title": "een lagere of middelbare school" }, "1": { - "title": "een lagere of middelbare school" + "title": "een kleuterschool" } }, "tagRenderings": { diff --git a/langs/layers/pl.json b/langs/layers/pl.json index a9408413dd..5361d29b30 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -3451,11 +3451,6 @@ } }, "school": { - "presets": { - "0": { - "title": "przedszkole" - } - }, "tagRenderings": { "school-language": { "render": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index bf3110103f..eb95a110be 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1630,13 +1630,6 @@ } } }, - "school": { - "presets": { - "0": { - "title": "детский сад" - } - } - }, "shops": { "description": "Магазин", "name": "Магазин", From 419495f26d91a26a4e3b304b8d247d3aca748e49 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 26 Jan 2025 18:36:50 +0100 Subject: [PATCH 09/59] UX: move debug information in dropdown --- assets/layers/usersettings/usersettings.json | 44 ++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index ed8d50057e..099c5d149a 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -1464,13 +1464,57 @@ ], "#force-save-button": "yes" }, + { + "id": "gps_accordeon", + "render": { + "special": { + "type": "group", + "header": "debug-gps-title", + "labels": "debug-gps" + } + } + }, + { + "id": "debug-gps-title", + "labels": [ + "hidden" + ], + "render": { + "en": "GPS and gyroscope data" + } + }, { "id": "debug-gps", + "labels": [ + "hidden" + ], "condition": "mapcomplete-show_debug=yes", "render": "{gps_all_tags()}" }, + { + "id": "debug_accordeon", + "render": { + "special": { + "type": "group", + "header": "debug_accordeon_title", + "labels": "debug" + } + } + }, + { + "id": "debug_accordeon_title", + "labels": [ + "hidden" + ], + "render": { + "en": "Debug information" + } + }, { "id": "debug", + "labels": [ + "hidden" + ], "condition": "mapcomplete-show_debug=yes", "render": "{all_tags()}" } From 7bddaa7d4c0c9ce95d57beb24c3b317f2f008035 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:32:19 +0100 Subject: [PATCH 10/59] Scripts(community_index): create script to update community index files, create weekly data maintenance script --- .forgejo/workflows/update_community_index.yml | 31 ++++ package.json | 1 + scripts/downloadCommunityIndex.ts | 116 +++++++++++++ scripts/slice.ts | 56 ++----- .../Actors/SaveFeatureSourceToLocalStorage.ts | 2 +- src/Logic/GeoOperations.ts | 157 +++++++++++------- src/Logic/Web/CommunityIndex.ts | 33 ++++ src/Models/TileRange.ts | 12 ++ .../BigComponents/CommunityIndexView.svelte | 15 +- src/UI/BigComponents/ContactLink.svelte | 11 +- test/Logic/GeoOperations.spec.ts | 119 ++++++++++--- 11 files changed, 412 insertions(+), 141 deletions(-) create mode 100644 .forgejo/workflows/update_community_index.yml create mode 100644 scripts/downloadCommunityIndex.ts create mode 100644 src/Logic/Web/CommunityIndex.ts diff --git a/.forgejo/workflows/update_community_index.yml b/.forgejo/workflows/update_community_index.yml new file mode 100644 index 0000000000..77b0e8f8cf --- /dev/null +++ b/.forgejo/workflows/update_community_index.yml @@ -0,0 +1,31 @@ +name: Weekly data updates +on: + schedule: + -cron: "* * * * 1" + +jobs: + deploy_on_hetzner_single: + runs-on: [ ubuntu-latest, hetzner-access ] + + runs-on: [ ubuntu-latest, hetzner-access ] + steps: + - uses: actions/checkout@v3 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: "20" + cache: "npm" + cache-dependency-path: package-lock.json + + - name: install deps + run: npm ci + shell: bash + + - name: update community index files + shell: bash + run: | + mkdir community-index + npm run download:community-index -- community-index/ + zip community-index.zip community-index/* + scp community-index.zip hetzner:data/ diff --git a/package.json b/package.json index 4ff48086b5..5e868596a8 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,7 @@ "download:editor-layer-index": "vite-node scripts/downloadEli.ts", "download:stats": "vite-node scripts/GenerateSeries.ts", "download:images": "vite-node scripts/generateImageAnalysis.ts -- ~/data/imgur-image-backup/", + "download:community-index": "vite-node scripts/downloadCommunityIndex.ts -- /tmp/test", "weblate:add-upstream": "git remote add weblate https://translate.mapcomplete.org/git/mapcomplete/core/ ; git remote update weblate", "weblate:fix": "npm run weblate:add-upstream && git merge weblate/master && git rebase origin/master && git push origin master", "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:themes", diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts new file mode 100644 index 0000000000..fe4d4dcc02 --- /dev/null +++ b/scripts/downloadCommunityIndex.ts @@ -0,0 +1,116 @@ +import Script from "./Script" +import { CommunityResource } from "../src/Logic/Web/CommunityIndex" +import { Utils } from "../src/Utils" +import { FeatureCollection, MultiPolygon, Polygon } from "geojson" +import { writeFileSync } from "fs" +import { GeoOperations } from "../src/Logic/GeoOperations" +import { Tiles } from "../src/Models/TileRange" +import ScriptUtils from "./ScriptUtils" + +class DownloadCommunityIndex extends Script { + + constructor() { + super("Updates the community index") + } + + printHelp() { + console.log("Arguments are:\noutputdirectory") + } + + private static targetZoomlevel: number = 6 + private static upstreamUrl: string = "https://raw.githubusercontent.com/osmlab/osm-community-index/main/dist/" + + /** + * Prunes away unnecessary fields from a CommunityResource + * @private + */ + private static stripResource(r: Readonly): CommunityResource { + return { + id: r.id, + languageCodes: r.languageCodes, + account: r.account, + type: r.type, + resolved: { + name: r.resolved.name, + description: r.resolved.description, + url: r.resolved.url + } + } + } + + private static stripResourcesObj(resources: Readonly>>) { + const stripped: Record = {} + for (const k in resources) { + stripped[k] = DownloadCommunityIndex.stripResource(resources[k]) + } + return stripped + } + + public static async update(targetDirectory: string) { + const data = await Utils.downloadJson, + nameEn: string, + id: string + }>>(DownloadCommunityIndex.upstreamUrl + "completeFeatureCollection.json" + ) + const features = data.features + const global = features.find( + f => f.id === "Q2" + ) + const globalProperties = DownloadCommunityIndex.stripResourcesObj(global.properties.resources) + writeFileSync(targetDirectory + "/global.json", JSON.stringify(globalProperties), "utf8") + console.log("Written global properties") + + const types = new Set() + for (const f of features) { + const res = f.properties.resources + for (const k in res) { + types.add(res[k].type) + } + } + for (const type of types) { + const url = `${DownloadCommunityIndex.upstreamUrl}img/${type}.svg` + await ScriptUtils.DownloadFileTo(url, `${targetDirectory}/${type}.svg`) + } + const local = features.filter(f => f.id !== "Q2") + const spread = GeoOperations.spreadIntoBboxes(local, DownloadCommunityIndex.targetZoomlevel) + let written = 0 + let skipped = 0 + writeFileSync(targetDirectory + "local.geojson", JSON.stringify({ type: "FeatureCollection", features: local })) + for (const tileIndex of spread.keys()) { + const features = spread.get(tileIndex) + const clipped = GeoOperations.clipAllInBox(features, tileIndex) + if (clipped.length === 0) { + skipped++ + features.push(Tiles.asGeojson(tileIndex)) + writeFileSync(`${targetDirectory + tileIndex}_skipped.geojson`, JSON.stringify({ + type: "FeatureCollection", features + })) + continue + } + const [z, x, y] = Tiles.tile_from_index(tileIndex) + const path = `${targetDirectory}/tile_${z}_${x}_${y}.geojson` + clipped.forEach((f) => { + delete f.bbox + }) + writeFileSync(path, JSON.stringify({ type: "FeatureCollection", features: clipped }), "utf8") + written++ + console.log(`Written tile ${path}`) + } + console.log(`Created ${written} tiles, skipped ${skipped}`) + } + + + async main(args: string[]): Promise { + const path = args[0] + if (!path) { + this.printHelp() + return + } + + await DownloadCommunityIndex.update(path) + + } +} + +new DownloadCommunityIndex().run() diff --git a/scripts/slice.ts b/scripts/slice.ts index 77b7b65c9a..a4a17831a0 100644 --- a/scripts/slice.ts +++ b/scripts/slice.ts @@ -1,13 +1,12 @@ import * as fs from "fs" -import StaticFeatureSource from "../Logic/FeatureSource/Sources/StaticFeatureSource" import * as readline from "readline" import ScriptUtils from "./ScriptUtils" import { Utils } from "../Utils" import Script from "./Script" -import { BBox } from "../Logic/BBox" import { GeoOperations } from "../Logic/GeoOperations" import { Tiles } from "../Models/TileRange" import { Feature } from "geojson" +import { features } from "monaco-editor/esm/metadata" /** * This script slices a big newline-delimeted geojson file into tiled geojson @@ -96,34 +95,15 @@ class Slice extends Script { features: Feature[], tileIndex: number, outputDirectory: string, - doSlice: boolean, + doClip: boolean, handled: number, maxNumberOfTiles: number - ) { + ): boolean { + if (doClip) { + features = GeoOperations.clipAllInBox(features, tileIndex) + } const [z, x, y] = Tiles.tile_from_index(tileIndex) const path = `${outputDirectory}/tile_${z}_${x}_${y}.geojson` - const box = BBox.fromTileIndex(tileIndex) - if (doSlice) { - features = Utils.NoNull( - features.map((f) => { - const bbox = box.asGeoJson({}) - const properties = { - ...f.properties, - id: (f.properties?.id ?? "") + "_" + z + "_" + x + "_" + y, - } - - if (GeoOperations.completelyWithin(bbox, f)) { - bbox.properties = properties - return bbox - } - const intersection = GeoOperations.intersect(f, box.asGeoJson({})) - if (intersection) { - intersection.properties = properties - } - return intersection - }) - ) - } features.forEach((f) => { delete f.bbox }) @@ -177,7 +157,7 @@ class Slice extends Script { } console.log("Using directory ", outputDirectory) - let allFeatures: any[] + let allFeatures: Feature[] if (inputFile.endsWith(".geojson")) { console.log("Detected geojson") allFeatures = await this.readFeaturesFromGeoJson(inputFile) @@ -202,18 +182,16 @@ class Slice extends Script { } const maxNumberOfTiles = Math.pow(2, zoomlevel) * Math.pow(2, zoomlevel) let handled = 0 - StaticFeatureSource.fromGeojson(allFeatures).features.addCallbackAndRun((feats) => { - GeoOperations.slice(zoomlevel, feats).forEach((tileData, tileIndex) => { - handled = handled + 1 - this.handleTileData( - tileData, - tileIndex, - outputDirectory, - doSlice, - handled, - maxNumberOfTiles - ) - }) + GeoOperations.slice(zoomlevel, features).forEach((tileData, tileIndex) => { + handled = handled + 1 + this.handleTileData( + tileData, + tileIndex, + outputDirectory, + doSlice, + handled, + maxNumberOfTiles + ) }) } } diff --git a/src/Logic/FeatureSource/Actors/SaveFeatureSourceToLocalStorage.ts b/src/Logic/FeatureSource/Actors/SaveFeatureSourceToLocalStorage.ts index 6e2510b727..59cf8b51bd 100644 --- a/src/Logic/FeatureSource/Actors/SaveFeatureSourceToLocalStorage.ts +++ b/src/Logic/FeatureSource/Actors/SaveFeatureSourceToLocalStorage.ts @@ -75,7 +75,7 @@ export default class SaveFeatureSourceToLocalStorage { this.storage = storage const singleTileSavers: Map = new Map() features.features.addCallbackAndRunD((features) => { - const sliced = GeoOperations.slice(zoomlevel, features) + const sliced = GeoOperations.spreadIntoBboxes(features, zoomlevel) sliced.forEach((features, tileIndex) => { let tileSaver = singleTileSavers.get(tileIndex) diff --git a/src/Logic/GeoOperations.ts b/src/Logic/GeoOperations.ts index 63fe2ccb76..a6faf3d8b8 100644 --- a/src/Logic/GeoOperations.ts +++ b/src/Logic/GeoOperations.ts @@ -1,6 +1,6 @@ import { BBox } from "./BBox" import * as turf from "@turf/turf" -import { AllGeoJSON, booleanWithin, Coord } from "@turf/turf" +import { AllGeoJSON, booleanWithin, Coord, Polygon } from "@turf/turf" import { Feature, FeatureCollection, @@ -9,13 +9,13 @@ import { MultiLineString, MultiPolygon, Point, - Polygon, - Position, + Position } from "geojson" import { Tiles } from "../Models/TileRange" import { Utils } from "../Utils" import { NearestPointOnLine } from "@turf/nearest-point-on-line" -;("use strict") + +("use strict") export class GeoOperations { private static readonly _earthRadius = 6378137 @@ -29,7 +29,7 @@ export class GeoOperations { "behind", "sharp_left", "left", - "slight_left", + "slight_left" ] as const private static reverseBearing = { N: 0, @@ -47,7 +47,7 @@ export class GeoOperations { W: 270, WNW: 292.5, NW: 315, - NNW: 337.5, + NNW: 337.5 } /** @@ -61,8 +61,8 @@ export class GeoOperations { } public static intersect( - f0: Feature, - f1: Feature + f0: Readonly>, + f1: Readonly> ): Feature | null { return turf.intersect(f0, f1) } @@ -309,7 +309,7 @@ export class GeoOperations { bufferSizeInMeter: number ): Feature | FeatureCollection { return turf.buffer(feature, bufferSizeInMeter / 1000, { - units: "kilometers", + units: "kilometers" }) } @@ -325,9 +325,9 @@ export class GeoOperations { [lon0, lat], [lon0, lat0], [lon, lat0], - [lon, lat], - ], - }, + [lon, lat] + ] + } } } @@ -368,9 +368,9 @@ export class GeoOperations { type: "Feature", geometry: { type: "LineString", - coordinates: way.geometry.coordinates[0], + coordinates: way.geometry.coordinates[0] }, - properties: way.properties, + properties: way.properties } } if (way.geometry.type === "MultiPolygon") { @@ -378,9 +378,9 @@ export class GeoOperations { type: "Feature", geometry: { type: "MultiLineString", - coordinates: way.geometry.coordinates[0], + coordinates: way.geometry.coordinates[0] }, - properties: way.properties, + properties: way.properties } } if (way.geometry.type === "LineString") { @@ -512,6 +512,8 @@ export class GeoOperations { /** * Given a list of features, will construct a map of slippy map tile-indices. * Features of which the BBOX overlaps with the corresponding slippy map tile are added to the corresponding array + * + * Also @see clipAllInBox * @param features * @param zoomlevel */ @@ -535,6 +537,33 @@ export class GeoOperations { return perBbox } + /** + * Given a list of features, returns a new list of features so that the features are clipped into the given tile-index. + * Note: IDs are rewritten + * Also @see spreadIntoBBoxes + */ + public static clipAllInBox(features: ReadonlyArray>, tileIndex: number): Feature[] { + const bbox = Tiles.asGeojson(tileIndex) + const newFeatures: Feature[] = [] + for (const f of features) { + const intersectionParts = GeoOperations.clipWith(f, bbox) + for (let i = 0; i < intersectionParts.length; i++) { + const intersectionPart = intersectionParts[i] + let id = (f.properties?.id ?? "") + "_" + tileIndex + if (i > 0) { + id += "_part_" + i + } + const properties = { + ...f.properties, + id + } + intersectionPart.properties = properties + newFeatures.push(intersectionPart) + } + } + return Utils.NoNull(newFeatures) + } + public static toGpx( locations: | Feature @@ -558,8 +587,8 @@ export class GeoOperations { properties: {}, geometry: { type: "Point", - coordinates: p, - }, + coordinates: p + } } ) } @@ -575,7 +604,7 @@ export class GeoOperations { trackPoints.push(trkpt) } const header = - '' + "" return ( header + "\n" + @@ -614,7 +643,7 @@ export class GeoOperations { trackPoints.push(trkpt) } const header = - '' + "" return ( header + "\n" + @@ -640,7 +669,7 @@ export class GeoOperations { const copy = { ...feature, - geometry: { ...feature.geometry }, + geometry: { ...feature.geometry } } let coordinates: [number, number][] if (feature.geometry.type === "LineString") { @@ -698,8 +727,8 @@ export class GeoOperations { type: "Feature", geometry: { type: "LineString", - coordinates: [a, b], - }, + coordinates: [a, b] + } }, distanceMeter, { units: "meters" } @@ -736,17 +765,26 @@ export class GeoOperations { * GeoOperations.completelyWithin(park, pond) // => false */ static completelyWithin( - feature: Feature, - possiblyEnclosingFeature: Feature + feature: Readonly, + possiblyEnclosingFeature: Readonly> ): boolean { + if (feature.geometry.type === "MultiPolygon") { + const polygons = feature.geometry.coordinates.map(coordinates => + >{ + type: "Feature", geometry: { + type: "Polygon", coordinates + } + }) + return !polygons.some(polygon => !booleanWithin(polygon, possiblyEnclosingFeature)) + } return booleanWithin(feature, possiblyEnclosingFeature) } /** * Create an intersection between two features. - * One or multiple new feature is returned based on 'toSplit', which'll have a geometry that is completely withing boundary + * One or multiple new feature are returned based on 'toSplit', which'll have a geometry that is completely withing boundary */ - public static clipWith(toSplit: Feature, boundary: Feature): Feature[] { + public static clipWith(toSplit: Readonly, boundary: Readonly>): Feature[] { if (toSplit.geometry.type === "Point") { const p = >toSplit if (GeoOperations.inside(<[number, number]>p.geometry.coordinates, boundary)) { @@ -757,9 +795,9 @@ export class GeoOperations { } if (toSplit.geometry.type === "LineString") { - const splitup = turf.lineSplit(>toSplit, boundary) - const kept = [] - for (const f of splitup.features) { + const splitup: Feature[] = turf.lineSplit(>toSplit, boundary).features + const kept: Feature[] = [] + for (const f of splitup) { if (!GeoOperations.inside(GeoOperations.centerpointCoordinates(f), boundary)) { continue } @@ -787,7 +825,24 @@ export class GeoOperations { return kept } if (toSplit.geometry.type === "Polygon" || toSplit.geometry.type == "MultiPolygon") { + const splitup = turf.intersect(>toSplit, boundary) + if (splitup === null) { + // No intersection found. + // Either: the boundary is contained fully in 'toSplit', 'toSplit' is contained fully in 'boundary' or they are unrelated at all + if (GeoOperations.completelyWithin(toSplit, boundary)) { + return [toSplit] + } + if (GeoOperations.completelyWithin(boundary, >toSplit)) { + return [{ + type: "Feature", + properties: { ...toSplit.properties }, + geometry: boundary.geometry, + bbox: boundary.bbox + }] + } + return [] + } splitup.properties = { ...toSplit.properties } return [splitup] } @@ -864,32 +919,6 @@ export class GeoOperations { } } - /** - * Constructs all tiles where features overlap with and puts those features in them. - * Long features (e.g. lines or polygons) which overlap with multiple tiles are referenced in each tile they overlap with - * @param zoomlevel - * @param features - */ - public static slice(zoomlevel: number, features: Feature[]): Map { - const tiles = new Map() - - for (const feature of features) { - const bbox = BBox.get(feature) - Tiles.MapRange(Tiles.tileRangeFrom(bbox, zoomlevel), (x, y) => { - const i = Tiles.tile_index(zoomlevel, x, y) - - let tiledata = tiles.get(i) - if (tiledata === undefined) { - tiledata = [] - tiles.set(i, tiledata) - } - tiledata.push(feature) - }) - } - - return tiles - } - /** * Creates a linestring object based on the outer ring of the given polygon * @@ -905,8 +934,8 @@ export class GeoOperations { properties: p.properties, geometry: { type: "LineString", - coordinates: p.geometry.coordinates[0], - }, + coordinates: p.geometry.coordinates[0] + } } } @@ -934,7 +963,7 @@ export class GeoOperations { console.debug("SPlitting way", feature.properties.id) result.push({ ...feature, - geometry: { ...feature.geometry, coordinates: coors.slice(i + 1) }, + geometry: { ...feature.geometry, coordinates: coors.slice(i + 1) } }) coors = coors.slice(0, i + 1) break @@ -943,7 +972,7 @@ export class GeoOperations { } result.push({ ...feature, - geometry: { ...feature.geometry, coordinates: coors }, + geometry: { ...feature.geometry, coordinates: coors } }) } } @@ -1117,8 +1146,8 @@ export class GeoOperations { properties: multiLineStringFeature.properties, geometry: { type: "LineString", - coordinates: coors[0], - }, + coordinates: coors[0] + } } } return { @@ -1126,8 +1155,8 @@ export class GeoOperations { properties: multiLineStringFeature.properties, geometry: { type: "MultiLineString", - coordinates: coors, - }, + coordinates: coors + } } } diff --git a/src/Logic/Web/CommunityIndex.ts b/src/Logic/Web/CommunityIndex.ts new file mode 100644 index 0000000000..bb0dc14760 --- /dev/null +++ b/src/Logic/Web/CommunityIndex.ts @@ -0,0 +1,33 @@ +/** + * Various tools and types to work with the community index (https://openstreetmap.community/; https://github.com/osmlab/osm-community-index) + */ + + +export interface CommunityResource { + /** + * A unique identifier for the resource + * "pattern": "^[-_.A-Za-z0-9]+$" + */ + id: string, + /** + * Type of community resource (thus: platform) + */ + type: string, + /** + * included and excluded locations for this item + * See location-conflation documentation for compatible values: https://github.com/rapideditor/location-conflation#readme + */ + locationSet?, + + /** Array of ISO-639-1 (2 letter) or ISO-639-3 (3 letter) codes in lowercase + * */ + languageCodes?: string[] + /** + * Resource account string, required for some resource types + */ + account?: string + + resolved?: { url: string, name: string, description: string } & Record + +} + diff --git a/src/Models/TileRange.ts b/src/Models/TileRange.ts index 6b70c438e8..31890210da 100644 --- a/src/Models/TileRange.ts +++ b/src/Models/TileRange.ts @@ -1,4 +1,5 @@ import { BBox } from "../Logic/BBox" +import { Feature, Polygon } from "geojson" export interface TileRange { xstart: number @@ -80,6 +81,17 @@ export class Tiles { return [z, x, index % factor] } + static asGeojson(index: number): Feature; + static asGeojson(x: number, y: number, z: number): Feature; + static asGeojson(zIndex: number, x?: number, y?: number): Feature { + let z = zIndex + if (x === undefined) { + [z, x, y] = Tiles.tile_from_index(zIndex) + } + const bounds = Tiles.tile_bounds_lon_lat(z, x, y) + return new BBox(bounds).asGeoJson() + } + /** * Return x, y of the tile containing (lat, lon) on the given zoom level */ diff --git a/src/UI/BigComponents/CommunityIndexView.svelte b/src/UI/BigComponents/CommunityIndexView.svelte index 5ef59b4f39..d1dfc3659d 100644 --- a/src/UI/BigComponents/CommunityIndexView.svelte +++ b/src/UI/BigComponents/CommunityIndexView.svelte @@ -6,8 +6,10 @@ import ContactLink from "./ContactLink.svelte" import { GeoOperations } from "../../Logic/GeoOperations" import Translations from "../i18n/Translations" - import ToSvelte from "../Base/ToSvelte.svelte" import type { Feature, Geometry, GeometryCollection } from "@turf/turf" + import type { FeatureCollection, Polygon } from "geojson" + import type { CommunityResource } from "../../Logic/Web/CommunityIndex" + import Tr from "../Base/Tr.svelte" export let location: Store<{ lat: number; lon: number }> const tileToFetch: Store = location.mapD((l) => { @@ -20,7 +22,10 @@ >([]) tileToFetch.addCallbackAndRun(async (url) => { - const data = await Utils.downloadJsonCached(url, 24 * 60 * 60) + const data = await Utils.downloadJsonCached + }>>(url, 24 * 60 * 60) if (data === undefined) { return } @@ -29,15 +34,13 @@ const filteredResources = resources.map( (features) => - features.filter((f) => { - return GeoOperations.inside([location.data.lon, location.data.lat], f) - }), + features.filter((f) => GeoOperations.inside([location.data.lon, location.data.lat], f)), [location] )
- + {#each $filteredResources as feature} {/each} diff --git a/src/UI/BigComponents/ContactLink.svelte b/src/UI/BigComponents/ContactLink.svelte index ca37679f8d..123d5f82a7 100644 --- a/src/UI/BigComponents/ContactLink.svelte +++ b/src/UI/BigComponents/ContactLink.svelte @@ -3,23 +3,18 @@ // The _properties_ of a community feature import Locale from "../i18n/Locale.js" import Translations from "../i18n/Translations" - import ToSvelte from "../Base/ToSvelte.svelte" import * as native from "../../assets/language_native.json" import { TypedTranslation } from "../i18n/Translation" import Tr from "../Base/Tr.svelte" + import type { CommunityResource } from "../../Logic/Web/CommunityIndex" const availableTranslationTyped: TypedTranslation<{ native: string }> = Translations.t.communityIndex.available const availableTranslation = availableTranslationTyped.OnEveryLanguage((s, ln) => s.replace("{native}", native[ln] ?? ln) ) - export let country: { resources; nameEn: string } - let resources: { - id: string - resolved: Record - languageCodes: string[] - type: string - }[] = [] + export let country: { resources: Record; nameEn: string } + let resources: CommunityResource[] = [] $: resources = Array.from(Object.values(country?.resources ?? {})) const language = Locale.language diff --git a/test/Logic/GeoOperations.spec.ts b/test/Logic/GeoOperations.spec.ts index f069603655..0bc249be1d 100644 --- a/test/Logic/GeoOperations.spec.ts +++ b/test/Logic/GeoOperations.spec.ts @@ -6,7 +6,7 @@ import { describe, expect, it } from "vitest" describe("GeoOperations", () => { describe("calculateOverlap", () => { it("should not give too much overlap (regression test)", () => { - const polyGrb = { + const polyGrb: Feature = { type: "Feature", properties: { osm_id: "25189153", @@ -37,7 +37,7 @@ describe("GeoOperations", () => { "_now:date": "2021-12-05", "_now:datetime": "2021-12-05 21:51:40", "_loaded:date": "2021-12-05", - "_loaded:datetime": "2021-12-05 21:51:40", + "_loaded:datetime": "2021-12-05 21:51:40" }, geometry: { type: "Polygon", @@ -50,21 +50,21 @@ describe("GeoOperations", () => { [3.24329779999996, 50.837435399999855], [3.2431881000000504, 50.83740090000025], [3.243152699999997, 50.83738980000017], - [3.2431059999999974, 50.83730270000021], - ], - ], + [3.2431059999999974, 50.83730270000021] + ] + ] }, id: "https://betadata.grbosm.site/grb?bbox=360935.6475626023,6592540.815539878,361088.52161917265,6592693.689596449/37", _lon: 3.2432137000000116, _lat: 50.83736194999996, bbox: { + minLat: 50.83728850000007, maxLat: 50.837435399999855, maxLon: 3.2433214000000254, - minLat: 50.83728850000007, - minLon: 3.2431059999999974, - }, + minLon: 3.2431059999999974 + } } - const polyHouse = { + const polyHouse: Feature = { type: "Feature", id: "way/594963177", properties: { @@ -95,7 +95,7 @@ describe("GeoOperations", () => { "_loaded:date": "2021-12-05", "_loaded:datetime": "2021-12-05 21:51:39", _surface: "93.32785810484549", - "_surface:ha": "0", + "_surface:ha": "0" }, geometry: { type: "Polygon", @@ -108,9 +108,9 @@ describe("GeoOperations", () => { [3.2431691, 50.8374252], [3.2430936, 50.837401], [3.243046, 50.8374112], - [3.2429993, 50.8373243], - ], - ], + [3.2429993, 50.8373243] + ] + ] }, _lon: 3.2430937, _lat: 50.83736395, @@ -118,8 +118,8 @@ describe("GeoOperations", () => { maxLat: 50.8374252, maxLon: 3.2431881, minLat: 50.8373027, - minLon: 3.2429993, - }, + minLon: 3.2429993 + } } const p0 = turf.polygon(polyGrb.geometry.coordinates) @@ -145,11 +145,11 @@ describe("GeoOperations", () => { [3.218560377159008, 51.21499687768525], [3.2207456783268356, 51.21499687768525], [3.2207456783268356, 51.21600586532159], - [3.218560377159008, 51.21600586532159], - ], + [3.218560377159008, 51.21600586532159] + ] ], - type: "Polygon", - }, + type: "Polygon" + } } const line: Feature = { type: "Feature", @@ -157,10 +157,10 @@ describe("GeoOperations", () => { geometry: { coordinates: [ [3.218405371672816, 51.21499091846559], - [3.2208408127450525, 51.21560173433727], + [3.2208408127450525, 51.21560173433727] ], - type: "LineString", - }, + type: "LineString" + } } const result = GeoOperations.clipWith(line, bbox) expect(result.length).to.equal(1) @@ -168,10 +168,83 @@ describe("GeoOperations", () => { const clippedLine = (>result[0]).geometry.coordinates const expCoordinates = [ [3.2185604, 51.215029800031594], - [3.2207457, 51.21557787977764], + [3.2207457, 51.21557787977764] ] expect(clippedLine).to.deep.equal(expCoordinates) }) + it("clipWith should contain the full feature if it is fully contained", () => { + const bbox: Feature = { + type: "Feature", + properties: {}, + geometry: { + coordinates: [ + [ + [ + 2.1541744759711037, + 51.73994420687188 + ], + [ + 2.1541744759711037, + 50.31129074222787 + ], + [ + 4.53247037641421, + 50.31129074222787 + ], + [ + 4.53247037641421, + 51.73994420687188 + ], + [ + 2.1541744759711037, + 51.73994420687188 + ] + ] + ], + type: "Polygon" + } + } + const content: Feature = { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 2.8900597545854225, + 50.9035099487991 + ], + [ + 3.4872999807053873, + 50.74856284865993 + ], + [ + 3.9512276563531543, + 50.947206170675486 + ], + [ + 3.897902636163167, + 51.25526892606362 + ], + [ + 3.188679867646016, + 51.24525576870511 + ], [ + 2.8900597545854225, + 50.9035099487991 + ] + ] + ], + "type": "Polygon" + } + } + const clipped = GeoOperations.clipWith(content, bbox) + expect(clipped.length).to.equal(1) + + const clippedReverse = GeoOperations.clipWith(bbox, content) + expect(clippedReverse.length).to.equal(1) + } + ) }) }) From 851e7e4dee840223971a45fdf9d66502c90f4776 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:34:50 +0100 Subject: [PATCH 11/59] Scripts: attempt to force a run --- .forgejo/workflows/update_community_index.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/update_community_index.yml b/.forgejo/workflows/update_community_index.yml index 77b0e8f8cf..3247c4b325 100644 --- a/.forgejo/workflows/update_community_index.yml +++ b/.forgejo/workflows/update_community_index.yml @@ -1,7 +1,10 @@ name: Weekly data updates on: + push: + branches-ignore: + - build/* schedule: - -cron: "* * * * 1" + - cron: "* * * * 1" jobs: deploy_on_hetzner_single: From 6bdb5b2d5b6f299b21ec7149fe0a70b17e7313b5 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:37:47 +0100 Subject: [PATCH 12/59] Scripts: attempt to force a run --- .forgejo/workflows/update_community_index.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/update_community_index.yml b/.forgejo/workflows/update_community_index.yml index 3247c4b325..3e5d07cc1f 100644 --- a/.forgejo/workflows/update_community_index.yml +++ b/.forgejo/workflows/update_community_index.yml @@ -8,8 +8,6 @@ on: jobs: deploy_on_hetzner_single: - runs-on: [ ubuntu-latest, hetzner-access ] - runs-on: [ ubuntu-latest, hetzner-access ] steps: - uses: actions/checkout@v3 From b4b35aa699880553e893a6b1ba9f7209f7229357 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:41:46 +0100 Subject: [PATCH 13/59] Scripts: attempt to fix a run --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e868596a8..d94904d85c 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "download:editor-layer-index": "vite-node scripts/downloadEli.ts", "download:stats": "vite-node scripts/GenerateSeries.ts", "download:images": "vite-node scripts/generateImageAnalysis.ts -- ~/data/imgur-image-backup/", - "download:community-index": "vite-node scripts/downloadCommunityIndex.ts -- /tmp/test", + "download:community-index": "vite-node scripts/downloadCommunityIndex.ts ", "weblate:add-upstream": "git remote add weblate https://translate.mapcomplete.org/git/mapcomplete/core/ ; git remote update weblate", "weblate:fix": "npm run weblate:add-upstream && git merge weblate/master && git rebase origin/master && git push origin master", "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:themes", From 7a6cd34d0ddb3a2832d53401b413c3c7b048c1df Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:43:11 +0100 Subject: [PATCH 14/59] Actions: remove unnecessary 'name' from config files --- .forgejo/workflows/deploy_hosted.yml | 1 - .forgejo/workflows/deploy_single_theme.yml | 1 - .forgejo/workflows/update_community_index.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.forgejo/workflows/deploy_hosted.yml b/.forgejo/workflows/deploy_hosted.yml index 53d2137dcb..7a9e1fa6b8 100644 --- a/.forgejo/workflows/deploy_hosted.yml +++ b/.forgejo/workflows/deploy_hosted.yml @@ -1,4 +1,3 @@ -name: Deploy develop on dev.mapcomplete.org on: push: branches-ignore: diff --git a/.forgejo/workflows/deploy_single_theme.yml b/.forgejo/workflows/deploy_single_theme.yml index 2d7d662fbe..5858007ece 100644 --- a/.forgejo/workflows/deploy_single_theme.yml +++ b/.forgejo/workflows/deploy_single_theme.yml @@ -1,4 +1,3 @@ -name: Deploy develop on theme.mapcomplete.org on: push: branches: diff --git a/.forgejo/workflows/update_community_index.yml b/.forgejo/workflows/update_community_index.yml index 3e5d07cc1f..661e23d519 100644 --- a/.forgejo/workflows/update_community_index.yml +++ b/.forgejo/workflows/update_community_index.yml @@ -1,4 +1,3 @@ -name: Weekly data updates on: push: branches-ignore: From 17f839b02f59095f62abd32f85c4c2ad08599cfd Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:48:37 +0100 Subject: [PATCH 15/59] Actions: attempt to fix script --- ...update_community_index.yml => daily_data_maintenance.yml} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename .forgejo/workflows/{update_community_index.yml => daily_data_maintenance.yml} (86%) diff --git a/.forgejo/workflows/update_community_index.yml b/.forgejo/workflows/daily_data_maintenance.yml similarity index 86% rename from .forgejo/workflows/update_community_index.yml rename to .forgejo/workflows/daily_data_maintenance.yml index 661e23d519..adbcbd94ac 100644 --- a/.forgejo/workflows/update_community_index.yml +++ b/.forgejo/workflows/daily_data_maintenance.yml @@ -3,7 +3,7 @@ on: branches-ignore: - build/* schedule: - - cron: "* * * * 1" + - cron: "0 2 * * *" jobs: deploy_on_hetzner_single: @@ -26,6 +26,7 @@ jobs: shell: bash run: | mkdir community-index - npm run download:community-index -- community-index/ + npm run download:community-index -- -- community-index/ zip community-index.zip community-index/* scp community-index.zip hetzner:data/ + From 90aa2f1fc15cf2fbcde36ca6874621e192c22db4 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 02:56:13 +0100 Subject: [PATCH 16/59] Config(hetzner): update caddyfile --- Docs/ServerConfig/hetzner/Caddyfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Docs/ServerConfig/hetzner/Caddyfile b/Docs/ServerConfig/hetzner/Caddyfile index bedaba838f..33c4f55d87 100644 --- a/Docs/ServerConfig/hetzner/Caddyfile +++ b/Docs/ServerConfig/hetzner/Caddyfile @@ -64,6 +64,15 @@ countrycoder.mapcomplete.org { } } +data.mapcomplete.org { + root * data/ + file_server + header { + +Permissions-Policy "interest-cohort=()" + +Access-Control-Allow-Origin * + } +} + report.mapcomplete.org { reverse_proxy http://127.0.0.1:2348 } From 30604304eb5a6a83445ac26b0a9ed452414d172a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 03:14:19 +0100 Subject: [PATCH 17/59] Scripts: fix overview-support for osm-community, switch server --- .forgejo/workflows/daily_data_maintenance.yml | 9 ++++++--- .../osm_community_index/osm_community_index.json | 2 +- scripts/downloadCommunityIndex.ts | 13 ++++++++++++- .../TiledFeatureSource/DynamicGeoJsonTileSource.ts | 8 ++++---- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/daily_data_maintenance.yml b/.forgejo/workflows/daily_data_maintenance.yml index adbcbd94ac..6e2b3922a0 100644 --- a/.forgejo/workflows/daily_data_maintenance.yml +++ b/.forgejo/workflows/daily_data_maintenance.yml @@ -22,11 +22,14 @@ jobs: run: npm ci shell: bash - - name: update community index files + - name: create community index files + shell: bash + run: npm run download:community-index -- -- community-index/ + + - name: upload community index shell: bash run: | - mkdir community-index - npm run download:community-index -- -- community-index/ zip community-index.zip community-index/* scp community-index.zip hetzner:data/ + ssh hetzner "cd data && rm -rf community-index/ && unzip community-index.zip && rm community-index.zip" diff --git a/assets/layers/osm_community_index/osm_community_index.json b/assets/layers/osm_community_index/osm_community_index.json index 0f50782567..df2bf5a5ba 100644 --- a/assets/layers/osm_community_index/osm_community_index.json +++ b/assets/layers/osm_community_index/osm_community_index.json @@ -19,7 +19,7 @@ "es": "Una capa que muestra las comunidades de OpenStreetMap" }, "source": { - "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson", + "geoJson": "https://data.mapcomplete.org/community-index/tile_{z}_{x}_{y}.geojson", "geoJsonZoomLevel": 6, "osmTags": "resources~*" }, diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index fe4d4dcc02..6643b23de5 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -2,7 +2,7 @@ import Script from "./Script" import { CommunityResource } from "../src/Logic/Web/CommunityIndex" import { Utils } from "../src/Utils" import { FeatureCollection, MultiPolygon, Polygon } from "geojson" -import { writeFileSync } from "fs" +import { existsSync, mkdirSync, writeFileSync } from "fs" import { GeoOperations } from "../src/Logic/GeoOperations" import { Tiles } from "../src/Models/TileRange" import ScriptUtils from "./ScriptUtils" @@ -53,6 +53,9 @@ class DownloadCommunityIndex extends Script { id: string }>>(DownloadCommunityIndex.upstreamUrl + "completeFeatureCollection.json" ) + if (!existsSync(targetDirectory)) { + mkdirSync(targetDirectory) + } const features = data.features const global = features.find( f => f.id === "Q2" @@ -76,6 +79,7 @@ class DownloadCommunityIndex extends Script { const spread = GeoOperations.spreadIntoBboxes(local, DownloadCommunityIndex.targetZoomlevel) let written = 0 let skipped = 0 + const writtenTilesOverview: Record = {} writeFileSync(targetDirectory + "local.geojson", JSON.stringify({ type: "FeatureCollection", features: local })) for (const tileIndex of spread.keys()) { const features = spread.get(tileIndex) @@ -95,9 +99,16 @@ class DownloadCommunityIndex extends Script { }) writeFileSync(path, JSON.stringify({ type: "FeatureCollection", features: clipped }), "utf8") written++ + let yList = writtenTilesOverview[x] + if (!yList) { + yList = [] + writtenTilesOverview[x] = yList + } + yList.push(y) console.log(`Written tile ${path}`) } console.log(`Created ${written} tiles, skipped ${skipped}`) + writeFileSync(targetDirectory + "/tiles_6_overview.json", JSON.stringify(writtenTilesOverview), "utf8") } diff --git a/src/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts b/src/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts index 7cb3428563..848d8734b0 100644 --- a/src/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts +++ b/src/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts @@ -6,7 +6,7 @@ import { BBox } from "../../BBox" import LayerConfig from "../../../Models/ThemeConfig/LayerConfig" export default class DynamicGeoJsonTileSource extends UpdatableDynamicTileSource { - private static whitelistCache = new Map() + private static whitelistCache = new Map>>() constructor( layer: LayerConfig, @@ -27,7 +27,7 @@ export default class DynamicGeoJsonTileSource extends UpdatableDynamicTileSource } console.log("Creating a dynamic geojson source for", layer.source.geojsonSource) - let whitelist = undefined + let whitelist: Map> = undefined if (source.geojsonSource.indexOf("{x}_{y}.geojson") > 0) { const whitelistUrl = source.geojsonSource .replace("{z}", "" + source.geojsonZoomLevel) @@ -37,8 +37,8 @@ export default class DynamicGeoJsonTileSource extends UpdatableDynamicTileSource if (DynamicGeoJsonTileSource.whitelistCache.has(whitelistUrl)) { whitelist = DynamicGeoJsonTileSource.whitelistCache.get(whitelistUrl) } else { - Utils.downloadJsonCached(whitelistUrl, 1000 * 60 * 60) - .then((json) => { + Utils.downloadJsonCached>(whitelistUrl, 1000 * 60 * 60) + .then(json => { const data = new Map>() for (const x in json) { if (x === "zoom") { From 7f5b797b7db338d310aa5ec7d73532386ea2bf0e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 03:20:07 +0100 Subject: [PATCH 18/59] Scripts: fix typo --- scripts/downloadCommunityIndex.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index 6643b23de5..edc0c9c20d 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -108,7 +108,8 @@ class DownloadCommunityIndex extends Script { console.log(`Written tile ${path}`) } console.log(`Created ${written} tiles, skipped ${skipped}`) - writeFileSync(targetDirectory + "/tiles_6_overview.json", JSON.stringify(writtenTilesOverview), "utf8") + writeFileSync(targetDirectory + "/tile_6_overview.json", JSON.stringify(writtenTilesOverview), "utf8") + console.log("Created overview file") } From 3c6606c90be13c9d6d1eda4c0e0dbbb7ae1f5d48 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 03:47:50 +0100 Subject: [PATCH 19/59] UI: update community index view to point to the selfhosted server --- package.json | 1 + scripts/downloadCommunityIndex.ts | 6 +- src/Models/Constants.ts | 2 + src/UI/Base/Popup.svelte | 2 +- .../BigComponents/CommunityIndexView.svelte | 27 +- src/UI/BigComponents/ContactLink.svelte | 8 +- .../community_index_global_resources.json | 355 ------------------ 7 files changed, 33 insertions(+), 368 deletions(-) delete mode 100644 src/assets/community_index_global_resources.json diff --git a/package.json b/package.json index d94904d85c..502f86bd0e 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "https://overpass.openstreetmap.ru/cgi/interpreter": "Broken as of 2024-09-05, might be a glitch" }, "country_coder_host": "https://countrycoder.mapcomplete.org", + "community_index_host": "https://data.mapcomplete.org/community-index/", "nominatimEndpoint": "https://geocoding.geofabrik.de/b75350b1cfc34962ac49824fe5b582dc/", "#photonEndpoint": "`api/` or `reverse/` will be appended by the code", "photonEndpoint": "https://photon.komoot.io/", diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index edc0c9c20d..f8702d4151 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -1,5 +1,5 @@ import Script from "./Script" -import { CommunityResource } from "../src/Logic/Web/CommunityIndex" +import { CommunityResource } from "../src/Logic/Web/CommunityIndex"downlaodComm import { Utils } from "../src/Utils" import { FeatureCollection, MultiPolygon, Polygon } from "geojson" import { existsSync, mkdirSync, writeFileSync } from "fs" @@ -41,6 +41,10 @@ class DownloadCommunityIndex extends Script { private static stripResourcesObj(resources: Readonly>>) { const stripped: Record = {} for (const k in resources) { + if(k === "twitter" || k === "facebook" || k === "x"){ + // These channels are toxic nowadays - we simply omit them + continue + } stripped[k] = DownloadCommunityIndex.stripResource(resources[k]) } return stripped diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index 3f6f5c9431..1831b894b6 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -134,6 +134,8 @@ export default class Constants { public static readonly mapillary_client_token_v4 = Constants.config.api_keys.mapillary_v4 public static defaultOverpassUrls = Constants.config.default_overpass_urls public static countryCoderEndpoint: string = Constants.config.country_coder_host + public static communityIndexHost: string = Constants.config.community_index_host + public static osmAuthConfig: AuthConfig = Constants.config.oauth_credentials public static nominatimEndpoint: string = Constants.config.nominatimEndpoint public static photonEndpoint: string = Constants.config.photonEndpoint diff --git a/src/UI/Base/Popup.svelte b/src/UI/Base/Popup.svelte index 728d92448e..b644bcbae4 100644 --- a/src/UI/Base/Popup.svelte +++ b/src/UI/Base/Popup.svelte @@ -9,7 +9,7 @@ export let fullscreen: boolean = false export let bodyPadding = "p-4 md:p-5 " export let shown: UIEventSource - export let dismissable = false + export let dismissable = true /** * Default: 50 */ diff --git a/src/UI/BigComponents/CommunityIndexView.svelte b/src/UI/BigComponents/CommunityIndexView.svelte index d1dfc3659d..a76450e6b8 100644 --- a/src/UI/BigComponents/CommunityIndexView.svelte +++ b/src/UI/BigComponents/CommunityIndexView.svelte @@ -2,7 +2,6 @@ import { Store, UIEventSource } from "../../Logic/UIEventSource" import { Tiles } from "../../Models/TileRange" import { Utils } from "../../Utils" - import global_community from "../../assets/community_index_global_resources.json" import ContactLink from "./ContactLink.svelte" import { GeoOperations } from "../../Logic/GeoOperations" import Translations from "../i18n/Translations" @@ -10,11 +9,13 @@ import type { FeatureCollection, Polygon } from "geojson" import type { CommunityResource } from "../../Logic/Web/CommunityIndex" import Tr from "../Base/Tr.svelte" + import Constants from "../../Models/Constants" + import Loading from "../Base/Loading.svelte" export let location: Store<{ lat: number; lon: number }> const tileToFetch: Store = location.mapD((l) => { const t = Tiles.embedded_tile(l.lat, l.lon, 6) - return `https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_${t.z}_${t.x}_${t.y}.geojson` + return Utils.SubstituteKeys(Constants.communityIndexHost + "tile_{z}_{x}_{y}.geojson", t) }) const t = Translations.t.communityIndex const resources = new UIEventSource< @@ -32,17 +33,29 @@ resources.setData(data.features) }) - const filteredResources = resources.map( + const filteredResources = resources.mapD( (features) => features.filter((f) => GeoOperations.inside([location.data.lon, location.data.lat], f)), [location] ) + + const globalResources: UIEventSource> = UIEventSource.FromPromise(Utils.downloadJsonCached>( + Constants.communityIndexHost + "/global.json", 24 * 60 * 60 * 1000 + ))
- {#each $filteredResources as feature} - - {/each} - + {#if $filteredResources === undefined} + + {:else} + {#each $filteredResources as feature} + + {/each} + {/if} + {#if $globalResources === undefined} + + {:else} + + {/if}
diff --git a/src/UI/BigComponents/ContactLink.svelte b/src/UI/BigComponents/ContactLink.svelte index 123d5f82a7..f1c8de96a4 100644 --- a/src/UI/BigComponents/ContactLink.svelte +++ b/src/UI/BigComponents/ContactLink.svelte @@ -7,6 +7,7 @@ import { TypedTranslation } from "../i18n/Translation" import Tr from "../Base/Tr.svelte" import type { CommunityResource } from "../../Logic/Web/CommunityIndex" + import Constants from "../../Models/Constants" const availableTranslationTyped: TypedTranslation<{ native: string }> = Translations.t.communityIndex.available @@ -16,7 +17,6 @@ export let country: { resources: Record; nameEn: string } let resources: CommunityResource[] = [] $: resources = Array.from(Object.values(country?.resources ?? {})) - const language = Locale.language @@ -28,16 +28,16 @@
- {resource.resolved.name ?? resource.resolved.url} + {resource.resolved?.name ?? resource.resolved?.url} {resource.resolved?.description} {#if resource.languageCodes?.indexOf($language) >= 0} diff --git a/src/assets/community_index_global_resources.json b/src/assets/community_index_global_resources.json deleted file mode 100644 index 6978a956ad..0000000000 --- a/src/assets/community_index_global_resources.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "OSM-Discord": { - "id": "OSM-Discord", - "type": "discord", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "de", - "en", - "es", - "fr", - "it", - "pt-BR", - "ro", - "tr" - ], - "order": 6, - "strings": { - "name": "OpenStreetMap World Discord" - }, - "contacts": [ - { - "name": "Austin Harrison", - "email": "jaustinharrison@gmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap World Discord", - "url": "https://discord.gg/openstreetmap", - "description": "Get in touch with other mappers on Discord", - "nameHTML": "OpenStreetMap World Discord", - "urlHTML": "https://discord.gg/openstreetmap", - "descriptionHTML": "Get in touch with other mappers on Discord" - } - }, - "OSM-Discourse": { - "id": "OSM-Discourse", - "type": "discourse", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "de", - "en", - "es", - "nl", - "pl", - "pt-BR" - ], - "order": 7, - "strings": { - "name": "OpenStreetMap Discourse", - "description": "A shared place for conversations about OpenStreetMap", - "url": "https://community.openstreetmap.org/" - }, - "contacts": [ - { - "name": "Grant Slater", - "email": "osmfuture@firefishy.com" - }, - { - "name": "Rubén Martín", - "email": "nukeador@protonmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap Discourse", - "url": "https://community.openstreetmap.org/", - "description": "A shared place for conversations about OpenStreetMap", - "nameHTML": "OpenStreetMap Discourse", - "urlHTML": "https://community.openstreetmap.org/", - "descriptionHTML": "A shared place for conversations about OpenStreetMap" - } - }, - "OSM-Facebook": { - "id": "OSM-Facebook", - "type": "facebook", - "account": "OpenStreetMap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 3, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "Like us on Facebook for news and updates about OpenStreetMap." - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on Facebook", - "url": "https://www.facebook.com/OpenStreetMap", - "description": "Like us on Facebook for news and updates about OpenStreetMap.", - "nameHTML": "OpenStreetMap on Facebook", - "urlHTML": "https://www.facebook.com/OpenStreetMap", - "descriptionHTML": "Like us on Facebook for news and updates about OpenStreetMap." - } - }, - "OSM-help": { - "id": "OSM-help", - "type": "forum", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": -2, - "strings": { - "name": "OpenStreetMap Help", - "description": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescription": "{url} is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!", - "url": "https://help.openstreetmap.org/" - }, - "contacts": [ - { - "name": "OSMF Operations", - "email": "operations@osmfoundation.org" - } - ], - "resolved": { - "name": "OpenStreetMap Help", - "url": "https://help.openstreetmap.org/", - "description": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescription": "https://help.openstreetmap.org/ is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!", - "nameHTML": "OpenStreetMap Help", - "urlHTML": "https://help.openstreetmap.org/", - "descriptionHTML": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescriptionHTML": "https://help.openstreetmap.org/ is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!" - } - }, - "OSM-IRC": { - "id": "OSM-IRC", - "type": "irc", - "account": "osm", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": -4, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on IRC", - "url": "https://webchat.oftc.net/?channels=osm", - "description": "Join #osm on irc.oftc.net (port 6667)", - "nameHTML": "OpenStreetMap on IRC", - "urlHTML": "https://webchat.oftc.net/?channels=osm", - "descriptionHTML": "Join #osm on irc.oftc.net (port 6667)" - } - }, - "OSM-Mastodon": { - "id": "OSM-Mastodon", - "type": "mastodon", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 3, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "url": "https://en.osm.town/@openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap Mastodon Account", - "url": "https://en.osm.town/@openstreetmap", - "description": "The official Mastodon account for OpenStreetMap", - "nameHTML": "OpenStreetMap Mastodon Account", - "urlHTML": "https://en.osm.town/@openstreetmap", - "descriptionHTML": "The official Mastodon account for OpenStreetMap" - } - }, - "OSM-Reddit": { - "id": "OSM-Reddit", - "type": "reddit", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 2, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "/r/{account} is a great place to learn more about OpenStreetMap. Ask us anything!" - }, - "contacts": [ - { - "name": "Serge Wroclawski", - "email": "emacsen@gmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap on Reddit", - "url": "https://www.reddit.com/r/openstreetmap", - "description": "/r/openstreetmap is a great place to learn more about OpenStreetMap. Ask us anything!", - "nameHTML": "OpenStreetMap on Reddit", - "urlHTML": "https://www.reddit.com/r/openstreetmap", - "descriptionHTML": "/r/openstreetmap is a great place to learn more about OpenStreetMap. Ask us anything!" - } - }, - "OSM-Telegram": { - "id": "OSM-Telegram", - "type": "telegram", - "account": "OpenStreetMapOrg", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 5, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "Join the OpenStreetMap Telegram global supergroup at {url}" - }, - "contacts": [ - { - "name": "Max N", - "email": "abonnements@revolwear.com" - } - ], - "resolved": { - "name": "OpenStreetMap Telegram", - "url": "https://t.me/OpenStreetMapOrg", - "description": "Join the OpenStreetMap Telegram global supergroup at https://t.me/OpenStreetMapOrg", - "nameHTML": "OpenStreetMap Telegram", - "urlHTML": "https://t.me/OpenStreetMapOrg", - "descriptionHTML": "Join the OpenStreetMap Telegram global supergroup at https://t.me/OpenStreetMapOrg" - } - }, - "OSM-Twitter": { - "id": "OSM-Twitter", - "type": "twitter", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 4, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on Twitter", - "url": "https://twitter.com/openstreetmap", - "description": "Follow us on Twitter", - "nameHTML": "OpenStreetMap on Twitter", - "urlHTML": "https://twitter.com/openstreetmap", - "descriptionHTML": "Follow us on Twitter" - } - }, - "OSMF": { - "id": "OSMF", - "type": "osm-lc", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en", - "fr", - "it", - "ja", - "nl", - "ru" - ], - "order": 10, - "strings": { - "name": "OpenStreetMap Foundation", - "description": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescription": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: {signupUrl}", - "signupUrl": "https://join.osmfoundation.org/", - "url": "https://wiki.osmfoundation.org/wiki/Main_Page" - }, - "contacts": [ - { - "name": "OSMF Board", - "email": "board@osmfoundation.org" - } - ], - "resolved": { - "name": "OpenStreetMap Foundation", - "url": "https://wiki.osmfoundation.org/wiki/Main_Page", - "signupUrl": "https://join.osmfoundation.org/", - "description": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescription": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: https://join.osmfoundation.org/", - "nameHTML": "OpenStreetMap Foundation", - "urlHTML": "https://wiki.osmfoundation.org/wiki/Main_Page", - "signupUrlHTML": "https://join.osmfoundation.org/", - "descriptionHTML": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescriptionHTML": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: https://join.osmfoundation.org/" - } - } -} From 3a2f4b8f361324afd59f05c09dd078585e5aa7ac Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 03:51:21 +0100 Subject: [PATCH 20/59] Chore: fix typo --- scripts/downloadCommunityIndex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index f8702d4151..7d32e2a29d 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -1,5 +1,5 @@ import Script from "./Script" -import { CommunityResource } from "../src/Logic/Web/CommunityIndex"downlaodComm +import { CommunityResource } from "../src/Logic/Web/CommunityIndex" import { Utils } from "../src/Utils" import { FeatureCollection, MultiPolygon, Polygon } from "geojson" import { existsSync, mkdirSync, writeFileSync } from "fs" From e9011b00e6e6b9c19fd921127dcdc2d85f40a996 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 04:00:51 +0100 Subject: [PATCH 21/59] Scripts: prune resources --- scripts/downloadCommunityIndex.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index 7d32e2a29d..679a4b4254 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -90,12 +90,12 @@ class DownloadCommunityIndex extends Script { const clipped = GeoOperations.clipAllInBox(features, tileIndex) if (clipped.length === 0) { skipped++ - features.push(Tiles.asGeojson(tileIndex)) - writeFileSync(`${targetDirectory + tileIndex}_skipped.geojson`, JSON.stringify({ - type: "FeatureCollection", features - })) continue } + for (const f of clipped) { + f.properties.resources = DownloadCommunityIndex.stripResourcesObj(f.properties.resources) + } + const [z, x, y] = Tiles.tile_from_index(tileIndex) const path = `${targetDirectory}/tile_${z}_${x}_${y}.geojson` clipped.forEach((f) => { From e8b7db1acba0beb735dc89b4517085f43d855ced Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 04:02:03 +0100 Subject: [PATCH 22/59] Scripts: prune resources --- scripts/downloadCommunityIndex.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index 679a4b4254..2fce588b73 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -41,7 +41,8 @@ class DownloadCommunityIndex extends Script { private static stripResourcesObj(resources: Readonly>>) { const stripped: Record = {} for (const k in resources) { - if(k === "twitter" || k === "facebook" || k === "x"){ + const type = resources[k].type + if (type === "twitter" || type === "facebook" || type === "x") { // These channels are toxic nowadays - we simply omit them continue } From 644445248c19ecd051589b1e46feda65b3749e69 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 04:46:16 +0100 Subject: [PATCH 23/59] Fix: whitelist data.Mapcomplete.org --- scripts/generateLayouts.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts index fec306d941..dc4fa9eedb 100644 --- a/scripts/generateLayouts.ts +++ b/scripts/generateLayouts.ts @@ -338,6 +338,7 @@ class GenerateLayouts extends Script { "https://api.panoramax.xyz", "https://panoramax.mapcomplete.org", "https://data.velopark.be", + "https://data.mapcomplete.org" ].concat(...(await this.eliUrls())) SpecialVisualizations.specialVisualizations.forEach((sv) => { From b59524733c8949f5389ed88ea1e885b83bc998c0 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 04:50:44 +0100 Subject: [PATCH 24/59] Refactoring: move specialVisulations into groups --- src/UI/Base/LoginButton.svelte | 17 +- src/UI/BigComponents/Giggity.svelte | 106 --- src/UI/Popup/Notes/AddNoteCommentViz.ts | 22 - src/UI/Popup/ShareLinkViz.ts | 5 +- src/UI/Popup/SplitRoadWizard.svelte | 101 +-- .../FavouriteVisualisations.ts | 53 ++ .../ImageVisualisations.ts | 122 +++ .../NoteVisualisations.ts | 139 ++++ .../ReviewSpecialVisualisations.ts | 147 ++++ .../SettingsVisualisations.ts | 103 +++ .../UISpecialVisualisations.ts | 204 +++++ src/UI/SpecialVisualization.ts | 36 + src/UI/SpecialVisualizations.ts | 739 +----------------- 13 files changed, 894 insertions(+), 900 deletions(-) delete mode 100644 src/UI/BigComponents/Giggity.svelte delete mode 100644 src/UI/Popup/Notes/AddNoteCommentViz.ts create mode 100644 src/UI/SpecialVisualisations/FavouriteVisualisations.ts create mode 100644 src/UI/SpecialVisualisations/ImageVisualisations.ts create mode 100644 src/UI/SpecialVisualisations/NoteVisualisations.ts create mode 100644 src/UI/SpecialVisualisations/ReviewSpecialVisualisations.ts create mode 100644 src/UI/SpecialVisualisations/SettingsVisualisations.ts create mode 100644 src/UI/SpecialVisualisations/UISpecialVisualisations.ts diff --git a/src/UI/Base/LoginButton.svelte b/src/UI/Base/LoginButton.svelte index 72ef23b245..21d3327267 100644 --- a/src/UI/Base/LoginButton.svelte +++ b/src/UI/Base/LoginButton.svelte @@ -2,8 +2,6 @@ import { OsmConnection } from "../../Logic/Osm/OsmConnection" import Translations from "../i18n/Translations.js" import Tr from "./Tr.svelte" - import Login from "../../assets/svg/Login.svelte" - import ArrowRightOnRectangle from "@babeard/svelte-heroicons/solid/ArrowRightOnRectangle" import ArrowLeftOnRectangle from "@babeard/svelte-heroicons/solid/ArrowLeftOnRectangle" export let osmConnection: OsmConnection @@ -12,11 +10,14 @@ if (osmConnection === undefined) { console.error("No osmConnection passed into loginButton") } + let isLoggedIn = osmConnection.isLoggedIn - +{#if !$isLoggedIn} + +{/if} diff --git a/src/UI/BigComponents/Giggity.svelte b/src/UI/BigComponents/Giggity.svelte deleted file mode 100644 index 6107b8ca7e..0000000000 --- a/src/UI/BigComponents/Giggity.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - -{#if $events === undefined} - Loading giggity events from {giggityUrl} -{:else if $events.length === 0} - No upcoming events in this room -{:else} -
-

Upcoming events

- {#each $events as event} -
- {#if event.url} -

{event.title}

- {:else} -

{event.title}

- {/if} -
{event.start}
- By {event.persons} -
- {event.abstract} -
- {event.url} -
- {/each} -
-{/if} diff --git a/src/UI/Popup/Notes/AddNoteCommentViz.ts b/src/UI/Popup/Notes/AddNoteCommentViz.ts deleted file mode 100644 index 0a223ef8b5..0000000000 --- a/src/UI/Popup/Notes/AddNoteCommentViz.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { SpecialVisualization, SpecialVisualizationState } from "../../SpecialVisualization" -import { UIEventSource } from "../../../Logic/UIEventSource" -import Constants from "../../../Models/Constants" -import SvelteUIElement from "../../Base/SvelteUIElement" -import AddNoteComment from "./AddNoteComment.svelte" - -export class AddNoteCommentViz implements SpecialVisualization { - funcName = "add_note_comment" - needsUrls = [Constants.osmAuthConfig.url] - docs = "A textfield to add a comment to a node (with the option to close the note)." - args = [ - { - name: "Id-key", - doc: "The property name where the ID of the note to close can be found", - defaultValue: "id", - }, - ] - - public constr(state: SpecialVisualizationState, tags: UIEventSource>) { - return new SvelteUIElement(AddNoteComment, { state, tags }) - } -} diff --git a/src/UI/Popup/ShareLinkViz.ts b/src/UI/Popup/ShareLinkViz.ts index 123883c636..487573664b 100644 --- a/src/UI/Popup/ShareLinkViz.ts +++ b/src/UI/Popup/ShareLinkViz.ts @@ -1,11 +1,12 @@ import { UIEventSource } from "../../Logic/UIEventSource" import LayerConfig from "../../Models/ThemeConfig/LayerConfig" -import { SpecialVisualization, SpecialVisualizationState } from "../SpecialVisualization" +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" import SvelteUIElement from "../Base/SvelteUIElement" import ShareButton from "../Base/ShareButton.svelte" -export class ShareLinkViz implements SpecialVisualization { +export class ShareLinkViz implements SpecialVisualizationSvelte { funcName = "share_link" + group = "default" docs = "Creates a link that (attempts to) open the native 'share'-screen" example = "{share_link()} to share the current page, {share_link()} to share the given url" diff --git a/src/UI/Popup/SplitRoadWizard.svelte b/src/UI/Popup/SplitRoadWizard.svelte index 4b0b79a9f9..524625ae7a 100644 --- a/src/UI/Popup/SplitRoadWizard.svelte +++ b/src/UI/Popup/SplitRoadWizard.svelte @@ -1,5 +1,5 @@ +{#if $id.startsWith("way/")} + + - - - - {#if step === "deleted"} - - {:else if step === "initial"} - - {:else if step === "loading_way"} - - {:else if step === "splitting"} -
-
- -
-
- { + {#if step === "deleted"} + + {:else if step === "initial"} + + {:else if step === "loading_way"} + + {:else if step === "splitting"} +
+
+ +
+
+ { splitPoints.set([]) step = "initial" }} - > - - - doSplit()} - > - - + > + + + doSplit()} + > + + +
-
- {:else if step === "has_been_split"} - - - {/if} - + {:else if step === "has_been_split"} + + + {/if} + +{/if} diff --git a/src/UI/SpecialVisualisations/FavouriteVisualisations.ts b/src/UI/SpecialVisualisations/FavouriteVisualisations.ts new file mode 100644 index 0000000000..21ff2df87d --- /dev/null +++ b/src/UI/SpecialVisualisations/FavouriteVisualisations.ts @@ -0,0 +1,53 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import { UIEventSource } from "../../Logic/UIEventSource" +import { Feature } from "geojson" +import LayerConfig from "../../Models/ThemeConfig/LayerConfig" +import SvelteUIElement from "../Base/SvelteUIElement" +import MarkAsFavourite from "../Popup/MarkAsFavourite.svelte" +import MarkAsFavouriteMini from "../Popup/MarkAsFavouriteMini.svelte" + +export class FavouriteVisualisations { + public static initList(): SpecialVisualizationSvelte[] { + return [{ + funcName: "favourite_status", + + docs: "A button that allows a (logged in) contributor to mark a location as a favourite location", + args: [], + group: "favourites", + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + return new SvelteUIElement(MarkAsFavourite, { + tags: tagSource, + state, + layer, + feature + }) + } + }, + { + funcName: "favourite_icon", + group: "favourites", + docs: "A small button that allows a (logged in) contributor to mark a location as a favourite location, sized to fit a title-icon", + args: [], + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + return new SvelteUIElement(MarkAsFavouriteMini, { + tags: tagSource, + state, + layer, + feature + }) + } + }] + } +} diff --git a/src/UI/SpecialVisualisations/ImageVisualisations.ts b/src/UI/SpecialVisualisations/ImageVisualisations.ts new file mode 100644 index 0000000000..f75f5c5cda --- /dev/null +++ b/src/UI/SpecialVisualisations/ImageVisualisations.ts @@ -0,0 +1,122 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import AllImageProviders from "../../Logic/ImageProviders/AllImageProviders" +import SvelteUIElement from "../Base/SvelteUIElement" +import ImageCarousel from "../Image/ImageCarousel.svelte" +import { Imgur } from "../../Logic/ImageProviders/Imgur" +import UploadImage from "../Image/UploadImage.svelte" +import { CombinedFetcher } from "../../Logic/Web/NearbyImagesSearch" +import { UIEventSource } from "../../Logic/UIEventSource" +import { Feature } from "geojson" +import LayerConfig from "../../Models/ThemeConfig/LayerConfig" +import { GeoOperations } from "../../Logic/GeoOperations" +import NearbyImages from "../Image/NearbyImages.svelte" +import NearbyImagesCollapsed from "../Image/NearbyImagesCollapsed.svelte" + +class NearbyImageVis implements SpecialVisualizationSvelte { + // Class must be in SpecialVisualisations due to weird cyclical import that breaks the tests + args: { name: string; defaultValue?: string; doc: string; required?: boolean }[] = [ + { + name: "mode", + defaultValue: "closed", + doc: "Either `open` or `closed`. If `open`, then the image carousel will always be shown" + }, + { + name: "readonly", + required: false, + doc: "If 'readonly' or 'yes', will not show the 'link'-button" + } + ] + group: "images" + docs = + "A component showing nearby images loaded from various online services such as Mapillary. In edit mode and when used on a feature, the user can select an image to add to the feature" + funcName = "nearby_images" + needsUrls = CombinedFetcher.apiUrls + + constr( + state: SpecialVisualizationState, + tags: UIEventSource>, + args: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + const isOpen = args[0] === "open" + const readonly = args[1] === "readonly" || args[1] === "yes" + const [lon, lat] = GeoOperations.centerpointCoordinates(feature) + return new SvelteUIElement(isOpen ? NearbyImages : NearbyImagesCollapsed, { + tags, + state, + lon, + lat, + feature, + layer, + linkable: !readonly + }) + } +} + +export class ImageVisualisations { + + static initList(): SpecialVisualizationSvelte[] { + return [ + new NearbyImageVis(), + { + funcName: "image_carousel", + group: "images", + docs: "Creates an image carousel for the given sources. An attempt will be made to guess what source is used. Supported: Wikidata identifiers, Wikipedia pages, Wikimedia categories, IMGUR (with attribution, direct links)", + args: [ + { + name: "image_key", + defaultValue: AllImageProviders.defaultKeys.join(","), + doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated " + } + ], + needsUrls: AllImageProviders.apiUrls, + constr: (state, tags, args) => { + let imagePrefixes: string[] = undefined + if (args.length > 0) { + imagePrefixes = [].concat(...args.map((a) => a.split(","))) + } + const images = AllImageProviders.loadImagesFor(tags, imagePrefixes) + const estimated = tags.mapD(tags => AllImageProviders.estimateNumberOfImages(tags, imagePrefixes)) + return new SvelteUIElement(ImageCarousel, { state, tags, images, estimated }) + } + }, + { + funcName: "image_upload", + group: "images", + docs: "Creates a button where a user can upload an image to IMGUR", + needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], + args: [ + { + name: "image-key", + doc: "Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added)", + required: false + }, + { + name: "label", + doc: "The text to show on the button", + required: false + }, + { + name: "disable_blur", + doc: "If set to 'true' or 'yes', then face blurring will be disabled. To be used sparingly", + required: false + } + ], + constr: (state, tags, args, feature) => { + const targetKey = args[0] === "" ? undefined : args[0] + const noBlur = args[3]?.toLowerCase()?.trim() + return new SvelteUIElement(UploadImage, { + state, + tags, + targetKey, + feature, + labelText: args[1], + image: args[2], + noBlur: noBlur === "true" || noBlur === "yes" + }) + } + }] + } + +} diff --git a/src/UI/SpecialVisualisations/NoteVisualisations.ts b/src/UI/SpecialVisualisations/NoteVisualisations.ts new file mode 100644 index 0000000000..6f4ccd5d86 --- /dev/null +++ b/src/UI/SpecialVisualisations/NoteVisualisations.ts @@ -0,0 +1,139 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import Constants from "../../Models/Constants" +import { UIEventSource } from "../../Logic/UIEventSource" +import { Feature } from "geojson" +import { GeoOperations } from "../../Logic/GeoOperations" +import SvelteUIElement from "../Base/SvelteUIElement" +import CreateNewNote from "../Popup/Notes/CreateNewNote.svelte" +import { Utils } from "../../Utils" +import CloseNoteButton from "../Popup/Notes/CloseNoteButton.svelte" +import Translations from "../i18n/Translations" +import AddNoteComment from "../Popup/Notes/AddNoteComment.svelte" +import { Imgur } from "../../Logic/ImageProviders/Imgur" +import UploadImage from "../Image/UploadImage.svelte" + +class CloseNoteViz implements SpecialVisualizationSvelte { + public readonly funcName = "close_note" + public readonly needsUrls = [Constants.osmAuthConfig.url] + public readonly docs = + "Button to close a note. A predefined text can be defined to close the note with. If the note is already closed, will show a small text." + public readonly args = [ + { + name: "text", + doc: "Text to show on this button", + required: true + }, + { + name: "icon", + doc: "Icon to show", + defaultValue: "checkmark.svg" + }, + { + name: "idkey", + doc: "The property name where the ID of the note to close can be found", + defaultValue: "id" + }, + { + name: "comment", + doc: "Text to add onto the note when closing" + }, + { + name: "minZoom", + doc: "If set, only show the closenote button if zoomed in enough" + }, + { + name: "zoomButton", + doc: "Text to show if not zoomed in enough" + } + ] + public readonly group: "notes" + + public constr( + state: SpecialVisualizationState, + tags: UIEventSource>, + args: string[] + ): SvelteUIElement { + const { text, icon, idkey, comment, minZoom, zoomButton } = Utils.ParseVisArgs( + this.args, + args + ) + + return new SvelteUIElement(CloseNoteButton, { + state, + tags, + icon, + idkey, + message: comment, + text: Translations.T(text), + minzoom: minZoom, + zoomMoreMessage: zoomButton + }) + } +} + + +class AddNoteCommentViz implements SpecialVisualizationSvelte { + funcName = "add_note_comment" + needsUrls = [Constants.osmAuthConfig.url] + docs = "A textfield to add a comment to a node (with the option to close the note)." + args = [ + { + name: "Id-key", + doc: "The property name where the ID of the note to close can be found", + defaultValue: "id" + } + ] + public readonly group: "notes" + + + public constr(state: SpecialVisualizationState, tags: UIEventSource>): SvelteUIElement { + return new SvelteUIElement(AddNoteComment, { state, tags }) + } +} + + +export class NoteVisualisations { + public static initList(): SpecialVisualizationSvelte[] { + return [new AddNoteCommentViz(), + { + funcName: "open_note", + args: [], + group: "notes", + needsUrls: [Constants.osmAuthConfig.url], + docs: "Creates a new map note on the given location. This options is placed in the 'last_click'-popup automatically if the 'notes'-layer is enabled", + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature + ): SvelteUIElement { + const [lon, lat] = GeoOperations.centerpointCoordinates(feature) + return new SvelteUIElement(CreateNewNote, { + state, + coordinate: new UIEventSource({ lon, lat }) + }) + } + }, + { + funcName: "add_image_to_note", + docs: "Adds an image to a node", + args: [ + { + name: "Id-key", + doc: "The property name where the ID of the note to close can be found", + defaultValue: "id" + } + ], + group: "notes", + needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], + + constr: (state, tags, args, feature, layer) => { + const id = tags.data[args[0] ?? "id"] + tags = state.featureProperties.getStore(id) + return new SvelteUIElement(UploadImage, { state, tags, layer, feature }) + } + }, + new CloseNoteViz() + ] + } +} diff --git a/src/UI/SpecialVisualisations/ReviewSpecialVisualisations.ts b/src/UI/SpecialVisualisations/ReviewSpecialVisualisations.ts new file mode 100644 index 0000000000..7678f6f72e --- /dev/null +++ b/src/UI/SpecialVisualisations/ReviewSpecialVisualisations.ts @@ -0,0 +1,147 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import { MangroveReviews } from "mangrove-reviews-typescript" +import FeatureReviews from "../../Logic/Web/MangroveReviews" +import SvelteUIElement from "../Base/SvelteUIElement" +import StarsBarIcon from "../Reviews/StarsBarIcon.svelte" +import ReviewForm from "../Reviews/ReviewForm.svelte" +import AllReviews from "../Reviews/AllReviews.svelte" +import { UIEventSource } from "../../Logic/UIEventSource" +import ImportReviewIdentity from "../Reviews/ImportReviewIdentity.svelte" + +export class ReviewSpecialVisualisations { + public static initList(): SpecialVisualizationSvelte[] { + return [{ + funcName: "rating", + group: "reviews", + docs: "Shows stars which represent the average rating on mangrove.", + needsUrls: [MangroveReviews.ORIGINAL_API], + args: [ + { + name: "subjectKey", + defaultValue: "name", + doc: "The key to use to determine the subject. If the value is specified, the subject will be tags[subjectKey] and will use this to filter the reviews." + }, + { + name: "fallback", + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" + } + ], + constr: (state, tags, args, feature) => { + const nameKey = args[0] ?? "name" + const fallbackName = args[1] + const reviews = FeatureReviews.construct( + feature, + tags, + state.userRelatedState.mangroveIdentity, + { + nameKey: nameKey, + fallbackName + }, + state.featureSwitchIsTesting + ) + return new SvelteUIElement(StarsBarIcon, { + score: reviews.average + }) + } + }, + { + funcName: "create_review", + group: "reviews", + + docs: "Invites the contributor to leave a review. Somewhat small UI-element until interacted", + needsUrls: [MangroveReviews.ORIGINAL_API], + 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" + }, + { + name: "question", + doc: "The question to ask during the review" + } + ], + constr: (state, tags, args, feature, layer) => { + const nameKey = args[0] ?? "name" + const fallbackName = args[1] + const question = args[2] + const reviews = FeatureReviews.construct( + feature, + tags, + state.userRelatedState?.mangroveIdentity, + { + nameKey: nameKey, + fallbackName + }, + state.featureSwitchIsTesting + ) + return new SvelteUIElement(ReviewForm, { + reviews, + state, + tags, + feature, + layer, + question + }) + } + }, + { + funcName: "list_reviews", + group: "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], + 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, tags, args, feature, layer) => { + const nameKey = args[0] ?? "name" + const fallbackName = args[1] + const reviews = FeatureReviews.construct( + feature, + tags, + state.userRelatedState?.mangroveIdentity, + { + nameKey: nameKey, + fallbackName + }, + state.featureSwitchIsTesting + ) + return new SvelteUIElement(AllReviews, { reviews, state, tags, feature, layer }) + } + }, + { + funcName: "import_mangrove_key", + group: "settings", + + docs: "Only makes sense in the usersettings. Allows to import a mangrove public key and to use this to make reviews", + args: [ + { + name: "text", + doc: "The text that is shown on the button" + } + ], + needsUrls: [], + constr( + state: SpecialVisualizationState, + _: UIEventSource>, + argument: string[] + ): SvelteUIElement { + const [text] = argument + return new SvelteUIElement(ImportReviewIdentity, { state, text }) + } + }] + } +} diff --git a/src/UI/SpecialVisualisations/SettingsVisualisations.ts b/src/UI/SpecialVisualisations/SettingsVisualisations.ts new file mode 100644 index 0000000000..c882c38dcd --- /dev/null +++ b/src/UI/SpecialVisualisations/SettingsVisualisations.ts @@ -0,0 +1,103 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import SvelteUIElement from "../Base/SvelteUIElement" +import DisabledQuestions from "../Popup/DisabledQuestions.svelte" +import Constants from "../../Models/Constants" +import LogoutButton from "../Base/LogoutButton.svelte" +import LoginButton from "../Base/LoginButton.svelte" +import ThemeViewState from "../../Models/ThemeViewState" +import OrientationDebugPanel from "../Debug/OrientationDebugPanel.svelte" +import AllTagsPanel from "../Popup/AllTagsPanel.svelte" +import { UIEventSource } from "../../Logic/UIEventSource" +import { Feature } from "geojson" +import LayerConfig from "../../Models/ThemeConfig/LayerConfig" +import ClearCaches from "../Popup/ClearCaches.svelte" + +export class SettingsVisualisations { + public static initList(): SpecialVisualizationSvelte[] { + return [ + { + funcName: "disabled_questions", + group: "settings", + docs: "Shows which questions are disabled for every layer. Used in 'settings'", + needsUrls: [], + args: [], + constr(state) { + return new SvelteUIElement(DisabledQuestions, { state }) + } + }, + { + funcName: "gyroscope_all_tags", + group: "settings", + docs: "Shows the current tags of the GPS-representing object, used for debugging", + args: [], + constr(): SvelteUIElement { + return new SvelteUIElement(OrientationDebugPanel, {}) + } + }, + { + funcName: "gps_all_tags", + group: "settings", + docs: "Shows the current tags of the GPS-representing object, used for debugging", + args: [], + constr( + state: SpecialVisualizationState + ): SvelteUIElement { + const tags = (( + state + )).geolocation.currentUserLocation.features.map( + (features) => features[0]?.properties + ) + return new SvelteUIElement(AllTagsPanel, { + state, + tags + }) + } + }, + { + funcName: "clear_caches", + docs: "A button which clears the locally downloaded data and the service worker. Login status etc will be kept", + args: [ + { + name: "text", + required: true, + doc: "The text to show on the button" + } + ], + group: "settings", + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + return new SvelteUIElement(ClearCaches, { + msg: argument[0] ?? "Clear local caches" + }) + } + }, + { + funcName: "login_button", + args: [], + docs: "Show a login button", + needsUrls: [], + group: "settings", + constr(state: SpecialVisualizationState): SvelteUIElement { + return new SvelteUIElement(LoginButton, { osmConnection: state.osmConnection }) + } + }, + + { + funcName: "logout", + args: [], + needsUrls: [Constants.osmAuthConfig.url], + docs: "Shows a button where the user can log out", + group: "settings", + constr(state: SpecialVisualizationState): SvelteUIElement { + return new SvelteUIElement(LogoutButton, { osmConnection: state.osmConnection }) + } + } + + ] + } +} diff --git a/src/UI/SpecialVisualisations/UISpecialVisualisations.ts b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts new file mode 100644 index 0000000000..73c5cd1d21 --- /dev/null +++ b/src/UI/SpecialVisualisations/UISpecialVisualisations.ts @@ -0,0 +1,204 @@ +import { SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization" +import SvelteUIElement from "../Base/SvelteUIElement" +import { UIEventSource } from "../../Logic/UIEventSource" +import { Feature } from "geojson" +import LayerConfig from "../../Models/ThemeConfig/LayerConfig" +import Questionbox from "../Popup/TagRendering/Questionbox.svelte" +import MinimapViz from "../Popup/MinimapViz.svelte" +import SplitRoadWizard from "../Popup/SplitRoadWizard.svelte" +import MoveWizard from "../Popup/MoveWizard.svelte" +import DeleteWizard from "../Popup/DeleteFlow/DeleteWizard.svelte" +import QrCode from "../Popup/QrCode.svelte" +import NothingKnown from "../Popup/NothingKnown.svelte" +import { ShareLinkViz } from "../Popup/ShareLinkViz" + +/** + * Thin wrapper around QuestionBox.svelte to include it into the special Visualisations + */ +class QuestionViz implements SpecialVisualizationSvelte { + funcName = "questions" + needsUrls = [] + docs = + "The special element which shows the questions which are unkown. Added by default if not yet there" + args = [ + { + name: "labels", + doc: "One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown" + }, + { + name: "blacklisted-labels", + doc: "One or more ';'-separated labels of questions which should _not_ be included" + } + ] + svelteBased = true + group: "default" + + constr( + state: SpecialVisualizationState, + tags: UIEventSource>, + args: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + + const labels = args[0] + ?.split(";") + ?.map((s) => s.trim()) + ?.filter((s) => s !== "") + const blacklist = args[1] + ?.split(";") + ?.map((s) => s.trim()) + ?.filter((s) => s !== "") + return new SvelteUIElement(Questionbox, { + layer, + tags, + selectedElement: feature, + state, + onlyForLabels: labels, + notForLabels: blacklist + }) + } +} + +export class UISpecialVisualisations { + public static initList(): SpecialVisualizationSvelte [] { + return [new QuestionViz(), + { + funcName: "minimap", + docs: "A small map showing the selected feature.", + needsUrls: [], + group: "default", + + args: [ + { + doc: "The (maximum) zoomlevel: the target zoomlevel after fitting the entire feature. The minimap will fit the entire feature, then zoom out to this zoom level. The higher, the more zoomed in with 1 being the entire world and 19 being really close", + name: "zoomlevel", + defaultValue: "18" + }, + { + doc: "(Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap. (Note: if the key is 'id', list interpration is disabled)", + name: "idKey", + defaultValue: "id" + } + ], + example: + "`{minimap()}`, `{minimap(17, id, _list_of_embedded_feature_ids_calculated_by_calculated_tag):height:10rem; border: 2px solid black}`", + + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + args: string[], + feature: Feature + ): SvelteUIElement { + return new SvelteUIElement(MinimapViz, { state, args, feature, tagSource }) + } + }, + { + funcName: "split_button", + docs: "Adds a button which allows to split a way", + args: [], + group: "default", + + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource> + ): SvelteUIElement { + return new SvelteUIElement(SplitRoadWizard, { id: tagSource.map(pr => pr.id), state }) + } + }, + { + funcName: "move_button", + docs: "Adds a button which allows to move the object to another location. The config will be read from the layer config", + args: [], + group: "default", + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + if (feature.geometry.type !== "Point") { + return undefined + } + + return new SvelteUIElement(MoveWizard, { + state, + featureToMove: feature, + layer + }) + } + }, + { + funcName: "delete_button", + docs: "Adds a button which allows to delete the object at this location. The config will be read from the layer config", + args: [], + group: "default", + + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + if (!layer.deletion) { + return undefined + } + return new SvelteUIElement(DeleteWizard, { + tags: tagSource, + deleteConfig: layer.deletion, + state, + feature, + layer + }) + } + }, + { + funcName: "qr_code", + args: [], + group: "default", + docs: "Generates a QR-code to share the selected object", + constr( + state: SpecialVisualizationState, + tags: UIEventSource>, + argument: string[], + feature: Feature + ): SvelteUIElement { + return new SvelteUIElement(QrCode, { state, tags, feature }) + } + }, + { + funcName: "if_nothing_known", + args: [ + { + name: "text", + doc: "Text to show", + required: true + }, + { name: "cssClasses", doc: "Classes to apply onto the text" } + ], + group: "default", + docs: "Shows a 'nothing is currently known-message if there is at least one unanswered question and no known (answerable) question", + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement { + const text = argument[0] + const cssClasses = argument[1] + return new SvelteUIElement(NothingKnown, { + state, + tags: tagSource, + layer, + text, + cssClasses + }) + } + }, + new ShareLinkViz() + ] + } +} diff --git a/src/UI/SpecialVisualization.ts b/src/UI/SpecialVisualization.ts index d032165ace..8b97c64a7d 100644 --- a/src/UI/SpecialVisualization.ts +++ b/src/UI/SpecialVisualization.ts @@ -21,6 +21,7 @@ import ShowDataLayer from "./Map/ShowDataLayer" import { CombinedFetcher } from "../Logic/Web/NearbyImagesSearch" import UserRelatedState from "../Logic/State/UserRelatedState" import FeaturePropertiesStore from "../Logic/FeatureSource/Actors/FeaturePropertiesStore" +import SvelteUIElement from "./Base/SvelteUIElement" /** * The state needed to render a special Visualisation. @@ -83,6 +84,7 @@ export interface SpecialVisualizationState { export interface SpecialVisualization { readonly funcName: string readonly docs: string | BaseUIElement + readonly group?: string readonly example?: string readonly needsUrls?: string[] | ((args: string[]) => string | string[]) @@ -109,6 +111,40 @@ export interface SpecialVisualization { ): BaseUIElement } + +export interface SpecialVisualizationSvelte { + readonly funcName: string + readonly docs: string + /** + * The 'group' is merely what association it has in the docs + */ + readonly group: string + readonly example?: string + readonly needsUrls?: string[] | ((args: string[]) => string | string[]) + + /** + * Indicates that this special visualisation will make requests to the 'alLNodesDatabase' and that it thus should be included + */ + readonly needsNodeDatabase?: boolean + readonly args: { + name: string + defaultValue?: string + doc: string + required?: false | boolean + }[] + readonly getLayerDependencies?: (argument: string[]) => string[] + + structuredExamples?(): { feature: Feature>; args: string[] }[] + + constr( + state: SpecialVisualizationState, + tagSource: UIEventSource>, + argument: string[], + feature: Feature, + layer: LayerConfig + ): SvelteUIElement +} + export type RenderingSpecification = | string | { diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index 8844bedbf5..18bd5d7936 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -5,17 +5,13 @@ import Title from "./Base/Title" import { default as FeatureTitle } from "./Popup/Title.svelte" import { RenderingSpecification, SpecialVisualization, SpecialVisualizationState } from "./SpecialVisualization" import { HistogramViz } from "./Popup/HistogramViz" -import MinimapViz from "./Popup/MinimapViz.svelte" -import { ShareLinkViz } from "./Popup/ShareLinkViz" import { UploadToOsmViz } from "./Popup/UploadToOsmViz" import { MultiApplyViz } from "./Popup/MultiApplyViz" -import { AddNoteCommentViz } from "./Popup/Notes/AddNoteCommentViz" import { PlantNetDetectionViz } from "./Popup/PlantNetDetectionViz" import TagApplyButton from "./Popup/TagApplyButton" import { MapillaryLinkVis } from "./Popup/MapillaryLinkVis" import { ImmutableStore, Store, Stores, UIEventSource } from "../Logic/UIEventSource" import AllTagsPanel from "./Popup/AllTagsPanel.svelte" -import AllImageProviders from "../Logic/ImageProviders/AllImageProviders" import { VariableUiElement } from "./Base/VariableUIElement" import { Utils } from "../Utils" import Wikidata, { WikidataResponse } from "../Logic/Web/Wikidata" @@ -27,13 +23,11 @@ import List from "./Base/List" import StatisticsPanel from "./BigComponents/StatisticsPanel" import AutoApplyButton from "./Popup/AutoApplyButton" import { LanguageElement } from "./Popup/LanguageElement/LanguageElement" -import FeatureReviews from "../Logic/Web/MangroveReviews" import Maproulette, { MaprouletteTask } from "../Logic/Maproulette" import SvelteUIElement from "./Base/SvelteUIElement" import { BBoxFeatureSourceForLayer } from "../Logic/FeatureSource/Sources/TouchesBboxFeatureSource" import { Feature, GeoJsonProperties, LineString } from "geojson" import { GeoOperations } from "../Logic/GeoOperations" -import CreateNewNote from "./Popup/Notes/CreateNewNote.svelte" import AddNewPoint from "./Popup/AddNewPoint/AddNewPoint.svelte" import LayerConfig from "../Models/ThemeConfig/LayerConfig" import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig" @@ -43,101 +37,40 @@ import TagRenderingEditable from "./Popup/TagRendering/TagRenderingEditable.svel import { PointImportButtonViz } from "./Popup/ImportButtons/PointImportButtonViz" import WayImportButtonViz from "./Popup/ImportButtons/WayImportButtonViz" import ConflateImportButtonViz from "./Popup/ImportButtons/ConflateImportButtonViz" -import DeleteWizard from "./Popup/DeleteFlow/DeleteWizard.svelte" import OpenIdEditor from "./BigComponents/OpenIdEditor.svelte" import SendEmail from "./Popup/SendEmail.svelte" -import UploadImage from "./Image/UploadImage.svelte" -import { Imgur } from "../Logic/ImageProviders/Imgur" import Constants from "../Models/Constants" -import { MangroveReviews } from "mangrove-reviews-typescript" import Wikipedia from "../Logic/Web/Wikipedia" -import AllReviews from "./Reviews/AllReviews.svelte" -import StarsBarIcon from "./Reviews/StarsBarIcon.svelte" -import ReviewForm from "./Reviews/ReviewForm.svelte" -import Questionbox from "./Popup/TagRendering/Questionbox.svelte" import { TagUtils } from "../Logic/Tags/TagUtils" -import Giggity from "./BigComponents/Giggity.svelte" -import ThemeViewState from "../Models/ThemeViewState" import LanguagePicker from "./InputElement/LanguagePicker.svelte" -import LogoutButton from "./Base/LogoutButton.svelte" import OpenJosm from "./Base/OpenJosm.svelte" -import MarkAsFavourite from "./Popup/MarkAsFavourite.svelte" -import MarkAsFavouriteMini from "./Popup/MarkAsFavouriteMini.svelte" import NextChangeViz from "./OpeningHours/NextChangeViz.svelte" -import NearbyImages from "./Image/NearbyImages.svelte" -import NearbyImagesCollapsed from "./Image/NearbyImagesCollapsed.svelte" -import MoveWizard from "./Popup/MoveWizard.svelte" import { Unit } from "../Models/Unit" -import OrientationDebugPanel from "./Debug/OrientationDebugPanel.svelte" import MaprouletteSetStatus from "./MapRoulette/MaprouletteSetStatus.svelte" import DirectionIndicator from "./Base/DirectionIndicator.svelte" import ComparisonTool from "./Comparison/ComparisonTool.svelte" import SpecialTranslation from "./Popup/TagRendering/SpecialTranslation.svelte" import SpecialVisualisationUtils from "./SpecialVisualisationUtils" -import LoginButton from "./Base/LoginButton.svelte" import Toggle from "./Input/Toggle" -import ImportReviewIdentity from "./Reviews/ImportReviewIdentity.svelte" import LinkedDataLoader from "../Logic/Web/LinkedDataLoader" -import SplitRoadWizard from "./Popup/SplitRoadWizard.svelte" import DynLink from "./Base/DynLink.svelte" import Locale from "./i18n/Locale" import LanguageUtils from "../Utils/LanguageUtils" import MarkdownUtils from "../Utils/MarkdownUtils" import Trash from "@babeard/svelte-heroicons/mini/Trash" -import NothingKnown from "./Popup/NothingKnown.svelte" -import { CombinedFetcher } from "../Logic/Web/NearbyImagesSearch" import { And } from "../Logic/Tags/And" -import CloseNoteButton from "./Popup/Notes/CloseNoteButton.svelte" import PendingChangesIndicator from "./BigComponents/PendingChangesIndicator.svelte" -import QrCode from "./Popup/QrCode.svelte" -import ClearCaches from "./Popup/ClearCaches.svelte" import GroupedView from "./Popup/GroupedView.svelte" import { QuestionableTagRenderingConfigJson } from "../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import NoteCommentElement from "./Popup/Notes/NoteCommentElement.svelte" -import DisabledQuestions from "./Popup/DisabledQuestions.svelte" import FediverseLink from "./Popup/FediverseLink.svelte" -import ImageCarousel from "./Image/ImageCarousel.svelte" +import { ImageVisualisations } from "./SpecialVisualisations/ImageVisualisations" +import { NoteVisualisations } from "./SpecialVisualisations/NoteVisualisations" +import { FavouriteVisualisations } from "./SpecialVisualisations/FavouriteVisualisations" +import { UISpecialVisualisations } from "./SpecialVisualisations/UISpecialVisualisations" +import { SettingsVisualisations } from "./SpecialVisualisations/SettingsVisualisations" +import { ReviewSpecialVisualisations } from "./SpecialVisualisations/ReviewSpecialVisualisations" -class NearbyImageVis implements SpecialVisualization { - // Class must be in SpecialVisualisations due to weird cyclical import that breaks the tests - args: { name: string; defaultValue?: string; doc: string; required?: boolean }[] = [ - { - name: "mode", - defaultValue: "closed", - doc: "Either `open` or `closed`. If `open`, then the image carousel will always be shown", - }, - { - name: "readonly", - required: false, - doc: "If 'readonly' or 'yes', will not show the 'link'-button", - }, - ] - docs = - "A component showing nearby images loaded from various online services such as Mapillary. In edit mode and when used on a feature, the user can select an image to add to the feature" - funcName = "nearby_images" - needsUrls = CombinedFetcher.apiUrls - - constr( - state: SpecialVisualizationState, - tags: UIEventSource>, - args: string[], - feature: Feature, - layer: LayerConfig - ): SvelteUIElement { - const isOpen = args[0] === "open" - const readonly = args[1] === "readonly" || args[1] === "yes" - const [lon, lat] = GeoOperations.centerpointCoordinates(feature) - return new SvelteUIElement(isOpen ? NearbyImages : NearbyImagesCollapsed, { - tags, - state, - lon, - lat, - feature, - layer, - linkable: !readonly, - }) - } -} class StealViz implements SpecialVisualization { // Class must be in SpecialVisualisations due to weird cyclical import that breaks the tests @@ -212,109 +145,7 @@ class StealViz implements SpecialVisualization { } } -class CloseNoteViz implements SpecialVisualization { - public readonly funcName = "close_note" - public readonly needsUrls = [Constants.osmAuthConfig.url] - public readonly docs = - "Button to close a note. A predefined text can be defined to close the note with. If the note is already closed, will show a small text." - public readonly args = [ - { - name: "text", - doc: "Text to show on this button", - required: true, - }, - { - name: "icon", - doc: "Icon to show", - defaultValue: "checkmark.svg", - }, - { - name: "idkey", - doc: "The property name where the ID of the note to close can be found", - defaultValue: "id", - }, - { - name: "comment", - doc: "Text to add onto the note when closing", - }, - { - name: "minZoom", - doc: "If set, only show the closenote button if zoomed in enough", - }, - { - name: "zoomButton", - doc: "Text to show if not zoomed in enough", - }, - ] - public constr( - state: SpecialVisualizationState, - tags: UIEventSource>, - args: string[] - ): SvelteUIElement { - const { text, icon, idkey, comment, minZoom, zoomButton } = Utils.ParseVisArgs( - this.args, - args - ) - - return new SvelteUIElement(CloseNoteButton, { - state, - tags, - icon, - idkey, - message: comment, - text: Translations.T(text), - minzoom: minZoom, - zoomMoreMessage: zoomButton, - }) - } -} - -/** - * Thin wrapper around QuestionBox.svelte to include it into the special Visualisations - */ -export class QuestionViz implements SpecialVisualization { - funcName = "questions" - needsUrls = [] - docs = - "The special element which shows the questions which are unkown. Added by default if not yet there" - args = [ - { - name: "labels", - doc: "One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown", - }, - { - name: "blacklisted-labels", - doc: "One or more ';'-separated labels of questions which should _not_ be included", - }, - ] - svelteBased = true - - constr( - state: SpecialVisualizationState, - tags: UIEventSource>, - args: string[], - feature: Feature, - layer: LayerConfig - ): SvelteUIElement { - const labels = args[0] - ?.split(";") - ?.map((s) => s.trim()) - ?.filter((s) => s !== "") - const blacklist = args[1] - ?.split(";") - ?.map((s) => s.trim()) - ?.filter((s) => s !== "") - return new SvelteUIElement(Questionbox, { - layer, - tags, - selectedElement: feature, - state, - onlyForLabels: labels, - notForLabels: blacklist, - }) - } -} export default class SpecialVisualizations { public static specialVisualizations: SpecialVisualization[] = SpecialVisualizations.initList() @@ -421,7 +252,12 @@ export default class SpecialVisualizations { private static initList(): SpecialVisualization[] { const specialVisualizations: SpecialVisualization[] = [ - new QuestionViz(), + ...ImageVisualisations.initList(), + ...NoteVisualisations.initList(), + ...FavouriteVisualisations.initList(), + ...UISpecialVisualisations.initList(), + ...SettingsVisualisations.initList(), + ...ReviewSpecialVisualisations.initList(), { funcName: "add_new_point", docs: "An element which allows to add a new point on the 'last_click'-location. Only makes sense in the layer `last_click`", @@ -456,115 +292,11 @@ export default class SpecialVisualizations { ) }, }, - { - funcName: "logout", - args: [], - needsUrls: [Constants.osmAuthConfig.url], - docs: "Shows a button where the user can log out", - constr(state: SpecialVisualizationState): BaseUIElement { - return new SvelteUIElement(LogoutButton, { osmConnection: state.osmConnection }) - }, - }, new HistogramViz(), new StealViz(), - { - funcName: "minimap", - docs: "A small map showing the selected feature.", - needsUrls: [], - args: [ - { - doc: "The (maximum) zoomlevel: the target zoomlevel after fitting the entire feature. The minimap will fit the entire feature, then zoom out to this zoom level. The higher, the more zoomed in with 1 being the entire world and 19 being really close", - name: "zoomlevel", - defaultValue: "18", - }, - { - doc: "(Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap. (Note: if the key is 'id', list interpration is disabled)", - name: "idKey", - defaultValue: "id", - }, - ], - example: - "`{minimap()}`, `{minimap(17, id, _list_of_embedded_feature_ids_calculated_by_calculated_tag):height:10rem; border: 2px solid black}`", - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - args: string[], - feature: Feature - ): SvelteUIElement { - return new SvelteUIElement(MinimapViz, { state, args, feature, tagSource }) - }, - }, - { - funcName: "split_button", - docs: "Adds a button which allows to split a way", - args: [], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource> - ): BaseUIElement { - return new VariableUiElement( - tagSource - .map((tags) => tags.id) - .map((id) => { - if (id.startsWith("way/")) { - return new SvelteUIElement(SplitRoadWizard, { id, state }) - } - return undefined - }) - ) - }, - }, - { - funcName: "move_button", - docs: "Adds a button which allows to move the object to another location. The config will be read from the layer config", - args: [], - - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - if (feature.geometry.type !== "Point") { - return undefined - } - - return new SvelteUIElement(MoveWizard, { - state, - featureToMove: feature, - layer, - }) - }, - }, - { - funcName: "delete_button", - docs: "Adds a button which allows to delete the object at this location. The config will be read from the layer config", - args: [], - - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - if (!layer.deletion) { - return undefined - } - return new SvelteUIElement(DeleteWizard, { - tags: tagSource, - deleteConfig: layer.deletion, - state, - feature, - layer, - }) - }, - }, - new ShareLinkViz(), { funcName: "export_as_gpx", docs: "Exports the selected feature as GPX-file", @@ -598,26 +330,7 @@ export default class SpecialVisualizations { }, new UploadToOsmViz(), new MultiApplyViz(), - new AddNoteCommentViz(), - { - funcName: "open_note", - args: [], - needsUrls: [Constants.osmAuthConfig.url], - docs: "Creates a new map note on the given location. This options is placed in the 'last_click'-popup automatically if the 'notes'-layer is enabled", - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature - ): BaseUIElement { - const [lon, lat] = GeoOperations.centerpointCoordinates(feature) - return new SvelteUIElement(CreateNewNote, { - state, - coordinate: new UIEventSource({ lon, lat }), - }) - }, - }, - new CloseNoteViz(), + new PlantNetDetectionViz(), new TagApplyButton(), @@ -625,7 +338,6 @@ export default class SpecialVisualizations { new PointImportButtonViz(), new WayImportButtonViz(), new ConflateImportButtonViz(), - new NearbyImageVis(), { funcName: "wikipedia", @@ -700,172 +412,10 @@ export default class SpecialVisualizations { layer: LayerConfig ) => new SvelteUIElement(AllTagsPanel, { tags, layer }), }, - { - funcName: "image_carousel", - docs: "Creates an image carousel for the given sources. An attempt will be made to guess what source is used. Supported: Wikidata identifiers, Wikipedia pages, Wikimedia categories, IMGUR (with attribution, direct links)", - args: [ - { - name: "image_key", - defaultValue: AllImageProviders.defaultKeys.join(","), - doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated ", - }, - ], - needsUrls: AllImageProviders.apiUrls, - constr: (state, tags, args) => { - let imagePrefixes: string[] = undefined - if (args.length > 0) { - imagePrefixes = [].concat(...args.map((a) => a.split(","))) - } - const images = AllImageProviders.loadImagesFor(tags, imagePrefixes) - const estimated = tags.mapD(tags => AllImageProviders.estimateNumberOfImages(tags, imagePrefixes)) - return new SvelteUIElement(ImageCarousel, { state, tags, images, estimated }) - }, - }, - { - funcName: "image_upload", - docs: "Creates a button where a user can upload an image to IMGUR", - needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], - args: [ - { - name: "image-key", - doc: "Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added)", - required: false, - }, - { - name: "label", - doc: "The text to show on the button", - required: false, - }, - { - name: "disable_blur", - doc: "If set to 'true' or 'yes', then face blurring will be disabled. To be used sparingly", - required: false, - }, - ], - constr: (state, tags, args, feature) => { - const targetKey = args[0] === "" ? undefined : args[0] - const noBlur = args[3]?.toLowerCase()?.trim() - return new SvelteUIElement(UploadImage, { - state, - tags, - targetKey, - feature, - labelText: args[1], - image: args[2], - noBlur: noBlur === "true" || noBlur === "yes", - }) - }, - }, - { - funcName: "rating", - docs: "Shows stars which represent the average rating on mangrove.", - needsUrls: [MangroveReviews.ORIGINAL_API], - args: [ - { - name: "subjectKey", - defaultValue: "name", - doc: "The key to use to determine the subject. If the value is specified, the subject will be tags[subjectKey] and will use this to filter the reviews.", - }, - { - name: "fallback", - doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", - }, - ], - constr: (state, tags, args, feature) => { - const nameKey = args[0] ?? "name" - const fallbackName = args[1] - const reviews = FeatureReviews.construct( - feature, - tags, - state.userRelatedState.mangroveIdentity, - { - nameKey: nameKey, - fallbackName, - }, - state.featureSwitchIsTesting - ) - return new SvelteUIElement(StarsBarIcon, { - score: reviews.average, - }) - }, - }, - - { - funcName: "create_review", - docs: "Invites the contributor to leave a review. Somewhat small UI-element until interacted", - needsUrls: [MangroveReviews.ORIGINAL_API], - 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", - }, - { - name: "question", - doc: "The question to ask during the review", - }, - ], - constr: (state, tags, args, feature, layer) => { - const nameKey = args[0] ?? "name" - const fallbackName = args[1] - const question = args[2] - const reviews = FeatureReviews.construct( - feature, - tags, - state.userRelatedState?.mangroveIdentity, - { - nameKey: nameKey, - fallbackName, - }, - state.featureSwitchIsTesting - ) - return new SvelteUIElement(ReviewForm, { - reviews, - state, - tags, - feature, - layer, - question, - }) - }, - }, - { - 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], - 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, tags, args, feature, layer) => { - const nameKey = args[0] ?? "name" - const fallbackName = args[1] - const reviews = FeatureReviews.construct( - feature, - tags, - state.userRelatedState?.mangroveIdentity, - { - nameKey: nameKey, - fallbackName, - }, - state.featureSwitchIsTesting - ) - return new SvelteUIElement(AllReviews, { reviews, state, tags, feature, layer }) - }, - }, { funcName: "reviews", + group: "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`", @@ -873,16 +423,16 @@ export default class SpecialVisualizations { { name: "subjectKey", defaultValue: "name", - doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]", + 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", + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" }, { name: "question", - doc: "The question to ask in the review form. Optional", - }, + doc: "The question to ask in the review form. Optional" + } ], constr( state: SpecialVisualizationState, @@ -897,29 +447,12 @@ export default class SpecialVisualizations { .constr(state, tagSource, args, feature, layer), SpecialVisualizations.specialVisualisationsDict .get("list_reviews") - .constr(state, tagSource, args, feature, layer), + .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", - args: [ - { - name: "text", - doc: "The text that is shown on the button", - }, - ], - needsUrls: [], - constr( - state: SpecialVisualizationState, - _: UIEventSource>, - argument: string[] - ): BaseUIElement { - const [text] = argument - return new SvelteUIElement(ImportReviewIdentity, { state, text }) - }, + } }, + + { funcName: "opening_hours_table", docs: "Creates an opening-hours table. Usage: {opening_hours_table(opening_hours)} to create a table of the tag 'opening_hours'.", @@ -1119,24 +652,6 @@ export default class SpecialVisualizations { }) ), }, - { - funcName: "add_image_to_note", - docs: "Adds an image to a node", - args: [ - { - name: "Id-key", - doc: "The property name where the ID of the note to close can be found", - defaultValue: "id", - }, - ], - needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls], - - constr: (state, tags, args, feature, layer) => { - const id = tags.data[args[0] ?? "id"] - tags = state.featureProperties.getStore(id) - return new SvelteUIElement(UploadImage, { state, tags, layer, feature }) - }, - }, { funcName: "title", args: [], @@ -1591,96 +1106,7 @@ export default class SpecialVisualizations { ) }, }, - { - funcName: "giggity", - args: [ - { - name: "giggityUrl", - required: true, - doc: "The URL of the giggity-XML", - }, - ], - docs: "Shows events that are happening based on a Giggity URL", - needsUrls: (args) => args[0], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - const giggityUrl = argument[0] - return new SvelteUIElement(Giggity, { tags: tagSource, state, giggityUrl }) - }, - }, - { - funcName: "gps_all_tags", - - docs: "Shows the current tags of the GPS-representing object, used for debugging", - args: [], - constr( - state: SpecialVisualizationState, - _: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - const tags = (( - state - )).geolocation.currentUserLocation.features.map( - (features) => features[0]?.properties - ) - return new Combine([ - new SvelteUIElement(OrientationDebugPanel, {}), - new SvelteUIElement(AllTagsPanel, { - state, - tags, - }), - ]) - }, - }, - { - funcName: "favourite_status", - - docs: "A button that allows a (logged in) contributor to mark a location as a favourite location", - args: [], - - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - return new SvelteUIElement(MarkAsFavourite, { - tags: tagSource, - state, - layer, - feature, - }) - }, - }, - { - funcName: "favourite_icon", - - docs: "A small button that allows a (logged in) contributor to mark a location as a favourite location, sized to fit a title-icon", - args: [], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - return new SvelteUIElement(MarkAsFavouriteMini, { - tags: tagSource, - state, - layer, - feature, - }) - }, - }, { funcName: "direction_indicator", args: [], @@ -1696,19 +1122,7 @@ export default class SpecialVisualizations { return new SvelteUIElement(DirectionIndicator, { state, feature }) }, }, - { - funcName: "qr_code", - args: [], - docs: "Generates a QR-code to share the selected object", - constr( - state: SpecialVisualizationState, - tags: UIEventSource>, - argument: string[], - feature: Feature - ): SvelteUIElement { - return new SvelteUIElement(QrCode, { state, tags, feature }) - }, - }, + { funcName: "direction_absolute", docs: "Converts compass degrees (with 0° being north, 90° being east, ...) into a human readable, translated direction such as 'north', 'northeast'", @@ -1784,25 +1198,6 @@ export default class SpecialVisualizations { }) }, }, - { - funcName: "login_button", - args: [], - docs: "Show a login button", - needsUrls: [], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - args: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - return new Toggle( - undefined, - new SvelteUIElement(LoginButton, { osmConnection: state.osmConnection }), - state.osmConnection.isLoggedIn - ) - }, - }, { funcName: "linked_data_from_website", docs: "Attempts to load (via a proxy) the specified website and parsed ld+json from there. Suitable data will be offered to import into OSM", @@ -1937,35 +1332,7 @@ export default class SpecialVisualizations { ) }, }, - { - funcName: "if_nothing_known", - args: [ - { - name: "text", - doc: "Text to show", - required: true, - }, - { name: "cssClasses", doc: "Classes to apply onto the text" }, - ], - docs: "Shows a 'nothing is currently known-message if there is at least one unanswered question and no known (answerable) question", - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - const text = argument[0] - const cssClasses = argument[1] - return new SvelteUIElement(NothingKnown, { - state, - tags: tagSource, - layer, - text, - cssClasses, - }) - }, - }, + { funcName: "preset_description", docs: "Shows the extra description from the presets of the layer, if one matches. It will pick the most specific one (e.g. if preset `A` implies `B`, but `B` does not imply `A`, it'll pick B) or the first one if no ordering can be made. Might be empty", @@ -1992,28 +1359,7 @@ export default class SpecialVisualizations { return new SvelteUIElement(PendingChangesIndicator, { state, compact: false }) }, }, - { - funcName: "clear_caches", - docs: "A button which clears the locally downloaded data and the service worker. Login status etc will be kept", - args: [ - { - name: "text", - required: true, - doc: "The text to show on the button", - }, - ], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): SvelteUIElement { - return new SvelteUIElement(ClearCaches, { - msg: argument[0] ?? "Clear local caches", - }) - }, - }, + { funcName: "group", docs: "A collapsable group (accordion)", @@ -2080,38 +1426,7 @@ export default class SpecialVisualizations { }) }, }, - { - funcName: "clear_all", - docs: "Clears all user preferences", - needsUrls: [], - args: [ - { - name: "text", - doc: "Text to show on the button", - }, - ], - constr( - state: SpecialVisualizationState, - tagSource: UIEventSource>, - argument: string[], - feature: Feature, - layer: LayerConfig - ): BaseUIElement { - const text = argument[0] - return new SubtleButton(undefined, text).onClick(() => { - state.osmConnection.preferencesHandler.ClearPreferences() - }) - }, - }, - { - funcName: "disabled_questions", - docs: "Shows which questions are disabled for every layer. Used in 'settings'", - needsUrls: [], - args: [], - constr(state) { - return new SvelteUIElement(DisabledQuestions, { state }) - }, - }, + ] specialVisualizations.push(new AutoApplyButton(specialVisualizations)) From c0920bff9f112f33aab903c3441408490089869c Mon Sep 17 00:00:00 2001 From: Osmwithspace <> Date: Mon, 27 Jan 2025 14:48:22 +0100 Subject: [PATCH 25/59] copy from mapcomplete studio --- .../layers/group_campsite/group_campsite.json | 235 ++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 assets/layers/group_campsite/group_campsite.json diff --git a/assets/layers/group_campsite/group_campsite.json b/assets/layers/group_campsite/group_campsite.json new file mode 100644 index 0000000000..2e1d4c740a --- /dev/null +++ b/assets/layers/group_campsite/group_campsite.json @@ -0,0 +1,235 @@ +{ + "credits": "Osmwithspace", + "minzoom": 7, + "filter": [ + { + "id": "capacity_persons_filter", + "options": [ + { + "question": { + "en": "persons", + "de": "Personen" + } + }, + { + "question": { + "en": "1-20" + }, + "osmTags": { + "and": [ + "capacity:persons>=1", + "capacity:persons<=20" + ] + } + }, + { + "question": { + "en": "21-50" + }, + "osmTags": { + "and": [ + "capacity:persons>=21", + "capacity:persons<=50" + ] + } + }, + { + "question": { + "en": "51-100" + }, + "osmTags": { + "and": [ + "capacity:persons>=51", + "capacity:persons<=100" + ] + } + }, + { + "question": { + "en": "101-200" + }, + "osmTags": { + "and": [ + "capacity:persons>=101", + "capacity:persons<=200" + ] + } + }, + { + "question": { + "en": "201-500" + }, + "osmTags": { + "and": [ + "capacity:persons>=201", + "capacity:persons<=500" + ] + } + }, + { + "question": { + "en": "500+" + }, + "osmTags": "capacity:persons>=501" + }, + { + "question": { + "en": "?" + }, + "osmTags": "capacity:persons=" + } + ] + } + ], + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": { + "render": "https://opencampingmap.org/markers/l_standard.svg", + "mappings": [ + { + "if": { + "or": [ + "scout=yes", + "group_only=yes" + ] + }, + "then": "https://wiki.openstreetmap.org/w/images/6/6b/OCM_l_group_only.svg" + } + ] + } + } + ] + } + ], + "tagRenderings": [ + { + "question": { + "de": "Wie heißt dieser Zeltplatz?", + "en": "What is the name of this campsite?" + }, + "render": { + "en": "The name of this campsite is {name}", + "de": "Dieser Zeltplatz heißt {name}" + }, + "freeform": { + "key": "name" + }, + "id": "Name" + }, + { + "id": "fee", + "question": { + "en": "Is a fee charged here?", + "de": "Wird hier eine Gebühr erhoben?" + }, + "render": { + "en": "A fee of {charge} should be paid for here", + "de": "Hier wird eine Gebühr von {charge} erhoben" + }, + "freeform": { + "key": "charge", + "type": "currency", + "addExtraTags": [ + "fee=yes" + ], + "inline": true + }, + "mappings": [ + { + "if": "fee=no", + "addExtraTags": [ + "charge=" + ], + "then": { + "en": "The campsite is free of charge", + "de": "Der Zeltplatz ist kostenlos" + } + }, + { + "if": { + "and": [ + "fee=yes", + "charge=" + ] + }, + "then": { + "en": "A fee is charged here.", + "de": "Hier wird eine Gebühr erhoben." + }, + "hideInAnswer": "charge~*" + } + ] + }, + { + "question": { + "de": "Wie viele Personen können hier übernachten?", + "en": "How many people can stay here?" + }, + "render": { + "en": "{capacity:persons} people can stay here", + "de": "Hier können {capacity:persons} Personen übernachten" + }, + "freeform": { + "key": "capacity:persons", + "type": "pnat" + }, + "id": "capacity:persons" + }, + "contact", + "questions", + "mastodon", + "images" + ], + "lineRendering": [ + { + "width": 1, + "color": "blue" + } + ], + "credits:uid": 8770388, + "id": "groupcampsites", + "name": { + "en": "Campsites for groups and scouts", + "de": "Zeltplatz für Gruppen/Pfadfinder:innen" + }, + "description": { + "en": "Campsites for groups and scouts", + "de": "Zeltplatz für Gruppen/Pfadfinder:innen" + }, + "title": { + "render": { + "en": "{name}" + } + }, + "source": { + "osmTags": { + "and": [ + "tourism=camp_site", + { + "or": [ + "scout=yes", + "group_only=yes" + ] + } + ] + } + }, + "shownByDefault": true, + "presets": [ + { + "title": { + "en": "campsite for groups" + }, + "tags": [ + "tourism=camp_site", + "group_only=yes" + ] + } + ] +} \ No newline at end of file From a69f86fd33214ed4349a08a4f79e19e4bf747493 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Jan 2025 23:19:37 +0100 Subject: [PATCH 26/59] Chore: regenerate docs --- Docs/BuiltinIndex.md | 10 +- Docs/ELI-overview.md | 6 +- Docs/Hotkeys.md | 11 - Docs/Layers/banks_with_atm.md | 4 - Docs/Layers/bike_shop.md | 298 +--- Docs/Layers/dogfoodb.md | 612 ------- Docs/Layers/dogshop.md | 918 ---------- Docs/Layers/kindergarten_childcare.md | 153 -- Docs/Layers/medical_shops.md | 18 + Docs/Layers/osm_community_index.md | 2 +- Docs/Layers/school.md | 44 +- Docs/Layers/scouting_group.md | 25 +- Docs/Layers/shops.md | 18 + Docs/Layers/shops_glutenfree.md | 18 + Docs/Layers/shops_lactosefree.md | 18 + Docs/Layers/shops_second_hand.md | 18 + .../Layers/shops_with_climbing_shoe_repair.md | 18 + Docs/Layers/sport_shops.md | 18 + Docs/Layers/waste_basket.md | 4 +- Docs/SpecialRenderings.md | 1478 +++++++++-------- .../TagInfo/mapcomplete_circular_economy.json | 25 + Docs/TagInfo/mapcomplete_climbing.json | 25 + Docs/TagInfo/mapcomplete_cyclofix.json | 950 +---------- Docs/TagInfo/mapcomplete_education.json | 569 +++---- Docs/TagInfo/mapcomplete_glutenfree.json | 25 + Docs/TagInfo/mapcomplete_healthcare.json | 25 + Docs/TagInfo/mapcomplete_lactosefree.json | 25 + Docs/TagInfo/mapcomplete_onwheels.json | 25 + Docs/TagInfo/mapcomplete_pets.json | 423 +++-- Docs/TagInfo/mapcomplete_postboxes.json | 25 + Docs/TagInfo/mapcomplete_shops.json | 25 + Docs/TagInfo/mapcomplete_sports.json | 25 + Docs/Themes/atm.md | 4 - Docs/Themes/circular_economy.md | 18 + Docs/Themes/climbing.md | 18 + Docs/Themes/education.md | 4 +- Docs/Themes/glutenfree.md | 18 + Docs/Themes/healthcare.md | 18 + Docs/Themes/lactosefree.md | 18 + Docs/Themes/openlovemap.md | 18 + Docs/Themes/personal.md | 3 +- Docs/Themes/pets.md | 136 +- Docs/Themes/scouting.md | 1 + Docs/Themes/sports.md | 18 + Docs/URL_Parameters.md | 4 +- Docs/wikiIndex.txt | 2 +- 46 files changed, 2026 insertions(+), 4112 deletions(-) delete mode 100644 Docs/Layers/dogfoodb.md delete mode 100644 Docs/Layers/dogshop.md delete mode 100644 Docs/Layers/kindergarten_childcare.md diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index e7f25bfb6f..aa89a72167 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -47,6 +47,7 @@ - dentist - disaster_response - doctors + - dog_toilet - dogpark - drinking_water - dumpstations @@ -145,6 +146,7 @@ - brothel - cafe_pub - car_rental + - childcare - climbing_club - climbing_gym - dentist @@ -152,7 +154,6 @@ - food - food_courts - ice_cream - - kindergarten_childcare - pharmacy - police - postoffices @@ -198,6 +199,7 @@ - bike_themed_object - cafe_pub - car_rental + - childcare - climbing_club - climbing_gym - cycle_highways @@ -211,7 +213,6 @@ - food_courts - governments - hackerspace - - kindergarten_childcare - nature_reserve - observation_tower - outdoor_seating @@ -237,6 +238,7 @@ - bike_themed_object - cafe_pub - car_rental + - childcare - climbing_club - climbing_gym - dentist @@ -246,7 +248,6 @@ - food_courts - governments - hackerspace - - kindergarten_childcare - physiotherapist - recycling - shops @@ -264,6 +265,7 @@ - bike_themed_object - cafe_pub - car_rental + - childcare - climbing_club - climbing_gym - dentist @@ -272,7 +274,6 @@ - food - governments - hackerspace - - kindergarten_childcare - physiotherapist - recycling - shops @@ -466,6 +467,7 @@ - cafe_pub - food + - shops - tourism_accomodation ### internet diff --git a/Docs/ELI-overview.md b/Docs/ELI-overview.md index a414fb2083..045ecfb904 100644 --- a/Docs/ELI-overview.md +++ b/Docs/ELI-overview.md @@ -238,6 +238,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl | ICGC-orto25c | ICGC - Ortofoto de Catalunya 1:2.500 vigent | photo | ⭐ | Institut Cartogràfic i Geològic de Catalunya | | ICGC-topo | ICGC - Topogràfic de Catalunya | other | | Institut Cartogràfic i Geològic de Catalunya | | PNOA-Spain-TMS | PNOA Spain | photo | ⭐ | PNOA | +| SITNA-catastro | Catastro Navarra | other | | SITNA - Gobierno de Navarra / Nafarroako Gobernua | | geoEuskadi-ORTO | geoEuskadiren Ortoargazkiak | photo | ⭐ | Eusko Jaurlaritza / Gobierno Vasco. geoEuskadi | | IDEIB | IDEIB - Ortofoto més recent de les Illes Balears | photo | ⭐ | Infraestructura de Dades Espacials de les Illes Balears | | hri-orto | Helsinki region orthophoto | photo | ⭐ | © Espoon, Helsingin ja Vantaan kaupungit, Kirkkonummen ja Nurmijärven kunnat sekä HSL ja HSY | @@ -263,7 +264,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl | Brest_2004 | Brest - 2004 | historicphoto | | Brest Métropole - 2004 | | enedis | Enedis | photo | | Enedis 2018 | | EMS-Orthophotographie-2022 | Eurométropole de Strasbourg - Orthophotographie 2022 | photo | ⭐ | Ville et eurométropole de Strasbourg - DataGrandEst 2022 | -| Cadastre | Cadastre | map | | cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2021 | +| Cadastre | Cadastre | map | | cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2022 | | Geolittoral-Orthophotos2000 | Géolittoral - Orthophotos 2000 | historicphoto | | Ortho Littorale 2000 - Ministère en charge de l’environnement | | GeolittoralV2-Orthophotos | Géolittoral V2 - Orthophotos 2011-2014 | historicphoto | | Ortho Littorale v2 - Ministère en charge de l’environnement | | montauban_2020 | Grand Montauban 2020 | photo | | Grand Montauban 2020 | @@ -448,9 +449,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl | German-1944_Aerial | German Aerial Imagery (1944) | historicphoto | | © Simpals SRL, Bundesarchiv - Stabsbildabteilung | | American-1966_Aerial | American Aerial Imagery (1966) | historicphoto | | © Simpals SRL, U.S. Geological Survey | | Actueel_orthoHR_WMTS | PDOK aerial imagery Beeldmateriaal.nl 8cm (WMTS) latest | photo | ⭐ | Kadaster / Beeldmateriaal.nl, CC BY 4.0 | -| kartverket-topo4 | Kartverket topo | map | | © Kartverket | | kartverket-ok-1st | Kartverket Economic Maps (historic) | historicmap | | © Kartverket | -| kartverket-sjokart | Kartverket Nautical Charts | map | | © Kartverket | | geovekst-nib | Norway Orthophoto | photo | ⭐ | © Geovekst | | geovekst-nib2 | Norway Orthophoto (more recent, less zoom) | photo | ⭐ | © Geovekst | | geovekst-nib-historic | Norway Orthophoto (historic) | historicphoto | | © Geovekst | @@ -692,6 +691,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl | Cook_IL_2021 | Cook County Orthoimagery 2021 | photo | | Cook County GIS | | Cook_IL_2022 | Cook County Orthoimagery 2022 | photo | | Cook County GIS | | Cook_IL_2023 | Cook County Orthoimagery 2023 | photo | | Cook County GIS | +| Cook_IL_2024 | Cook County Orthoimagery 2024 | photo | | Cook County GIS | | IN_2021 | Indiana Statewide Imagery Program (2021) | photo | | Indiana Geographic Information Office | | IndianaMap_Latest | IndianaMap Orthoimagery - Latest Available | photo | | IndianaMap, Indiana Geographic Information Office | | Kansas_NG911_2014 | Kansas NG911 Orthoimagery (2014) | historicphoto | | Kansas 911 Coordinating Council | diff --git a/Docs/Hotkeys.md b/Docs/Hotkeys.md index f9fa1a0477..edc5371eb3 100644 --- a/Docs/Hotkeys.md +++ b/Docs/Hotkeys.md @@ -5,24 +5,13 @@ MapComplete supports the following keys: | Key combination | Action | -----|----- | -| `1` | Select the POI which is closest to the map center (crosshair). Only when in keyboard navigation is used | -| `2` | Select the POI which is second closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `3` | Select the POI which is third closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `4` | Select the POI which is the 4th closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `5` | Select the POI which is the 5th closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `6` | Select the POI which is the 6th closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `7` | Select the POI which is the 7th closest element to the map center (crosshair). Only when in keyboard navigation is used | -| `8` | Select the POI which is the 8th closest element to the map center (crosshair). Only when in keyboard navigation is used | | `B` | Opens the background layers panel | -| `Escape` | Close the sidebar | | `F` | Open the favourites page | | `L` | Pan the map to the current location or zoom the map to the current location. Requests geopermission | | `M` | Set the background to a map from external sources. Toggles between the two best, available layers | | `O` | Set the background layer to on OpenStreetMap-based map (or disable the background raster layer) | | `P` | Set the background to aerial or satellite imagery. Toggles between the two best, available layers | | `S` | Opens the POI-layers and filter panel | -| `Spacebar` | Select the POI which is closest to the map center (crosshair). Only when in keyboard navigation is used | -| `ctrl+F` | Select the search bar to search locations | | `shift+M` | Set the background to a map from external sources. Toggles between the two best, available layers | | `shift+O` | Set the background layer to on OpenStreetMap-based map (or disable the background raster layer) | | `shift+P` | Set the background to aerial or satellite imagery. Toggles between the two best, available layers | diff --git a/Docs/Layers/banks_with_atm.md b/Docs/Layers/banks_with_atm.md index 9afe2462e2..9b2c6044bf 100644 --- a/Docs/Layers/banks_with_atm.md +++ b/Docs/Layers/banks_with_atm.md @@ -84,10 +84,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Now open | _isOpen=yes | -| id | question | osmTags | ------|-----|----- | -| has_atm.0 | With an ATM | atm=yes | - This document is autogenerated from [assets/themes/atm/atm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/atm/atm.json) diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 8f03bc9266..0674359d31 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -15,7 +15,6 @@ A shop specifically selling bicycles or related items - [images](#images) - [reviews](#reviews) - [shops-name](#shops-name) - - [shop_types](#shop_types) - [brand](#brand) - [second_hand](#second_hand) - [opening_hours](#opening_hours) @@ -34,18 +33,9 @@ A shop specifically selling bicycles or related items - [bike_second_hand](#bike_second_hand) - [repairs_bikes](#repairs_bikes) - [bicycle_rental](#bicycle_rental) - - [bicycle-types](#bicycle-types) - - [rental-capacity-city_bike](#rental-capacity-city_bike) - - [rental-capacity-ebike](#rental-capacity-ebike) - - [rental-capacity-kid_bike](#rental-capacity-kid_bike) - - [rental-capacity-bmx](#rental-capacity-bmx) - - [rental-capacity-mtb](#rental-capacity-mtb) - - [rental-capacity-bicycle_pannier](#rental-capacity-bicycle_pannier) - - [rental-capacity-tandem_bicycle](#rental-capacity-tandem_bicycle) - [bike_pump_service](#bike_pump_service) - [bike_repair_tools](#bike_repair_tools) - [bike_wash](#bike_wash) - - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge) - [internet](#internet) - [internet-fee](#internet-fee) - [internet-ssid](#internet-ssid) @@ -53,6 +43,7 @@ A shop specifically selling bicycles or related items - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -90,7 +81,6 @@ Elements must match **any** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | | [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [bicycle_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_rental) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) | | [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | | | [second_hand](https://wiki.openstreetmap.org/wiki/Key:second_hand) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dno) | | [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | @@ -104,18 +94,9 @@ Elements must match **any** of the following expressions: | [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly) | | [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand) | | [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno) | -| [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet) [cargo_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcargo_bike) | -| [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) | | | [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate) | | [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold) | | [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno) | -| [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) | | | [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [terminal;wifi](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal;wifi) | | [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) | | [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) | @@ -123,6 +104,7 @@ Elements must match **any** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -140,180 +122,6 @@ _This tagrendering has no question and is thus read-only_ The question is `What is the name of this shop?` *This shop is called {name}* is shown if `name` is set -### shop_types - -The question is `What kind of shop is this?` -*This is a {shop}* is shown if `shop` is set - - - *Bicycle rental shop* is shown if with shop=bicycle_rental - - *Farm Supply Shop* is shown if with shop=agrarian - - *Liquor Store* is shown if with shop=alcohol - - *Anime / Manga Shop* is shown if with shop=anime - - *Antique Shop* is shown if with shop=antiques - - *Appliance Store* is shown if with shop=appliance - - *Art Store* is shown if with shop=art - - *Baby Goods Store* is shown if with shop=baby_goods - - *Bag/Luggage Store* is shown if with shop=bag - - *Bakery* is shown if with shop=bakery - - *Bathroom Furnishing Store* is shown if with shop=bathroom_furnishing - - *Beauty Shop* is shown if with shop=beauty - - *Bedding/Mattress Store* is shown if with shop=bed - - *Beverage Store* is shown if with shop=beverages - - *Bicycle Shop* is shown if with shop=bicycle - - *Boat Store* is shown if with shop=boat - - *Bookmaker* is shown if with shop=bookmaker - - *Bookstore* is shown if with shop=books - - *Brewing Supply Store* is shown if with shop=brewing_supplies - - *Butcher* is shown if with shop=butcher - - *Camera Equipment Store* is shown if with shop=camera - - *Candle Shop* is shown if with shop=candles - - *Cannabis Shop* is shown if with shop=cannabis - - *Car Dealership* is shown if with shop=car - - *Car Parts Store* is shown if with shop=car_parts - - *Car Repair Shop* is shown if with shop=car_repair - - *RV Dealership* is shown if with shop=caravan - - *Carpet Store* is shown if with shop=carpet - - *Catalog Shop* is shown if with shop=catalogue - - *Charity Store* is shown if with shop=charity - - *Cheese Store* is shown if with shop=cheese - - *Drugstore* is shown if with shop=chemist - - *Chocolate Store* is shown if with shop=chocolate - - *Clothing Store* is shown if with shop=clothes - - *Coffee Store* is shown if with shop=coffee - - *Collectibles Shop* is shown if with shop=collector - - *Computer Store* is shown if with shop=computer - - *Candy Store* is shown if with shop=confectionery - - *Convenience Store* is shown if with shop=convenience - - *Copy Store* is shown if with shop=copyshop - - *Cosmetics Store* is shown if with shop=cosmetics - - *Rural Supplies Store* is shown if with shop=country_store - - *Arts & Crafts Store* is shown if with shop=craft - - *Curtain Store* is shown if with shop=curtain - - *Dairy Store* is shown if with shop=dairy - - *Delicatessen* is shown if with shop=deli - - *Department Store* is shown if with shop=department_store - - *DIY Store* is shown if with shop=doityourself - - *Door Shop* is shown if with shop=doors - - *Dry Cleaner* is shown if with shop=dry_cleaning - - *E-Cigarette Shop* is shown if with shop=e-cigarette - - *Electrical Equipment Store* is shown if with shop=electrical - - *Electronics Store* is shown if with shop=electronics - - *Erotic Store* is shown if with shop=erotic - - *Fabric Store* is shown if with shop=fabric - - *Produce Stand* is shown if with shop=farm - - *Fashion Accessories Store* is shown if with shop=fashion_accessories - - *Fireplace Store* is shown if with shop=fireplace - - *Fishing Shop* is shown if with shop=fishing - - *Flooring Supply Shop* is shown if with shop=flooring - - *Florist* is shown if with shop=florist - - *Framing Shop* is shown if with shop=frame - - *Frozen Food Store* is shown if with shop=frozen_food - - *Fuel Shop* is shown if with shop=fuel - - *Funeral Home* is shown if with shop=funeral_directors - - *Furniture Store* is shown if with shop=furniture - - *Tabletop Game Store* is shown if with shop=games - - *Garden Center* is shown if with shop=garden_centre - - *Bottled Gas Shop* is shown if with shop=gas - - *General Store* is shown if with shop=general - - *Gift Shop* is shown if with shop=gift - - *Greengrocer* is shown if with shop=greengrocer - - *Hairdresser* is shown if with shop=hairdresser - - *Hairdresser Supply Store* is shown if with shop=hairdresser_supply - - *Hardware Store* is shown if with shop=hardware - - *Health Food Store* is shown if with shop=health_food - - *Hearing Aids Store* is shown if with shop=hearing_aids - - *Herbalist* is shown if with shop=herbalist - - *Hifi Store* is shown if with shop=hifi - - *Honey Store* is shown if with shop=honey - - *Household Linen Shop* is shown if with shop=household_linen - - *Houseware Store* is shown if with shop=houseware - - *Hunting Shop* is shown if with shop=hunting - - *Interior Decoration Store* is shown if with shop=interior_decoration - - *Jewelry Store* is shown if with shop=jewelry - - *Kiosk* is shown if with shop=kiosk - - *Kitchen Design Store* is shown if with shop=kitchen - - *Laundry* is shown if with shop=laundry - - *Leather Store* is shown if with shop=leather - - *Lighting Store* is shown if with shop=lighting - - *Locksmith* is shown if with shop=locksmith - - *Lottery Shop* is shown if with shop=lottery - - *Mall* is shown if with shop=mall - - *Massage Shop* is shown if with shop=massage - - *Medical Supply Store* is shown if with shop=medical_supply - - *Military Surplus Store* is shown if with shop=military_surplus - - *Mobile Phone Store* is shown if with shop=mobile_phone - - *Model Shop* is shown if with shop=model - - *Money Lender* is shown if with shop=money_lender - - *Motorcycle Dealership* is shown if with shop=motorcycle - - *Motorcycle Repair Shop* is shown if with shop=motorcycle_repair - - *Music Store* is shown if with shop=music - - *Musical Instrument Store* is shown if with shop=musical_instrument - - *Newsstand* is shown if with shop=newsagent - - *Nutrition Supplements Store* is shown if with shop=nutrition_supplements - - *Nuts Shop* is shown if with shop=nuts - - *Optician* is shown if with shop=optician - - *Outdoors Store* is shown if with shop=outdoor - - *Online Retailer Outpost* is shown if with shop=outpost - - *Paint Store* is shown if with shop=paint - - *Party Supply Store* is shown if with shop=party - - *Pasta Store* is shown if with shop=pasta - - *Pastry Shop* is shown if with shop=pastry - - *Pawnshop* is shown if with shop=pawnbroker - - *Perfume Store* is shown if with shop=perfumery - - *Pet Store* is shown if with shop=pet - - *Pet Groomer* is shown if with shop=pet_grooming - - *Photography Store* is shown if with shop=photo - - *Pottery Store* is shown if with shop=pottery - - *Printer Ink Store* is shown if with shop=printer_ink - - *Psychic* is shown if with shop=psychic - - *Fireworks Store* is shown if with shop=pyrotechnics - - *Radio/Electronic Component Store* is shown if with shop=radiotechnics - - *Religious Store* is shown if with shop=religion - - *Rental Shop* is shown if with shop=rental - - *Repair Shop* is shown if with shop=repair - - *Rice Store* is shown if with shop=rice - - *Scuba Diving Shop* is shown if with shop=scuba_diving - - *Seafood Shop* is shown if with shop=seafood - - *Thrift Store* is shown if with shop=second_hand - - *Sewing Supply Shop* is shown if with shop=sewing - - *Shoe Repair Shop* is shown if with shop=shoe_repair - - *Shoe Store* is shown if with shop=shoes - - *Spice Shop* is shown if with shop=spices - - *Sporting Goods Store* is shown if with shop=sports - - *Stationery Store* is shown if with shop=stationery - - *Storage Rental* is shown if with shop=storage_rental - - *Supermarket* is shown if with shop=supermarket - - *Pool Supply Store* is shown if with shop=swimming_pool - - *Tailor* is shown if with shop=tailor - - *Tattoo Parlor* is shown if with shop=tattoo - - *Tea Store* is shown if with shop=tea - - *Telecom Retail Store* is shown if with shop=telecommunication - - *Ticket Seller* is shown if with shop=ticket - - *Tile Shop* is shown if with shop=tiles - - *Tobacco Shop* is shown if with shop=tobacco - - *Tool Rental* is shown if with shop=tool_hire - - *Toy Store* is shown if with shop=toys - - *Trade Shop* is shown if with shop=trade - - *Travel Agency* is shown if with shop=travel_agency - - *Trophy Shop* is shown if with shop=trophy - - *Tire Store* is shown if with shop=tyres - - *Vacuum Cleaner Store* is shown if with shop=vacuum_cleaner - - *Discount Store* is shown if with shop=variety_store - - *Video Store* is shown if with shop=video - - *Video Game Store* is shown if with shop=video_games - - *Watches Shop* is shown if with shop=watches - - *Drinking Water Shop* is shown if with shop=water - - *Watersport/Swim Shop* is shown if with shop=water_sports - - *Weapon Shop* is shown if with shop=weapons - - *Wholesale Store* is shown if with shop=wholesale - - *Wig Shop* is shown if with shop=wigs - - *Window Blind Store* is shown if with shop=window_blind - - *Wine Shop* is shown if with shop=wine - - *This shop is no longer used. It is vacant* is shown if with disused:shop= - -This tagrendering has labels -`description` - ### brand The question is `What is the brand of this shop?` @@ -479,88 +287,6 @@ The question is `Does this shop rent out bikes?` This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=sport | shop=sports | shop=bicycle_repair | shop=outdoor | shop=rental | service:bicycle:rental~.+ -### bicycle-types - -The question is `What kind of bicycles and accessories are rented here?` -*{rental} is rented here* is shown if `rental` is set - - - *Normal city bikes can be rented here* is shown if with rental=city_bike - - *Electrical bikes can be rented here* is shown if with rental=ebike - - *BMX bikes can be rented here* is shown if with rental=bmx - - *Mountainbikes can be rented here* is shown if with rental=mtb - - *Bikes for children can be rented here* is shown if with rental=kid_bike - - *Tandem bicycles can be rented here* is shown if with rental=tandem - - *Race bicycles can be rented here* is shown if with rental=racebike - - *Bike helmets can be rented here* is shown if with rental=bike_helmet - - *Cargo bikes can be rented here* is shown if with rental=cargo_bike - -This tagrendering is only visible in the popup if the following condition is met: service:bicycle:rental=yes | bicycle_rental~.+ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-city_bike - -The question is `How many city bikes can be rented here?` -*{capacity:city_bike} city bikes can be rented here* is shown if `capacity:city_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*city_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-ebike - -The question is `How many electrical bikes can be rented here?` -*{capacity:ebike} electrical bikes can be rented here* is shown if `capacity:ebike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*ebike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-kid_bike - -The question is `How many bikes for children can be rented here?` -*{capacity:kid_bike} bikes for children can be rented here* is shown if `capacity:kid_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*kid_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bmx - -The question is `How many BMX bikes can be rented here?` -*{capacity:bmx} BMX bikes can be rented here* is shown if `capacity:bmx` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bmx.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-mtb - -The question is `How many mountainbikes can be rented here?` -*{capacity:mtb} mountainbikes can be rented here* is shown if `capacity:mtb` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*mtb.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bicycle_pannier - -The question is `How many bicycle panniers can be rented here?` -*{capacity:bicycle_pannier} bicycle panniers can be rented here* is shown if `capacity:bicycle_pannier` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bicycle_pannier.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-tandem_bicycle - -The question is `How many tandem can be rented here?` -*{capacity:tandem_bicycle} tandem can be rented here* is shown if `capacity:tandem_bicycle` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*tandem_bicycle.*)$ -This tagrendering has labels -`bicycle_rental` - ### bike_pump_service The question is `Does this shop offer a bike pump for use by anyone?` @@ -591,16 +317,6 @@ The question is `Are bicycles washed here?` This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$ | service:bicycle:cleaning~.+ -### bike_cleaning-service_bicycle_cleaning_charge - -The question is `How much does it cost to use the cleaning service?` -*Using the cleaning service costs {service:bicycle:cleaning:charge}* is shown if `service:bicycle:cleaning:charge` is set - - - *The cleaning service is free to use* is shown if with service:bicycle:cleaning:fee=no - - *Free to use* is shown if with service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge=. _This option cannot be chosen as answer_ - -This tagrendering is only visible in the popup if the following condition is met: amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+ - ### internet The question is `Does this place offer internet access?` @@ -687,6 +403,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md deleted file mode 100644 index ae7b35ae2f..0000000000 --- a/Docs/Layers/dogfoodb.md +++ /dev/null @@ -1,612 +0,0 @@ -[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) - -# dogfoodb - -This layer is based on [food](../Layers/food.md) - -A layer showing restaurants and fast-food amenities (with a special rendering for friteries) - - - This layer is shown at zoomlevel **12** and higher - -## Table of contents - -1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) - - [images](#images) - - [reviews](#reviews) - - [Name](#name) - - [Fastfood vs restaurant](#fastfood-vs-restaurant) - - [opening_hours](#opening_hours) - - [Opening hours](#opening-hours) - - [website](#website) - - [email](#email) - - [phone](#phone) - - [payment-options](#payment-options) - - [repeated](#repeated) - - [single_level](#single_level) - - [wheelchair-access](#wheelchair-access) - - [Cuisine](#cuisine) - - [show-menu-image](#show-menu-image) - - [add-menu-image](#add-menu-image) - - [menu-website](#menu-website) - - [Reservation](#reservation) - - [Takeaway](#takeaway) - - [delivery](#delivery) - - [drive-through](#drive-through) - - [drive-through-opening_hours](#drive-through-opening_hours) - - [Drive-through opening hours](#drive-through-opening-hours) - - [Vegetarian (no friture)](#vegetarian-(no-friture)) - - [Vegan (no friture)](#vegan-(no-friture)) - - [halal (no friture)](#halal-(no-friture)) - - [organic (no friture)](#organic-(no-friture)) - - [friture-vegetarian](#friture-vegetarian) - - [friture-vegan](#friture-vegan) - - [friture-organic](#friture-organic) - - [friture-oil](#friture-oil) - - [friture-take-your-container](#friture-take-your-container) - - [sugar_free](#sugar_free) - - [gluten_free](#gluten_free) - - [lactose_free](#lactose_free) - - [smoking](#smoking) - - [service:electricity](#serviceelectricity) - - [seating](#seating) - - [dog-access](#dog-access) - - [internet](#internet) - - [internet-fee](#internet-fee) - - [internet-ssid](#internet-ssid) - - [leftover-questions](#leftover-questions) - - [move-button](#move-button) - - [delete-button](#delete-button) - - [lod](#lod) -4. [Filters](#filters) - -## Themes using this layer - - - [pets](https://mapcomplete.org/pets) - -## Basic tags for this layer - -Elements must match **all** of the following expressions: - -0. amenity=restaurant | amenity=cafe -1. dog=unleashed | dog=leashed | dog=yes - -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22dog%22%3D%22unleashed%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22dog%22%3D%22leashed%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22dog%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22dog%22%3D%22unleashed%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22dog%22%3D%22leashed%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22dog%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) - -## Supported attributes - -**Warning:**,this quick overview is incomplete, - -| attribute | type | values which are supported by this layer | ------|-----|----- | -| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [fast_food](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food) [restaurant](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant) | -| [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | -| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | -| [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | -| [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | -| [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) | -| [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | -| [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | -| [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | -| [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | -| [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) | -| [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) | -| [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) | -| [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) | -| [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) | -| [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) | -| [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) | -| [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) | -| [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) | -| [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) | -| [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal) | -| [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly) | -| [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | -| [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | -| [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [smoking](https://wiki.openstreetmap.org/wiki/Key:smoking) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dno) [outside](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Doutside) | -| [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno) | -| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | -| [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [terminal;wifi](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal;wifi) | -| [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) | -| [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) | - -### images -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images -_This tagrendering has no question and is thus read-only_ -*{image_carousel()}{image_upload()}* - -### reviews -Shows the reviews module (including the possibility to leave a review) -_This tagrendering has no question and is thus read-only_ -*{create_review()}{list_reviews()}* - -### Name - -The question is `What is the name of this business?` -*The name of this business is {name}* is shown if `name` is set - -### Fastfood vs restaurant - -The question is `What type of business is this?` - - - *This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.* is shown if with amenity=fast_food - - *A restaurant, focused on creating a nice experience where one is served at the table* is shown if with amenity=restaurant - -### opening_hours - -The question is `What are the opening hours of {title()}?` -*

Opening hours

{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set - - - *Marked as closed for an unspecified time* is shown if with opening_hours=closed. _This option cannot be chosen as answer_ - -### website - -The question is `What is the website of {title()}?` -*{website}* is shown if `website` is set - - - *{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### email - -The question is `What is the email address of {title()}?` -*{email}* is shown if `email` is set - - - *{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_ - - *{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### phone - -The question is `What is the phone number of {title()}?` -*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### payment-options - -The question is `Which methods of payment are accepted here?` - - - *Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no - - *Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no - - *Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no - -### repeated - -_This tagrendering has no question and is thus read-only_ -*Multiple, identical objects can be found on floors {repeat_on}.* - -This tagrendering is only visible in the popup if the following condition is met: repeat_on~.+ -This tagrendering has labels -`level` - -### single_level - -The question is `On what level is this feature located?` -*Located on the {level}th floor* is shown if `level` is set - - - *Located underground* is shown if with location=underground. _This option cannot be chosen as answer_ - - *Located on the ground floor* is shown if with level=0 - - *Located on the ground floor* is shown if with level=. _This option cannot be chosen as answer_ - - *Located on the first floor* is shown if with level=1 - - *Located on the first basement level* is shown if with level=-1 - -This tagrendering has labels -`level` - -### wheelchair-access - -The question is `Is this place accessible with a wheelchair?` - - - *This place is specially adapted for wheelchair users* is shown if with wheelchair=designated - - *This place is easily reachable with a wheelchair* is shown if with wheelchair=yes - - *It is possible to reach this place in a wheelchair, but it is not easy* is shown if with wheelchair=limited - - *This place is not reachable with a wheelchair* is shown if with wheelchair=no - -### Cuisine - -The question is `What kind of food is served here?` -*This place mostly serves {cuisine}* is shown if `cuisine` is set - - - *Pizzeria* is shown if with cuisine=pizza - - *Friture* is shown if with cuisine=friture - - *Serves mainly pasta* is shown if with cuisine=pasta - - *Kebab shop* is shown if with cuisine=kebab - - *Sandwich shop* is shown if with cuisine=sandwich - - *Burgersrestaurant* is shown if with cuisine=burger - - *Sushi restaurant* is shown if with cuisine=sushi - - *Coffeebar* is shown if with cuisine=coffee - - *Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French restaurant* is shown if with cuisine=french - - *Chinese* is shown if with cuisine=chinese - - *Greek* is shown if with cuisine=greek - - *Indian* is shown if with cuisine=indian - - *Turkish restaurant* is shown if with cuisine=turkish - - *Thai restaurant* is shown if with cuisine=thai - - *Mexican dishes are served here* is shown if with cuisine=mexican - - *Japanese dishes are served here* is shown if with cuisine=japanese - - *Chicken based dishes are served here* is shown if with cuisine=chicken - - *Seafood dishes are served here* is shown if with cuisine=seafood - -### show-menu-image - -_This tagrendering has no question and is thus read-only_ -*{image_carousel(image:menu)}* - -### add-menu-image - -_This tagrendering has no question and is thus read-only_ -*{image_upload(image:menu,Add an image from the menu,)}* - -### menu-website - -The question is `On what webpage is the menu published?` -*{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,,)}* is shown if `website:menu` is set - -### Reservation - -The question is `Is a reservation required for this place?` - - - *A reservation is required at this place* is shown if with reservation=required - - *A reservation is not required, but still recommended to make sure you get a table* is shown if with reservation=recommended - - *Reservation is possible at this place* is shown if with reservation=yes - - *Reservation is not possible at this place* is shown if with reservation=no - -### Takeaway - -The question is `Does this place offer take-away?` - - - *This is a take-away only business* is shown if with takeaway=only - - *Take-away is possible here* is shown if with takeaway=yes - - *Take-away is not possible here* is shown if with takeaway=no - -### delivery - -The question is `Does {title()} deliver food to your home?` - - - *This business does home delivery (possibly via a third party)* is shown if with delivery=yes - - *This business does not deliver at home* is shown if with delivery=no - -### drive-through - -The question is `Does this fast-food restaurant have a drive-through?` - - - *This fast-food restaurant has a drive-through* is shown if with drive_through=yes - - *This fast-food restaurant does not have a drive-through* is shown if with drive_through=no - -This tagrendering is only visible in the popup if the following condition is met: amenity=fast_food - -### drive-through-opening_hours - -The question is `What are the opening hours of the drive-through?` -*

Drive-through opening hours

{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set - - - *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through= - -This tagrendering is only visible in the popup if the following condition is met: drive_through=yes - -### Vegetarian (no friture) - -The question is `Does this restaurant have a vegetarian option?` - - - *No vegetarian options are available* is shown if with diet:vegetarian=no - - *Some vegetarian options are available* is shown if with diet:vegetarian=limited - - *Vegetarian options are available* is shown if with diet:vegetarian=yes - - *All dishes are vegetarian* is shown if with diet:vegetarian=only - - *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with diet:vegetarian=on_demand - -### Vegan (no friture) - -The question is `Does this business serve vegan meals?` - - - *No vegan options available* is shown if with diet:vegan=no - - *Some vegan options are available* is shown if with diet:vegan=limited - - *Vegan options are available* is shown if with diet:vegan=yes - - *All dishes are vegan* is shown if with diet:vegan=only - - *Some dishes might be adapted to a vegan version if asked for* is shown if with diet:vegan=on_demand - -### halal (no friture) - -The question is `Does this restaurant offer a halal menu?` - - - *There are no halal options available* is shown if with diet:halal=no - - *There is a small halal menu* is shown if with diet:halal=limited - - *There is a halal menu* is shown if with diet:halal=yes - - *Only halal options are available* is shown if with diet:halal=only - -### organic (no friture) - -The question is `Does this restaurant offer organic food?` - - - *There are no organic options available* is shown if with organic=no - - *There is an organic menu* is shown if with organic=yes - - *Only organic options are available* is shown if with organic=only - -### friture-vegetarian - -The question is `Does this fries shop have vegetarian snacks?` - - - *Serves only vegetarian snacks and burgers* is shown if with diet:vegetarian=only - - *Vegetarian snacks are available* is shown if with diet:vegetarian=yes - - *Only a small selection of snacks are vegetarian* is shown if with diet:vegetarian=limited - - *No vegetarian snacks are available* is shown if with diet:vegetarian=no - -This tagrendering is only visible in the popup if the following condition is met: cuisine=friture - -### friture-vegan - -The question is `Does this fries shop have vegan snacks?` - - - *Serves only vegan snacks and burgers* is shown if with diet:vegan=only - - *Vegan snacks are available* is shown if with diet:vegan=yes - - *A small selection of vegan snacks are available* is shown if with diet:vegan=limited - - *No vegan snacks are available* is shown if with diet:vegan=no - -This tagrendering is only visible in the popup if the following condition is met: cuisine=friture - -### friture-organic - -The question is `Does this fries shop offer organic snacks?` - - - *Organic snacks are available* is shown if with organic=yes - - *No organic snacks are available* is shown if with organic=no - - *Only organic snacks are available* is shown if with organic=only - -This tagrendering is only visible in the popup if the following condition is met: cuisine=friture - -### friture-oil - -The question is `Does this fries shop use vegetable or animal oil for cooking?` - - - *The frying is done with vegetable oil* is shown if with friture:oil=vegetable - - *The frying is done with animal oil* is shown if with friture:oil=animal - -This tagrendering is only visible in the popup if the following condition is met: cuisine=friture - -### friture-take-your-container - -The question is `If you bring your own container (such as a cooking pot and small pots), is it used to package your order?` - - - *You can bring your own containers to get your order, saving on single-use packaging material and thus waste* is shown if with reusable_packaging:accept=yes - - *Bringing your own container is not allowed* is shown if with reusable_packaging:accept=no - - *You must bring your own container to order here.* is shown if with reusable_packaging:accept=only - -This tagrendering is only visible in the popup if the following condition is met: cuisine=friture - -### sugar_free - -The question is `Does this shop have a sugar free offering?` - - - *This shop only sells sugar free products* is shown if with diet:sugar_free=only - - *This shop has a big sugar free offering* is shown if with diet:sugar_free=yes - - *This shop has a limited sugar free offering* is shown if with diet:sugar_free=limited - - *This shop has no sugar free offering* is shown if with diet:sugar_free=no - -This tagrendering has labels -`diets` - -### gluten_free - -The question is `Does this shop have a gluten free offering?` - - - *This shop only sells gluten free products* is shown if with diet:gluten_free=only - - *This shop has a big gluten free offering* is shown if with diet:gluten_free=yes - - *This shop has a limited gluten free offering* is shown if with diet:gluten_free=limited - - *This shop has no gluten free offering* is shown if with diet:gluten_free=no - -This tagrendering has labels -`diets` - -### lactose_free - -The question is `Does {title()} have a lactose-free offering?` - - - *Only sells lactose free products* is shown if with diet:lactose_free=only - - *Big lactose free offering* is shown if with diet:lactose_free=yes - - *Limited lactose free offering* is shown if with diet:lactose_free=limited - - *No lactose free offering* is shown if with diet:lactose_free=no - -This tagrendering has labels -`diets` - -### smoking - -The question is `Is smoking allowed at {title()}?` - - - *Smoking is allowed* is shown if with smoking=yes - - *Smoking is not allowed* is shown if with smoking=no - - *Smoking is allowed outside.* is shown if with smoking=outside - -### service:electricity - -The question is `Does this amenity have electrical outlets, available to customers when they are inside?` - - - *There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics* is shown if with service:electricity=yes - - *There are a few domestic sockets available to customers seated indoors, where they can charge their electronics* is shown if with service:electricity=limited - - *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with service:electricity=ask - - *There are a no domestic sockets available to customers seated indoors* is shown if with service:electricity=no - -### seating - -The question is `What kind of seating does {title()} have?` - - - *This place has outdoor seating* is shown if with outdoor_seating=yes. Unselecting this answer will add outdoor_seating=no - - *This place has indoor seating* is shown if with indoor_seating=yes. Unselecting this answer will add indoor_seating=no - -### dog-access - -The question is `Are dogs allowed in this business?` - - - *Dogs are allowed* is shown if with dog=yes - - *Dogs are not allowed* is shown if with dog=no - - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed - - *Dogs are allowed and can run around freely* is shown if with dog=unleashed - - *Dogs are allowed only outside* is shown if with dog=outside - -### internet - -The question is `Does this place offer internet access?` - - - *This place offers wireless internet access* is shown if with internet_access=wlan - - *This place does not offer internet access* is shown if with internet_access=no - - *This place offers internet access* is shown if with internet_access=yes. _This option cannot be chosen as answer_ - - *This place offers internet access via a terminal or computer* is shown if with internet_access=terminal - - *This place offers wired internet access* is shown if with internet_access=wired - - *This place offers both wireless internet and internet access via a terminal or computer* is shown if with internet_access=terminal;wifi - -This tagrendering has labels -`internet-all` - -### internet-fee - -The question is `Is there a fee for internet access?` - - - *There is a fee for the internet access at this place* is shown if with internet_access:fee=yes - - *Internet access is free at this place* is shown if with internet_access:fee=no - - *Internet access is free at this place, for customers only* is shown if with internet_access:fee=customers - -This tagrendering is only visible in the popup if the following condition is met: internet_access!=no & internet_access~.+ -This tagrendering has labels -`internet-all` - -### internet-ssid - -The question is `What is the network name for the wireless internet access?` -*The network name is {internet_access:ssid}* is shown if `internet_access:ssid` is set - - - *Telekom* is shown if with internet_access:ssid=Telekom - -This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ -This tagrendering has labels -`internet-all` - -### leftover-questions - -_This tagrendering has no question and is thus read-only_ -*{questions( ,)}* - -### move-button - -_This tagrendering has no question and is thus read-only_ -*{move_button()}* - -### delete-button - -_This tagrendering has no question and is thus read-only_ -*{delete_button()}* - -### lod - -_This tagrendering has no question and is thus read-only_ -*{linked_data_from_website()}* - -This tagrendering has labels -`added_by_default` - -## Filters - -| id | question | osmTags | ------|-----|----- | -| open_now.0 | Now open | _isOpen=yes | - -| id | question | osmTags | ------|-----|----- | -| reservation.0 | Reservation not required | reservation=no | reservation=optional | reservation= | - -| id | question | osmTags | ------|-----|----- | -| food-category.0 | *Restaurants and fast food businesses* (default) | | -| food-category.1 | Only fastfood businesses | amenity=fast_food | -| food-category.2 | Only restaurants | amenity=restaurant | - -| id | question | osmTags | ------|-----|----- | -| vegetarian.0 | Has a vegetarian menu | diet:vegetarian=yes | diet:vegetarian=only | diet:vegan=yes | diet:vegan=only | - -| id | question | osmTags | ------|-----|----- | -| vegan.0 | Has a vegan menu | diet:vegan=yes | diet:vegan=only | - -| id | question | osmTags | ------|-----|----- | -| halal.0 | Has a halal menu | diet:halal=yes | diet:halal=only | - -| id | question | osmTags | ------|-----|----- | -| has_organic.0 | Has organic options | organic=yes | organic=only | - -| id | question | osmTags | ------|-----|----- | -| sugar_free.0 | Has a sugar-free offering | diet:sugar_free=yes | diet:sugar_free=only | diet:sugar_free=limited | - -| id | question | osmTags | ------|-----|----- | -| gluten_free.0 | Has a gluten free offering | diet:gluten_free=yes | diet:gluten_free=only | diet:gluten_free=limited | - -| id | question | osmTags | ------|-----|----- | -| lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited | - -| id | question | osmTags | ------|-----|----- | -| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes | - -| id | question | osmTags | ------|-----|----- | -| indoor_seating.0 | Has indoor seating | indoor_seating=yes | - -| id | question | osmTags | ------|-----|----- | -| accepts_cash.0 | Accepts cash | payment:cash=yes | - -| id | question | osmTags | ------|-----|----- | -| accepts_cards.0 | Accepts payment cards | payment:cards=yes | - -| id | question | osmTags | ------|-----|----- | -| dogs.0 | *No preference towards dogs* (default) | | -| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | -| dogs.2 | No dogs allowed | dog=no | - -| id | question | osmTags | ------|-----|----- | -| Cuisine.0 | *What kind of food is served here?* (default) | | -| Cuisine.1 | Pizzeria | cuisine=pizza | -| Cuisine.2 | Friture | cuisine=friture | -| Cuisine.3 | Serves mainly pasta | cuisine=pasta | -| Cuisine.4 | Kebab shop | cuisine=kebab | -| Cuisine.5 | Sandwich shop | cuisine=sandwich | -| Cuisine.6 | Burgersrestaurant | cuisine=burger | -| Cuisine.7 | Sushi restaurant | cuisine=sushi | -| Cuisine.8 | Coffeebar | cuisine=coffee | -| Cuisine.9 | Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | -| Cuisine.10 | French restaurant | cuisine=french | -| Cuisine.11 | Chinese | cuisine=chinese | -| Cuisine.12 | Greek | cuisine=greek | -| Cuisine.13 | Indian | cuisine=indian | -| Cuisine.14 | Turkish restaurant | cuisine=turkish | -| Cuisine.15 | Thai restaurant | cuisine=thai | -| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | -| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | -| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | -| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | - -| id | question | osmTags | ------|-----|----- | -| has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | - - - -This document is autogenerated from [assets/themes/pets/pets.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/pets/pets.json) diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md deleted file mode 100644 index 675aa86b15..0000000000 --- a/Docs/Layers/dogshop.md +++ /dev/null @@ -1,918 +0,0 @@ -[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) - -# dogshop - -This layer is based on [shops](../Layers/shops.md) - -A shop - - - This layer is shown at zoomlevel **15** and higher - -## Table of contents - -1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) - - [images](#images) - - [reviews](#reviews) - - [shops-name](#shops-name) - - [shop_types](#shop_types) - - [brand](#brand) - - [second_hand](#second_hand) - - [opening_hours](#opening_hours) - - [Opening hours](#opening-hours) - - [website](#website) - - [email](#email) - - [phone](#phone) - - [payment-options](#payment-options) - - [repeated](#repeated) - - [single_level](#single_level) - - [copyshop-print-sizes](#copyshop-print-sizes) - - [copyshop-binding](#copyshop-binding) - - [optometrist_service](#optometrist_service) - - [key_cutter](#key_cutter) - - [sells_new_bikes](#sells_new_bikes) - - [bike_second_hand](#bike_second_hand) - - [repairs_bikes](#repairs_bikes) - - [bicycle_rental](#bicycle_rental) - - [bicycle-types](#bicycle-types) - - [rental-capacity-city_bike](#rental-capacity-city_bike) - - [rental-capacity-ebike](#rental-capacity-ebike) - - [rental-capacity-kid_bike](#rental-capacity-kid_bike) - - [rental-capacity-bmx](#rental-capacity-bmx) - - [rental-capacity-mtb](#rental-capacity-mtb) - - [rental-capacity-bicycle_pannier](#rental-capacity-bicycle_pannier) - - [rental-capacity-tandem_bicycle](#rental-capacity-tandem_bicycle) - - [bike_pump_service](#bike_pump_service) - - [bike_repair_tools](#bike_repair_tools) - - [bike_wash](#bike_wash) - - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge) - - [internet](#internet) - - [internet-fee](#internet-fee) - - [internet-ssid](#internet-ssid) - - [organic](#organic) - - [sugar_free](#sugar_free) - - [gluten_free](#gluten_free) - - [lactose_free](#lactose_free) - - [description](#description) - - [leftover-questions](#leftover-questions) - - [move-button](#move-button) - - [delete-button](#delete-button) - - [lod](#lod) -4. [Filters](#filters) - -## Themes using this layer - - - [pets](https://mapcomplete.org/pets) - -## Basic tags for this layer - -Elements must match **all** of the following expressions: - -0. dog=leashed | dog=yes | shop=pet -1. shop~.+ - -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22dog%22%3D%22leashed%22%5D%5B%22shop%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22dog%22%3D%22yes%22%5D%5B%22shop%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22pet%22%5D%5B%22shop%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) - -## Supported attributes - -**Warning:**,this quick overview is incomplete, - -| attribute | type | values which are supported by this layer | ------|-----|----- | -| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [bicycle_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_rental) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) | -| [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | | -| [second_hand](https://wiki.openstreetmap.org/wiki/Key:second_hand) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dno) | -| [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | -| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | -| [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | -| [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | -| [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) | -| [service:binding](https://wiki.openstreetmap.org/wiki/Key:service:binding) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:binding%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:binding%3Dno) | -| [healthcare](https://wiki.openstreetmap.org/wiki/Key:healthcare) | Multiple choice | [optometrist](https://wiki.openstreetmap.org/wiki/Tag:healthcare%3Doptometrist) [audiologist](https://wiki.openstreetmap.org/wiki/Tag:healthcare%3Daudiologist) | -| [service:bicycle:retail](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:retail) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dno) | -| [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly) | -| [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand) | -| [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno) | -| [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet) [cargo_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcargo_bike) | -| [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) | | -| [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate) | -| [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold) | -| [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno) | -| [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) | | -| [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [terminal;wifi](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal;wifi) | -| [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) | -| [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) | -| [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | -| [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | -| [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | -| [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | - -### images -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images -_This tagrendering has no question and is thus read-only_ -*{image_carousel()}{image_upload()}* - -### reviews -Shows the reviews module (including the possibility to leave a review) -_This tagrendering has no question and is thus read-only_ -*{create_review()}{list_reviews()}* - -### shops-name - -The question is `What is the name of this shop?` -*This shop is called {name}* is shown if `name` is set - -### shop_types - -The question is `What kind of shop is this?` -*This is a {shop}* is shown if `shop` is set - - - *Bicycle rental shop* is shown if with shop=bicycle_rental - - *Farm Supply Shop* is shown if with shop=agrarian - - *Liquor Store* is shown if with shop=alcohol - - *Anime / Manga Shop* is shown if with shop=anime - - *Antique Shop* is shown if with shop=antiques - - *Appliance Store* is shown if with shop=appliance - - *Art Store* is shown if with shop=art - - *Baby Goods Store* is shown if with shop=baby_goods - - *Bag/Luggage Store* is shown if with shop=bag - - *Bakery* is shown if with shop=bakery - - *Bathroom Furnishing Store* is shown if with shop=bathroom_furnishing - - *Beauty Shop* is shown if with shop=beauty - - *Bedding/Mattress Store* is shown if with shop=bed - - *Beverage Store* is shown if with shop=beverages - - *Bicycle Shop* is shown if with shop=bicycle - - *Boat Store* is shown if with shop=boat - - *Bookmaker* is shown if with shop=bookmaker - - *Bookstore* is shown if with shop=books - - *Brewing Supply Store* is shown if with shop=brewing_supplies - - *Butcher* is shown if with shop=butcher - - *Camera Equipment Store* is shown if with shop=camera - - *Candle Shop* is shown if with shop=candles - - *Cannabis Shop* is shown if with shop=cannabis - - *Car Dealership* is shown if with shop=car - - *Car Parts Store* is shown if with shop=car_parts - - *Car Repair Shop* is shown if with shop=car_repair - - *RV Dealership* is shown if with shop=caravan - - *Carpet Store* is shown if with shop=carpet - - *Catalog Shop* is shown if with shop=catalogue - - *Charity Store* is shown if with shop=charity - - *Cheese Store* is shown if with shop=cheese - - *Drugstore* is shown if with shop=chemist - - *Chocolate Store* is shown if with shop=chocolate - - *Clothing Store* is shown if with shop=clothes - - *Coffee Store* is shown if with shop=coffee - - *Collectibles Shop* is shown if with shop=collector - - *Computer Store* is shown if with shop=computer - - *Candy Store* is shown if with shop=confectionery - - *Convenience Store* is shown if with shop=convenience - - *Copy Store* is shown if with shop=copyshop - - *Cosmetics Store* is shown if with shop=cosmetics - - *Rural Supplies Store* is shown if with shop=country_store - - *Arts & Crafts Store* is shown if with shop=craft - - *Curtain Store* is shown if with shop=curtain - - *Dairy Store* is shown if with shop=dairy - - *Delicatessen* is shown if with shop=deli - - *Department Store* is shown if with shop=department_store - - *DIY Store* is shown if with shop=doityourself - - *Door Shop* is shown if with shop=doors - - *Dry Cleaner* is shown if with shop=dry_cleaning - - *E-Cigarette Shop* is shown if with shop=e-cigarette - - *Electrical Equipment Store* is shown if with shop=electrical - - *Electronics Store* is shown if with shop=electronics - - *Erotic Store* is shown if with shop=erotic - - *Fabric Store* is shown if with shop=fabric - - *Produce Stand* is shown if with shop=farm - - *Fashion Accessories Store* is shown if with shop=fashion_accessories - - *Fireplace Store* is shown if with shop=fireplace - - *Fishing Shop* is shown if with shop=fishing - - *Flooring Supply Shop* is shown if with shop=flooring - - *Florist* is shown if with shop=florist - - *Framing Shop* is shown if with shop=frame - - *Frozen Food Store* is shown if with shop=frozen_food - - *Fuel Shop* is shown if with shop=fuel - - *Funeral Home* is shown if with shop=funeral_directors - - *Furniture Store* is shown if with shop=furniture - - *Tabletop Game Store* is shown if with shop=games - - *Garden Center* is shown if with shop=garden_centre - - *Bottled Gas Shop* is shown if with shop=gas - - *General Store* is shown if with shop=general - - *Gift Shop* is shown if with shop=gift - - *Greengrocer* is shown if with shop=greengrocer - - *Hairdresser* is shown if with shop=hairdresser - - *Hairdresser Supply Store* is shown if with shop=hairdresser_supply - - *Hardware Store* is shown if with shop=hardware - - *Health Food Store* is shown if with shop=health_food - - *Hearing Aids Store* is shown if with shop=hearing_aids - - *Herbalist* is shown if with shop=herbalist - - *Hifi Store* is shown if with shop=hifi - - *Honey Store* is shown if with shop=honey - - *Household Linen Shop* is shown if with shop=household_linen - - *Houseware Store* is shown if with shop=houseware - - *Hunting Shop* is shown if with shop=hunting - - *Interior Decoration Store* is shown if with shop=interior_decoration - - *Jewelry Store* is shown if with shop=jewelry - - *Kiosk* is shown if with shop=kiosk - - *Kitchen Design Store* is shown if with shop=kitchen - - *Laundry* is shown if with shop=laundry - - *Leather Store* is shown if with shop=leather - - *Lighting Store* is shown if with shop=lighting - - *Locksmith* is shown if with shop=locksmith - - *Lottery Shop* is shown if with shop=lottery - - *Mall* is shown if with shop=mall - - *Massage Shop* is shown if with shop=massage - - *Medical Supply Store* is shown if with shop=medical_supply - - *Military Surplus Store* is shown if with shop=military_surplus - - *Mobile Phone Store* is shown if with shop=mobile_phone - - *Model Shop* is shown if with shop=model - - *Money Lender* is shown if with shop=money_lender - - *Motorcycle Dealership* is shown if with shop=motorcycle - - *Motorcycle Repair Shop* is shown if with shop=motorcycle_repair - - *Music Store* is shown if with shop=music - - *Musical Instrument Store* is shown if with shop=musical_instrument - - *Newsstand* is shown if with shop=newsagent - - *Nutrition Supplements Store* is shown if with shop=nutrition_supplements - - *Nuts Shop* is shown if with shop=nuts - - *Optician* is shown if with shop=optician - - *Outdoors Store* is shown if with shop=outdoor - - *Online Retailer Outpost* is shown if with shop=outpost - - *Paint Store* is shown if with shop=paint - - *Party Supply Store* is shown if with shop=party - - *Pasta Store* is shown if with shop=pasta - - *Pastry Shop* is shown if with shop=pastry - - *Pawnshop* is shown if with shop=pawnbroker - - *Perfume Store* is shown if with shop=perfumery - - *Pet Store* is shown if with shop=pet - - *Pet Groomer* is shown if with shop=pet_grooming - - *Photography Store* is shown if with shop=photo - - *Pottery Store* is shown if with shop=pottery - - *Printer Ink Store* is shown if with shop=printer_ink - - *Psychic* is shown if with shop=psychic - - *Fireworks Store* is shown if with shop=pyrotechnics - - *Radio/Electronic Component Store* is shown if with shop=radiotechnics - - *Religious Store* is shown if with shop=religion - - *Rental Shop* is shown if with shop=rental - - *Repair Shop* is shown if with shop=repair - - *Rice Store* is shown if with shop=rice - - *Scuba Diving Shop* is shown if with shop=scuba_diving - - *Seafood Shop* is shown if with shop=seafood - - *Thrift Store* is shown if with shop=second_hand - - *Sewing Supply Shop* is shown if with shop=sewing - - *Shoe Repair Shop* is shown if with shop=shoe_repair - - *Shoe Store* is shown if with shop=shoes - - *Spice Shop* is shown if with shop=spices - - *Sporting Goods Store* is shown if with shop=sports - - *Stationery Store* is shown if with shop=stationery - - *Storage Rental* is shown if with shop=storage_rental - - *Supermarket* is shown if with shop=supermarket - - *Pool Supply Store* is shown if with shop=swimming_pool - - *Tailor* is shown if with shop=tailor - - *Tattoo Parlor* is shown if with shop=tattoo - - *Tea Store* is shown if with shop=tea - - *Telecom Retail Store* is shown if with shop=telecommunication - - *Ticket Seller* is shown if with shop=ticket - - *Tile Shop* is shown if with shop=tiles - - *Tobacco Shop* is shown if with shop=tobacco - - *Tool Rental* is shown if with shop=tool_hire - - *Toy Store* is shown if with shop=toys - - *Trade Shop* is shown if with shop=trade - - *Travel Agency* is shown if with shop=travel_agency - - *Trophy Shop* is shown if with shop=trophy - - *Tire Store* is shown if with shop=tyres - - *Vacuum Cleaner Store* is shown if with shop=vacuum_cleaner - - *Discount Store* is shown if with shop=variety_store - - *Video Store* is shown if with shop=video - - *Video Game Store* is shown if with shop=video_games - - *Watches Shop* is shown if with shop=watches - - *Drinking Water Shop* is shown if with shop=water - - *Watersport/Swim Shop* is shown if with shop=water_sports - - *Weapon Shop* is shown if with shop=weapons - - *Wholesale Store* is shown if with shop=wholesale - - *Wig Shop* is shown if with shop=wigs - - *Window Blind Store* is shown if with shop=window_blind - - *Wine Shop* is shown if with shop=wine - - *This shop is no longer used. It is vacant* is shown if with disused:shop= - -This tagrendering has labels -`description` - -### brand - -The question is `What is the brand of this shop?` -*Part of {brand}* is shown if `brand` is set - - - *This shop does not have a specific brand, it is not part of a bigger chain* is shown if with not:brand=yes - -### second_hand - -The question is `Does this shop sell second-hand items?` - - - *This shop sells second-hand items only* is shown if with second_hand=only - - *This shop sells second-hand items along with new items* is shown if with second_hand=yes - - *This shop only sells brand-new items* is shown if with second_hand=no - -This tagrendering is only visible in the popup if the following condition is met: shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys - -### opening_hours - -The question is `What are the opening hours of {title()}?` -*

Opening hours

{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set - - - *Marked as closed for an unspecified time* is shown if with opening_hours=closed. _This option cannot be chosen as answer_ - -### website - -The question is `What is the website of {title()}?` -*{website}* is shown if `website` is set - - - *{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### email - -The question is `What is the email address of {title()}?` -*{email}* is shown if `email` is set - - - *{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_ - - *{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### phone - -The question is `What is the phone number of {title()}?` -*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### payment-options - -The question is `Which methods of payment are accepted here?` - - - *Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no - - *Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no - - *Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no - -### repeated - -_This tagrendering has no question and is thus read-only_ -*Multiple, identical objects can be found on floors {repeat_on}.* - -This tagrendering is only visible in the popup if the following condition is met: repeat_on~.+ -This tagrendering has labels -`level` - -### single_level - -The question is `On what level is this feature located?` -*Located on the {level}th floor* is shown if `level` is set - - - *Located underground* is shown if with location=underground. _This option cannot be chosen as answer_ - - *Located on the ground floor* is shown if with level=0 - - *Located on the ground floor* is shown if with level=. _This option cannot be chosen as answer_ - - *Located on the first floor* is shown if with level=1 - - *Located on the first basement level* is shown if with level=-1 - -This tagrendering has labels -`level` - -### copyshop-print-sizes - -The question is `What paper formats does this shop offer?` - - - *This shop can print on papers of size A4* is shown if with service:print:A4=yes. Unselecting this answer will add service:print:A4=no - - *This shop can print on papers of size A3* is shown if with service:print:A3=yes. Unselecting this answer will add service:print:A3=no - - *This shop can print on papers of size A2* is shown if with service:print:A2=yes. Unselecting this answer will add service:print:A2=no - - *This shop can print on papers of size A1* is shown if with service:print:A1=yes. Unselecting this answer will add service:print:A1=no - - *This shop can print on papers of size A0* is shown if with service:print:A0=yes. Unselecting this answer will add service:print:A0=no - -This tagrendering is only visible in the popup if the following condition is met: service:print=yes | shop~^(.*copyshop.*)$ | shop~^(.*stationery.*)$ - -### copyshop-binding - -The question is `Does this shop offer a binding service?` - - - *This shop binds papers into a booklet* is shown if with service:binding=yes - - *This shop does bind books* is shown if with service:binding=no - -This tagrendering is only visible in the popup if the following condition is met: service:print=yes | shop~^(.*copyshop.*)$ | shop~^(.*stationery.*)$ - -### optometrist_service - -The question is `Are medical services available here?` - - - *This shop offers eye exams by certified optometrists* is shown if with healthcare=optometrist. Unselecting this answer will add not:healtcare=optometrist - - *This shop offers hearing tests by a certified audiologist* is shown if with healthcare=audiologist. Unselecting this answer will add not:healthcare=audiologist - -This tagrendering is only visible in the popup if the following condition is met: shop=optician | shop=hearing_aid | shop=medical_supply - -### key_cutter - -The question is `Does this shop offer key cutting?` - - - *This shop is also specialized in key cutting* is shown if with craft=key_cutter - - *This shop offers key cutting as a service* is shown if with service:key_cutting=yes - - *This shops does not offer key cutting as a service* is shown if with craft= & service:key_cutting=no - -This tagrendering is only visible in the popup if the following condition is met: craft=key_cutting | shop=shoe_repair | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair | service:key_cutting~.+ - -### sells_new_bikes - -The question is `Does this shop sell bikes?` - - - *This shop sells new bikes* is shown if with service:bicycle:retail=yes - - *This shop doesn't sell new bikes* is shown if with service:bicycle:retail=no - -This tagrendering is only visible in the popup if the following condition is met: shop=outdoor | shop=sport | shop=sports | shop=diy | shop=doityourself | service:bicycle:retail~.+ - -### bike_second_hand - -The question is `Does this shop sell second-hand bikes?` - - - *This shop sells second-hand bikes* is shown if with service:bicycle:second_hand=yes - - *This shop doesn't sell second-hand bikes* is shown if with service:bicycle:second_hand=no - - *This shop only sells second-hand bikes* is shown if with service:bicycle:second_hand=only - -This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair | service:bicycle:second_hand~.+ - -### repairs_bikes - -The question is `Does this shop repair bikes?` - - - *This shop repairs bikes* is shown if with service:bicycle:repair=yes - - *This shop doesn't repair bikes* is shown if with service:bicycle:repair=no - - *This shop only repairs bikes bought here* is shown if with service:bicycle:repair=only_sold - - *This shop only repairs bikes of a certain brand* is shown if with service:bicycle:repair=brand - -This tagrendering is only visible in the popup if the following condition is met: service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only | shop=sport | shop=sports | shop=outdoor | shop=bicycle | service:bicycle:repair~.+ - -### bicycle_rental - -The question is `Does this shop rent out bikes?` - - - *This shop rents out bikes* is shown if with service:bicycle:rental=yes - - *This shop doesn't rent out bikes* is shown if with service:bicycle:rental=no - -This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=sport | shop=sports | shop=bicycle_repair | shop=outdoor | shop=rental | service:bicycle:rental~.+ - -### bicycle-types - -The question is `What kind of bicycles and accessories are rented here?` -*{rental} is rented here* is shown if `rental` is set - - - *Normal city bikes can be rented here* is shown if with rental=city_bike - - *Electrical bikes can be rented here* is shown if with rental=ebike - - *BMX bikes can be rented here* is shown if with rental=bmx - - *Mountainbikes can be rented here* is shown if with rental=mtb - - *Bikes for children can be rented here* is shown if with rental=kid_bike - - *Tandem bicycles can be rented here* is shown if with rental=tandem - - *Race bicycles can be rented here* is shown if with rental=racebike - - *Bike helmets can be rented here* is shown if with rental=bike_helmet - - *Cargo bikes can be rented here* is shown if with rental=cargo_bike - -This tagrendering is only visible in the popup if the following condition is met: service:bicycle:rental=yes | bicycle_rental~.+ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-city_bike - -The question is `How many city bikes can be rented here?` -*{capacity:city_bike} city bikes can be rented here* is shown if `capacity:city_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*city_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-ebike - -The question is `How many electrical bikes can be rented here?` -*{capacity:ebike} electrical bikes can be rented here* is shown if `capacity:ebike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*ebike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-kid_bike - -The question is `How many bikes for children can be rented here?` -*{capacity:kid_bike} bikes for children can be rented here* is shown if `capacity:kid_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*kid_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bmx - -The question is `How many BMX bikes can be rented here?` -*{capacity:bmx} BMX bikes can be rented here* is shown if `capacity:bmx` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bmx.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-mtb - -The question is `How many mountainbikes can be rented here?` -*{capacity:mtb} mountainbikes can be rented here* is shown if `capacity:mtb` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*mtb.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bicycle_pannier - -The question is `How many bicycle panniers can be rented here?` -*{capacity:bicycle_pannier} bicycle panniers can be rented here* is shown if `capacity:bicycle_pannier` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bicycle_pannier.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-tandem_bicycle - -The question is `How many tandem can be rented here?` -*{capacity:tandem_bicycle} tandem can be rented here* is shown if `capacity:tandem_bicycle` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*tandem_bicycle.*)$ -This tagrendering has labels -`bicycle_rental` - -### bike_pump_service - -The question is `Does this shop offer a bike pump for use by anyone?` - - - *This shop offers a bike pump for anyone* is shown if with service:bicycle:pump=yes - - *This shop doesn't offer a bike pump for anyone* is shown if with service:bicycle:pump=no - - *There is bicycle pump, it is shown as a separate point* is shown if with service:bicycle:pump=separate - -This tagrendering is only visible in the popup if the following condition is met: service:bicycle:retail=yes | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.+)$~~^(yes)$ | service:bicycle:pump~.+ - -### bike_repair_tools - -The question is `Are there tools here to repair your own bike?` - - - *This shop offers tools for DIY bicycle repair* is shown if with service:bicycle:diy=yes - - *This shop doesn't offer tools for DIY bicycle repair* is shown if with service:bicycle:diy=no - - *Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop* is shown if with service:bicycle:diy=only_sold - -This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=bicycle_repair | service:bicycle:diy~.+ | service:bicycle:repair~^(yes|only)$ - -### bike_wash - -The question is `Are bicycles washed here?` - - - *This shop cleans bicycles* is shown if with service:bicycle:cleaning=yes - - *This shop has an installation where one can clean bicycles themselves* is shown if with service:bicycle:cleaning=diy - - *This shop doesn't offer bicycle cleaning* is shown if with service:bicycle:cleaning=no - -This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$ | service:bicycle:cleaning~.+ - -### bike_cleaning-service_bicycle_cleaning_charge - -The question is `How much does it cost to use the cleaning service?` -*Using the cleaning service costs {service:bicycle:cleaning:charge}* is shown if `service:bicycle:cleaning:charge` is set - - - *The cleaning service is free to use* is shown if with service:bicycle:cleaning:fee=no - - *Free to use* is shown if with service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge=. _This option cannot be chosen as answer_ - -This tagrendering is only visible in the popup if the following condition is met: amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+ - -### internet - -The question is `Does this place offer internet access?` - - - *This place offers wireless internet access* is shown if with internet_access=wlan - - *This place does not offer internet access* is shown if with internet_access=no - - *This place offers internet access* is shown if with internet_access=yes. _This option cannot be chosen as answer_ - - *This place offers internet access via a terminal or computer* is shown if with internet_access=terminal - - *This place offers wired internet access* is shown if with internet_access=wired - - *This place offers both wireless internet and internet access via a terminal or computer* is shown if with internet_access=terminal;wifi - -This tagrendering has labels -`internet-all` - -### internet-fee - -The question is `Is there a fee for internet access?` - - - *There is a fee for the internet access at this place* is shown if with internet_access:fee=yes - - *Internet access is free at this place* is shown if with internet_access:fee=no - - *Internet access is free at this place, for customers only* is shown if with internet_access:fee=customers - -This tagrendering is only visible in the popup if the following condition is met: internet_access!=no & internet_access~.+ -This tagrendering has labels -`internet-all` - -### internet-ssid - -The question is `What is the network name for the wireless internet access?` -*The network name is {internet_access:ssid}* is shown if `internet_access:ssid` is set - - - *Telekom* is shown if with internet_access:ssid=Telekom - -This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ -This tagrendering has labels -`internet-all` - -### organic - -The question is `Does this shop offer organic products?` - - - *This shop offers organic products* is shown if with organic=yes - - *This shop only offers organic products* is shown if with organic=only - - *This shop does not offer organic products* is shown if with organic=no - -This tagrendering is only visible in the popup if the following condition is met: shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=clothes | shop=shoes | shop=butcher | shop=cosmetics | shop=deli | shop=bakery | shop=alcohol | shop=seafood | shop=beverages | shop=florist - -### sugar_free - -The question is `Does this shop have a sugar free offering?` - - - *This shop only sells sugar free products* is shown if with diet:sugar_free=only - - *This shop has a big sugar free offering* is shown if with diet:sugar_free=yes - - *This shop has a limited sugar free offering* is shown if with diet:sugar_free=limited - - *This shop has no sugar free offering* is shown if with diet:sugar_free=no - -This tagrendering is only visible in the popup if the following condition is met: shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream -This tagrendering has labels -`diets` - -### gluten_free - -The question is `Does this shop have a gluten free offering?` - - - *This shop only sells gluten free products* is shown if with diet:gluten_free=only - - *This shop has a big gluten free offering* is shown if with diet:gluten_free=yes - - *This shop has a limited gluten free offering* is shown if with diet:gluten_free=limited - - *This shop has no gluten free offering* is shown if with diet:gluten_free=no - -This tagrendering is only visible in the popup if the following condition is met: shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream -This tagrendering has labels -`diets` - -### lactose_free - -The question is `Does {title()} have a lactose-free offering?` - - - *Only sells lactose free products* is shown if with diet:lactose_free=only - - *Big lactose free offering* is shown if with diet:lactose_free=yes - - *Limited lactose free offering* is shown if with diet:lactose_free=limited - - *No lactose free offering* is shown if with diet:lactose_free=no - -This tagrendering is only visible in the popup if the following condition is met: shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream -This tagrendering has labels -`diets` - -### description - -The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` -*{description}* is shown if `description` is set - -### leftover-questions - -_This tagrendering has no question and is thus read-only_ -*{questions( ,)}* - -### move-button - -_This tagrendering has no question and is thus read-only_ -*{move_button()}* - -### delete-button - -_This tagrendering has no question and is thus read-only_ -*{delete_button()}* - -### lod - -_This tagrendering has no question and is thus read-only_ -*{linked_data_from_website()}* - -This tagrendering has labels -`added_by_default` - -## Filters - -| id | question | osmTags | ------|-----|----- | -| second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | - -| id | question | osmTags | ------|-----|----- | -| has_organic.0 | Has organic options | organic=yes | organic=only | - -| id | question | osmTags | ------|-----|----- | -| shop_types.0 | *What kind of shop is this?* (default) | | -| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) | -| shop_types.2 | Farm Supply Shop | shop=agrarian | -| shop_types.3 | Liquor Store | shop=alcohol | -| shop_types.4 | Anime / Manga Shop | shop=anime | -| shop_types.5 | Antique Shop | shop=antiques | -| shop_types.6 | Appliance Store | shop=appliance | -| shop_types.7 | Art Store | shop=art | -| shop_types.8 | Baby Goods Store | shop=baby_goods | -| shop_types.9 | Bag/Luggage Store | shop=bag | -| shop_types.10 | Bakery | shop=bakery | -| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | -| shop_types.12 | Beauty Shop | shop=beauty | -| shop_types.13 | Bedding/Mattress Store | shop=bed | -| shop_types.14 | Beverage Store | shop=beverages | -| shop_types.15 | Bicycle Shop | shop=bicycle | -| shop_types.16 | Boat Store | shop=boat | -| shop_types.17 | Bookmaker | shop=bookmaker | -| shop_types.18 | Bookstore | shop=books | -| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | -| shop_types.20 | Butcher | shop=butcher | -| shop_types.21 | Camera Equipment Store | shop=camera | -| shop_types.22 | Candle Shop | shop=candles | -| shop_types.23 | Cannabis Shop | shop=cannabis | -| shop_types.24 | Car Dealership | shop=car | -| shop_types.25 | Car Parts Store | shop=car_parts | -| shop_types.26 | Car Repair Shop | shop=car_repair | -| shop_types.27 | RV Dealership | shop=caravan | -| shop_types.28 | Carpet Store | shop=carpet | -| shop_types.29 | Catalog Shop | shop=catalogue | -| shop_types.30 | Charity Store | shop=charity | -| shop_types.31 | Cheese Store | shop=cheese | -| shop_types.32 | Drugstore | shop=chemist | -| shop_types.33 | Chocolate Store | shop=chocolate | -| shop_types.34 | Clothing Store | shop=clothes | -| shop_types.35 | Coffee Store | shop=coffee | -| shop_types.36 | Collectibles Shop | shop=collector | -| shop_types.37 | Computer Store | shop=computer | -| shop_types.38 | Candy Store | shop=confectionery | -| shop_types.39 | Convenience Store | shop=convenience | -| shop_types.40 | Copy Store | shop=copyshop | -| shop_types.41 | Cosmetics Store | shop=cosmetics | -| shop_types.42 | Rural Supplies Store | shop=country_store | -| shop_types.43 | Arts & Crafts Store | shop=craft | -| shop_types.44 | Curtain Store | shop=curtain | -| shop_types.45 | Dairy Store | shop=dairy | -| shop_types.46 | Delicatessen | shop=deli | -| shop_types.47 | Department Store | shop=department_store | -| shop_types.48 | DIY Store | shop=doityourself | -| shop_types.49 | Door Shop | shop=doors | -| shop_types.50 | Dry Cleaner | shop=dry_cleaning | -| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | -| shop_types.52 | Electrical Equipment Store | shop=electrical | -| shop_types.53 | Electronics Store | shop=electronics | -| shop_types.54 | Erotic Store | shop=erotic | -| shop_types.55 | Fabric Store | shop=fabric | -| shop_types.56 | Produce Stand | shop=farm | -| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | -| shop_types.58 | Fireplace Store | shop=fireplace | -| shop_types.59 | Fishing Shop | shop=fishing | -| shop_types.60 | Flooring Supply Shop | shop=flooring | -| shop_types.61 | Florist | shop=florist | -| shop_types.62 | Framing Shop | shop=frame | -| shop_types.63 | Frozen Food Store | shop=frozen_food | -| shop_types.64 | Fuel Shop | shop=fuel | -| shop_types.65 | Funeral Home | shop=funeral_directors | -| shop_types.66 | Furniture Store | shop=furniture | -| shop_types.67 | Tabletop Game Store | shop=games | -| shop_types.68 | Garden Center | shop=garden_centre | -| shop_types.69 | Bottled Gas Shop | shop=gas | -| shop_types.70 | General Store | shop=general | -| shop_types.71 | Gift Shop | shop=gift | -| shop_types.72 | Greengrocer | shop=greengrocer | -| shop_types.73 | Hairdresser | shop=hairdresser | -| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | -| shop_types.75 | Hardware Store | shop=hardware | -| shop_types.76 | Health Food Store | shop=health_food | -| shop_types.77 | Hearing Aids Store | shop=hearing_aids | -| shop_types.78 | Herbalist | shop=herbalist | -| shop_types.79 | Hifi Store | shop=hifi | -| shop_types.80 | Honey Store | shop=honey | -| shop_types.81 | Household Linen Shop | shop=household_linen | -| shop_types.82 | Houseware Store | shop=houseware | -| shop_types.83 | Hunting Shop | shop=hunting | -| shop_types.84 | Interior Decoration Store | shop=interior_decoration | -| shop_types.85 | Jewelry Store | shop=jewelry | -| shop_types.86 | Kiosk | shop=kiosk | -| shop_types.87 | Kitchen Design Store | shop=kitchen | -| shop_types.88 | Laundry | shop=laundry | -| shop_types.89 | Leather Store | shop=leather | -| shop_types.90 | Lighting Store | shop=lighting | -| shop_types.91 | Locksmith | shop=locksmith | -| shop_types.92 | Lottery Shop | shop=lottery | -| shop_types.93 | Mall | shop=mall | -| shop_types.94 | Massage Shop | shop=massage | -| shop_types.95 | Medical Supply Store | shop=medical_supply | -| shop_types.96 | Military Surplus Store | shop=military_surplus | -| shop_types.97 | Mobile Phone Store | shop=mobile_phone | -| shop_types.98 | Model Shop | shop=model | -| shop_types.99 | Money Lender | shop=money_lender | -| shop_types.100 | Motorcycle Dealership | shop=motorcycle | -| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | -| shop_types.102 | Music Store | shop=music | -| shop_types.103 | Musical Instrument Store | shop=musical_instrument | -| shop_types.104 | Newsstand | shop=newsagent | -| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | -| shop_types.106 | Nuts Shop | shop=nuts | -| shop_types.107 | Optician | shop=optician | -| shop_types.108 | Outdoors Store | shop=outdoor | -| shop_types.109 | Online Retailer Outpost | shop=outpost | -| shop_types.110 | Paint Store | shop=paint | -| shop_types.111 | Party Supply Store | shop=party | -| shop_types.112 | Pasta Store | shop=pasta | -| shop_types.113 | Pastry Shop | shop=pastry | -| shop_types.114 | Pawnshop | shop=pawnbroker | -| shop_types.115 | Perfume Store | shop=perfumery | -| shop_types.116 | Pet Store | shop=pet | -| shop_types.117 | Pet Groomer | shop=pet_grooming | -| shop_types.118 | Photography Store | shop=photo | -| shop_types.119 | Pottery Store | shop=pottery | -| shop_types.120 | Printer Ink Store | shop=printer_ink | -| shop_types.121 | Psychic | shop=psychic | -| shop_types.122 | Fireworks Store | shop=pyrotechnics | -| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | -| shop_types.124 | Religious Store | shop=religion | -| shop_types.125 | Rental Shop | shop=rental | -| shop_types.126 | Repair Shop | shop=repair | -| shop_types.127 | Rice Store | shop=rice | -| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | -| shop_types.129 | Seafood Shop | shop=seafood | -| shop_types.130 | Thrift Store | shop=second_hand | -| shop_types.131 | Sewing Supply Shop | shop=sewing | -| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | -| shop_types.133 | Shoe Store | shop=shoes | -| shop_types.134 | Spice Shop | shop=spices | -| shop_types.135 | Sporting Goods Store | shop=sports | -| shop_types.136 | Stationery Store | shop=stationery | -| shop_types.137 | Storage Rental | shop=storage_rental | -| shop_types.138 | Supermarket | shop=supermarket | -| shop_types.139 | Pool Supply Store | shop=swimming_pool | -| shop_types.140 | Tailor | shop=tailor | -| shop_types.141 | Tattoo Parlor | shop=tattoo | -| shop_types.142 | Tea Store | shop=tea | -| shop_types.143 | Telecom Retail Store | shop=telecommunication | -| shop_types.144 | Ticket Seller | shop=ticket | -| shop_types.145 | Tile Shop | shop=tiles | -| shop_types.146 | Tobacco Shop | shop=tobacco | -| shop_types.147 | Tool Rental | shop=tool_hire | -| shop_types.148 | Toy Store | shop=toys | -| shop_types.149 | Trade Shop | shop=trade | -| shop_types.150 | Travel Agency | shop=travel_agency | -| shop_types.151 | Trophy Shop | shop=trophy | -| shop_types.152 | Tire Store | shop=tyres | -| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | -| shop_types.154 | Discount Store | shop=variety_store | -| shop_types.155 | Video Store | shop=video | -| shop_types.156 | Video Game Store | shop=video_games | -| shop_types.157 | Watches Shop | shop=watches | -| shop_types.158 | Drinking Water Shop | shop=water | -| shop_types.159 | Watersport/Swim Shop | shop=water_sports | -| shop_types.160 | Weapon Shop | shop=weapons | -| shop_types.161 | Wholesale Store | shop=wholesale | -| shop_types.162 | Wig Shop | shop=wigs | -| shop_types.163 | Window Blind Store | shop=window_blind | -| shop_types.164 | Wine Shop | shop=wine | -| shop_types.165 | This shop is no longer used. It is vacant | disused:shop= | (shop=disused | shop=vacant | disused:shop~^(.+)$ | abandoned:shop~^(.+)$) | - -| id | question | osmTags | ------|-----|----- | -| open_now.0 | Now open | _isOpen=yes | - -| id | question | osmTags | ------|-----|----- | -| accepts_cash.0 | Accepts cash | payment:cash=yes | - -| id | question | osmTags | ------|-----|----- | -| accepts_cards.0 | Accepts payment cards | payment:cards=yes | - -| id | question | osmTags | ------|-----|----- | -| has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | - -| id | question | osmTags | ------|-----|----- | -| sugar_free.0 | Has a sugar-free offering | diet:sugar_free=yes | diet:sugar_free=only | diet:sugar_free=limited | - -| id | question | osmTags | ------|-----|----- | -| gluten_free.0 | Has a gluten free offering | diet:gluten_free=yes | diet:gluten_free=only | diet:gluten_free=limited | - -| id | question | osmTags | ------|-----|----- | -| lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited | - - - -This document is autogenerated from [assets/themes/pets/pets.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/pets/pets.json) diff --git a/Docs/Layers/kindergarten_childcare.md b/Docs/Layers/kindergarten_childcare.md deleted file mode 100644 index 72ceb7abae..0000000000 --- a/Docs/Layers/kindergarten_childcare.md +++ /dev/null @@ -1,153 +0,0 @@ -[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) - -# kindergarten_childcare - -Shows kindergartens and preschools. Both are grouped in one layer, as they are regularly confused with each other - - - This layer is shown at zoomlevel **12** and higher - -## Table of contents - -1. [Themes using this layer](#themes-using-this-layer) -2. [Presets](#presets) -3. [Basic tags for this layer](#basic-tags-for-this-layer) -4. [Supported attributes](#supported-attributes) - - [childcare-type](#childcare-type) - - [name](#name) - - [website](#website) - - [email](#email) - - [phone](#phone) - - [opening_hours](#opening_hours) - - [Opening hours](#opening-hours) - - [capacity](#capacity) - - [leftover-questions](#leftover-questions) - - [move-button](#move-button) - - [delete-button](#delete-button) - - [lod](#lod) -5. [Filters](#filters) - -## Themes using this layer - - - [education](https://mapcomplete.org/education) - - [personal](https://mapcomplete.org/personal) - -## Presets - -The following options to create new points are included: - - - **a kindergarten** which has the following tags:amenity=kindergarten & isced:level=0 & isced:2011:level=early_childhood - - **a childcare** which has the following tags:amenity=kindergarten - -## Basic tags for this layer - -Elements must match **any** of the following expressions: - - - amenity=childcare - - amenity=kindergarten - - isced:level:2011=early_childhood - -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22childcare%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22kindergarten%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22isced%3Alevel%3A2011%22%3D%22early_childhood%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) - -## Supported attributes - -**Warning:**,this quick overview is incomplete, - -| attribute | type | values which are supported by this layer | ------|-----|----- | -| [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [kindergarten](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten) [childcare](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dchildcare) | -| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | -| [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | -| [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | -| [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | -| [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | | - -### childcare-type - -The question is `What type of facility is this?` - - - *This is a kindergarten (also known as preschool) where small kids receive early education.* is shown if with amenity=kindergarten - - *This is a childcare facility, such as a nursery or daycare where small kids are looked after. They do not offer an education and are ofter run as private businesses* is shown if with amenity=childcare - -### name - -The question is `What is the name of this facility?` -*This facility is named {name}* is shown if `name` is set - -### website - -The question is `What is the website of {title()}?` -*{website}* is shown if `website` is set - - - *{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### email - -The question is `What is the email address of {title()}?` -*{email}* is shown if `email` is set - - - *{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_ - - *{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### phone - -The question is `What is the phone number of {title()}?` -*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ - -This tagrendering has labels -`contact` - -### opening_hours - -The question is `When is this childcare opened?` -*

Opening hours

{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set - - - *Marked as closed for an unspecified time* is shown if with opening_hours=closed. _This option cannot be chosen as answer_ - -This tagrendering is only visible in the popup if the following condition is met: amenity=childcare - -### capacity - -The question is `How much kids (at most) can be enrolled here?` -*This facility has room for {capacity} kids* is shown if `capacity` is set - -### leftover-questions - -_This tagrendering has no question and is thus read-only_ -*{questions( ,)}* - -### move-button - -_This tagrendering has no question and is thus read-only_ -*{move_button()}* - -### delete-button - -_This tagrendering has no question and is thus read-only_ -*{delete_button()}* - -### lod - -_This tagrendering has no question and is thus read-only_ -*{linked_data_from_website()}* - -This tagrendering has labels -`added_by_default` - -## Filters - -| id | question | osmTags | ------|-----|----- | -| open_now.0 | Now open | _isOpen=yes | - - - -This document is autogenerated from [assets/layers/kindergarten_childcare/kindergarten_childcare.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/kindergarten_childcare/kindergarten_childcare.json) diff --git a/Docs/Layers/medical_shops.md b/Docs/Layers/medical_shops.md index 88ccb7f30b..899ed496a0 100644 --- a/Docs/Layers/medical_shops.md +++ b/Docs/Layers/medical_shops.md @@ -55,6 +55,7 @@ A shop - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -123,6 +124,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -687,6 +689,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -914,6 +926,12 @@ This tagrendering has labels -----|-----|----- | | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + This document is autogenerated from [assets/themes/healthcare/healthcare.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/healthcare/healthcare.json) diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md index 5e8d49c1ef..c51a21f151 100644 --- a/Docs/Layers/osm_community_index.md +++ b/Docs/Layers/osm_community_index.md @@ -9,7 +9,7 @@ A layer showing the OpenStreetMap Communities This layer is loaded from an external source, namely -`https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson` +`https://data.mapcomplete.org/community-index/tile_{z}_{x}_{y}.geojson` ## Table of contents diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md index 98a668010a..51ba6eb6ee 100644 --- a/Docs/Layers/school.md +++ b/Docs/Layers/school.md @@ -21,6 +21,7 @@ Schools giving primary and secondary education and post-secondary, non-tertiary - [website](#website) - [capacity](#capacity) - [education-level-belgium](#education-level-belgium) + - [orientation_belgium](#orientation_belgium) - [gender](#gender) - [pedagogy](#pedagogy) - [target-audience](#target-audience) @@ -40,12 +41,16 @@ Schools giving primary and secondary education and post-secondary, non-tertiary The following options to create new points are included: - **a primary or secondary school** which has the following tags:amenity=school & fixme=Added with MapComplete, the precise geometry should still be drawn + - **a kindergarten** which has the following tags:amenity=kindergarten & school=kindergarten & isced:level=0 ## Basic tags for this layer -Elements must match the expression **amenity=school** +Elements must match **any** of the following expressions: -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) + - amenity=school + - amenity=kindergarten + +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22kindergarten%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) ## Supported attributes @@ -59,9 +64,10 @@ Elements must match the expression ** [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | | [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | | | [school](https://wiki.openstreetmap.org/wiki/Key:school) | Multiple choice | [kindergarten](https://wiki.openstreetmap.org/wiki/Tag:school%3Dkindergarten) [primary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dprimary) [secondary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dsecondary) [lower_secondary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dlower_secondary) [middle_secondary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dmiddle_secondary) [upper_secondary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dupper_secondary) [post_secondary](https://wiki.openstreetmap.org/wiki/Tag:school%3Dpost_secondary) | +| [school:orientation](https://wiki.openstreetmap.org/wiki/Key:school:orientation) | Multiple choice | [academic](https://wiki.openstreetmap.org/wiki/Tag:school:orientation%3Dacademic) [professional](https://wiki.openstreetmap.org/wiki/Tag:school:orientation%3Dprofessional) [vocational](https://wiki.openstreetmap.org/wiki/Tag:school:orientation%3Dvocational) | | [school:gender](https://wiki.openstreetmap.org/wiki/Key:school:gender) | Multiple choice | [mixed](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmixed) [separated](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dseparated) [male](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmale) [female](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dfemale) | | [pedagogy](https://wiki.openstreetmap.org/wiki/Key:pedagogy) | [string](../SpecialInputElements.md#string) | [mainstream](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dmainstream) [montessori](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dmontessori) [freinet](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dfreinet) [jenaplan](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Djenaplan) [waldorf](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dwaldorf) [dalton](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Ddalton) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Doutdoor) [reggio_emilia](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dreggio_emilia) [sudbury](https://wiki.openstreetmap.org/wiki/Tag:pedagogy%3Dsudbury) | -| [school:for](https://wiki.openstreetmap.org/wiki/Key:school:for) | [string](../SpecialInputElements.md#string) | [mainstream](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dmainstream) [adults](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dadults) [autism](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dautism) [learning_disabilities](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dlearning_disabilities) [blind](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dblind) [deaf](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Ddeaf) [disabilities](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Ddisabilities) [special_needs](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dspecial_needs) | +| [school:for](https://wiki.openstreetmap.org/wiki/Key:school:for) | [string](../SpecialInputElements.md#string) | [mainstream](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dmainstream) [learning_disabilities](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dlearning_disabilities) [blind](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dblind) [deaf](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Ddeaf) [disabilities](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Ddisabilities) [special_needs](https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dspecial_needs) | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -123,6 +129,16 @@ The question is `What level of education is given on this school?` This tagrendering is only visible in the popup if the following condition is met: _country=be +### orientation_belgium + +The question is `What does this school train pupils for?` + + - *Prepares for an academic study at university* is shown if with school:orientation=academic + - *Prepares for a professional study at a college* is shown if with school:orientation=professional + - *Prepares for a job* is shown if with school:orientation=vocational + +This tagrendering is only visible in the popup if the following condition is met: school~^((.+;)?upper_secondary(;.+)?)$ | school~^((.+;)?secondary(;.+)?)$ + ### gender The question is `Which genders can enroll at this school?` @@ -152,18 +168,13 @@ The question is `What educational theory is applied on this school?` The question is `Does this school target students with a special need? Which structural facilities does this school have?` *This school has facilities for students with {school:for}* is shown if `school:for` is set - - *This is a school where students study skills at their age-adequate level.
There are little or no special facilities to cater for students with special needs or facilities are ad-hoc
* is shown if with school:for=. _This option cannot be chosen as answer_ - *This is a school for students without special needs
This includes students who can follow the courses with small, ad hoc measurements
* is shown if with school:for=mainstream - - *This is a school where adults are taught skills on the level as specified.* is shown if with school:for=adults - - *This is a school for students with autism* is shown if with school:for=autism - *This is a school for students with learning disabilities* is shown if with school:for=learning_disabilities - *This is a school for blind students or students with sight impairments* is shown if with school:for=blind - *This is a school for deaf students or students with hearing impairments* is shown if with school:for=deaf - *This is a school for students with disabilities* is shown if with school:for=disabilities - *This is a school for students with special needs* is shown if with school:for=special_needs -This tagrendering is only visible in the popup if the following condition is met: school:for~.+ - ### school-language _This tagrendering has no question and is thus read-only_ @@ -204,14 +215,15 @@ This tagrendering has labels | id | question | osmTags | -----|-----|----- | -| education-level-belgium.0 | *What level of education is given on this school?* (default) | | -| education-level-belgium.1 | This is a school with a kindergarten section where young kids receive some education which prepares reading and writing. | school~^(.+;)?kindergarten(;.+)$ | -| education-level-belgium.2 | This is a school where one learns primary skills such as basic literacy and numerical skills.
Pupils typically enroll from 6 years old till 12 years old
| school~^(.+;)?primary(;.+)$ | -| education-level-belgium.3 | This is a secondary school which offers all grades | school~^(.+;)?secondary(;.+)$ | -| education-level-belgium.4 | This is a secondary school which does not have all grades, but offers first and second grade | school~^(.+;)?lower_secondary(;.+)$ | -| education-level-belgium.5 | This is a secondary school which does not have all grades, but offers third and fourth grade | school~^(.+;)?middle_secondary(;.+)$ | -| education-level-belgium.6 | This is a secondary school which does not have all grades, but offers fifth and sixth grade | school~^(.+;)?upper_secondary(;.+)$ | -| education-level-belgium.7 | This school offers post-secondary education (e.g. a seventh or eight specialisation year) | school~^(.+;)?post_secondary(;.+)$ | +| level.0 | *All levels of education* (default) | | +| level.1 | Has a kindergarten | school~^((.+;)?kindergarten(;.+)?)$ | amenity=kindergarten | +| level.2 | Primary school | school~^((.+;)?primary(;.+)?)$ | +| level.3 | Secondary school with all grades | school~^((.+;)?secondary(;.+)?)$ | +| level.4 | Has first grade | school~^((.+;)?lower_secondary(;.+)?)$ | school~^((.+;)?secondary(;.+)?)$ | +| level.5 | Has second grade | school~^((.+;)?middle_secondary(;.+)?)$ | school~^((.+;)?secondary(;.+)?)$ | +| level.6 | Has third grade | school~^((.+;)?upper_secondary(;.+)?)$ | school~^((.+;)?secondary(;.+)?)$ | +| level.7 | This school offers post-secondary education (e.g. a seventh or eight specialisation year) | school~^(.+;)?post_secondary(;.+)$ | +| level.8 | Unknown school level | school= & amenity!=kindergarten | diff --git a/Docs/Layers/scouting_group.md b/Docs/Layers/scouting_group.md index 3b55b6ec44..6fb3a85d7c 100644 --- a/Docs/Layers/scouting_group.md +++ b/Docs/Layers/scouting_group.md @@ -124,17 +124,20 @@ This tagrendering has labels | brand.0 | *brand* (default) | | | brand.1 | Associação de Escuteiros de Angola | brand=Associação de Escuteiros de Angola | brand:wikidata=Q4810279 | | brand.2 | Bund der Pfadfinderinnen und Pfadfinder | brand=Bund der Pfadfinderinnen und Pfadfinder | brand:wikidata=Q1005225 | -| brand.3 | Deutsche Pfadfinderschaft Sankt Georg | brand=Deutsche Pfadfinderschaft Sankt Georg | brand:wikidata=Q1203670 | -| brand.4 | Girl Scouts | brand=Girl Scouts | brand:wikidata=Q2576280 | name=Girl Scouts | -| brand.5 | Norges KFUK-KFUM-speidere | brand=Norges KFUK-KFUM-speidere | brand:wikidata=Q8046067 | -| brand.6 | Norges speiderforbund | brand=Norges speiderforbund | brand:wikidata=Q1769346 | -| brand.7 | Scoutisme Béninois | brand=Scoutisme Béninois | brand:wikidata=Q13534588 | -| brand.8 | Scouts South Africa | brand=Scouts South Africa | brand:wikidata=Q7565791 | -| brand.9 | The Botswana Scouts Association | brand=The Botswana Scouts Association | brand:wikidata=Q7719478 | -| brand.10 | The Scout Association | brand=The Scout Association | brand:wikidata=Q849740 | name=The Scout Association | -| brand.11 | Verband Christlicher Pfadfinder*innen | brand=Verband Christlicher Pfadfinder*innen | brand:wikidata=Q1316309 | -| brand.12 | 香港女童軍總會 Hong Kong Girl Guides Association | brand=香港女童軍總會 | brand:en=Hong Kong Girl Guides Association | brand:wikidata=Q5894627 | brand:zh=香港女童軍總會 | brand:zh-Hans=香港女童军总会 | brand:zh-Hant=香港女童軍總會 | -| brand.13 | 香港童軍總會 Scout Association of Hong Kong | brand=香港童軍總會 Scout Association of Hong Kong | brand:en=Scout Association of Hong Kong | brand:wikidata=Q1883585 | brand:zh=香港童軍總會 | brand:zh-Hans=香港童军总会 | brand:zh-Hant=香港童軍總會 | +| brand.3 | Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands | brand=Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands | brand:wikidata=Q16318690 | +| brand.4 | Deutsche Pfadfinderschaft Sankt Georg | brand=Deutsche Pfadfinderschaft Sankt Georg | brand:wikidata=Q1203670 | +| brand.5 | Girl Scouts | brand=Girl Scouts | brand:wikidata=Q2576280 | name=Girl Scouts | +| brand.6 | Norges KFUK-KFUM-speidere | brand=Norges KFUK-KFUM-speidere | brand:wikidata=Q8046067 | +| brand.7 | Norges speiderforbund | brand=Norges speiderforbund | brand:wikidata=Q1769346 | +| brand.8 | Pfadfinderbund Weltenbummler | brand=Pfadfinderbund Weltenbummler | brand:wikidata=Q1755705 | +| brand.9 | Pfadfinderinnenschaft St. Georg | brand=Pfadfinderinnenschaft St. Georg | brand:wikidata=Q2081993 | +| brand.10 | Scoutisme Béninois | brand=Scoutisme Béninois | brand:wikidata=Q13534588 | +| brand.11 | Scouts South Africa | brand=Scouts South Africa | brand:wikidata=Q7565791 | +| brand.12 | The Botswana Scouts Association | brand=The Botswana Scouts Association | brand:wikidata=Q7719478 | +| brand.13 | The Scout Association | brand=The Scout Association | brand:wikidata=Q849740 | name=The Scout Association | +| brand.14 | Verband Christlicher Pfadfinder*innen | brand=Verband Christlicher Pfadfinder*innen | brand:wikidata=Q1316309 | +| brand.15 | 香港女童軍總會 Hong Kong Girl Guides Association | brand=香港女童軍總會 | brand:en=Hong Kong Girl Guides Association | brand:wikidata=Q5894627 | brand:zh=香港女童軍總會 | brand:zh-Hans=香港女童军总会 | brand:zh-Hant=香港女童軍總會 | +| brand.16 | 香港童軍總會 Scout Association of Hong Kong | brand=香港童軍總會 Scout Association of Hong Kong | brand:en=Scout Association of Hong Kong | brand:wikidata=Q1883585 | brand:zh=香港童軍總會 | brand:zh-Hans=香港童军总会 | brand:zh-Hant=香港童軍總會 | diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md index 85ec79f052..92f2fb7579 100644 --- a/Docs/Layers/shops.md +++ b/Docs/Layers/shops.md @@ -53,6 +53,7 @@ A shop - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -131,6 +132,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -695,6 +697,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -733,6 +745,12 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + | id | question | osmTags | -----|-----|----- | | shop_types.0 | *What kind of shop is this?* (default) | | diff --git a/Docs/Layers/shops_glutenfree.md b/Docs/Layers/shops_glutenfree.md index 3650ae9dbd..90ca449038 100644 --- a/Docs/Layers/shops_glutenfree.md +++ b/Docs/Layers/shops_glutenfree.md @@ -54,6 +54,7 @@ A shop - [organic](#organic) - [sugar_free](#sugar_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -116,6 +117,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -679,6 +681,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -717,6 +729,12 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + | id | question | osmTags | -----|-----|----- | | shop_types.0 | *What kind of shop is this?* (default) | | diff --git a/Docs/Layers/shops_lactosefree.md b/Docs/Layers/shops_lactosefree.md index d9a2b0c37a..265dd01013 100644 --- a/Docs/Layers/shops_lactosefree.md +++ b/Docs/Layers/shops_lactosefree.md @@ -54,6 +54,7 @@ A shop - [organic](#organic) - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -116,6 +117,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -679,6 +681,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -717,6 +729,12 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + | id | question | osmTags | -----|-----|----- | | shop_types.0 | *What kind of shop is this?* (default) | | diff --git a/Docs/Layers/shops_second_hand.md b/Docs/Layers/shops_second_hand.md index 4fba56c966..f25176c812 100644 --- a/Docs/Layers/shops_second_hand.md +++ b/Docs/Layers/shops_second_hand.md @@ -54,6 +54,7 @@ A shop - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -114,6 +115,7 @@ Elements must match **any** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -678,6 +680,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -905,6 +917,12 @@ This tagrendering has labels -----|-----|----- | | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + This document is autogenerated from [assets/themes/circular_economy/circular_economy.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/circular_economy/circular_economy.json) diff --git a/Docs/Layers/shops_with_climbing_shoe_repair.md b/Docs/Layers/shops_with_climbing_shoe_repair.md index 25baf7c8f3..d8c0d8c907 100644 --- a/Docs/Layers/shops_with_climbing_shoe_repair.md +++ b/Docs/Layers/shops_with_climbing_shoe_repair.md @@ -55,6 +55,7 @@ A shop - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -116,6 +117,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### repairs_climbing_shoes @@ -687,6 +689,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -725,6 +737,12 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + | id | question | osmTags | -----|-----|----- | | shop_types.0 | *What kind of shop is this?* (default) | | diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md index 30804ff41f..250b323c7f 100644 --- a/Docs/Layers/sport_shops.md +++ b/Docs/Layers/sport_shops.md @@ -55,6 +55,7 @@ A shop - [sugar_free](#sugar_free) - [gluten_free](#gluten_free) - [lactose_free](#lactose_free) + - [dog-access](#dog-access) - [description](#description) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -118,6 +119,7 @@ Elements must match the expression ** [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | +| [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images @@ -682,6 +684,16 @@ This tagrendering is only visible in the popup if the following condition is met This tagrendering has labels `diets` +### dog-access + +The question is `Are dogs allowed in this business?` + + - *Dogs are allowed* is shown if with dog=yes + - *Dogs are not allowed* is shown if with dog=no + - *Dogs are allowed, but they have to be leashed* is shown if with dog=leashed + - *Dogs are allowed and can run around freely* is shown if with dog=unleashed + - *Dogs are allowed only outside* is shown if with dog=outside + ### description The question is `Is there still some relevant info that the previous questions did not cover? Feel free to add it here.` @@ -720,6 +732,12 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| dogs.0 | *No preference towards dogs* (default) | | +| dogs.1 | Dogs allowed | dog=unleashed | dog=yes | +| dogs.2 | No dogs allowed | dog=no | + | id | question | osmTags | -----|-----|----- | | shop_types.0 | *What kind of shop is this?* (default) | | diff --git a/Docs/Layers/waste_basket.md b/Docs/Layers/waste_basket.md index 4eb0c9cb69..a5197b0f3d 100644 --- a/Docs/Layers/waste_basket.md +++ b/Docs/Layers/waste_basket.md @@ -109,7 +109,7 @@ This tagrendering has labels | waste-type.0 | *All types* (default) | | | waste-type.1 | Waste basket for cigarettes | waste~^(.*cigarettes.*)$ | | waste-type.2 | Waste basket for drugs | waste~^(.*drugs.*)$ | -| waste-type.3 | Waste basket for dog excrement | waste~^(.*dog_excrement.*)$ | +| waste-type.3 | Waste basket for dog excrement | waste~^(.*excrement.*)$ | | waste-type.4 | Waste basket for trash | waste~^(.*trash.*)$ | | waste-type.5 | Waste basket for sharps | waste~^(.*sharps.*)$ | | waste-type.6 | Waste basket for plastic | waste~^(.*plastic.*)$ | @@ -118,7 +118,7 @@ This tagrendering has labels | id | question | osmTags | -----|-----|----- | -| waste-vending.0 | Waste basket with dispenser for (dog) excrement bags | vending=dog_excrement_bag | +| waste-vending.0 | Waste basket with dispenser for (dog) excrement bags | vending=excrement_bags | diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md index c3fc6627bd..fab9bbf4b8 100644 --- a/Docs/SpecialRenderings.md +++ b/Docs/SpecialRenderings.md @@ -11,110 +11,116 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam #### Table of contents - - [Using expanded syntax](#using-expanded-syntax) -1. [questions](#questions) - - [Example usage of questions](#example-usage-of-questions) -2. [add_new_point](#add_new_point) - - [Example usage of add_new_point](#example-usage-of-add_new_point) -3. [language_picker](#language_picker) - - [Example usage of language_picker](#example-usage-of-language_picker) -4. [logout](#logout) - - [Example usage of logout](#example-usage-of-logout) -5. [histogram](#histogram) - - [Example usage of histogram](#example-usage-of-histogram) -6. [steal](#steal) - - [Example usage of steal](#example-usage-of-steal) -7. [minimap](#minimap) - - [Example usage of minimap](#example-usage-of-minimap) -8. [split_button](#split_button) - - [Example usage of split_button](#example-usage-of-split_button) -9. [move_button](#move_button) - - [Example usage of move_button](#example-usage-of-move_button) -10. [delete_button](#delete_button) - - [Example usage of delete_button](#example-usage-of-delete_button) -11. [share_link](#share_link) - - [Example usage of share_link](#example-usage-of-share_link) -12. [export_as_gpx](#export_as_gpx) - - [Example usage of export_as_gpx](#example-usage-of-export_as_gpx) -13. [upload_to_osm](#upload_to_osm) - - [Example usage of upload_to_osm](#example-usage-of-upload_to_osm) -14. [multi_apply](#multi_apply) - - [Example usage of multi_apply](#example-usage-of-multi_apply) -15. [add_note_comment](#add_note_comment) - - [Example usage of add_note_comment](#example-usage-of-add_note_comment) -16. [open_note](#open_note) - - [Example usage of open_note](#example-usage-of-open_note) -17. [close_note](#close_note) - - [Example usage of close_note](#example-usage-of-close_note) -18. [plantnet_detection](#plantnet_detection) - - [Example usage of plantnet_detection](#example-usage-of-plantnet_detection) -19. [tag_apply](#tag_apply) - - [Example usage of tag_apply](#example-usage-of-tag_apply) -20. [import_button](#import_button) - - [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) - - [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) - - [Disabled in unofficial themes](#disabled-in-unofficial-themes) - - [Example usage of import_button](#example-usage-of-import_button) -21. [import_way_button](#import_way_button) - - [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) - - [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) - - [Disabled in unofficial themes](#disabled-in-unofficial-themes) - - [Example usage of import_way_button](#example-usage-of-import_way_button) -22. [conflate_button](#conflate_button) - - [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) - - [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) - - [Disabled in unofficial themes](#disabled-in-unofficial-themes) - - [Example usage of conflate_button](#example-usage-of-conflate_button) -23. [nearby_images](#nearby_images) - - [Example usage of nearby_images](#example-usage-of-nearby_images) -24. [wikipedia](#wikipedia) - - [Example usage of wikipedia](#example-usage-of-wikipedia) -25. [wikidata_label](#wikidata_label) - - [Example usage of wikidata_label](#example-usage-of-wikidata_label) -26. [mapillary_link](#mapillary_link) - - [Example usage of mapillary_link](#example-usage-of-mapillary_link) -27. [language_chooser](#language_chooser) - - [Example usage of language_chooser](#example-usage-of-language_chooser) -28. [all_tags](#all_tags) - - [Example usage of all_tags](#example-usage-of-all_tags) -29. [image_carousel](#image_carousel) - - [Example usage of image_carousel](#example-usage-of-image_carousel) -30. [image_upload](#image_upload) - - [Example usage of image_upload](#example-usage-of-image_upload) -31. [rating](#rating) - - [Example usage of rating](#example-usage-of-rating) -32. [create_review](#create_review) - - [Example usage of create_review](#example-usage-of-create_review) -33. [list_reviews](#list_reviews) - - [Example usage of list_reviews](#example-usage-of-list_reviews) -34. [reviews](#reviews) - - [Example usage of reviews](#example-usage-of-reviews) -35. [import_mangrove_key](#import_mangrove_key) - - [Example usage of import_mangrove_key](#example-usage-of-import_mangrove_key) -36. [opening_hours_table](#opening_hours_table) - - [Example usage of opening_hours_table](#example-usage-of-opening_hours_table) -37. [opening_hours_state](#opening_hours_state) - - [Example usage of opening_hours_state](#example-usage-of-opening_hours_state) -38. [canonical](#canonical) - - [Example usage of canonical](#example-usage-of-canonical) -39. [export_as_geojson](#export_as_geojson) - - [Example usage of export_as_geojson](#example-usage-of-export_as_geojson) -40. [open_in_iD](#open_in_id) - - [Example usage of open_in_iD](#example-usage-of-open_in_id) -41. [open_in_josm](#open_in_josm) - - [Example usage of open_in_josm](#example-usage-of-open_in_josm) -42. [clear_location_history](#clear_location_history) - - [Example usage of clear_location_history](#example-usage-of-clear_location_history) -43. [visualize_note_comments](#visualize_note_comments) - - [Example usage of visualize_note_comments](#example-usage-of-visualize_note_comments) -44. [add_image_to_note](#add_image_to_note) - - [Example usage of add_image_to_note](#example-usage-of-add_image_to_note) -45. [title](#title) - - [Example usage of title](#example-usage-of-title) -46. [maproulette_task](#maproulette_task) - - [Example usage of maproulette_task](#example-usage-of-maproulette_task) -47. [maproulette_set_status](#maproulette_set_status) - - [Example usage of maproulette_set_status](#example-usage-of-maproulette_set_status) + + [Using expanded syntax](#using-expanded-syntax) +1. [default](#default) + - [delete_button](#delete_button) + + [Example usage of delete_button](#example-usage-of-delete_button) + - [if_nothing_known](#if_nothing_known) + + [Example usage of if_nothing_known](#example-usage-of-if_nothing_known) + - [minimap](#minimap) + + [Example usage of minimap](#example-usage-of-minimap) + - [move_button](#move_button) + + [Example usage of move_button](#example-usage-of-move_button) + - [qr_code](#qr_code) + + [Example usage of qr_code](#example-usage-of-qr_code) + - [share_link](#share_link) + + [Example usage of share_link](#example-usage-of-share_link) + - [split_button](#split_button) + + [Example usage of split_button](#example-usage-of-split_button) +2. [favourites](#favourites) + - [favourite_icon](#favourite_icon) + + [Example usage of favourite_icon](#example-usage-of-favourite_icon) + - [favourite_status](#favourite_status) + + [Example usage of favourite_status](#example-usage-of-favourite_status) +3. [images](#images) + - [image_carousel](#image_carousel) + + [Example usage of image_carousel](#example-usage-of-image_carousel) + - [image_upload](#image_upload) + + [Example usage of image_upload](#example-usage-of-image_upload) +4. [notes](#notes) + - [add_image_to_note](#add_image_to_note) + + [Example usage of add_image_to_note](#example-usage-of-add_image_to_note) + - [open_note](#open_note) + + [Example usage of open_note](#example-usage-of-open_note) +5. [reviews](#reviews) + - [create_review](#create_review) + + [Example usage of create_review](#example-usage-of-create_review) + - [list_reviews](#list_reviews) + + [Example usage of list_reviews](#example-usage-of-list_reviews) + - [rating](#rating) + + [Example usage of rating](#example-usage-of-rating) + - [reviews](#reviews) + + [Example usage of reviews](#example-usage-of-reviews) +6. [settings](#settings) + - [clear_caches](#clear_caches) + + [Example usage of clear_caches](#example-usage-of-clear_caches) + - [disabled_questions](#disabled_questions) + + [Example usage of disabled_questions](#example-usage-of-disabled_questions) + - [gps_all_tags](#gps_all_tags) + + [Example usage of gps_all_tags](#example-usage-of-gps_all_tags) + - [gyroscope_all_tags](#gyroscope_all_tags) + + [Example usage of gyroscope_all_tags](#example-usage-of-gyroscope_all_tags) + - [import_mangrove_key](#import_mangrove_key) + + [Example usage of import_mangrove_key](#example-usage-of-import_mangrove_key) + - [login_button](#login_button) + + [Example usage of login_button](#example-usage-of-login_button) + - [logout](#logout) + + [Example usage of logout](#example-usage-of-logout) +7. [Unclassified elements](#unclassified-elements) + - [add_new_point](#add_new_point) + + [Example usage of add_new_point](#example-usage-of-add_new_point) + - [add_note_comment](#add_note_comment) + + [Example usage of add_note_comment](#example-usage-of-add_note_comment) + - [all_tags](#all_tags) + + [Example usage of all_tags](#example-usage-of-all_tags) + - [auto_apply](#auto_apply) + + [Example usage of auto_apply](#example-usage-of-auto_apply) + - [braced](#braced) + + [Example usage of braced](#example-usage-of-braced) + - [canonical](#canonical) + + [Example usage of canonical](#example-usage-of-canonical) + - [clear_location_history](#clear_location_history) + + [Example usage of clear_location_history](#example-usage-of-clear_location_history) + - [close_note](#close_note) + + [Example usage of close_note](#example-usage-of-close_note) + - [compare_data](#compare_data) + + [Example usage of compare_data](#example-usage-of-compare_data) + - [conflate_button](#conflate_button) + + [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) + + [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) + + [Disabled in unofficial themes](#disabled-in-unofficial-themes) + + [Example usage of conflate_button](#example-usage-of-conflate_button) + - [direction_absolute](#direction_absolute) + + [Example usage of direction_absolute](#example-usage-of-direction_absolute) + - [direction_indicator](#direction_indicator) + + [Example usage of direction_indicator](#example-usage-of-direction_indicator) + - [export_as_geojson](#export_as_geojson) + + [Example usage of export_as_geojson](#example-usage-of-export_as_geojson) + - [export_as_gpx](#export_as_gpx) + + [Example usage of export_as_gpx](#example-usage-of-export_as_gpx) + - [fediverse_link](#fediverse_link) + + [Example usage of fediverse_link](#example-usage-of-fediverse_link) + - [group](#group) + + [Example usage of group](#example-usage-of-group) + - [histogram](#histogram) + + [Example usage of histogram](#example-usage-of-histogram) + - [import_button](#import_button) + + [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) + + [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) + + [Disabled in unofficial themes](#disabled-in-unofficial-themes) + + [Example usage of import_button](#example-usage-of-import_button) + - [import_way_button](#import_way_button) + + [Specifying which tags to copy or add](#specifying-which-tags-to-copy-or-add) + + [Importing a dataset into OpenStreetMap: requirements](#importing-a-dataset-into-openstreetmap-requirements) + + [Disabled in unofficial themes](#disabled-in-unofficial-themes) + + [Example usage of import_way_button](#example-usage-of-import_way_button) + - [language_chooser](#language_chooser) + + [Example usage of language_chooser](#example-usage-of-language_chooser) + - [language_picker](#language_picker) + + [Example usage of language_picker](#example-usage-of-language_picker) + - [link](#link) + + [Example usage of link](#example-usage-of-link) + - [linked_data_from_website](#linked_data_from_website) #### Using expanded syntax @@ -145,70 +151,30 @@ Instead of using `{"render": {"en": "{some_special_visualisation(some_arg, some In other words: use `{ "before": ..., "after": ..., "special": {"type": ..., "argname": ...argvalue...}`. The args are in the `special` block; an argvalue can be a string, a translation or another value. (Refer to class `RewriteSpecial` in case of problems) -### questions +## default -The special element which shows the questions which are unkown. Added by default if not yet there +These special visualisations are interactive components that most elements get by default. You'll normally won't need them in custom layers + +### delete_button + +Adds a button which allows to delete the object at this location. The config will be read from the layer config + +#### Example usage of delete_button + +`{delete_button()}` + +### if_nothing_known + +Shows a 'nothing is currently known-message if there is at least one unanswered question and no known (answerable) question | name | default | description | -----|-----|----- | -| labels | _undefined_ | One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown | -| blacklisted-labels | _undefined_ | One or more ';'-separated labels of questions which should _not_ be included | +| text | _undefined_ | Text to show | +| cssClasses | _undefined_ | Classes to apply onto the text | -#### Example usage of questions +#### Example usage of if_nothing_known -`{questions(,)}` - -### add_new_point - -An element which allows to add a new point on the 'last_click'-location. Only makes sense in the layer `last_click` - -#### Example usage of add_new_point - -`{add_new_point()}` - -### language_picker - -A component to set the language of the user interface - -#### Example usage of language_picker - -`{language_picker()}` - -### logout - -Shows a button where the user can log out - -#### Example usage of logout - -`{logout()}` - -### histogram - -Create a histogram for a list of given values, read from the properties. - -| name | default | description | ------|-----|----- | -| key | _undefined_ | The key to be read and to generate a histogram from | -| title | _empty string_ | This text will be placed above the texts (in the first column of the visulasition) | -| countHeader | _empty string_ | This text will be placed above the bars | -| colors* | _undefined_ | (Matches all resting arguments - optional) Matches a regex onto a color value, e.g. `3[a-zA-Z+-]*:#33cc33` | - -#### Example usage of histogram - -`{histogram('some_key')}` with properties being `{some_key: ["a","b","a","c"]} to create a histogram - -### steal - -Shows a tagRendering from a different object as if this was the object itself - -| name | default | description | ------|-----|----- | -| featureId | _undefined_ | The key of the attribute which contains the id of the feature from which to use the tags | -| tagRenderingId | _undefined_ | The layer-id and tagRenderingId to render. Can be multiple value if ';'-separated (in which case every value must also contain the layerId, e.g. `layerId.tagRendering0; layerId.tagRendering1`). Note: this can cause layer injection | - -#### Example usage of steal - -`{steal(,)}` +`{if_nothing_known(,)}` ### minimap @@ -223,14 +189,6 @@ A small map showing the selected feature. `{minimap()}`, `{minimap(17, id, _list_of_embedded_feature_ids_calculated_by_calculated_tag):height:10rem; border: 2px solid black}` -### split_button - -Adds a button which allows to split a way - -#### Example usage of split_button - -`{split_button()}` - ### move_button Adds a button which allows to move the object to another location. The config will be read from the layer config @@ -239,13 +197,13 @@ Adds a button which allows to move the object to another location. The config wi `{move_button()}` -### delete_button +### qr_code -Adds a button which allows to delete the object at this location. The config will be read from the layer config +Generates a QR-code to share the selected object -#### Example usage of delete_button +#### Example usage of qr_code -`{delete_button()}` +`{qr_code()}` ### share_link @@ -260,37 +218,225 @@ Creates a link that (attempts to) open the native 'share'-screen {share_link()} to share the current page, {share_link()} to share the given url -### export_as_gpx +### split_button -Exports the selected feature as GPX-file +Adds a button which allows to split a way -#### Example usage of export_as_gpx +#### Example usage of split_button -`{export_as_gpx()}` +`{split_button()}` -### upload_to_osm +## favourites -Uploads the GPS-history as GPX to OpenStreetMap.org; clears the history afterwards. The actual feature is ignored. +Elements relating to marking an object as favourite (giving it a heart). Default element -#### Example usage of upload_to_osm +### favourite_icon -`{upload_to_osm()}` +A small button that allows a (logged in) contributor to mark a location as a favourite location, sized to fit a title-icon -### multi_apply +#### Example usage of favourite_icon -A button to apply the tagging of this object onto a list of other features. This is an advanced feature for which you'll need calculatedTags +`{favourite_icon()}` + +### favourite_status + +A button that allows a (logged in) contributor to mark a location as a favourite location + +#### Example usage of favourite_status + +`{favourite_status()}` + +## images + +Elements related to adding or manipulating images. Normally also added by default, but in some cases a tweaked version is needed + +### image_carousel + +Creates an image carousel for the given sources. An attempt will be made to guess what source is used. Supported: Wikidata identifiers, Wikipedia pages, Wikimedia categories, IMGUR (with attribution, direct links) + +| name | default | description | +-----|-----|----- | +| image_key | image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image | The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated | + +#### Example usage of image_carousel + +`{image_carousel(image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image)}` + +### image_upload + +Creates a button where a user can upload an image to IMGUR + +| name | default | description | +-----|-----|----- | +| image-key | _undefined_ | Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added) | +| label | _undefined_ | The text to show on the button | +| disable_blur | _undefined_ | If set to 'true' or 'yes', then face blurring will be disabled. To be used sparingly | + +#### Example usage of image_upload + +`{image_upload(,,)}` + +## notes + +Elements relating to OpenStreetMap-notes, e.g. the component to close and/or add a comment + +### add_image_to_note + +Adds an image to a node + +| name | default | description | +-----|-----|----- | +| Id-key | id | The property name where the ID of the note to close can be found | + +#### Example usage of add_image_to_note + +`{add_image_to_note(id)}` + +### open_note + +Creates a new map note on the given location. This options is placed in the 'last_click'-popup automatically if the 'notes'-layer is enabled + +#### Example usage of open_note + +`{open_note()}` + +## reviews + +Elements relating to seeing and adding ratings and reviews with Mangrove.reviews + +### create_review + +Invites the contributor to leave a review. Somewhat small UI-element until interacted + +| name | default | description | +-----|-----|----- | +| subjectKey | name | The key to use to determine the subject. If specified, the subject will be tags[subjectKey] | +| fallback | _undefined_ | The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value | +| question | _undefined_ | The question to ask during the review | + +#### Example usage of create_review + +`{create_review(name,,)}` + +### list_reviews + +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 + +| name | default | description | +-----|-----|----- | +| subjectKey | name | The key to use to determine the subject. If specified, the subject will be tags[subjectKey] | +| fallback | _undefined_ | The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value | + +#### Example usage of list_reviews + +`{list_reviews(name,)}` + +### rating + +Shows stars which represent the average rating on mangrove. + +| name | default | description | +-----|-----|----- | +| subjectKey | name | The key to use to determine the subject. If the value is specified, the subject will be tags[subjectKey] and will use this to filter the reviews. | +| fallback | _undefined_ | The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value | + +#### Example usage of rating + +`{rating(name,)}` + +### reviews + +A pragmatic combination of `create_review` and `list_reviews` + +| name | default | description | +-----|-----|----- | +| subjectKey | name | The key to use to determine the subject. If specified, the subject will be tags[subjectKey] | +| fallback | _undefined_ | The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value | +| question | _undefined_ | The question to ask in the review form. Optional | + +#### Example usage of reviews + +`{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 + +## settings + +Elements part of the usersettings-ui + +### clear_caches + +A button which clears the locally downloaded data and the service worker. Login status etc will be kept | name | default | description | -----|-----|----- | -| feature_ids | _undefined_ | A JSON-serialized list of IDs of features to apply the tagging on | -| keys | _undefined_ | One key (or multiple keys, seperated by ';') of the attribute that should be copied onto the other features. | | text | _undefined_ | The text to show on the button | -| autoapply | _undefined_ | A boolean indicating wether this tagging should be applied automatically if the relevant tags on this object are changed. A visual element indicating the multi_apply is still shown | -| overwrite | _undefined_ | If set to 'true', the tags on the other objects will always be overwritten. The default behaviour will be to only change the tags on other objects if they are either undefined or had the same value before the change | -#### Example usage of multi_apply +#### Example usage of clear_caches -{multi_apply(_features_with_the_same_name_within_100m, name:etymology:wikidata;name:etymology, Apply etymology information on all nearby objects with the same name)} +`{clear_caches()}` + +### disabled_questions + +Shows which questions are disabled for every layer. Used in 'settings' + +#### Example usage of disabled_questions + +`{disabled_questions()}` + +### gps_all_tags + +Shows the current tags of the GPS-representing object, used for debugging + +#### Example usage of gps_all_tags + +`{gps_all_tags()}` + +### gyroscope_all_tags + +Shows the current tags of the GPS-representing object, used for debugging + +#### Example usage of gyroscope_all_tags + +`{gyroscope_all_tags()}` + +### import_mangrove_key + +Only makes sense in the usersettings. Allows to import a mangrove public key and to use this to make reviews + +| name | default | description | +-----|-----|----- | +| text | _undefined_ | The text that is shown on the button | + +#### Example usage of import_mangrove_key + +`{import_mangrove_key()}` + +### login_button + +Show a login button + +#### Example usage of login_button + +`{login_button()}` + +### logout + +Shows a button where the user can log out + +#### Example usage of logout + +`{logout()}` + +## Unclassified elements + +Various elements + +### add_new_point + +An element which allows to add a new point on the 'last_click'-location. Only makes sense in the layer `last_click` + +#### Example usage of add_new_point + +`{add_new_point()}` ### add_note_comment @@ -304,13 +450,67 @@ A textfield to add a comment to a node (with the option to close the note). `{add_note_comment(id)}` -### open_note +### all_tags -Creates a new map note on the given location. This options is placed in the 'last_click'-popup automatically if the 'notes'-layer is enabled +Prints all key-value pairs of the object - used for debugging -#### Example usage of open_note +#### Example usage of all_tags -`{open_note()}` +`{all_tags()}` + +### auto_apply + + A button to run many actions for many features at once. + To effectively use this button, you'll need some ingredients: + + 1. A target layer with features for which an action is defined in a tag rendering. The following special visualisations support an autoAction: tag_apply, import_way_button, conflate_button + 2. A host feature to place the auto-action on. This can be a big outline (such as a city). Another good option for this is the layer [current_view](./BuiltinLayers.md#current_view) + 3. Then, use a calculated tag on the host feature to determine the overlapping object ids + 4. At last, add this component + +| name | default | description | +-----|-----|----- | +| target_layer | _undefined_ | The layer that the target features will reside in | +| target_feature_ids | _undefined_ | The key, of which the value contains a list of ids | +| tag_rendering_id | _undefined_ | The ID of the tagRendering containing the autoAction. This tagrendering will be calculated. The embedded actions will be executed | +| text | _undefined_ | The text to show on the button | +| icon | ./assets/svg/robot.svg | The icon to show on the button | + +#### Example usage of auto_apply + +`{auto_apply(,,,,./assets/svg/robot.svg)}` + +### braced + +Show a literal text within braces + +| name | default | description | +-----|-----|----- | +| text | _undefined_ | The value to show | + +#### Example usage of braced + +`{braced()}` + +### canonical + +Converts a short, canonical value into the long, translated text including the unit. This only works if a `unit` is defined for the corresponding value. The unit specification will be included in the text. + +| name | default | description | +-----|-----|----- | +| key | _undefined_ | The key of the tag to give the canonical text for | + +#### Example usage of canonical + +If the object has `length=42`, then `{canonical(length)}` will be shown as **42 meter** (in english), **42 metre** (in french), ... + +### clear_location_history + +A button to remove the travelled track information from the device + +#### Example usage of clear_location_history + +`{clear_location_history()}` ### close_note @@ -329,23 +529,31 @@ Button to close a note. A predefined text can be defined to close the note with. `{close_note(,checkmark.svg,id,,,)}` -### plantnet_detection +### compare_data -Sends the images linked to the current object to plantnet.org and asks it what plant species is shown on it. The user can then select the correct species; the corresponding wikidata-identifier will then be added to the object (together with `source:species:wikidata=plantnet.org AI`). +Gives an interactive element which shows a tag comparison between the OSM-object and the upstream object. This allows to copy some or all tags into OSM | name | default | description | -----|-----|----- | -| image_key | image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image | The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated | +| url | _undefined_ | The attribute containing the url where to fetch more data | +| host | _undefined_ | The domain name(s) where data might be fetched from - this is needed to set the CSP. A domain must include 'https', e.g. 'https://example.com'. For multiple domains, separate them with ';'. If you don't know the possible domains, use '*'. | +| readonly | _undefined_ | If 'yes', will not show 'apply'-buttons | -#### Example usage of plantnet_detection +#### Example usage of compare_data -`{plantnet_detection(image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image)}` +`{compare_data(,,)}` -### tag_apply +### conflate_button -Shows a big button; clicking this button will apply certain tags onto the feature. +This button will modify the geometry of an existing OSM way to match the specified geometry. This can conflate OSM-ways with LineStrings and Polygons (only simple polygons with one single ring). An attempt is made to move points with special values to a decent new location (e.g. entrances) + +Note that the contributor must zoom to at least zoomlevel 18 to be able to use this functionality. + It is only functional in official themes, but can be tested in unoffical themes. + +#### Specifying which tags to copy or add + + The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties). -The first argument takes a specification of which tags to add. These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. @@ -357,18 +565,117 @@ Remark that the syntax is slightly different then expected; it uses '$' to note Note that these values can be prepare with javascript in the theme by using a [calculatedTag](calculatedTags.md#calculating-tags-with-javascript) +#### Importing a dataset into OpenStreetMap: requirements + +If you want to import a dataset, make sure that: + +1. The dataset to import has a suitable license +2. The community has been informed of the import +3. All other requirements of the [import guidelines](https://wiki.openstreetmap.org/wiki/Import/Guidelines) have been followed + +There are also some technicalities in your theme to keep in mind: + +1. The new feature will be added and will flow through the program as any other new point as if it came from OSM. + This means that there should be a layer which will match the new tags and which will display it. +2. The original feature from your geojson layer will gain the tag '_imported=yes'. + This should be used to change the appearance or even to hide it (eg by changing the icon size to zero) +3. There should be a way for the theme to detect previously imported points, even after reloading. + A reference number to the original dataset is an excellent way to do this +4. When importing ways, the theme creator is also responsible of avoiding overlapping ways. + +#### Disabled in unofficial themes + +The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md). +The import button will show up then. If in testmode, you can read the changeset-XML directly in the web console. +In the case that MapComplete is pointed to the testing grounds, the edit will be made on https://master.apis.dev.openstreetmap.org | name | default | description | -----|-----|----- | -| tags_to_apply | _undefined_ | A specification of the tags to apply. This is either hardcoded in the layer or the `$name` of a property containing the tags to apply. If redirected and the value of the linked property starts with `{`, the other property will be interpreted as a json object | -| message | _undefined_ | The text to show to the contributor | -| image | _undefined_ | An image to show to the contributor on the button | -| id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tags onto _another_ object. The id will be read from properties[id_of_object_to_apply_this_one] of the selected object. The tags are still calculated based on the tags of the _selected_ element | -| maproulette_id | _undefined_ | If specified, this maproulette-challenge will be closed when the tags are applied. This should be the ID of the task, _not_ the task_id. | +| targetLayer | _undefined_ | The id of the layer where this point should end up. This is not very strict, it will simply result in checking that this layer is shown preventing possible duplicate elements | +| tags | _undefined_ | The tags to add onto the new object - see specification above. If this is a key (a single word occuring in the properties of the object), the corresponding value is taken and expanded instead | +| text | Import this data into OpenStreetMap | The text to show on the button | +| icon | ./assets/svg/addSmall.svg | A nice icon to show in the button | +| way_to_conflate | _undefined_ | The key, of which the corresponding value is the id of the OSM-way that must be conflated; typically a calculatedTag | -#### Example usage of tag_apply +#### Example usage of conflate_button -`{tag_apply(survey_date=$_now:date, Surveyed today!)}`, `{tag_apply(addr:street=$addr:street, Apply the address, apply_icon.svg, _closest_osm_id) +`{conflate_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,)}` + +### direction_absolute + +Converts compass degrees (with 0° being north, 90° being east, ...) into a human readable, translated direction such as 'north', 'northeast' + +| name | default | description | +-----|-----|----- | +| key | _direction:centerpoint | The attribute containing the degrees | + +#### Example usage of direction_absolute + +`{direction_absolute(_direction:centerpoint)}` + +### direction_indicator + +Gives a distance indicator and a compass pointing towards the location from your GPS-location. If clicked, centers the map on the object + +#### Example usage of direction_indicator + +`{direction_indicator()}` + +### export_as_geojson + +Exports the selected feature as GeoJson-file + +#### Example usage of export_as_geojson + +`{export_as_geojson()}` + +### export_as_gpx + +Exports the selected feature as GPX-file + +#### Example usage of export_as_gpx + +`{export_as_gpx()}` + +### fediverse_link + +Converts a fediverse username or link into a clickable link + +| name | default | description | +-----|-----|----- | +| key | _undefined_ | The attribute-name containing the link | + +#### Example usage of fediverse_link + +`{fediverse_link()}` + +### group + +A collapsable group (accordion) + +| name | default | description | +-----|-----|----- | +| header | _undefined_ | The _identifier_ of a single tagRendering. This will be used as header | +| labels | _undefined_ | A `;`-separated list of either identifiers or label names. All tagRenderings matching this value will be shown in the accordion | + +#### Example usage of group + +`{group(,)}` + +### histogram + +Create a histogram for a list of given values, read from the properties. + +| name | default | description | +-----|-----|----- | +| key | _undefined_ | The key to be read and to generate a histogram from | +| title | _empty string_ | This text will be placed above the texts (in the first column of the visulasition) | +| countHeader | _empty string_ | This text will be placed above the bars | +| colors* | _undefined_ | (Matches all resting arguments - optional) Matches a regex onto a color value, e.g. `3[a-zA-Z+-]*:#33cc33` | + +#### Example usage of histogram + +`{histogram('some_key')}` with properties being `{some_key: ["a","b","a","c"]} to create a histogram ### import_button @@ -495,113 +802,6 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be `{import_way_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,0.05,,0.05,,0.1)}` -### conflate_button - -This button will modify the geometry of an existing OSM way to match the specified geometry. This can conflate OSM-ways with LineStrings and Polygons (only simple polygons with one single ring). An attempt is made to move points with special values to a decent new location (e.g. entrances) - -Note that the contributor must zoom to at least zoomlevel 18 to be able to use this functionality. - It is only functional in official themes, but can be tested in unoffical themes. - -#### Specifying which tags to copy or add - - The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties). - -These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. -This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. - -If a value to substitute is undefined, empty string will be used instead. - -This supports multiple values, e.g. `ref=$source:geometry:type/$source:geometry:ref` - -Remark that the syntax is slightly different then expected; it uses '$' to note a value to copy, followed by a name (matched with `[a-zA-Z0-9_:]*`). Sadly, delimiting with `{}` as these already mark the boundaries of the special rendering... - -Note that these values can be prepare with javascript in the theme by using a [calculatedTag](calculatedTags.md#calculating-tags-with-javascript) - -#### Importing a dataset into OpenStreetMap: requirements - -If you want to import a dataset, make sure that: - -1. The dataset to import has a suitable license -2. The community has been informed of the import -3. All other requirements of the [import guidelines](https://wiki.openstreetmap.org/wiki/Import/Guidelines) have been followed - -There are also some technicalities in your theme to keep in mind: - -1. The new feature will be added and will flow through the program as any other new point as if it came from OSM. - This means that there should be a layer which will match the new tags and which will display it. -2. The original feature from your geojson layer will gain the tag '_imported=yes'. - This should be used to change the appearance or even to hide it (eg by changing the icon size to zero) -3. There should be a way for the theme to detect previously imported points, even after reloading. - A reference number to the original dataset is an excellent way to do this -4. When importing ways, the theme creator is also responsible of avoiding overlapping ways. - -#### Disabled in unofficial themes - -The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md). -The import button will show up then. If in testmode, you can read the changeset-XML directly in the web console. -In the case that MapComplete is pointed to the testing grounds, the edit will be made on https://master.apis.dev.openstreetmap.org - -| name | default | description | ------|-----|----- | -| targetLayer | _undefined_ | The id of the layer where this point should end up. This is not very strict, it will simply result in checking that this layer is shown preventing possible duplicate elements | -| tags | _undefined_ | The tags to add onto the new object - see specification above. If this is a key (a single word occuring in the properties of the object), the corresponding value is taken and expanded instead | -| text | Import this data into OpenStreetMap | The text to show on the button | -| icon | ./assets/svg/addSmall.svg | A nice icon to show in the button | -| way_to_conflate | _undefined_ | The key, of which the corresponding value is the id of the OSM-way that must be conflated; typically a calculatedTag | - -#### Example usage of conflate_button - -`{conflate_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,)}` - -### nearby_images - -A component showing nearby images loaded from various online services such as Mapillary. In edit mode and when used on a feature, the user can select an image to add to the feature - -| name | default | description | ------|-----|----- | -| mode | closed | Either `open` or `closed`. If `open`, then the image carousel will always be shown | -| readonly | _undefined_ | If 'readonly' or 'yes', will not show the 'link'-button | - -#### Example usage of nearby_images - -`{nearby_images(closed,)}` - -### wikipedia - -A box showing the corresponding wikipedia article(s) - based on the **wikidata** tag. - -| name | default | description | ------|-----|----- | -| keyToShowWikipediaFor | wikidata;wikipedia | Use the wikidata entry from this key to show the wikipedia article for. Multiple keys can be given (separated by ';'), in which case the first matching value is used | - -#### Example usage of wikipedia - -`{wikipedia()}` is a basic example, `{wikipedia(name:etymology:wikidata)}` to show the wikipedia page of whom the feature was named after. Also remember that these can be styled, e.g. `{wikipedia():max-height: 10rem}` to limit the height - -### wikidata_label - -Shows the label of the corresponding wikidata-item - -| name | default | description | ------|-----|----- | -| keyToShowWikidataFor | wikidata | Use the wikidata entry from this key to show the label | - -#### Example usage of wikidata_label - -`{wikidata_label()}` is a basic example, `{wikipedia(name:etymology:wikidata)}` to show the label itself - -### mapillary_link - -Adds a button to open mapillary on the specified location - -| name | default | description | ------|-----|----- | -| zoom | 18 | The startzoom of mapillary | - -#### Example usage of mapillary_link - -`{mapillary_link(18)}` - ### language_chooser The language element allows to show and pick all known (modern) languages. The key can be set @@ -619,220 +819,58 @@ The language element allows to show and pick all known (modern) languages. The k `{language_chooser(,,{language()},,{list()},)}` -### all_tags +### language_picker -Prints all key-value pairs of the object - used for debugging +A component to set the language of the user interface -#### Example usage of all_tags +#### Example usage of language_picker -`{all_tags()}` +`{language_picker()}` -### image_carousel +### link -Creates an image carousel for the given sources. An attempt will be made to guess what source is used. Supported: Wikidata identifiers, Wikipedia pages, Wikimedia categories, IMGUR (with attribution, direct links) +Construct a link. By using the 'special' visualisation notation, translations should be easier | name | default | description | -----|-----|----- | -| image_key | image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image | The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated | +| text | _undefined_ | Text to be shown | +| href | _undefined_ | The URL to link to. Note that this will be URI-encoded before | +| class | _undefined_ | CSS-classes to add to the element | +| download | _undefined_ | Expects a string which denotes the filename to download the contents of `href` into. If set, this link will act as a download-button. | +| arialabel | _undefined_ | If set, this text will be used as aria-label | +| icon | _undefined_ | If set, show this icon next to the link. You might want to combine this with `class: button` | -#### Example usage of image_carousel +#### Example usage of link -`{image_carousel(image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image)}` +`{link(,,,,,)}` -### image_upload +### linked_data_from_website -Creates a button where a user can upload an image to IMGUR +Attempts to load (via a proxy) the specified website and parsed ld+json from there. Suitable data will be offered to import into OSM | name | default | description | -----|-----|----- | -| image-key | _undefined_ | Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added) | -| label | _undefined_ | The text to show on the button | -| disable_blur | _undefined_ | If set to 'true' or 'yes', then face blurring will be disabled. To be used sparingly | +| key | website | Attempt to load ld+json from the specified URL. This can be in an embedded -{#if availableLanguages?.length > 1} +{#if $languages?.length > 1}