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-07-18 16:20:25 +02:00
commit e37ada0b20
48 changed files with 6550 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

18
assets/contributors.json
View file

@ -1,11 +1,11 @@
{
"contributors": [
{
"commits": 4067,
"commits": 4165,
"contributor": "Pieter Vander Vennet"
},
{
"commits": 103,
"commits": 119,
"contributor": "Robin van der Linde"
},
{
@ -64,6 +64,10 @@
"commits": 17,
"contributor": "pgm-chardelv1"
},
{
"commits": 15,
"contributor": "Andrews Leruth"
},
{
"commits": 15,
"contributor": "ToastHawaii"
@ -81,13 +85,17 @@
"contributor": "Bavo Vanderghote"
},
{
"commits": 10,
"commits": 11,
"contributor": "dependabot[bot]"
},
{
"commits": 10,
"contributor": "LiamSimons"
},
{
"commits": 9,
"contributor": "AlexanderRebai"
},
{
"commits": 9,
"contributor": "RobJN"
@ -188,6 +196,10 @@
"commits": 2,
"contributor": "Stanislas Gueniffey"
},
{
"commits": 1,
"contributor": "bxl-forever"
},
{
"commits": 1,
"contributor": "loviuz"

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

@ -7,12 +7,14 @@
"render": {
"en": "{name}"
},
"mappings": [{
"if": "name=",
"then": {
"en": "Pharmacy"
"mappings": [
{
"if": "name=",
"then": {
"en": "Pharmacy"
}
}
}]
]
},
"source": {
"osmTags": {

6
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -1,4 +1,5 @@
{
"#dont-translate": "*",
"id": "buurtnatuur",
"title": {
"nl": "Breng jouw buurtnatuur in kaart"
@ -35,7 +36,10 @@
"or": [
"leisure=nature_reserve",
{
"and": ["boundary=protected_area","protect_class!=22"]
"and": [
"boundary=protected_area",
"protect_class!=22"
]
}
]
}

2
assets/themes/grb_import/grb.json
View file

@ -630,7 +630,7 @@
}
}
],
"isShown":{
"isShown": {
"or": [
"_imported_osm_object_found!=true",
"_imported_osm_still_fresh!=true"

55
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -1,13 +1,19 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete"
"en": "Changes made with MapComplete",
"de": "Mit MapComplete vorgenommene Änderungen",
"nl": "Wijzigingen gemaakt met MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete"
"en": "Shows changes made by MapComplete",
"de": "Zeigt die mit MapComplete vorgenommenen Änderungen",
"nl": "Toont wijzigingen gemaakt met MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
"en": "This maps shows all the changes made with MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
"nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt"
},
"maintainer": "",
"icon": "./assets/svg/logo.svg",
@ -22,7 +28,8 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers"
"en": "Changeset centers",
"de": "Zentrum der Änderungssätze"
},
"minzoom": 0,
"source": {
@ -36,35 +43,47 @@
],
"title": {
"render": {
"en": "Changeset for {theme}"
"en": "Changeset for {theme}",
"de": "Änderungssatz für {theme}",
"nl": "Wijzigingset voor {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes"
"en": "Shows all MapComplete changes",
"de": "Zeigt alle MapComplete Änderungen",
"nl": "Toont alle wijzigingen met MapComplete"
},
"tagRenderings": [
{
"id": "render_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"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>",
"nl": "Wijzigingset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
"de": "Geändert von <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
"nl": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
}
},
{
"id": "theme",
"render": {
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"de": "Änderung mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"nl": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
},
"mappings": [
{
"if": "theme~http.*",
"then": {
"en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
"en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
"de": "Änderung mit <b>inoffiziellem</b> Thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
"nl": "Wijziging met <b>officieus</b> thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
}
}
]
@ -368,7 +387,9 @@
}
],
"question": {
"en": "Themename contains {search}"
"en": "Themename contains {search}",
"de": "Themenname enthält {search}",
"nl": "Themanaam bevat {search}"
}
}
]
@ -384,7 +405,9 @@
}
],
"question": {
"en": "Made by contributor {search}"
"en": "Made by contributor {search}",
"de": "Erstellt von {search}",
"nl": "Gemaakt door bijdrager {search}"
}
}
]
@ -400,7 +423,9 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}"
"en": "<b>Not</b> made by contributor {search}",
"de": "<b>Nicht</b> erstellt von {search}",
"nl": "<b>Niet</b> gemaakt door bijdrager {search}"
}
}
]
@ -415,7 +440,9 @@
{
"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>"
"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 finden Sie <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>",
"nl": "Meer statistieken kunnen <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> gevonden worden"
}
},
{

3
assets/themes/onwheels/onwheels.json
View file

@ -4,7 +4,7 @@
"en": "OnWheels"
},
"description": {
"en": "On this map, publicly wheelchair accessible places are shown and can be easily added"
"en": "On this map, publicly weelchair accessible places are shown and can be easily added"
},
"maintainer": "MapComplete",
"icon": "./assets/themes/onwheels/crest.svg",
@ -40,7 +40,6 @@
"+calculatedTags": [
"_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
"_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
],
"+tagRenderings": [
{

2
assets/themes/speelplekken/speelplekken.json
View file

@ -288,6 +288,6 @@
"then": "./assets/themes/speelplekken/youtube.svg"
}
],
"isShown":"_is_shadowed!=yes"
"isShown": "_is_shadowed!=yes"
}
}

2
assets/translators.json
View file

@ -1,7 +1,7 @@
{
"contributors": [
{
"commits": 176,
"commits": 177,
"contributor": "Pieter Vander Vennet"
},
{