Merge pull request #1122 from pietervdvn/develop

Sync branches
This commit is contained in:
Pieter Vander Vennet 2022-10-29 20:38:57 +02:00 committed by GitHub
commit ac09898efd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 13460 additions and 42299 deletions

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"

View file

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

File diff suppressed because it is too large Load diff

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 @@
]
}
]
}
}

View file

@ -6,10 +6,34 @@
"osmTags": "id=gps",
"maxCacheAge": 0
},
"title": "Current position",
"name": "GPS Location",
"mapRendering": [
{
"icon": "crosshair:var(--catch-detail-color)",
"icon": {
"render": "crosshair:var(--catch-detail-color)",
"mappings": [
{
"if": "speed>2",
"then": "gps_arrow"
}
]
},
"iconSize": "40,40,center",
"rotation": {
"render": "0deg",
"mappings": [
{
"if": {
"and": [
"speed>2",
"heading!=NaN"
]
},
"then": "{heading}deg"
}
]
},
"location": [
"point",
"centroid"

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"
}
]
}

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",

View file

@ -183,7 +183,8 @@
"presets": [
{
"tags": [
"tourism=map"
"tourism=information",
"information=map"
],
"title": {
"en": "a map",

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
}
]
}
}

View file

@ -50,6 +50,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": {
@ -93,33 +161,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": [
@ -129,4 +170,4 @@
"dashArray": "2 2"
}
]
}
}

File diff suppressed because it is too large Load diff

View file

@ -33,6 +33,22 @@
],
"sources": []
},
{
"path": "SocialImageRepo.png",
"license": "CC0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "SocialImageRepo.svg",
"license": "CC0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "SocialImageSmall.png",
"license": "CC-BY-SA 4.0",

43
assets/svg/gps_arrow.svg Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="375px"
height="375px"
viewBox="0 0 375 375"
version="1.1"
id="svg5"
sodipodi:docname="gps_arrow.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs9" />
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.7173333"
inkscape:cx="187.79115"
inkscape:cy="187.5"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg5" />
<g
id="surface1"
transform="matrix(0.63906155,0,0,0.98221939,67.675844,3.3354774)"
style="stroke:#ffffff;stroke-opacity:1;stroke-width:3.78656711;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:bevel;fill:#5454eb;fill-opacity:0.98823529">
<path
style="fill:#5454eb;fill-opacity:0.98823529;fill-rule:nonzero;stroke:#ffffff;stroke-opacity:1;stroke-width:3.78656711;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:bevel"
d="M 0,374.61719 C 0,373.62109 187.49609,-0.375 187.80469,0 188.84766,1.261719 375.34375,374.71094 375,374.85156 c -0.22266,0.0899 -42.48047,-18.05078 -93.90234,-40.3125 l -93.4961,-40.47265 -93.343748,40.46875 C 42.917969,356.78906 0.707031,375 0.457031,375 0.207031,375 0,374.82812 0,374.61719 Z m 0,0"
id="path2" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

@ -577,6 +577,14 @@
"https://www.svgrepo.com/svg/22182/map"
]
},
{
"path": "gps_arrow.svg",
"license": "CC0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "hand.svg",
"license": "CC0",