ilja_space/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 2023-06-29 15:08:13 +02:00
commit 24e7bc95cb
354 changed files with 1394 additions and 86984 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -686,7 +686,7 @@
"then": {
"ca": "Informació sobre teatres, concerts, ...",
"es": "Información sobre teatros, conciertos, ...",
"en": "Inormation related to theatre, concerts, ...",
"en": "Information related to theatre, concerts, …",
"de": "Informationen über Theater, Konzerte, ...",
"cs": "Informace týkající se divadla, koncertů, ...",
"fr": "Informations liées au théâtre, à des concerts, …",

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

@ -86,7 +86,7 @@
"ru": "Разнообразные произведения искусства",
"es": "Un mapa abierto de Estatuas, bustos, Graffitis y otras Obras de Arte en todo el mundo",
"ja": "多様な作品",
"zh_Hant": "不同類型的藝術品",
"zh_Hant": "顯示全世界的雕像、半身像、塗鴉以及其他類型的藝術品的地圖",
"id": "Peta terbuka patung, grafiti, dan karya seni lainnya di seluruh dunia",
"pt": "Diversas obras de arte",
"hu": "Szobrok, mellszobrok, graffitik és egyéb műalkotások nyílt világtérképe",

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

@ -789,7 +789,7 @@
"question": {
"en": "Does this bench have an inscription?",
"nl": "Heeft deze bank een inscriptie?",
"de": "Hat diese Bank eine Inschrift? ",
"de": "Hat diese Bank eine Inschrift?",
"fr": "Est-ce que ce banc possède une inscription ?",
"ca": "Aquest banc té una inscripció?",
"cs": "Má tato lavička nápis?",
@ -833,9 +833,9 @@
}
],
"questionHint": {
"en": "E.g. on a mounted plaque, in the backrest, ...",
"en": "E.g. on a mounted plaque, in the backrest, …",
"nl": "Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, ...",
"de": "Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ... ",
"de": "Z.B. auf einer angebrachten Plakette, in der Rückenlehne, ...",
"fr": "Par exemple, sur une plaque accrochée, sur le dossier, ...",
"ca": "P. ex. en una placa, al respatller, ...",
"cs": "Např. na připevněné desce, v opěradle, ...",
@ -847,7 +847,7 @@
"question": {
"en": "Does this bench have an artistic element?",
"nl": "Heeft deze bank een geïntegreerd kunstwerk?",
"de": "Hat diese Bank ein künstlerisches Element? ",
"de": "Hat diese Bank ein künstlerisches Element?",
"ca": "Aquest banc té algun element artístic?",
"cs": "Má tato lavička umělecké prvky?"
},

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

@ -212,7 +212,7 @@
{
"if": "fee=yes",
"then": {
"en": "This cleaning service is paid",
"en": "There is a fee to use this cleaning service",
"nl": "Dit fietsschoonmaakpunt is betalend",
"es": "Este servicio de limpieza es de pago",
"ca": "Aquest servei de neteja és de pagament",

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

@ -243,7 +243,8 @@
"if": "access=permissive",
"then": {
"en": "This charging station is accessible to the public during certain hours or conditions. Restrictions might apply, but general use is allowed.",
"nl": "Dit oplaadstation is publiek toegankelijk onder voorwaarden (bv. enkel tijdens bepaalde uren). "
"nl": "Dit oplaadstation is publiek toegankelijk onder voorwaarden (bv. enkel tijdens bepaalde uren). ",
"de": "Diese Ladestation ist zu gewissen Öffnungszeiten oder Bedingungen öffentlich zugänglich. Einschränkungen sind möglich, aber generelle Nutzung ist erlaubt."
}
}
]
@ -4639,7 +4640,8 @@
"id": "questions-technical",
"render": {
"en": "<h3>Technical questions</h3>The questions below are very technical. Feel free to ignore them<br/>{questions(technical)}",
"nl": "<h3>Technische vragen</h3>De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt<br/>{questions(technical)}"
"nl": "<h3>Technische vragen</h3>De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt<br/>{questions(technical)}",
"de": "<h3>Technische Frage</h3>Die nächsten Fragen sind sehr technisch. Du kannst diese auch überspringen.<br/>{questions(technical)}"
}
}
],

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

@ -18,7 +18,7 @@
"title": {
"render": {
"en": "Dentist Office {name}",
"de": "Arztpraxis {name}",
"de": "Zahnarztpraxis {name}",
"nl": "Tandartspraktijk {name}",
"fr": "Cabinet medical {name}"
}

23
assets/layers/filters/filters.json
View file

@ -173,6 +173,27 @@
}
}
]
},
{
"id": "free",
"options": [
{
"question": {
"en": "Free to use",
"nl": "Gratis toegankelijk",
"de": "Nutzung kostenlos",
"fr": "Utilisation gratuite",
"da": "Gratis at bruge"
},
"osmTags": {
"or": [
"fee=no",
"fee=0",
"charge=0"
]
}
}
]
}
]
}
}

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

@ -32,13 +32,15 @@
"type": "text"
},
"question": {
"en": "What is wrong with this feature?"
"en": "What is wrong with this feature?",
"de": "Was stimmt mit diesem Objekt nicht?"
},
"mappings": [
{
"if": "fixme=",
"then": {
"en": "This issue has been resolved"
"en": "This issue has been resolved",
"de": "Dieses Problem wurde behoben"
}
}
],

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

@ -6,7 +6,8 @@
"title": {
"render": {
"en": "Your travelled path",
"nl": "Jouw traject"
"nl": "Jouw traject",
"de": "Deine zurückgelegte Strecke"
}
},
"shownByDefault": false,

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

@ -22,21 +22,24 @@
},
"then": {
"en": "Add a new point or add a note",
"nl": "Voeg een nieuw punt of een nieuwe kaartnota toe"
"nl": "Voeg een nieuw punt of een nieuwe kaartnota toe",
"de": "Objekt oder Hinweis auf der Karte hinzufügen"
}
},
{
"if": "has_note_layer=yes",
"then": {
"en": "Add a new note",
"nl": "Voeg een nieuwe kaartnota toe"
"nl": "Voeg een nieuwe kaartnota toe",
"de": "Hinweis hinzufügen"
}
},
{
"if": "has_presets=yes",
"then": {
"en": "Add a new point",
"nl": "Voeg een nieuw punt toe"
"nl": "Voeg een nieuw punt toe",
"de": "Objekt hinzufügen"
}
}
]
@ -107,7 +110,8 @@
},
"then": {
"en": "Create a new map note",
"nl": "Maak een nieuwe kaartnotitie"
"nl": "Maak een nieuwe kaartnotitie",
"de": "Hinweis auf der Karte hinzufügen"
}
}
]

25
assets/layers/public_bookcase/public_bookcase.json
View file

@ -22,7 +22,7 @@
"source": {
"osmTags": "amenity=public_bookcase"
},
"minzoom": 10,
"minzoom": 7,
"title": {
"render": {
"en": "Bookcase",
@ -478,7 +478,10 @@
"id": "kid-books",
"options": [
{
"question": "Kinderboeken aanwezig?",
"question": {
"en": "Has children books",
"nl": "Kinderboeken aanwezig"
},
"osmTags": "books~i~.*children.*"
}
]
@ -487,7 +490,10 @@
"id": "adult-books",
"options": [
{
"question": "Boeken voor volwassenen aanwezig?",
"question": {
"en": "Has books for adults",
"nl": "Boeken voor volwassenen aanwezig"
},
"osmTags": "books~i~.*adults.*"
}
]
@ -505,11 +511,17 @@
}
},
{
"question": "Binnen?",
"question": {
"en": "Located indoors",
"nl": "Bevindt zich binnen"
},
"osmTags": "indoor=yes"
},
{
"question": "Buiten?",
"question": {
"nl": "Bevindt zich buiten",
"en": "Located outdoors"
},
"osmTags": {
"or": [
"indoor=no",
@ -518,7 +530,8 @@
}
}
]
}
},
"has_image"
],
"mapRendering": [
{

12
assets/layers/shower/license_info.json Normal file
View file

@ -0,0 +1,12 @@
[
{
"path": "shower.svg",
"license": "CC0",
"authors": [
"James"
],
"sources": [
"https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/shower.svg"
]
}
]

187
assets/layers/shower/shower.json Normal file
View file

@ -0,0 +1,187 @@
{
"id": "shower",
"name": {
"en": "Shower"
},
"minzoom": 12,
"source": {
"osmTags": "amenity=shower"
},
"title": {
"render": {
"en": "Shower"
}
},
"presets": [
{
"title": {
"en": "a shower"
},
"description": {
"en": "A (public) shower"
},
"tags": [
"amenity=shower"
]
}
],
"tagRenderings": [
"images",
"level",
{
"id": "access",
"question": {
"en": "Who can use this shower?"
},
"mappings": [
{
"if": "access=yes",
"then": {
"en": "Anyone can use this shower"
}
},
{
"if": "access=customers",
"then": {
"en": "Only customers can use this shower"
}
},
{
"if": "access=key",
"then": {
"en": "Accesible, but one has to ask for a key"
}
}
]
},
{
"id": "fee",
"question": {
"en": "Is there a fee for using this shower?"
},
"mappings": [
{
"if": "fee=yes",
"then": {
"en": "There is a fee for using this shower"
}
},
{
"if": "fee=no",
"then": {
"en": "This shower is free to use"
},
"addExtraTags": [
"charge="
]
}
]
},
{
"id": "charge",
"condition": "fee=yes",
"question": {
"en": "How much does it cost to use this shower?"
},
"freeform": {
"key": "charge",
"type": "string",
"placeholder": {
"en": "e.g. 1.50 EUR"
}
},
"render": {
"en": "It costs {charge} to use this shower"
}
},
"opening_hours",
{
"id": "hot_water",
"question": {
"en": "Does this shower have hot water available?"
},
"mappings": [
{
"if": "hot_water=yes",
"then": {
"en": "Hot water is available here"
}
},
{
"if": "hot_water=fee",
"then": {
"en": "Hot water is available here, but there is a fee"
}
},
{
"if": "hot_water=no",
"then": {
"en": "There is no hot water available here"
}
}
]
},
{
"builtin": "payment-options-split",
"override": {
"condition": {
"or": [
"fee=yes",
"hot_water=fee"
]
}
}
}
],
"filter": [
"free",
{
"id": "hot-water",
"options": [
{
"question": {
"en": "Hot water available"
},
"osmTags": {
"or": [
"hot_water=yes",
"hot_water=fee"
]
}
}
]
},
"open_now"
],
"deletion": {
"softDeletionTags": {
"and": [
"disused:amenity={amenity}",
"amenity="
]
},
"neededChangesets": 1
},
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": false
},
"mapRendering": [
{
"icon": "circle:white;./assets/layers/shower/shower.svg",
"location": [
"point",
"centroid"
],
"iconBadges": [
{
"if": "opening_hours~*",
"then": "icons.isOpen"
}
]
}
],
"description": {
"en": "A layer showing (public) showers"
}
}

87
assets/layers/shower/shower.svg Normal file
View file

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="25"
height="25"
viewBox="0 0 25 25"
version="1.1"
id="svg92"
sodipodi:docname="shower.svg"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
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="defs96" />
<sodipodi:namedview
id="namedview94"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
showgrid="false"
inkscape:zoom="16.857143"
inkscape:cx="7.029661"
inkscape:cy="7"
inkscape:window-width="2256"
inkscape:window-height="1435"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg92" />
<g
id="g389"
transform="translate(5.5,5.4999998)">
<path
d="M 6.8417969,0 C 6.5080632,0.00895547 6.214521,0.24656385 6.1503906,0.58789062 L 5.8476562,2.1933594 C 4.6012255,2.2351741 3.5074523,3.1334887 3.2675781,4.4101562 L 8.6171875,5.4160156 C 8.8407092,4.2264228 8.2526189,3.0728712 7.2441406,2.5234375 L 7.4375,1.5 H 14 V 0 Z"
id="path72" />
<circle
cx="5.3477998"
cy="7.8193002"
r="0.85500002"
id="circle74" />
<circle
cx="4.8835001"
cy="10.4283"
r="0.85500002"
id="circle76" />
<circle
cx="4.3322001"
cy="13.0403"
r="0.85500002"
id="circle78" />
<circle
cx="7.9656"
cy="7.7733998"
r="0.85500002"
id="circle80" />
<circle
cx="7.9252"
cy="10.4407"
r="0.85500002"
id="circle82" />
<circle
cx="7.9875002"
cy="13.145"
r="0.85500002"
id="circle84" />
<circle
cx="2.9883001"
cy="6.8755999"
r="0.85500002"
id="circle86" />
<circle
cx="1.9097"
cy="9.3199997"
r="0.85500002"
id="circle88" />
<circle
cx="0.85500002"
cy="11.7795"
r="0.85500002"
id="circle90" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

33
assets/layers/sport_pitch/sport_pitch.json
View file

@ -178,6 +178,39 @@
],
"id": "sport_pitch-sport"
},
{
"id": "basketball-hoops",
"question": {
"en": "How much basketball hoops does this pitch have?"
},
"mappings": [
{
"if": "hoops=1",
"then": {
"en": "This basketball pitch has a single hoop"
}
},
{
"if": "hoops=2",
"then": {
"en": "This basketball pitch has two hoops"
}
},
{
"if": "hoops=4",
"then": {
"en": "This basketball pitch has four hoops"
}
},
{
"if": "hoops~*",
"then": {
"en": "This basketball pitch has {hoops} hoops"
},
"hideInAnswer": true
}
]
},
{
"question": {
"nl": "Wat is de ondergrond van dit sportveld?",

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

@ -241,7 +241,11 @@
"condition": "fee=yes",
"freeform": {
"key": "charge",
"type": "string"
"type": "string",
"placeholder": {
"en": "e.g. 0.50 EUR",
"nl": "bijv. 0.50 EUR"
}
},
"id": "toilet-charge"
},
@ -642,27 +646,7 @@
}
]
},
{
"id": "free",
"options": [
{
"question": {
"en": "Free to use",
"nl": "Gratis toegankelijk",
"de": "Nutzung kostenlos",
"fr": "Utilisation gratuite",
"da": "Gratis at bruge"
},
"osmTags": {
"or": [
"fee=no",
"fee=0",
"charge=0"
]
}
}
]
},
"free",
"open_now"
],
"deletion": {

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

@ -344,7 +344,7 @@
"mapRendering": [
{
"icon": {
"render": "./assets/layers/toilet/toilets.svg",
"render": "circle:white;./assets/layers/toilet/toilets.svg",
"mappings": [
{
"if": {

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

@ -9,7 +9,8 @@
"title": {
"render": {
"en": "Settings",
"nl": "Instellingen"
"nl": "Instellingen",
"de": "Einstellungen"
}
},
"source": "special",
@ -44,7 +45,8 @@
"href": "{_backend}/messages/inbox",
"text": {
"en": "Open your inbox",
"nl": "Ga naar je inbox"
"nl": "Ga naar je inbox",
"de": "Deinen Posteingang öffnen"
}
}
}
@ -55,7 +57,8 @@
"special": {
"type": "link",
"text": {
"en": "<b class='alert'>You have {_unreadMessages}</b><br/>Open your inbox"
"en": "<b class='alert'>You have {_unreadMessages}</b><br/>Open your inbox",
"de": "<b class='alert'>Du hast {_unreadMessages}</b><br/>Öffne Deinen Posteingang"
},
"href": "{_backend}/messages/inbox"
}
@ -69,7 +72,8 @@
"special": {
"type": "link",
"text": {
"en": "Open your settings on OpenStreetMap.org"
"en": "Open your settings on OpenStreetMap.org",
"de": "Öffne Deine Einstellungen auf OpenStreetMap.org"
},
"href": "{_backend}/account/edit"
}
@ -145,34 +149,40 @@
{
"id": "show_tags",
"question": {
"en": "Show the raw OpenStreetMap-tags?"
"en": "Show the raw OpenStreetMap-tags?",
"de": "Rohe OpenStreetMap-Tags anzeigen?"
},
"questionHint": {
"en": "<b>Tags</b> are attributes that every element has. This is the technical data that is stored in the database. You don't need this information to edit with MapComplete, but advanced users might want to use this as reference."
"en": "<b>Tags</b> are attributes that every element has. This is the technical data that is stored in the database. You don't need this information to edit with MapComplete, but advanced users might want to use this as reference.",
"de": "<b>Tags</b> sind die Eigenschaften, die jedes Objekt hat. Das sind die technischen Daten, die in der Datenbank gespeichert werden. Du brauchst diese Informationen nicht, um mit MapComplete Änderungen zu machen, aber fortgeschrittenen Nutzer*innen kann es als Referenz dienen."
},
"mappings": [
{
"if": "mapcomplete-show_tags=no",
"then": {
"en": "Never show the tags."
"en": "Never show the tags.",
"de": "Tags nie anzeigen."
}
},
{
"if": "mapcomplete-show_tags=",
"then": {
"en": "Show the tags that will be applied once I have made {__userjourney_tagsVisibleAt} changesets"
"en": "Show the tags that will be applied once I have made {__userjourney_tagsVisibleAt} changesets",
"de": "Tags anzeigen sobald ich {__userjourney_tagsVisibleAt} Changesets erstellt habe"
}
},
{
"if": "mapcomplete-show_tags=yes",
"then": {
"en": "Show the tags that will be applied when making a change"
"en": "Show the tags that will be applied when making a change",
"de": "Tags anzeigen, die bei der Änderung hinzugefügt werden"
}
},
{
"if": "mapcomplete-show_tags=full",
"then": {
"en": "Show the tags that will be applied when making a change and show the tags table on every feature"
"en": "Show the tags that will be applied when making a change and show the tags table on every feature",
"de": "Tags anzeigen, die bei der Änderung hinzugefügt werden, und Tag-Tabelle bei jedem Objekt anzeigen"
}
}
]

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

@ -20,7 +20,8 @@
"da": "Specielt indbygget lag giver alle vægge og bygninger. Dette lag er nyttigt i forudindstillinger til objekter, der kan placeres mod vægge (f.eks. AED'er, postkasser, indgange, adresser, overvågningskameraer, …). Dette lag er usynligt som standard og kan ikke skiftes af brugeren.",
"ca": "Capa construïda especial que proporciona totes les parets i edificis. Aquesta capa és útil als predefinits per a objectes que es poden col·locar a les parets (p. ex. DEA, bústies de correus, entrades, adreces, càmeres de vigilància, ...). Aquesta capa és invisible per defecte i no es pot activar per l'usuari.",
"es": "Capa especial incorporada que proporciona todas las paredes y edificios. Esta capa es útil en los preajustes para objetos que pueden colocarse contra las paredes (por ejemplo: AEDs, buzones de correos, entradas, direcciones, cámaras de vigilancia, ...). Esta capa es invisible por defecto y no puede ser activada por el usuario.",
"cs": "Speciální zabudovaná vrstva poskytující všechny stěny a budovy. Tato vrstva je užitečná v předvolbách pro objekty, které lze umístit ke stěnám (např. AED, poštovní schránky, vchody, adresy, bezpečnostní kamery, …). Tato vrstva je ve výchozím nastavení neviditelná a uživatel ji nemůže přepínat."
"cs": "Speciální zabudovaná vrstva poskytující všechny stěny a budovy. Tato vrstva je užitečná v předvolbách pro objekty, které lze umístit ke stěnám (např. AED, poštovní schránky, vchody, adresy, bezpečnostní kamery, …). Tato vrstva je ve výchozím nastavení neviditelná a uživatel ji nemůže přepínat.",
"zh_Hant": "特殊的內建圖層顯示所有牆壁與建築。這個圖層對於規畫要靠牆的東西 (例如 AED、郵筒、入口、地址、監視器等) 相當實用。這個圖層預設顯示而且無法由使用者開關。"
},
"source": {
"osmTags": {