Merge branch 'fix/licenses' into develop

This commit is contained in:
Pieter Vander Vennet 2022-12-23 14:36:12 +01:00
commit 7d56755660
14 changed files with 101 additions and 324 deletions

View file

@ -13,8 +13,13 @@
{
"path": "car.svg",
"license": "CC0",
"authors": [],
"sources": []
"authors": [
"Simon Child",
"The Noun Project"
],
"sources": [
"https://thenounproject.com/icon/electric-car-55511/"
]
},
{
"path": "logo.svg",

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"
]
}
]

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
}
}

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>

Before

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -107,9 +107,11 @@
},
{
"path": "logo.svg",
"license": "CC0",
"license": "Creative Commons 4.0 BY-NC",
"authors": [],
"sources": []
"sources": [
"https://pngimg.com/image/46283"
]
},
{
"path": "observation_platform.svg",

View file

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