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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-08-05 13:12:14 +02:00
commit 7e1e3c15dc
68 changed files with 1678 additions and 3734 deletions
Download patch file Download diff file Expand all files Collapse all files

1
assets/layers/bicycle_rental/bicycle_rental.json
View file

@ -291,6 +291,7 @@
]
},
{
"id": "rental_types",
"rewrite": {
"sourceString": [
"bicycle_type",

12
assets/layers/charging_station/charging_station.json
View file

@ -76,7 +76,8 @@
"nl": "Oplaadpunten",
"da": "En ladestation",
"de": "Eine Ladestation",
"es": "Una estación de carga"
"es": "Una estación de carga",
"fr": "Une station de recharge"
},
"tagRenderings": [
"images",
@ -4441,7 +4442,8 @@
"nl": "Enkel werkende oplaadpunten",
"da": "Kun fungerende ladestationer",
"de": "Nur Ladestationen in Betrieb",
"es": "Solo estaciones de carga funcionales"
"es": "Solo estaciones de carga funcionales",
"fr": "Stations de recharge en service uniquement"
},
"osmTags": {
"and": [
@ -4461,14 +4463,16 @@
"nl": "Alle types",
"ca": "Tots els connectors",
"de": "Alle Anschlüsse",
"es": "Todos los conectores"
"es": "Todos los conectores",
"fr": "Tous types de prise"
}
},
{
"question": {
"en": "Has a <div style='display: inline-block'><b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>",
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
"de": "Verfügt über einen <div style='display: inline-block'><b><b>Schuko-Stecker</b> ohne Erdungsstift (CEE7/4 Typ F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>",
"fr": "Dispose d’une <div style='display: inline-block'><b><b>prise murale Schuko</b> sans terre (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div>"
},
"osmTags": "socket:schuko~*"
},

1
assets/layers/climbing_area/climbing_area.json
View file

@ -258,6 +258,7 @@
"id": "Rock type (crag/rock/cliff only)"
},
{
"id": "default_climbing_questions",
"builtin": [
"climbing.website",
"climbing.fee",

5
assets/layers/climbing_gym/climbing_gym.json
View file

@ -74,12 +74,11 @@
"phone",
"email",
{
"builtin": [
"climbing.fee"
]
"builtin": "climbing.fee"
},
"opening_hours",
{
"id": "climbing_gym_questions",
"builtin": [
"climbing.average_length",
"climbing.min_difficulty",

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

@ -450,7 +450,8 @@
},
{
"title": {
"en": "an indoor door"
"en": "an indoor door",
"de": "eine Innentür"
},
"preciseInput": {
"preferredBackground": "map",

1
assets/layers/hackerspace/hackerspace.json
View file

@ -150,6 +150,7 @@
"id": "hackerspaces-opening_hours"
},
{
"id": "available_devices",
"rewrite": {
"sourceString": [
"device-key",

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

@ -60,10 +60,12 @@
{
"id": "ref",
"question": {
"en": "What is the name of this room?"
"en": "What is the name of this room?",
"de": "Wie lautet der Name dieses Raums?"
},
"render": {
"en": "This room is named {name}"
"en": "This room is named {name}",
"de": "Der Name des Raums lautet {name}"
},
"freeform": {
"key": "name"

66
assets/layers/maproulette/maproulette.json
View file

@ -59,49 +59,57 @@
{
"if": "status=0",
"then": {
"en": "Task is created"
"en": "Task is created",
"de": "Aufgabe wurde erstellt"
}
},
{
"if": "status=1",
"then": {
"en": "Task is fixed"
"en": "Task is fixed",
"de": "Aufgabe wurde erledigt"
}
},
{
"if": "status=2",
"then": {
"en": "Task is a false positive"
"en": "Task is a false positive",
"de": "Aufgabe ist ein falsches Positiv"
}
},
{
"if": "status=3",
"then": {
"en": "Task is skipped"
"en": "Task is skipped",
"de": "Aufgabe wurde übersprungen"
}
},
{
"if": "status=4",
"then": {
"en": "Task is deleted"
"en": "Task is deleted",
"de": "Aufgabe wurde gelöscht"
}
},
{
"if": "status=5",
"then": {
"en": "Task is already fixed"
"en": "Task is already fixed",
"de": "Aufgabe wurde bereits erledigt"
}
},
{
"if": "status=6",
"then": {
"en": "Task is marked as too hard"
"en": "Task is marked as too hard",
"de": "Aufgabe wurde als zu schwer markiert"
}
},
{
"if": "status=9",
"then": {
"en": "Task is disabled"
"en": "Task is disabled",
"de": "Aufgabe wurde deaktiviert"
}
}
]
@ -113,15 +121,18 @@
}
],
"description": {
"en": "Layer showing all tasks in MapRoulette"
"en": "Layer showing all tasks in MapRoulette",
"de": "Ebene, die alle MapRoulette-Aufgaben zeigt"
},
"minzoom": 15,
"name": {
"en": "MapRoulette Tasks"
"en": "MapRoulette Tasks",
"de": "MapRoulette-Aufgaben"
},
"title": {
"render": {
"en": "MapRoulette Item: {parentName}"
"en": "MapRoulette Item: {parentName}",
"de": "MapRoulette-Element: {parentName}"
}
},
"titleIcons": [
@ -136,54 +147,63 @@
"options": [
{
"question": {
"en": "Show tasks with all statuses"
"en": "Show tasks with all statuses",
"de": "Aufgaben mit allen Status anzeigen"
}
},
{
"question": {
"en": "Show tasks that are created"
"en": "Show tasks that are created",
"de": "Aufgaben anzeigen, die erstellt wurden"
},
"osmTags": "status=0"
},
{
"question": {
"en": "Show tasks that are fixed"
"en": "Show tasks that are fixed",
"de": "Aufgaben anzeigen, die erledigt wurden"
},
"osmTags": "status=1"
},
{
"question": {
"en": "Show tasks that are false positives"
"en": "Show tasks that are false positives",
"de": "Aufgaben anzeigen, die falsch positiv sind"
},
"osmTags": "status=2"
},
{
"question": {
"en": "Show tasks that are skipped"
"en": "Show tasks that are skipped",
"de": "Aufgaben anzeigen, die übersprungen wurden"
},
"osmTags": "status=3"
},
{
"question": {
"en": "Show tasks that are deleted"
"en": "Show tasks that are deleted",
"de": "Aufgaben anzeigen, die gelöscht wurden"
},
"osmTags": "status=4"
},
{
"question": {
"en": "Show tasks that are already fixed"
"en": "Show tasks that are already fixed",
"de": "Aufgaben anzeigen, die bereits erledigt wurden"
},
"osmTags": "status=5"
},
{
"question": {
"en": "Show tasks that are marked as too hard"
"en": "Show tasks that are marked as too hard",
"de": "Aufgaben anzeigen, die als zu schwierig markiert wurden"
},
"osmTags": "status=6"
},
{
"question": {
"en": "Show tasks that are disabled"
"en": "Show tasks that are disabled",
"de": "Aufgaben anzeigen, die deaktiviert wurden"
},
"osmTags": "status=9"
}
@ -200,7 +220,8 @@
}
],
"question": {
"en": "Challenge name contains {search}"
"en": "Challenge name contains {search}",
"de": "Name der Kampagne enthält {search}"
}
}
]
@ -216,7 +237,8 @@
}
],
"question": {
"en": "Challenge ID matches {search}"
"en": "Challenge ID matches {search}",
"de": "Kampagnen ID stimmt mit {search} überein"
}
}
]

57
assets/layers/maproulette_challenge/maproulette_challenge.json
View file

@ -2,7 +2,8 @@
"id": "maproulette_challenge",
"name": null,
"description": {
"en": "Layer showing tasks of a MapRoulette challenge"
"en": "Layer showing tasks of a MapRoulette challenge",
"de": "Ebene mit Aufgaben einer MapRoulette-Kampagne"
},
"source": {
"osmTags": "id~*",
@ -11,7 +12,8 @@
},
"title": {
"render": {
"en": "Item in MapRoulette"
"en": "Item in MapRoulette",
"de": "Aufgabe in MapRoulette"
}
},
"titleIcons": [
@ -78,49 +80,57 @@
{
"if": "mr_taskStatus=Created",
"then": {
"en": "Task is created"
"en": "Task is created",
"de": "Aufgabe wurde erstellt"
}
},
{
"if": "mr_taskStatus=Fixed",
"then": {
"en": "Task is fixed"
"en": "Task is fixed",
"de": "Aufgabe wurde erledigt"
}
},
{
"if": "mr_taskStatus=False positive",
"then": {
"en": "Task is a false positive"
"en": "Task is a false positive",
"de": "Aufgabe ist ein falsches Positiv"
}
},
{
"if": "mr_taskStatus=Skipped",
"then": {
"en": "Task is skipped"
"en": "Task is skipped",
"de": "Aufgabe wurde übersprungen"
}
},
{
"if": "mr_taskStatus=Deleted",
"then": {
"en": "Task is deleted"
"en": "Task is deleted",
"de": "Aufgabe wurde gelöscht"
}
},
{
"if": "mr_taskStatus=Already fixed",
"then": {
"en": "Task is already fixed"
"en": "Task is already fixed",
"de": "Aufgabe wurde bereits erledigt"
}
},
{
"if": "mr_taskStatus=Too hard",
"then": {
"en": "Task is marked as too hard"
"en": "Task is marked as too hard",
"de": "Aufgabe wurde als zu schwer markiert"
}
},
{
"if": "mr_taskStatus=Disabled",
"then": {
"en": "Task is disabled"
"en": "Task is disabled",
"de": "Aufgabe wurde deaktiviert"
}
}
]
@ -137,54 +147,63 @@
"options": [
{
"question": {
"en": "Show tasks with all statuses"
"en": "Show tasks with all statuses",
"de": "Aufgaben mit allen Status anzeigen"
}
},
{
"question": {
"en": "Show tasks that are created"
"en": "Show tasks that are created",
"de": "Aufgaben anzeigen, die erstellt wurden"
},
"osmTags": "mr_taskStatus=Created"
},
{
"question": {
"en": "Show tasks that are fixed"
"en": "Show tasks that are fixed",
"de": "Aufgaben anzeigen, die erledigt wurden"
},
"osmTags": "mr_taskStatus=Fixed"
},
{
"question": {
"en": "Show tasks that are false positives"
"en": "Show tasks that are false positives",
"de": "Aufgaben anzeigen, die falsch positiv sind"
},
"osmTags": "mr_taskStatus=False positive"
},
{
"question": {
"en": "Show tasks that are skipped"
"en": "Show tasks that are skipped",
"de": "Aufgaben anzeigen, die übersprungen wurden"
},
"osmTags": "mr_taskStatus=Skipped"
},
{
"question": {
"en": "Show tasks that are deleted"
"en": "Show tasks that are deleted",
"de": "Aufgaben anzeigen, die gelöscht wurden"
},
"osmTags": "mr_taskStatus=Deleted"
},
{
"question": {
"en": "Show tasks that are already fixed"
"en": "Show tasks that are already fixed",
"de": "Aufgaben anzeigen, die bereits erledigt wurden"
},
"osmTags": "mr_taskStatus=Already fixed"
},
{
"question": {
"en": "Show tasks that are marked as too hard"
"en": "Show tasks that are marked as too hard",
"de": "Aufgaben anzeigen, die als zu schwierig markiert wurden"
},
"osmTags": "mr_taskStatus=Too hard"
},
{
"question": {
"en": "Show tasks that are disabled"
"en": "Show tasks that are disabled",
"de": "Aufgaben anzeigen, die deaktiviert wurden"
},
"osmTags": "mr_taskStatus=Disabled"
}

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

@ -213,7 +213,7 @@
"title": {
"nl": "een parking voor auto's",
"en": "a car parking",
"de": "ein Parkplatz",
"de": "einen Parkplatz",
"es": "un aparcamiento de coches",
"fr": "un lieu de stationnement pour voitures"
}

1
assets/layers/recycling/recycling.json
View file

@ -950,6 +950,7 @@
}
},
{
"id": "contact_information",
"builtin": [
"website",
"email",

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

@ -2,7 +2,7 @@
"id": "shelter",
"name": {
"en": "Shelter",
"de": "Unterstand"
"de": "Unterstände"
},
"description": {
"en": "Layer showing shelter structures",

1
assets/layers/tertiary_education/tertiary_education.json
View file

@ -134,6 +134,7 @@
"condition": "amenity=university"
},
{
"id": "school-questions",
"builtin": [
"school.capacity",
"school.gender"

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

@ -94,16 +94,19 @@
"id": "entrance_info",
"render": {
"before": {
"en": "<h3>Entrances</h3>This building has {_entrances_count} entrances:"
"en": "<h3>Entrances</h3>This building has {_entrances_count} entrances:",
"de": "<h3>Eingänge</h3>Das Gebäude hat {_entrances_count} Eingänge:"
},
"after": {
"en": "{_entrances_count_without_width_count} entrances don't have width information yet"
"en": "{_entrances_count_without_width_count} entrances don't have width information yet",
"de": "{_entrances_count_without_width_count} Eingänge haben keine Angaben zur Breite"
},
"special": {
"type": "multi",
"key": "_entrance_properties_with_width",
"tagrendering": {
"en": "An <a href='#{id}'>entrance</a> of {canonical(width)}"
"en": "An <a href='#{id}'>entrance</a> of {canonical(width)}",
"de": "Ein <a href='#{id}'>Eingang</a> von {canonical(width)}"
}
}
},
@ -111,13 +114,15 @@
{
"if": "_entrances_count=0",
"then": {
"en": "No entrance has been marked"
"en": "No entrance has been marked",
"de": "Es wurde kein Eingang markiert"
}
},
{
"if": "_entrances_count_without_width:=_entrances_count",
"then": {
"en": "None of the {_entrance_count} entrances have width information yet"
"en": "None of the {_entrance_count} entrances have width information yet",
"de": "Keiner der {_entrance_count} Eingänge hat bisher Angaben zur Breite"
}
}
]