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

Small fixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-04-23 17:22:01 +02:00
parent 5c0e3662c1
commit 3e3da25edb
18 changed files with 263 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
]
},
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,bottom",
"iconSize": "40,40,center",
"width": "1",
"color": "#0f0",
"wayHandling": 2,

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

@ -335,7 +335,8 @@
{
"#": "Surface area",
"render": {
"en": "Surface area: {_surface:ha}Ha"
"en": "Surface area: {_surface:ha}Ha",
"nl": "Totale oppervlakte: {_surface:ha}Ha"
},
"mappings":[ {
"if": "_surface:ha=0",

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

@ -13,6 +13,9 @@
]
}
},
"calculatedTags": [
"_size_classification=Number(feat.properties._surface) < 10 ? 'small' : (Number(feat.properties._surface) < 100 ? 'medium' : 'large') "
],
"description": {
"nl": "Speeltuinen",
"en": "Playgrounds"
@ -331,7 +334,25 @@
"render": "1"
},
"iconSize": {
"render": "40,40,center"
"render": "40,40,center",
"mappings": [
{
"if": "id~node/.*",
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=medium",
"then": "40,40,center"
},
{
"if": "_size_classification=large",
"then": "60,60,center"
}
]
},
"color": {
"render": "#0c3"

109
assets/layers/sport_pitch/license_info.json
View file

@ -1,13 +1,112 @@
[
{
"authors": [
"@fontawesome"
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "tabletennis.svg",
"license": "CC-BY 4.0",
"path": "baseball.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://commons.wikimedia.org/wiki/File:Font_Awesome_5_solid_table-tennis.svg",
" https://fontawesome.com"
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "basketball.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "beachvolleyball.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "boules.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "skateboard.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": ".svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "soccer.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "table_tennis.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "tennis.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
},
{
"authors": [
"Gitte Loos (Createlli) in opdracht van Provincie Antwerpen "
],
"path": "volleyball.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://createlli.com/",
"https://www.provincieantwerpen.be/"
]
}
]

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

@ -4,7 +4,7 @@
"nl": "Sportterrein",
"en": "Sport pitches"
},
"wayHandling": 2,
"wayHandling": 1,
"minzoom": 12,
"source": {
"osmTags": {
@ -13,6 +13,9 @@
]
}
},
"calculatedTags": [
"_size_classification=Number(feat.properties._surface) < 200 ? 'small' : (Number(feat.properties._surface) < 750 ? 'medium' : 'large') "
],
"title": {
"render": {
"nl": "Sportterrein",
@ -264,7 +267,7 @@
"nl": "Wanneer is dit sportveld toegankelijk?",
"en": "When is this pitch accessible?"
},
"render": "{opening_hours()}",
"render": "Openingsuren: {opening_hours_table()}",
"freeform": {
"key": "opening_hours",
"type": "opening_hours"
@ -292,7 +295,25 @@
],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
"render": "circle:white;./assets/layers/sport_pitch/tabletennis.svg"
"render": "./assets/layers/sport_pitch/basketball.svg",
"mappings": [
{
"if": {
"or": [
"sport=baseball",
"sport=basketball",
"sport=beachvolleyball",
"sport=boules",
"sport=skateboard",
"sport=soccer",
"sport=table_tennis",
"sport=tennis",
"sport=volleyball"
]
},
"then": "./assets/layers/sport_pitch/{sport}.svg"
}
]
},
"iconOverlays": [
{
@ -310,7 +331,24 @@
"render": "1"
},
"iconSize": {
"render": "25,25,center"
"render": "25,25,center",
"mappings": [
{
"if": {
"or": ["_size_classification=medium","id~node/.*"]
},
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=large",
"then": "50,50,center"
}
]
},
"color": {
"render": "#009"

5
assets/layers/sport_pitch/tabletennis.svg
View file

@ -1,5 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M496.2 296.5C527.7 218.7 512 126.2 449 63.1 365.1-21 229-21 145.1 63.1l-56 56.1 211.5 211.5c46.1-62.1 131.5-77.4 195.6-34.2zm-217.9 79.7L57.9 155.9c-27.3 45.3-21.7 105 17.3 144.1l34.5 34.6L6.7 424c-8.6 7.5-9.1 20.7-1 28.8l53.4 53.5c8 8.1 21.2 7.6 28.7-1L177.1 402l35.7 35.7c19.7 19.7 44.6 30.5 70.3 33.3-7.1-17-11-35.6-11-55.1-.1-13.8 2.5-27 6.2-39.7zM416 320c-53 0-96 43-96 96s43 96 96 96 96-43 96-96-43-96-96-96z"/></svg>
<!--
Font Awesome Free 5.2.0 by @fontawesome - https://fontawesome.com
License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
-->
Side by side

Before

Width:  |  Height:  |  Size: 669 B

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

@ -21,7 +21,7 @@
]
},
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,bottom",
"iconSize": "40,40,center",
"width": "1",
"color": "#0f0",
"wayHandling": 2,

4
assets/license_info.json
View file

@ -33,9 +33,7 @@
],
"path": "social_image_front.png",
"license": "CC-BY-SA",
"sources": [
""
]
"sources": []
},
{
"authors": [

8
assets/svg/license_info.json
View file

@ -6,7 +6,7 @@
"path": "SocialImageForeground.svg",
"license": "CC-BY-SA",
"sources": [
""
"https://mapcomplete.osm.be"
]
},
{
@ -15,9 +15,7 @@
],
"path": "add.svg",
"license": "CC0",
"sources": [
""
]
"sources": []
},
{
"authors": [
@ -354,7 +352,7 @@
"path": "mapcomplete_logo.svg",
"license": "Logo; CC-BY-SA",
"sources": [
""
"https://mapcomplete.osm.be"
]
},
{

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

@ -30,58 +30,39 @@
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
},
"icon": "./assets/themes/speelplekken/speelbos.svg"
}
},
{
"builtin": "playground",
"override": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
}
},
{
"builtin": "sport_pitch",
"override": {
"minzoom": 15,
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
}
},
{
"builtin": "slow_roads",
"override": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
},
"calculatedTags": [
"_part_of_walking_routes=feat.memberships().map(r => \"<a href='#relation/\"+r.relation.id+\"'>\" + r.relation.tags.name + \"</a>\").join(', ')"
]
}
},
{
"builtin": "grass_in_parks",
"override": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
"icon": "./assets/themes/speelplekken/speeltuin.svg"
}
},
{
"builtin": "village_green",
"override": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
"icon": "./assets/themes/speelplekken/speelweide.svg"
}
},
{
"builtin": "grass_in_parks",
"override": {
"icon": "./assets/themes/speelplekken/speelweide.svg"
}
},
"sport_pitch",
{
"builtin": "slow_roads",
"override": {
"calculatedTags": [
"_part_of_walking_routes=feat.memberships().map(r => \"<a href='#relation/\"+r.relation.id+\"'>\" + r.relation.tags.name + \"</a>\").join(', ')"
]
}
},
{
"id": "walking_routes",
"name": {
@ -190,6 +171,12 @@
}
}
],
"overrideAll": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14
}
},
"roamingRenderings": [
{
"render": "Maakt deel uit van {_part_of_walking_routes}",