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

Add missing information, remove watermill-layer

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-11-30 23:22:51 +01:00
parent e81ea3db0b
commit b2c47532e6
11 changed files with 69 additions and 305 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,11 @@
{
"path": "bench.svg",
"license": "CC0",
"authors": [],
"sources": []
"authors": [
"Tobias Zwick"
],
"sources": [
"https://github.com/streetcomplete/StreetComplete/"
]
}
]

6
assets/layers/toilet/license_info.json
View file

@ -12,7 +12,7 @@
"license": "CC-BY",
"authors": [
"asianson.design",
" Pieter Vander Vennet"
"Pieter Vander Vennet"
],
"sources": [
"https://thenounproject.com/term/urinal/1307984/"
@ -22,6 +22,8 @@
"path": "wheelchair.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg"
]
}
]

4
assets/layers/trail/license_info.json
View file

@ -23,6 +23,8 @@
"path": "wheelchair.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Wheelchair_symbol.svg"
]
}
]

8
assets/layers/watermill/license_info.json
View file

@ -1,8 +0,0 @@
[
{
"path": "watermill.svg",
"license": "CC0",
"authors": [],
"sources": []
}
]

191
assets/layers/watermill/watermill.json
View file

@ -1,191 +0,0 @@
{
"id": "watermill",
"name": {
"nl": "Watermolens",
"en": "Watermill",
"de": "Wassermühlen",
"ru": "Водяная мельница",
"id": "Kincir Air",
"fr": "Moulin à eau",
"ca": "Molí d'aigua",
"da": "Vandmølle"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"man_made=watermill"
]
}
},
"title": {
"render": {
"nl": "Watermolens"
},
"mappings": [
{
"if": {
"and": [
"name:nl~*"
]
},
"then": {
"nl": "{name:nl}"
}
},
{
"if": {
"and": [
"name~*"
]
},
"then": {
"nl": "{name}"
}
}
]
},
"description": {
"nl": "Watermolens"
},
"tagRenderings": [
"images",
{
"render": {
"nl": "De toegankelijkheid van dit gebied is: {access:description}"
},
"question": {
"nl": "Is dit gebied toegankelijk?"
},
"freeform": {
"key": "access:description"
},
"mappings": [
{
"if": {
"and": [
"access=yes",
"fee="
]
},
"then": {
"nl": "Vrij toegankelijk"
}
},
{
"if": {
"and": [
"access=no",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk"
}
},
{
"if": {
"and": [
"access=private",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk, want privégebied"
}
},
{
"if": {
"and": [
"access=permissive",
"fee="
]
},
"then": {
"nl": "Toegankelijk, ondanks dat het privegebied is"
}
},
{
"if": {
"and": [
"access=guided",
"fee="
]
},
"then": {
"nl": "Enkel toegankelijk met een gids of tijdens een activiteit"
}
},
{
"if": {
"and": [
"access=yes",
"fee=yes"
]
},
"then": {
"nl": "Toegankelijk mits betaling"
}
}
],
"id": "Access tag"
},
{
"render": {
"nl": "Beheer door {operator}"
},
"question": {
"nl": "Wie beheert dit pad?"
},
"freeform": {
"key": "operator"
},
"mappings": [
{
"if": {
"and": [
"operator=Natuurpunt"
]
},
"then": {
"nl": "Dit gebied wordt beheerd door Natuurpunt"
},
"icon": {
"path": "./assets/themes/buurtnatuur/Natuurpunt.jpg",
"class": "small"
}
},
{
"if": {
"and": [
"operator~(n|N)atuurpunt.*"
]
},
"then": {
"nl": "Dit gebied wordt beheerd door {operator}"
},
"hideInAnswer": true,
"icon": {
"path": "./assets/themes/buurtnatuur/Natuurpunt.jpg",
"class": "small"
}
}
],
"id": "Operator tag"
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/layers/watermill/watermill.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point",
"centroid"
]
}
]
}

6
assets/layers/watermill/watermill.svg
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<svg xmlns="http://www.w3.org/2000/svg" width="281px" height="374px" viewBox="0 0 281 374" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 173.078125 146.714844 L 281 39.171875 L 269.894531 28.089844 L 257.675781 15.707031 L 159.9375 113.457031 C 154.6875 108.464844 147.746094 105.632812 140.5 105.511719 L 136.058594 105.511719 L 34.617188 4.621094 L 23.511719 15.707031 L 11.105469 27.902344 L 111.066406 127.871094 C 110.085938 130.175781 109.398438 132.597656 109.03125 135.074219 L 107.179688 143.945312 L 0 250.566406 L 11.105469 261.652344 L 23.324219 274.035156 L 94.964844 202.519531 L 66.085938 342.21875 L 45.167969 342.21875 L 45.167969 369.378906 L 240.644531 369.378906 L 240.644531 342.21875 L 218.988281 342.21875 L 193.070312 231.347656 L 246.382812 284.5625 L 257.488281 273.480469 L 269.894531 261.28125 L 178.820312 170.925781 Z M 162.898438 340.183594 L 122.171875 340.183594 L 122.171875 287.152344 C 122.171875 276.03125 131.207031 267.007812 142.351562 267.007812 C 147.765625 266.910156 152.992188 268.992188 156.859375 272.777344 C 160.722656 276.566406 162.898438 281.746094 162.898438 287.152344 Z M 162.898438 340.183594 "/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

6
assets/svg/license_info.json
View file

@ -1259,12 +1259,6 @@
],
"sources": []
},
{
"path": "teardrop_with_hole_green.svg",
"license": "CC0",
"authors": [],
"sources": []
},
{
"path": "translate.svg",
"license": "CC-BY-SA 3.0",

74
assets/themes/natuurpunt/license_info.json
View file

@ -3,37 +3,49 @@
"path": "bench.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "birdhide.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "drips.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "information.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "information_board.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "nature_reserve.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "natuurpunt.png",
@ -49,72 +61,88 @@
"path": "parking.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "parkingbike.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "parkingmotor.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "parkingwheels.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "picnic_table.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "pushchair.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "toilets.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "trail.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "urinal.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "walk_wheelchair.svg",
"license": "CC0",
"authors": [],
"sources": []
},
{
"path": "watermill.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
},
{
"path": "wheelchair.svg",
"license": "CC0",
"authors": [],
"sources": []
"sources": [
"https://osoc.be/editions/2021/nature-moves"
]
}
]

20
assets/themes/natuurpunt/natuurpunt.json
View file

@ -323,24 +323,6 @@
]
}
},
{
"builtin": "watermill",
"override": {
"minzoom": "14",
"source": {
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
}
}
]
}
},
{
"builtin": "gps_track",
"override": {
@ -353,4 +335,4 @@
"enableIframePopout": false,
"enableBackgroundLayerSelection": false,
"enableNoteImports": false
}
}

45
assets/themes/natuurpunt/watermill.svg
View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="-10 8 15.18 19.74"
version="1.1"
id="svg1054"
sodipodi:docname="watermill.svg"
width="15.18"
height="19.74"
inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)"
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">
<sodipodi:namedview
id="namedview1056"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="6.0407534"
inkscape:cx="-31.949657"
inkscape:cy="10.594705"
inkscape:current-layer="svg1054" />
<defs
id="defs1048">
<style
id="style1046">.cls-1{fill:#fff;}</style>
</defs>
<g
id="Layer_2"
data-name="Layer 2"
transform="matrix(0.58392824,0,0,0.58392824,-6.8420153,12.106628)">
<g
id="Layer_1-2"
data-name="Layer 1">
<path
class="cls-1"
d="M 9.35,7.69 15.18,1.87 14.58,1.27 13.92,0.6 8.64,5.89 A 1.56,1.56 0 0 0 7.59,5.46 H 7.35 L 1.87,0 1.27,0.6 0.6,1.26 6,6.67 A 1.6,1.6 0 0 0 5.89,7.06 v 0 L 5.79,7.54 0,13.31 l 0.6,0.6 0.66,0.67 3.87,-3.87 -1.56,7.56 H 2.44 v 1.47 H 13 v -1.47 h -1.17 l -1.4,-6 2.88,2.88 0.6,-0.6 0.67,-0.66 L 9.66,9 Z M 8.8,18.16 H 6.6 V 15.29 A 1.09,1.09 0 0 1 7.69,14.2 v 0 a 1.09,1.09 0 0 1 1.11,1.09 z"
id="path1050" />
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

6
assets/themes/width/license_info.json
View file

@ -2,7 +2,9 @@
{
"path": "icon.svg",
"license": "CC0; trivial",
"authors": ["Pieter Vander Vennet"],
"authors": [
"Pieter Vander Vennet"
],
"sources": []
}
]
]