Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop

This commit is contained in:
Pieter Vander Vennet 2024-04-27 01:49:07 +02:00
commit 4ced5c99c8
16 changed files with 128 additions and 88 deletions

View file

@ -934,7 +934,7 @@
"en": "This bench does <span class='subtle'>(probably)</span> not have an inscription",
"nl": "Deze bank heeft <span class='subtle'>(waarschijnlijk)</span> geen inscriptie",
"de": "Diese Bank hat <span class='subtle'>(wahrscheinlich)</span> keine Inschrift",
"fr": "Ce banc n'a<span class='subtle'>(probablement)</span> pas d'inscription",
"fr": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription",
"es": "Este banco <span class='subtle'>(probablemente)</span> no tiene inscripción",
"ca": "Aquest banc <span class='subtle'>(probablement)</span> no té cap inscripció",
"cs": "Tato lavička <span class='subtle'>(pravděpodobně)</span> nemá nápis",
@ -1020,7 +1020,8 @@
"cs": "Tato lavička <span class=\"subtle\">pravděpodobně</span> nemá integrované umělecké dílo",
"pt_BR": "Esse banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
"es": "Este banco <span class=\"subtle\">probablemente</span> no tiene una obra de arte integrada",
"pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada"
"pt": "Este banco <span class=\"subtle\">provavelmente</span> não tem uma obra de arte integrada",
"fr": "Ce banc ne comporte <span class=\"subtle\">probablement</span> pas d'œuvre d'art"
},
"hideInAnswer": true
}

View file

@ -2506,7 +2506,7 @@
"title": {
"en": "charging station for cars",
"nl": "oplaadstation voor elektrische auto's",
"de": "Ladestation für Elektrofahrräder"
"de": "Ladestation für Autos"
}
}
],

View file

@ -186,7 +186,8 @@
"alsoShowIf": "shape=",
"then": {
"en": "This elevator has a rectangular shape",
"de": "Dieser Aufzug hat eine rechteckige Form"
"de": "Dieser Aufzug hat eine rechteckige Form",
"fr": "Cet ascenseur est de forme rectangulaire"
},
"icon": "./assets/svg/square.svg"
},

View file

@ -352,7 +352,8 @@
"en": "This is a classroom",
"de": "Dies ist ein Klassenzimmer",
"ca": "Açò és una aula",
"cs": "Jedná se o učebnu"
"cs": "Jedná se o učebnu",
"fr": "C'est une salle de classe"
},
"icon": "./assets/layers/indoors/room_class.svg"
},
@ -449,7 +450,8 @@
"en": "This is an office",
"de": "Dies ist ein Büro",
"ca": "Açò és una oficina",
"cs": "Jedná se o kancelář"
"cs": "Jedná se o kancelář",
"fr": "C'est un bureau"
},
"icon": "./assets/layers/indoors/room_office.svg"
},

View file

@ -1,16 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete",
"de": "Änderungen mit MapComplete"
"en": "Changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete",
"de": "Änderungen von MapComplete anzeigen"
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
"en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
@ -21,8 +18,7 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers",
"de": "Zentrum der Änderungssätze"
"en": "Changeset centers"
},
"minzoom": 0,
"source": {
@ -32,48 +28,41 @@
},
"title": {
"render": {
"en": "Changeset for {theme}",
"de": "Änderungssatz für {theme}"
"en": "Changeset for {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes",
"de": "Alle MapComplete-Änderungen anzeigen"
"en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "show_changeset_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"question": {
"en": "What contributor did make this change?",
"de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
"en": "What contributor did make this change?"
},
"freeform": {
"key": "user"
},
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
}
},
{
"id": "theme-id",
"question": {
"en": "What theme was used to make this change?",
"de": "Welches Thema wurde für die Änderung verwendet?"
"en": "What theme was used to make this change?"
},
"freeform": {
"key": "theme"
},
"render": {
"en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>",
"de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>"
}
},
{
@ -82,23 +71,19 @@
"key": "locale"
},
"question": {
"en": "What locale (language) was this change made in?",
"de": "In welcher Benutzersprache wurde die Änderung vorgenommen?"
"en": "What locale (language) was this change made in?"
},
"render": {
"en": "User locale is {locale}",
"de": "Benutzersprache {locale}"
"en": "User locale is {locale}"
}
},
{
"id": "host",
"render": {
"en": "Change with with <a href='{host}'>{host}</a>",
"de": "Änderung über <a href='{host}'>{host}</a>"
"en": "Change with with <a href='{host}'>{host}</a>"
},
"question": {
"en": "What host (website) was this change made with?",
"de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
"en": "What host (website) was this change made with?"
},
"freeform": {
"key": "host"
@ -119,12 +104,10 @@
{
"id": "version",
"question": {
"en": "What version of MapComplete was used to make this change?",
"de": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?"
"en": "What version of MapComplete was used to make this change?"
},
"render": {
"en": "Made with {editor}",
"de": "Erstellt mit {editor}"
"en": "Made with {editor}"
},
"freeform": {
"key": "editor"
@ -506,8 +489,7 @@
}
],
"question": {
"en": "Themename contains {search}",
"de": "Themenname enthält {search}"
"en": "Themename contains {search}"
}
}
]
@ -523,8 +505,7 @@
}
],
"question": {
"en": "Themename does <b>not</b> contain {search}",
"de": "Themename enthält <b>not</b> {search}"
"en": "Themename does <b>not</b> contain {search}"
}
}
]
@ -540,8 +521,7 @@
}
],
"question": {
"en": "Made by contributor {search}",
"de": "Erstellt vom Mitwirkenden {search}"
"en": "Made by contributor {search}"
}
}
]
@ -557,8 +537,7 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}",
"de": "<b>Nicht</b> erstellt von Mitwirkendem {search}"
"en": "<b>Not</b> made by contributor {search}"
}
}
]
@ -575,8 +554,7 @@
}
],
"question": {
"en": "Made before {search}",
"de": "Erstellt vor {search}"
"en": "Made before {search}"
}
}
]
@ -593,8 +571,7 @@
}
],
"question": {
"en": "Made after {search}",
"de": "Erstellt nach {search}"
"en": "Made after {search}"
}
}
]
@ -610,8 +587,7 @@
}
],
"question": {
"en": "User language (iso-code) {search}",
"de": "Benutzersprache (ISO-Code) {search}"
"en": "User language (iso-code) {search}"
}
}
]
@ -627,8 +603,7 @@
}
],
"question": {
"en": "Made with host {search}",
"de": "Erstellt mit Host {search}"
"en": "Made with host {search}"
}
}
]
@ -639,8 +614,7 @@
{
"osmTags": "add-image>0",
"question": {
"en": "Changeset added at least one image",
"de": "Änderungssatz hat mindestens ein Bild hinzugefügt"
"en": "Changeset added at least one image"
}
}
]
@ -651,8 +625,7 @@
{
"osmTags": "theme!=grb",
"question": {
"en": "Exclude GRB theme",
"de": "GRB-Thema ausschließen"
"en": "Exclude GRB theme"
}
}
]
@ -663,8 +636,7 @@
{
"osmTags": "theme!=etymology",
"question": {
"en": "Exclude etymology theme",
"de": "Etymologie-Thema ausschließen"
"en": "Exclude etymology theme"
}
}
]
@ -679,8 +651,7 @@
{
"id": "link_to_more",
"render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
"de": "Weitere Statistiken gibt es <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
}
},
{

View file

@ -72,6 +72,18 @@
}
}
},
{
"id": "show-data-velopark",
"render": {
"special": {
"type": "linked_data_from_website",
"key": "ref:velopark",
"useProxy": "no",
"host": "https://data.velopark.be",
"mode": "readonly"
}
}
},
{
"id": "closest_parkings",
"render": {
@ -90,7 +102,7 @@
"type": "multi",
"key": "_nearby_bicycle_parkings:props",
"classes": "p-2 m-1 my-4 border-2 border-dashed border-black",
"tagrendering": "<b><a href='#{id}'>{id}</a></b> ({_distance}m, {_velopark:id}) {minimap(20)} {tag_apply(ref:velopark=$_ref,Link this object.,link,id,_mr_id)}"
"tagrendering": "<b><a href='#{id}'>{id}</a></b> ({_distance}m, {_velopark:id}, place for {capacity}, covered: {covered}) {minimap(20,id,_mr_id)} {tag_apply(ref:velopark=$_ref,Link this object.,link,id,_mr_id)}"
}
}
},
@ -120,7 +132,7 @@
"id": "title_manually_copy",
"render": {
"en": "<h3>Manually link</h3>Does the bicycle parking exist in OpenStreetMap but is it further then 25m away? Then: <ol><li>Copy the following URL: <span class='literal-code'>{ref:velopark}</span></li><li>Select the correct bicycle parking on the map</li><li>Paste the URL into the question <i>What is the URL of the data path in Velopark?</i></li><li>Mark this item as handled with the button below:</li></ul>",
"nl": "<h3>Manueel linken</h3>"
"nl": "<h3>Manueel linken</h3>Bestaat de fietsenstalling in OpenStreetMap maar is staat deze meer dan 25m verder?In dit geval: <ol><li>Kopieer de volgende URL: <span class='literal-code'>{ref:velopark}</span></li><li>Selecteer de juiste fietsenstalling op de kaart</li><li>Plak de URL in de vraag <i>Wat is de data-url van deze fietsenstalling in Velopark.be?</i></li><li>Open deze fietsenstalling opnieuw en markeer deze als gelinkt met onderstaande knop:</li></ul>"
}
},
{
@ -168,18 +180,6 @@
"nl": "<h3>Extra informatie</h3>"
}
},
{
"id": "show-data-velopark",
"render": {
"special": {
"type": "linked_data_from_website",
"key": "ref:velopark",
"useProxy": "no",
"host": "https://data.velopark.be",
"mode": "readonly"
}
}
},
{
"id": "velopark-data-link",
"render": {
@ -319,7 +319,21 @@
}
],
"+tagRenderings": [
"questions"
{
"id": "questions-intro",
"render": {
"en": "The question(s) below inquiry about attributes that are not yet known in OpenStreetMap",
"nl": "De vragen hieronder zijn attributen die nog niet gekend zijn in OpenStreetMap"
}
},
"questions",
{
"id": "osm-block-title",
"render": {
"en": "<h3>Attributes from OpenStreetMap</h3>Editing below will make changes directly in OpenStreetMap",
"nl": "<h3>Attributen uit OpenStreetMap</h3>Als je hieronder wijzigingen maakt, dan worden die direct in OpenStreetMap opgeslaan"
}
}
],
"tagRenderings+": [
"images"
@ -338,7 +352,14 @@
"doCount": false,
"minzoom": 14,
"+tagRenderings": [
"questions"
"questions",
{
"id": "osm-block-title",
"render": {
"en": "<h3>Attributes from OpenStreetMap</h3>Editing below will make changes directly in OpenStreetMap",
"nl": "<h3>Attributen uit OpenStreetMap</h3>Als je hieronder wijzigingen maakt, dan worden die direct in OpenStreetMap opgeslaan"
}
}
],
"tagRenderings+": [
"images"