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

Merge branch 'develop' into feature/station-map

Browse source
This commit is contained in:
Robin van der Linde 2022-10-29 22:07:56 +02:00
commit 1ead95029f
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
63 changed files with 13359 additions and 42297 deletions
Download patch file Download diff file Expand all files Collapse all files

24
assets/language_in_country.json
View file

@ -132,6 +132,7 @@
"en"
],
"CN": [
"zh",
"zh"
],
"CO": [
@ -148,6 +149,7 @@
],
"CY": [
"tr",
"el",
"el"
],
"CZ": [
@ -247,6 +249,9 @@
"es",
"pt"
],
"GR": [
"el"
],
"GT": [
"es"
],
@ -453,8 +458,7 @@
"fr"
],
"NG": [
"en",
"yo"
"en"
],
"NI": [
"es"
@ -502,9 +506,7 @@
"en"
],
"PK": [
"ur",
"en",
"ar"
"ur"
],
"PL": [
"pl",
@ -559,7 +561,6 @@
"ar"
],
"SE": [
"sv",
"sv"
],
"SG": [
@ -648,6 +649,9 @@
"en",
"en"
],
"TW": [
"zh"
],
"TZ": [
"en",
"sw"
@ -693,16 +697,16 @@
"ar"
],
"ZA": [
"en",
"zu",
"xh",
"af",
"ve",
"ss",
"tn",
"ts",
"st",
"nr",
"en",
"zu",
"xh"
"nr"
],
"ZM": [
"en"

1
assets/language_native.json
View file

@ -1,5 +1,6 @@
{
"ca": "català",
"cs": "čeština",
"da": "dansk",
"de": "Deutsch",
"en": "English",

10957
assets/language_translations.json
View file

File diff suppressed because it is too large Load diff

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

@ -136,13 +136,23 @@
},
"induction-loop",
{
"builtin": "wikidata.tactile_writing-braille",
"override": {
"id": "tactile_writing_language",
"render": {
"special": {
"type": "language_chooser",
"key": "tactile_writing:braille:language",
"question": {
"en": "In which languages does this elevator have tactile writing (braille)?"
},
"render_list_item": {
"en": "This elevator has tactile writing in {language():font-bold}"
},
"render_single_language": {
"en": "This elevator has tactile writing in {language():font-bold}"
}
}
}
}}
],
"mapRendering": [
{
@ -218,4 +228,4 @@
]
}
]
}
}

21
assets/layers/gps_location/gps_location.json
View file

@ -11,7 +11,7 @@
"mapRendering": [
{
"icon": {
"render":"crosshair:var(--catch-detail-color)",
"render": "crosshair:var(--catch-detail-color)",
"mappings": [
{
"if": "speed>2",
@ -22,12 +22,17 @@
"iconSize": "40,40,center",
"rotation": {
"render": "0deg",
"mappings": [{
"if": {
"and":["speed>2","heading!=NaN"]
},
"then": "{heading}deg"
}]
"mappings": [
{
"if": {
"and": [
"speed>2",
"heading!=NaN"
]
},
"then": "{heading}deg"
}
]
},
"location": [
"point",
@ -35,4 +40,4 @@
]
}
]
}
}

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

@ -1,11 +1,22 @@
{
"id": "gps_location_history",
"description": "Meta layer which contains the previous locations of the user as single points. This is mainly for technical reasons, e.g. to keep match the distance to the modified object",
"minzoom": 0,
"minzoom": 1,
"name": null,
"source": {
"osmTags": "user:location=yes",
"#": "Cache is disabled here as these points are kept seperately",
"maxCacheAge": 0
},
"mapRendering": null
"shownByDefault": false,
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": "square:red",
"iconSize": "5,5,center"
}
]
}

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

@ -1,6 +1,6 @@
{
"id": "gps_track",
"description": "Meta layer showing the previous locations of the user as single line. Add this to your theme and override the icon to change the appearance of the current location.",
"description": "Meta layer showing the previous locations of the user as single line with controls, e.g. to erase, upload or download this track. Add this to your theme and override the maprendering to change the appearance of the travelled track.",
"minzoom": 0,
"source": {
"osmTags": "id=location_track",
@ -22,6 +22,7 @@
},
"export_as_gpx",
"export_as_geojson",
"{upload_to_osm()}",
"minimap",
{
"id": "delete",

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

@ -270,4 +270,4 @@
}
}
]
}
}

35
assets/layers/school/school.json
View file

@ -296,28 +296,31 @@
"phone",
"email",
{
"builtin": "wikidata.school-language",
"override": {
"+mappings": [
{
"if": "school:language=",
"hideInAnswer": true,
"then": {
"en": "The main language of this school is unknown",
"nl": "De voertaal van deze school is niet gekend",
"de": "Die Unterrichtssprache der Schule ist unbekannt",
"fr": "La langue principale de cette école est inconnue"
}
}
],
"id": "school-language",
"render": {
"special": {
"type": "language_chooser",
"key": "language",
"render_all": {
"en": "The following languages are used in this school:{list()}"
},
"render_single_language": {
"en": "{language():font-bold} is the main language of this school"
},
"question": {
"en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",
"nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>",
"de": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",
"fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>"
},
"no_known_languages": {
"en": "The main language of this school is unknown",
"nl": "De voertaal van deze school is niet gekend",
"de": "Die Unterrichtssprache der Schule ist unbekannt",
"fr": "La langue principale de cette école est inconnue"
}
}
}
}}
],
"presets": [
{
@ -360,4 +363,4 @@
"width": 1
}
]
}
}

95
assets/layers/stairs/stairs.json
View file

@ -51,6 +51,74 @@
}
]
},
{
"id": "tactile_writing",
"condition": "handrail=yes",
"question": {
"en": "Do these stairs have tactile writing on the handrail?"
},
"mappings": [
{
"if": "tactile_writing=yes",
"then": {
"en": "There is tactile writing on the handrail"
}
},
{
"if": "tactile_writing=no",
"then": {
"en": "There is no tactile writing on the handrail"
}
}
]
},
{
"id": "tactile_writing_language",
"condition": "tactile_writing:braille:language=yes",
"render": {
"special": {
"type": "language_chooser",
"key": "tactile_writing:braille:language",
"question": {
"en": "In which languages is there tactile writing (braille) for navigation? <img src='./assets/layers/stairs/Braille_stairs.jpg' style='height: 300px; width: auto; display: block;' />"
},
"render_list_item": {
"en": "These stairs have tactile writing in {language():font-bold}"
},
"render_single_language": {
"en": "These stairs have tactile writing in {language():font-bold}"
}
}
}
},
{
"id": "conveying",
"mappings": [
{
"if": "conveying=yes",
"then": {
"en": "This is an escalator",
"nl": "Dit is een roltrap"
}
},
{
"if": "conveying=no",
"then": {
"en": "This is not an escalator",
"nl": "Dit is geen roltrap"
}
},
{
"if": "conveying=",
"then": {
"en": "This is not an escalator",
"nl": "Dit is geen roltrap"
},
"hideInAnswer": true
}
]
},
{
"id": "ramp",
"question": {
@ -94,33 +162,6 @@
}
}
]
},
{
"builtin": "wikidata.tactile_writing-braille",
"override": {
"question": {
"en": "In which languages is there tactile writing (braille) for navigation? <img src='./assets/layers/stairs/Braille_stairs.jpg' style='height: 300px; width: auto; display: block;' />"
}
}
},
{
"id": "conveying",
"mappings": [
{
"if": "conveying=yes",
"then": {
"en": "This is an escalator",
"nl": "Dit is een roltrap"
}
},
{
"if": "conveying=no",
"then": {
"en": "This is not an escalator",
"nl": "Dit is geen roltrap"
}
}
]
}
],
"mapRendering": [

40682
assets/layers/wikidata/wikidata.json
View file

File diff suppressed because it is too large Load diff