midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-08-26 13:18:39 +02:00
commit 1378c1a779
372 changed files with 26005 additions and 20082 deletions
Download patch file Download diff file Expand all files Collapse all files

112
assets/layers/cycle_highways/cycle_highways.json
View file

@ -1,5 +1,61 @@
{
"id": "cycle_highways",
"name": {
"en": "cycle highways",
"de": "Radschnellwege",
"ca": "vies ciclistes",
"fr": "Aménagements cyclables",
"nl": "fietssnelwegen",
"es": "autovías ciclistas",
"nb_NO": "sykkelmotorveier",
"da": "cykelmotorveje",
"pa_PK": "سائیکل‌وے",
"cs": "cyklodálnice",
"pl": "ścieżki rowerowe",
"it": "strade per biciclette",
"zh_Hant": "單車高速公路"
},
"source": {
"osmTags": "cycle_network=BE-VLG:cycle_highway"
},
"isCounted": false,
"minzoom": 6,
"title": {
"render": {
"en": "cycle highway",
"de": "Radschnellweg",
"ca": "via ciclista",
"fr": "Aménagement cyclable",
"nl": "fietssnelweg",
"es": "autovía ciclista",
"nb_NO": "sykkelmotorvei",
"da": "cykelmotorvej",
"pa_PK": "سائیکل‌وے",
"cs": "cyklodálnice",
"pl": "ścieżka rowerowa",
"it": "strada per bicilette",
"zh_Hant": "單車高速公路"
}
},
"pointRendering": null,
"lineRendering": [
{
"color": {
"render": "#ff7392",
"mappings": [
{
"if": "state=",
"then": "#00acfc"
},
{
"if": "state=temporary",
"then": "#00acfc"
}
]
},
"width": "4"
}
],
"tagRenderings": [
{
"render": "The name is <b>{name}</b>",
@ -69,42 +125,6 @@
"website",
"all_tags"
],
"name": {
"en": "cycle highways",
"de": "Radschnellwege",
"ca": "vies ciclistes",
"fr": "Aménagements cyclables",
"nl": "fietssnelwegen",
"es": "autovías ciclistas",
"nb_NO": "sykkelmotorveier",
"da": "cykelmotorveje",
"pa_PK": "سائیکل‌وے",
"cs": "cyklodálnice",
"pl": "ścieżki rowerowe",
"it": "strade per biciclette",
"zh_Hant": "單車高速公路"
},
"source": {
"osmTags": "cycle_network=BE-VLG:cycle_highway"
},
"minzoom": 6,
"title": {
"render": {
"en": "cycle highway",
"de": "Radschnellweg",
"ca": "via ciclista",
"fr": "Aménagement cyclable",
"nl": "fietssnelweg",
"es": "autovía ciclista",
"nb_NO": "sykkelmotorvei",
"da": "cykelmotorvej",
"pa_PK": "سائیکل‌وے",
"cs": "cyklodálnice",
"pl": "ścieżka rowerowa",
"it": "strada per bicilette",
"zh_Hant": "單車高速公路"
}
},
"filter": [
{
"id": "name-alt",
@ -192,25 +212,5 @@
}
]
}
],
"pointRendering": null,
"isCounted": false,
"lineRendering": [
{
"color": {
"render": "#ff7392",
"mappings": [
{
"if": "state=",
"then": "#00acfc"
},
{
"if": "state=temporary",
"then": "#00acfc"
}
]
},
"width": "4"
}
]
}

45
assets/layers/memorial/memorial.json
View file

@ -99,7 +99,8 @@
"question": {
"en": "What type of memorial is this?",
"de": "Was für eine Art von Denkmal ist das?",
"fr": "C'est un mémorial de guerre"
"fr": "C'est un mémorial de guerre",
"sl": "Kakšne vrste spomenik je to?"
},
"mappings": [
{
@ -108,7 +109,8 @@
"en": "This is a statue",
"de": "Das ist eine Statue",
"fr": "C'est une statue",
"nl": "Dit is een standbeeld"
"nl": "Dit is een standbeeld",
"sl": "To je kip"
},
"addExtraTags": [
"tourism=artwork",
@ -120,7 +122,8 @@
"then": {
"en": "This is a plaque",
"de": "Dies ist eine Gedenktafel",
"fr": "C'est une plaque"
"fr": "C'est une plaque",
"sl": "To je plošča"
}
},
{
@ -167,7 +170,8 @@
"then": {
"en": "This is a memorial stone",
"de": "Das ist ein Gedenkstein",
"fr": "C'est une pierre commémorative"
"fr": "C'est une pierre commémorative",
"sl": "To je spominski kamen"
}
},
{
@ -175,7 +179,8 @@
"then": {
"en": "This is a bust",
"de": "Das ist eine Büste",
"fr": "C'est un buste"
"fr": "C'est un buste",
"sl": "To je doprsni kip"
}
},
{
@ -184,7 +189,8 @@
"en": "This is a sculpture",
"de": "Dies ist eine Skulptur",
"fr": "C'est une sculpture",
"nl": "Dit is een sculptuur"
"nl": "Dit is een sculptuur",
"sl": "To je skulptura"
}
},
{
@ -193,7 +199,8 @@
"en": "This is an obelisk",
"de": "Das ist ein Obelisk",
"es": "Es un obelisco",
"fr": "C'est un obélisque"
"fr": "C'est un obélisque",
"sl": "To je obelisk"
}
},
{
@ -204,7 +211,8 @@
"es": "Es una cruz",
"fr": "C'est une croix",
"nl": "Dit is een kruis",
"pl": "To jest krzyż"
"pl": "To jest krzyż",
"sl": "To je križ"
}
},
{
@ -222,7 +230,8 @@
"en": "This is a historic tank, permanently placed in public space as memorial",
"de": "Dies ist ein historischer Panzer, der permanent in den öffentlichen Raum als Denkmal platziert wurde",
"fr": "C'est un char historique, placé de manière permanente dans l'espace public comme mémorial",
"nl": "Dit is een historische tank, permanent in de publieke ruimte geplaatst als gedenkteken"
"nl": "Dit is een historische tank, permanent in de publieke ruimte geplaatst als gedenkteken",
"sl": "To je zgodovinski tank, ki je stalno postavljen v spomin na javnem kraju"
}
},
{
@ -230,7 +239,8 @@
"then": {
"en": "This is a memorial tree",
"de": "Das ist ein Baumdenkmal",
"fr": "C'est un arbre du souvenir"
"fr": "C'est un arbre du souvenir",
"sl": "To je spominsko drevo"
},
"addExtraTags": [
"natural=tree"
@ -240,7 +250,8 @@
"if": "historic=tomb",
"then": {
"en": "This is a gravestone; the person is buried here",
"de": "Dies ist ein Grabstein; die Person ist hier begraben"
"de": "Dies ist ein Grabstein; die Person ist hier begraben",
"sl": "To je nagrobni kamen; oseba je pokopana tu"
},
"addExtraTags": [
"memorial="
@ -250,7 +261,8 @@
"render": {
"en": "This is a {memorial}",
"de": "Das ist ein {memorial}",
"fr": "C'est un {memorial}"
"fr": "C'est un {memorial}",
"sl": "To je {memorial}"
},
"freeform": {
"key": "memorial"
@ -267,7 +279,8 @@
"cs": "Jaký je nápis na této desce?",
"de": "Wie lautet die Inschrift auf diesem Denkmal?",
"fr": "Quelle est l'inscription sur cette plaque ?",
"nl": "Wat is het opschrift van dit gedenkteken?"
"nl": "Wat is het opschrift van dit gedenkteken?",
"sl": "Kakšen je napis na tem spomeniku?"
},
"#:condition": "Benches have a separate inscription question",
"condition": {
@ -280,7 +293,8 @@
"ca": "La inscripció d'aquesta placa diu: <p><i>{inscription}<i></p>",
"cs": "Nápis na této desce zní: <p><i>{inscription}<i></p>",
"de": "Die Inschrift auf diesem Denkmal lautet: <p><i>{inscription}<i></p>",
"fr": "L'inscription sur cette plaque indique: <p><i>{inscription}<i></p>"
"fr": "L'inscription sur cette plaque indique: <p><i>{inscription}<i></p>",
"sl": "Napis na tem spomeniku je: <p><i>{inscription}<i></p>"
},
"freeform": {
"key": "inscription",
@ -293,7 +307,8 @@
"en": "This memorial does not have an inscription",
"de": "Dieses Denkmal hat keine Inschrift",
"fr": "Il n'y a aucune inscription sur cette plaque",
"nl": "Dit gedenkteken heeft geen opschrift"
"nl": "Dit gedenkteken heeft geen opschrift",
"sl": "Ta spomenik nima napisa"
},
"addExtraTags": [
"inscription="

18
assets/layers/toilet/toilet.json
View file

@ -51,6 +51,23 @@
{
"if": "opening_hours~*",
"then": "icons.isOpen"
},
{
"if": {
"or": [
"access=no",
"access=private"
]
},
"then": "lock"
},
{
"if": "access=key",
"then": "key"
},
{
"if": "access=customers",
"then": "key:gray"
}
],
"location": [
@ -203,6 +220,7 @@
},
{
"if": "access=no",
"alsoShowIf": "access=private",
"then": {
"en": "Not accessible",
"de": "Der Zugang ist nicht erlaubt oder nicht möglich",

102
assets/layers/tourism_accomodation/tourism_accomodation.json
View file

@ -2,10 +2,13 @@
"id": "tourism_accomodation",
"name": {
"en": "Tourism accomodation",
"de": "Touristische Unterkunft"
"de": "Touristische Unterkunft",
"nl": "Accomodatie voor toeristen"
},
"description": {
"en": "Various types of lodging facilities"
"en": "Various types of lodging facilities",
"de": "Verschiedene Arten von Unterkünften",
"nl": "Verschillende soorten overnachtingsmogelijkheden voor toeristen"
},
"minzoom": 12,
"title": {
@ -26,37 +29,44 @@
"if": "tourism=hostel",
"then": {
"en": "Hostel {name}",
"de": "Hostel {name}"
"de": "Hostel {name}",
"nl": "Herberg {name}"
}
},
{
"if": "guest_house=bed_and_breakfast",
"then": {
"en": "B&B {name}"
"en": "B&B {name}",
"de": "B&B {name}",
"nl": "B&B {name}"
}
},
{
"if": "tourism=guest_house",
"then": {
"en": "Guest house {name}"
"en": "Guest house {name}",
"de": "Ferienhaus {name}"
}
},
{
"if": "tourism=motel",
"then": {
"en": "Motel {name}"
"en": "Motel {name}",
"de": "Motel {name}"
}
},
{
"if": "tourism=apartment",
"then": {
"en": "Apartment {name}"
"en": "Apartment {name}",
"de": "Ferienwohnung {name}"
}
},
{
"if": "tourism=chalet",
"then": {
"en": "Vacation home {name}"
"en": "Vacation home {name}",
"de": "Ferienhaus {name}"
}
}
],
@ -131,7 +141,8 @@
},
"description": {
"en": "A hotel is an establishment that provides paid lodging, usually on a short-term basis. Rooms are not shared with strangers.",
"de": "Ein Hotel ist eine Einrichtung, die eine bezahlte Unterkunft anbietet, in der Regel für einen kurzen Zeitraum. Die Zimmer werden nicht mit Fremden geteilt."
"de": "Ein Hotel ist eine Einrichtung, die eine bezahlte Unterkunft anbietet, in der Regel für einen kurzen Zeitraum. Die Zimmer werden nicht mit Fremden geteilt.",
"nl": "En hotel is een gebouw waar je tegen betaling kan overnachten voor een korte periode. Je krijgt je eigen kamer."
},
"tags": [
"tourism=hotel"
@ -143,11 +154,13 @@
],
"title": {
"en": "a hostel",
"de": "Ein Hostel"
"de": "Ein Hostel",
"nl": "een herberg"
},
"description": {
"en": "A hostel is a type of tourist accommodation where people can sleep in a room shared with strangers",
"de": "Ein Hostel ist eine Art von Touristenherberge, in der man in einem Zimmer schlafen kann, das man mit Fremden teilt"
"de": "Ein Hostel ist eine Art von Touristenherberge, in der man in einem Zimmer schlafen kann, das man mit Fremden teilt",
"nl": "Een herberg is een gebouw waar je enkele dagen kan blijven. Je deelt een kamer met onbekenden."
}
},
{
@ -155,10 +168,14 @@
"tourism=apartment"
],
"title": {
"en": "a vacation apartment"
"en": "a vacation apartment",
"de": "eine Ferienwohnung",
"nl": "een vakantie-appartement"
},
"description": {
"en": "A furnished apartment or flat with cooking and bathroom facilities in a shared building that can be rented for vacations, typically without breakfast or reception desk"
"en": "A furnished apartment or flat with cooking and bathroom facilities in a shared building that can be rented for vacations, typically without breakfast or reception desk",
"de": "Ein möbliertes Appartement oder eine Wohnung mit Kochgelegenheit und Bad in einem Gemeinschaftsgebäude, das für Ferienzwecke gemietet werden kann, normalerweise ohne Frühstück oder Rezeption",
"nl": "Een bemeubeld apparement met kookgelegenheid en een badkamer in een groter gebouw. Het appartement kan gehuurd worden voor vakanties. Er is geen receptie of ontbijt voorzien."
}
},
{
@ -166,10 +183,12 @@
"tourism=chalet"
],
"title": {
"en": "a vacation chalet"
"en": "a vacation chalet",
"de": "ein Ferienchalet"
},
"description": {
"en": "A holiday cottage or vacation home with cooking and bathroom facilities that can be rented for holiday vacations, typically without breakfast or reception desk"
"en": "A holiday cottage or vacation home with cooking and bathroom facilities that can be rented for holiday vacations, typically without breakfast or reception desk",
"de": "Ein Ferienhaus oder eine Ferienwohnung mit Kochgelegenheit und Bad, das bzw. die für Ferienaufenthalte gemietet werden kann, in der Regel ohne Frühstück oder Rezeption"
}
},
{
@ -177,10 +196,13 @@
"tourism=motel"
],
"title": {
"en": "a motel"
"en": "a motel",
"de": "ein Motel",
"nl": "een motel"
},
"description": {
"en": "A motel is an establishment that provides paid lodging, usually on a short-term basis, with convenient parking for motor cars at or close to the room. They are typically cheaper then a hotel"
"en": "A motel is an establishment that provides paid lodging, usually on a short-term basis, with convenient parking for motor cars at or close to the room. They are typically cheaper then a hotel",
"de": "Ein Motel ist eine Einrichtung, die eine bezahlte Unterkunft anbietet, in der Regel für kurze Zeit, mit bequemen Parkplätzen für Kraftfahrzeuge am oder in der Nähe des Zimmers. Sie sind in der Regel billiger als ein Hotel"
}
},
{
@ -189,10 +211,12 @@
"guest_house=bed_and_breakfast"
],
"title": {
"en": "a bed-and-breakfast"
"en": "a bed-and-breakfast",
"de": "eine Frühstückspension"
},
"description": {
"en": "A bed-and-breakfast in a guesthouse is a small lodging establishment. These are often a few rooms within a private family home where the owners also accommodate the guests. There is no reception desk, nor is there staff at all times. In some cases, check-in happens remotely by sharing a code to get in."
"en": "A bed-and-breakfast in a guesthouse is a small lodging establishment. These are often a few rooms within a private family home where the owners also accommodate the guests. There is no reception desk, nor is there staff at all times. In some cases, check-in happens remotely by sharing a code to get in.",
"de": "Ein Bed-and-Breakfast in einem Gästehaus ist ein kleiner Beherbergungsbetrieb. Oft handelt es sich um einige Zimmer in einem Privathaus, in dem die Eigentümer auch die Gäste beherbergen. Es gibt keine Rezeption und es ist auch nicht ständig Personal anwesend. In einigen Fällen erfolgt das Einchecken aus der Ferne, indem ein Zugangscode mitgeteilt wird."
}
},
{
@ -200,7 +224,8 @@
"tourism=guest_house"
],
"title": {
"en": "a small-scale lodging facility, typically operated by the owner"
"en": "a small-scale lodging facility, typically operated by the owner",
"de": "eine kleine Beherbergungseinrichtung, die in der Regel vom Eigentümer betrieben wird"
}
}
],
@ -211,11 +236,13 @@
"id": "name",
"question": {
"en": "What is the name of this {title()}?",
"de": "Wie lautet der Name von {title()}?"
"de": "Wie lautet der Name von {title()}?",
"nl": "Wat is de naam van deze {title()}"
},
"render": {
"en": "{name}",
"de": "{name}"
"de": "{name}",
"nl": "{name}"
},
"freeform": {
"key": "name"
@ -234,47 +261,64 @@
"options": [
{
"question": {
"en": "All types"
"en": "All types",
"de": "Alle Arten",
"nl": "Alle types"
}
},
{
"osmTags": "tourism=hotel",
"question": {
"en": "Hotels"
"en": "Hotels",
"de": "Hotels",
"nl": "Hotels"
}
},
{
"osmTags": "tourism=hostel",
"question": {
"en": "Hostels"
"en": "Hostels",
"de": "Hostels / Herbergen",
"nl": "Hostels"
}
},
{
"osmTags": "tourism=guest_house",
"question": {
"en": "Guest houses and Bed&Breakfasts"
"en": "Guest houses and Bed&Breakfasts",
"de": "Gasthäuser und Bed & Breakfasts",
"nl": "Gastenkamers en bed-en-breakfasts"
}
},
{
"osmTags": "tourism=motel",
"question": {
"en": "Motels"
"en": "Motels",
"de": "Motels",
"nl": "Motels"
}
},
{
"osmTags": "tourism=chalet",
"question": {
"en": "Vacation home"
"en": "Vacation home",
"de": "Ferienhaus",
"nl": "Vakantiehuisje"
}
},
{
"osmTags": "tourism=apartment",
"question": {
"en": "Vacation apartment"
"en": "Vacation apartment",
"de": "Ferienwohnung",
"nl": "Vakantie-appartement"
}
}
]
}
],
"deletion": {
"softDeletionTags": "disused:tourism:={tourism}"
},
"allowMove": true
}

17
assets/layers/usersettings/usersettings.json
View file

@ -27,7 +27,8 @@
"ca": "Configuració",
"cs": "Nastavení",
"fi": "Asetukset",
"zh_Hant": "設定"
"zh_Hant": "設定",
"sl": "Nastavitve"
}
},
"pointRendering": null,
@ -374,11 +375,15 @@
"fr": "Quel fond souhaitez-vous utiliser par défaut ?",
"da": "Hvilket baggrundslag skal vises som standard?"
},
"questionHint": {
"en": "To set a specific background as default, select it in the background menu first after which it will appear here."
},
"condition": "_theme:backgroundLayer=",
"mappings": [
{
"if": "mapcomplete-preferred-background-layer=default",
"alsoShowIf": "mapcomplete-preferred-background-layer=",
"icon": "./assets/svg/generic_map.svg",
"then": {
"en": "Use the default background layer",
"ca": "Utilitzeu la capa de fons predeterminada",
@ -391,6 +396,9 @@
},
{
"if": "mapcomplete-preferred-background-layer=osm",
"icon": {
"path": "./assets/svg/osm-logo.svg"
},
"then": {
"en": "Use OpenStreetMap-carto as default layer",
"ca": "Utilitzeu OpenStreetMap-carto com a capa predeterminada",
@ -403,6 +411,7 @@
},
{
"if": "mapcomplete-preferred-background-layer=photo",
"icon": "🛰️",
"then": {
"en": "Use aerial imagery as default background",
"ca": "Utilitzeu imatges aèries com a fons predeterminat",
@ -415,12 +424,13 @@
},
{
"if": "mapcomplete-preferred-background-layer=map",
"icon": "./assets/svg/generic_map.svg",
"then": {
"en": "Use a non-openstreetmap based map as default background",
"ca": "Utilitzeu un mapa que no sigui openstreetmap com a fons predeterminat",
"de": "Eine eigene Karte als Standardhintergrund verwenden",
"cs": "Použití mapy, která není založena na mapě openstreetmap, jako výchozího pozadí",
"nl": "Gebruik altijd een kaart di niet op OpenStreetMap gebaseerd is als achtergrond",
"nl": "Gebruik altijd een kaart die niet op OpenStreetMap gebaseerd is als achtergrond",
"fr": "Utiliser un fond non basé sur OpenStreetMap par défaut",
"da": "Brug et ikke-OpenSreetMap-baseret kort som standardbaggrund"
}
@ -725,7 +735,8 @@
},
"mappings": [
{
"if": "mapcomplete-fixate-north=",
"if": "mapcomplete-fixate-north=no",
"alsoShowIf": "mapcomplete-fixate-north=",
"icon": "./assets/svg/compass.svg",
"then": {
"en": "Allow to rotate the map",

862
assets/svg/osm-logo.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Before After
Before After

9
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -3,17 +3,14 @@
"title": {
"en": "Changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
"startLat": 0,
"startLon": 0,
"startZoom": 1,
"layers": [
{
"id": "mapcomplete-changes",

3
assets/themes/memorials/memorials.json
View file

@ -5,7 +5,8 @@
"de": "Denkmäler",
"fr": "Mémoriaux",
"nl": "Gedenktekens en graven",
"da": "Mindesmærker"
"da": "Mindesmærker",
"sl": "Spomeniki"
},
"description": {
"en": "Memorials are physical objects permantently placed in the public space to remember a person or event. They can be a wide range of objects, such as statues, plaques, paintings, military objects (such as tanks), ...",

5
assets/themes/playgrounds/playgrounds.json
View file

@ -64,7 +64,10 @@
{
"builtin": [
"bench",
"picnic_table"
"picnic_table",
"waste_basket",
"toilet",
"bbq"
],
"override": {
"minzoom": 16