Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-08-24 03:17:34 +02:00
commit 1c1040a834
47 changed files with 671 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

12
assets/contributors.json
View file

@ -1,11 +1,11 @@
{
"contributors": [
{
"commits": 4316,
"commits": 4336,
"contributor": "Pieter Vander Vennet"
},
{
"commits": 160,
"commits": 171,
"contributor": "Robin van der Linde"
},
{
@ -196,6 +196,14 @@
"commits": 2,
"contributor": "Stanislas Gueniffey"
},
{
"commits": 1,
"contributor": "Arya"
},
{
"commits": 1,
"contributor": "Robbert Gurdeep Singh"
},
{
"commits": 1,
"contributor": "HispanicMojitos"

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

@ -53,7 +53,7 @@
{
"if": "backrest=yes",
"then": {
"en": "Backrest: Yes",
"en": "Does have a backrest",
"de": "Die Sitzbank hat eine Rückenlehne",
"fr": "Dossier : Oui",
"nl": "Heeft een rugleuning",
@ -76,8 +76,8 @@
{
"if": "backrest=no",
"then": {
"en": "Backrest: No",
"de": "Die Sitzbank hat keine Rückenlehne",
"en": "Does <b>not</b> have a backrest",
"de": "Die Sitzbank hat <b>keine</b> Rückenlehne",
"fr": "Dossier : Non",
"nl": "Heeft geen rugleuning",
"es": "Respaldo: no",
@ -188,7 +188,7 @@
{
"if": "material=wood",
"then": {
"en": "Material: wood",
"en": "The seating is made from wood",
"de": "Die Sitzfläche ist aus Holz",
"fr": "Matériau : bois",
"nl": "Gemaakt uit hout",
@ -211,7 +211,7 @@
{
"if": "material=metal",
"then": {
"en": "Material: metal",
"en": "The seating is made from metal",
"de": "Die Sitzfläche ist aus Metall",
"fr": "Matériau : métal",
"nl": "Gemaakt uit metaal",
@ -233,7 +233,7 @@
{
"if": "material=stone",
"then": {
"en": "Material: stone",
"en": "The seating is made from stone",
"de": "Die Sitzfläche ist aus Stein",
"fr": "Matériau : pierre",
"nl": "Gemaakt uit steen",
@ -256,7 +256,7 @@
{
"if": "material=concrete",
"then": {
"en": "Material: concrete",
"en": "The seating is made from concrete",
"de": "Die Sitzfläche ist aus Beton",
"fr": "Matériau : béton",
"nl": "Gemaakt uit beton",
@ -279,7 +279,7 @@
{
"if": "material=plastic",
"then": {
"en": "Material: plastic",
"en": "The seating is made from plastic",
"de": "Die Sitzfläche ist aus Kunststoff",
"fr": "Matériau : plastique",
"nl": "Gemaakt uit plastiek",
@ -302,7 +302,7 @@
{
"if": "material=steel",
"then": {
"en": "Material: steel",
"en": "The seating is made from steel",
"de": "Die Sitzfläche ist aus Stahl",
"fr": "Matériau : acier",
"nl": "Gemaakt uit staal",

2
assets/layers/bicycle_library/bicycle_library.json
View file

@ -183,7 +183,7 @@
"ru": "Прокат велосипеда стоит €20/год и €20 залог",
"pt_BR": "Emprestar uma bicicleta custa €20/ano e €20 de garantia",
"pt": "Emprestar uma bicicleta custa €20/ano e €20 de garantia",
"es": "Alquilar una bicicleta cuesta 20€/año y 20€ de fianza"
"es": "Alquilar una bicicleta cuesta 20€/año y 20€ de garantía"
}
}
],

2
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -571,7 +571,7 @@
"body": {
"en": "Hello,\n\nWith this email, I'd like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} is broken.\n\n Kind regards",
"nl": "Geachte\n\nGraag had ik u gemeld dat een fietspomp defect is. De fietspomp bevindt zich hier: https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id}.\n\nMet vriendelijke groeten.",
"de": "Hallo,\n\nMit dieser E-Mail möchte ich Ihnen mitteilen, dass die Fahrradpumpe, die sich unter https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} befindet, kaputt ist.",
"de": "Hallo,\n\nMit dieser E-Mail möchte ich Ihnen mitteilen, dass die Fahrradpumpe, die sich unter https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} befindet, kaputt ist.\n\nMit freundlichen Grüßen",
"da": "Hej,\n\nMed denne e-mail vil jeg gerne oplyse, at cykelpumpen, der befinder sig på https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} er i stykker.\n\n Med venlig hilse",
"es": "Hola,\n\nCon este correo, me gustaría informar de que esta bomba para bicicletas situada en https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} está rota.\n\nUn saludo",
"fr": "Bonjour,\n\nCe mail pour vous informer que la pompe à vélo située à https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} est cassée.\n\nBien à vous."

15
assets/layers/dogpark/dogpark.json
View file

@ -21,7 +21,8 @@
"en": "a dog park",
"da": "en hundeskov",
"de": "Ein Hundepark",
"es": "un parque para perros"
"es": "un parque para perros",
"nl": "een hondenweide"
},
"tags": [
"leisure=dog_park"
@ -30,7 +31,8 @@
"en": "A place for dogs, where they can run unleashed",
"da": "En hundeskov eller hundeg&aring;rd beregnet til hunde, hvor de kan l&oslash;be uden snor",
"de": "Ein Ort ohne Leinenzwang für Hunde",
"es": "Un lugar para perros, donde pueden correr sin correa"
"es": "Un lugar para perros, donde pueden correr sin correa",
"nl": "Een plaats waar honden vrij mogen rondlopen"
}
}
],
@ -38,7 +40,8 @@
"en": "dog parks",
"da": "hundeskove",
"de": "Hundeparks",
"es": "parques de perros"
"es": "parques de perros",
"nl": "hondenweides"
},
"title": {
"render": {
@ -142,12 +145,14 @@
"en": "What is the name of this dog park?",
"da": "Hvad hedder denne hundeskov?",
"de": "Wie lautet der Name dieses Hundeparks?",
"es": "¿Cual es el nombre de este parque para perros?"
"es": "¿Cual es el nombre de este parque para perros?",
"nl": "Wat is de naam van deze hondenweide?"
},
"render": {
"en": "The name of this dog park is {name}",
"de": "Denne hundeskov hedder {name}",
"es": "El nombre de este parque para perros es {name}"
"es": "El nombre de este parque para perros es {name}",
"nl": "Deze hondenweide heet {name}"
},
"freeform": {
"key": "name"

2
assets/layers/entrance/entrance.json
View file

@ -44,7 +44,7 @@
"question": {
"en": "What type of entrance is this?",
"nl": "Wat voor ingang is dit?",
"de": "Um welchen Eingangstyp handelt es sich hier?",
"de": "Um welchen Eingangstyp handelt es sich?",
"es": "¿Qué tipo de entrada es esta?",
"fr": "De quel type d'entrée s'agit-il ?"
},

3
assets/layers/hydrant/hydrant.json
View file

@ -481,7 +481,8 @@
},
"humanSingular": {
"en": "millimeter",
"nl": "millimeter"
"nl": "millimeter",
"de": "Millimeter"
}
}
],

10
assets/layers/indoors/indoors.json
View file

@ -32,6 +32,7 @@
"if": "indoor=room",
"then": {
"en": "Indoor Room {name}",
"de": "Innenraum {name}",
"nl": "Binnenruimte {name}"
}
},
@ -39,6 +40,7 @@
"if": "indoor=area",
"then": {
"en": "Indoor Area {name}",
"de": "Innenbereich {name}",
"nl": "Gebied in gebouw {name}"
}
},
@ -46,6 +48,7 @@
"if": "indoor=wall",
"then": {
"en": "Indoor Wall {name}",
"de": "Innenwand {name}",
"nl": "Muur in gebouw {name}"
}
},
@ -53,6 +56,7 @@
"if": "indoor=corridor",
"then": {
"en": "Indoor Corridor {name}",
"de": "Innengang {name}",
"nl": "Gang in gebouw {name}"
}
},
@ -60,6 +64,7 @@
"if": "indoor=door",
"then": {
"en": "Indoor Door {name}",
"de": "Innentür {name}",
"nl": "Binnendeur {name}"
}
},
@ -67,6 +72,7 @@
"if": "indoor=level",
"then": {
"en": "Indoor Level {name}",
"de": "Geschoss {name}",
"nl": "Verdieping in gebouw {name}"
}
}
@ -79,10 +85,12 @@
"id": "ref",
"question": {
"en": "What is the reference number of this room?",
"de": "Wie lautet die Nummer dieses Raums?",
"nl": "Wat is het referentienummer van deze ruimte?"
},
"render": {
"en": "This room has the reference number {ref}",
"de": "Dieser Raum hat die Raumnummer {ref}",
"nl": "Deze ruimte heeft het referentienummer {ref}"
},
"freeform": {
@ -90,6 +98,7 @@
"type": "string",
"placeholder": {
"en": "Reference number of the room (e.g. '1.1' or 'A1')",
"de": "Raumnummer (z.B. '1.1' oder 'A1')",
"nl": "Referentienummer van de ruimte (bv. '1.1' of A1' )"
}
},
@ -118,6 +127,7 @@
"type": "string",
"placeholder": {
"en": "Name of the room",
"de": "Name des Raums",
"nl": "Naam van de ruimte"
}
},

2
assets/layers/maxspeed/maxspeed.json
View file

@ -58,7 +58,7 @@
{
"render": {
"en": "The maximum allowed speed on this road is {canonical(maxspeed)}",
"de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße ist {canonical(maxspeed)}",
"de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße beträgt {canonical(maxspeed)}",
"nl": "De maximum toegestane snelheid op deze weg is {canonical(maxspeed)}"
},
"question": {

5
assets/tagRenderings/questions.json
View file

@ -830,7 +830,8 @@
"zh_Hans": "使用专用APP支付",
"da": "Betaling sker ved hjælp af en dedikeret app",
"nb_NO": "Betaling utføres med et eget program",
"pt": "O pagamento é feito utilizando uma aplicação dedicada"
"pt": "O pagamento é feito utilizando uma aplicação dedicada",
"it": "Pagamento effettuato utilizzando un'app dedicata"
}
},
{
@ -1053,7 +1054,7 @@
"sl": "Nahaja se v prvi kletni etaži",
"ca": "Localitzat a la planta base",
"fil": "Nasa silong",
"es": "Situado en el primer nivel del sótano",
"es": "Localizada en el primer sótano",
"nb_NO": "Er å finne på første kjellernivå",
"pt": "Localizado no primeiro nível da cave"
}

8
assets/themes/cycle_highways/cycle_highways.json
View file

@ -7,7 +7,7 @@
"ca": "Vies ciclistes",
"fr": "Aménagements cyclables",
"nl": "Fietssnelwegen",
"es": "Carriles bici",
"es": "Autovías ciclistas",
"nb_NO": "Sykkelmotorveier"
},
"hideFromOverview": true,
@ -20,7 +20,7 @@
"it": "Questa cartina mostra le strade per velocipedi",
"fr": "Cette carte affiche les aménagements cyclables",
"nl": "Deze kaart toont fietssnelwegen",
"es": "Este mapa muestra carriles bici",
"es": "Este mapa muestra autovías ciclistas",
"nb_NO": "Kart som viser sykkelmotorveier",
"ca": "Aquest mapa mostra carrils bici"
},
@ -111,7 +111,7 @@
"ca": "vies ciclistes",
"fr": "Aménagements cyclables",
"nl": "fietssnelwegen",
"es": "carriles bici",
"es": "autovías ciclistas",
"nb_NO": "sykkelmotorveier"
},
"source": {
@ -125,7 +125,7 @@
"ca": "via ciclista",
"fr": "Aménagement cyclable",
"nl": "fietssnelweg",
"es": "carril bici",
"es": "autovía ciclista",
"nb_NO": "sykkelmotorvei"
}
},

2
assets/themes/cyclestreets/cyclestreets.json
View file

@ -34,7 +34,7 @@
"de": "Eine Fahrradstraße ist eine Straße, auf der <b>motorisierter Verkehr Radfahrer nicht überholen darf</b>. Sie sind durch ein spezielles Verkehrsschild gekennzeichnet. Fahrradstraßen gibt es in den Niederlanden und Belgien, aber auch in Deutschland und Frankreich. ",
"it": "Una strada ciclabile è una strada dove <b>il traffico motorizzato non può superare i velocipedi</b>. La sua presenza è segnalata da un cartello stradale specifico. Le strade ciclabili sono diffuse in Olanda e Belgio, ma si possono trovare anche in Germania e in Francia. ",
"hu": "A kerékpárosutca (cyclestreet, Fahrradstraße) olyan utca, ahol <b>gépjármű nem előzhet meg kerékpárost</b>. Az ilyen utcákat külön közlekedési tábla jelzi. Kerékpárosutcák találhatók Hollandiában és Belgiumban, valamint Németországban és Franciaországban is. ",
"es": "Una ciclocalle es una calle donde <b>el tráfico motorizado no puede adelantar a ciclistas</b>. Están señalizadas por una señal de tráfico especial. Las ciclocalles se pueden encontrar en los Países Bajos y Bélgica, pero también en Alemania y Francia. ",
"es": "Una ciclocalle es una calle en la que <b>el tráfico motorizado no puede sobrepasar a los ciclistas</b>. Están marcados por una señal de tráfico especial. Las ciclocalles se pueden encontrar en los Países Bajos y Bélgica, pero también en Alemania y Francia. ",
"fr": "Une rue cyclable est une rue où <b>les véhicules motorisés ne sont pas autorisés à dépasser les cyclistes</b>. Elles sont signalées par un signal routier particulier. On trouve des rues cyclables en Belgique et aux Pays-Bas, mais aussi en Allemagne et en France. "
},
"icon": "./assets/themes/cyclestreets/logo.svg",

6
assets/themes/grb_import/grb.json
View file

@ -11,7 +11,8 @@
"en": "This theme is an attempt to help automating the GRB import.",
"hu": "Ez a sablon a flandriai GRB épületimportálás automatizlását kívánja megkönnyíteni.",
"de": "Dieses Thema ist ein Versuch, die Automatisierung des GRB-Imports zu unterstützen.",
"fr": "Ce thème tente d’aider l’import automatique GRB."
"fr": "Ce thème tente d’aider l’import automatique GRB.",
"es": "Este tema es un intento de automatizar la importación GRB."
},
"icon": "./assets/themes/grb_import/logo.svg",
"startLat": 51.0249,
@ -515,7 +516,8 @@
"en": "This building has holes and is modeled as a relation. As such, it cannot be conflated. Conflate it manually via <a href='https://buildings.osm.be/#/'>the building export site</a> {open_in_josm()}",
"de": "Dieses Gebäude hat Löcher und ist als Relation modelliert. Als solches kann es nicht zusammengeführt werden. Es kann manuell zusammengeführt werden über die <a href='https://buildings.osm.be/#/'>Gebäudeexportseite</a> {open_in_josm()}",
"es": "Este edificio tiene agujeros y está modelado como una relación. Por lo tanto, no se puede combinar. Combínalo manualmente a través <a href='https://buildings.osm.be/#/'>el sitio de exportación de edificios</a> {open_in_josm()}",
"fr": "Ce bâtiment a des ouvertures et est modélisé comme une relation. Il ne peut être fusionné. Fusionnez-le manuellement via <a href='https://buildings.osm.be/#/'>le site d’export de bâtiment</a> {open_in_josm()}"
"fr": "Ce bâtiment a des ouvertures et est modélisé comme une relation. Il ne peut être fusionné. Fusionnez-le manuellement via <a href='https://buildings.osm.be/#/'>le site d’export de bâtiment</a> {open_in_josm()}",
"nl": "Dit gebouw heeft openingen en is gemodelleerd als een relatie. Bijgevolg kan het niet worden samengevoegd. Voeg het manueel samen via <a href='https://buildings.osm.be/#/'>de export-site voor gebouwen</a> {open_in_josm()}"
}
},
{

2
assets/themes/onwheels/onwheels.json
View file

@ -8,7 +8,7 @@
},
"description": {
"en": "On this map, publicly weelchair accessible places are shown and can be easily added",
"de": "Auf dieser Karte werden öffentlich zugängliche Orte für Rollstuhlfahrer angezeigt und können leicht hinzugefügt werden",
"de": "Auf dieser Karte können Sie öffentlich zugängliche Orte für Rollstuhlfahrer ansehen, bearbeiten oder hinzufügen",
"fr": "Sur cette carte nous pouvons voir et ajouter les différents endroits publiques accessibles aux chaises roulantes",
"nl": "Op deze kaart kan je informatie rond rolstoeltoegankelijkheid zien, zoals toegangsdeuren met hun breedte en drempelhoogte, toiletten met toegankelijkheidsinformatie, recepties maar ook winkels, cafés en restaurants."
},

33
assets/themes/sidewalks/sidewalks.json
View file

@ -8,7 +8,8 @@
"ca": "Voreres",
"es": "Aceras",
"fr": "Trottoirs",
"nb_NO": "Fortau"
"nb_NO": "Fortau",
"it": "Marciapiede"
},
"shortDescription": {
"en": "Sidewalk mapping",
@ -16,7 +17,8 @@
"de": "Kartierung von Bürgersteigen",
"es": "Mapeo de aceras",
"nl": "Voetpaden in kaart brengen",
"fr": "Cartographier des trottoirs"
"fr": "Cartographier des trottoirs",
"it": "Mappatura del marciapiede"
},
"description": {
"en": "Experimental theme",
@ -45,7 +47,8 @@
"es": "Aceras",
"nb_NO": "Fortau",
"nl": "Voetpaden",
"fr": "Trottoirs"
"fr": "Trottoirs",
"it": "Marciapiedi"
},
"minzoom": 12,
"source": {
@ -66,7 +69,8 @@
"ca": "{name}",
"es": "{name}",
"nl": "{name}",
"fr": "{name}"
"fr": "{name}",
"it": "{name}"
},
"mappings": [
{
@ -91,7 +95,8 @@
"es": "Esta calle se llama {name}",
"nl": "Deze straat heet {name}",
"fr": "Cette rue s’appelle {name}",
"nb_NO": "Denne gaten heter {name}"
"nb_NO": "Denne gaten heter {name}",
"it": "La strada si chiama {name}"
}
},
{
@ -117,25 +122,29 @@
{
"id": "has_sidewalk_left|right",
"question": {
"en": "Is there a sidewalk on this side of the road?"
"en": "Is there a sidewalk on this side of the road?",
"de": "Gibt es auf dieser Straßenseite einen Bürgersteig?"
},
"mappings": [
{
"if": "sidewalk:left|right=yes",
"then": {
"en": "Yes, there is a sidewalk on this side of the road"
"en": "Yes, there is a sidewalk on this side of the road",
"de": "Ja, es gibt einen Bürgersteig auf dieser Straßenseite"
}
},
{
"if": "sidewalk:left|right=no",
"then": {
"en": "No, there is no sidewalk to walk on"
"en": "No, there is no sidewalk to walk on",
"de": "Nein, es gibt keinen Bürgersteig für Fußgänger"
}
},
{
"if": "sidewalk:left|right=separate",
"then": {
"en": "There is a separately mapped sidewalk to walk on"
"en": "There is a separately mapped sidewalk to walk on",
"de": "Es gibt einen separat kartierten Bürgersteig für Fußgänger"
}
}
]
@ -143,10 +152,12 @@
{
"id": "sidewalk_width_left|right",
"question": {
"en": "What is the width of the sidewalk on this side of the road?"
"en": "What is the width of the sidewalk on this side of the road?",
"de": "Wie breit ist der Bürgersteig auf dieser Straßenseite?"
},
"render": {
"en": "This sidewalk is {sidewalk:left|right:width}m wide"
"en": "This sidewalk is {sidewalk:left|right:width}m wide",
"de": "Dieser Bürgersteig ist {sidewalk:left|right:width}m breit"
},
"condition": "sidewalk:left|right=yes",
"freeform": {

36
assets/translators.json
View file

@ -1,11 +1,11 @@
{
"contributors": [
{
"commits": 182,
"commits": 194,
"contributor": "Pieter Vander Vennet"
},
{
"commits": 152,
"commits": 161,
"contributor": "kjon"
},
{
@ -17,19 +17,23 @@
"contributor": "Allan Nordhøy"
},
{
"commits": 31,
"contributor": "Babos Gábor"
"commits": 36,
"contributor": "Iago"
},
{
"commits": 31,
"contributor": "Iago"
"contributor": "Babos Gábor"
},
{
"commits": 29,
"contributor": "Artem"
},
{
"commits": 23,
"commits": 25,
"contributor": "Robin van der Linde"
},
{
"commits": 24,
"contributor": "Supaplex"
},
{
@ -40,10 +44,6 @@
"commits": 21,
"contributor": "Anonymous"
},
{
"commits": 20,
"contributor": "Robin van der Linde"
},
{
"commits": 19,
"contributor": "SC"
@ -92,6 +92,10 @@
"commits": 10,
"contributor": "Irina"
},
{
"commits": 9,
"contributor": "Olivier"
},
{
"commits": 9,
"contributor": "Jacque Fresco"
@ -104,10 +108,6 @@
"commits": 7,
"contributor": "Niels Elgaard Larsen"
},
{
"commits": 6,
"contributor": "Olivier"
},
{
"commits": 6,
"contributor": "Joost Schouppe"
@ -232,6 +232,10 @@
"commits": 3,
"contributor": "SiegbjornSitumeang"
},
{
"commits": 2,
"contributor": "Valerio Bozzolan"
},
{
"commits": 2,
"contributor": "Manuel Tassi"
@ -296,6 +300,10 @@
"commits": 2,
"contributor": "Leo Alcaraz"
},
{
"commits": 1,
"contributor": "Dario Crespi"
},
{
"commits": 1,
"contributor": "Hungarian_user"