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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-09 23:25:32 +02:00
commit e5a3c1cab6
22 changed files with 4016 additions and 3740 deletions
Download patch file Download diff file Expand all files Collapse all files

103
assets/layers/charging_station/bosch-3pin.svg
View file

@ -9,9 +9,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="43.827324mm"
height="43.827263mm"
viewBox="0 0 43.827324 43.827263"
width="46.74284mm"
height="36.190933mm"
viewBox="0 0 46.74284 36.190933"
version="1.1"
id="svg8"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="-24.395661"
inkscape:cy="131.29597"
inkscape:zoom="2.8"
inkscape:cx="70.652971"
inkscape:cy="63.253829"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -44,7 +44,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -52,68 +52,61 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-138.53724,-189.09678)">
transform="translate(-56.579508,-203.85482)"
style="display:inline">
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.12588477;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="path876"
sodipodi:type="arc"
sodipodi:cx="160.45087"
sodipodi:cy="211.01041"
sodipodi:rx="21.313631"
sodipodi:ry="21.313631"
sodipodi:cx="-79.950958"
sodipodi:cy="221.95029"
sodipodi:rx="22.808449"
sodipodi:ry="17.532524"
sodipodi:start="0"
sodipodi:end="6.2828013"
sodipodi:open="true"
d="m 181.7645,211.01041 a 21.313631,21.313631 0 0 1 -21.31159,21.31363 21.313631,21.313631 0 0 1 -21.31567,-21.30954 21.313631,21.313631 0 0 1 21.30749,-21.31772 21.313631,21.313631 0 0 1 21.31977,21.30544" />
d="m -57.142509,221.95029 a 22.808449,17.532524 0 0 1 -22.80626,17.53252 22.808449,17.532524 0 0 1 -22.810641,-17.52916 22.808449,17.532524 0 0 1 22.801883,-17.53589 22.808449,17.532524 0 0 1 22.815016,17.52579"
transform="scale(-1,1)" />
<path
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 145.52083,212.42783 8.22098,0.0945 2.92932,2.36235 h 7.55952"
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 95.928119,223.11628 -8.797552,0.0777 -3.134766,1.94325 h -8.089702"
id="path919"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 167.06547,204.67931 9.07143,0.0945"
style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 72.605191,217.14329 -8.371301,0.0109"
id="path921"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 156.76562,198.63169 h 7.9375"
id="path923"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect925"
width="3.3072915"
height="8.9769344"
x="147.31622"
y="203.45088" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect927"
width="3.4955583"
height="8.7872486"
x="150.24625"
y="212.52232" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect927-6"
width="3.5510819"
height="7.8033376"
x="158.76985"
y="215.09351" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.58553958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7"
width="3.4955585"
height="11.50834"
x="169.85341"
y="204.93515" />
width="1.9557446"
height="11.019188"
x="-69.33577"
y="216.90891"
transform="scale(-1,1)" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.60303307;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-5"
width="3.4955587"
height="11.508341"
x="158.98587"
y="198.69853" />
width="2.3979976"
height="9.5319748"
x="-81.749748"
y="211.3553"
transform="scale(-1,1)" />
<path
style="display:inline;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 84.691994,210.50136 -8.3713,0.0109"
id="path921-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.51650959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-53"
width="2.0247746"
height="8.281888"
x="-91.173843"
y="223.57133"
transform="scale(-1,1)" />
</g>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

128
assets/layers/charging_station/bosch-5pin.svg Normal file
View file

@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="46.74284mm"
height="36.190933mm"
viewBox="0 0 46.74284 36.190933"
version="1.1"
id="svg8"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="bosch-5pin.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8"
inkscape:cx="2.2601139"
inkscape:cy="63.253829"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1039"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-56.579508,-203.85482)"
style="display:inline">
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.12588477;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="path876"
sodipodi:type="arc"
sodipodi:cx="-79.950958"
sodipodi:cy="221.95029"
sodipodi:rx="22.808449"
sodipodi:ry="17.532524"
sodipodi:start="0"
sodipodi:end="6.2828013"
sodipodi:open="true"
d="m -57.142509,221.95029 a 22.808449,17.532524 0 0 1 -22.80626,17.53252 22.808449,17.532524 0 0 1 -22.810641,-17.52916 22.808449,17.532524 0 0 1 22.801883,-17.53589 22.808449,17.532524 0 0 1 22.815016,17.52579"
transform="scale(-1,1)" />
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 95.928119,223.11628 -8.797552,0.0777 -3.134766,1.94325 h -8.089702"
id="path919"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 72.605191,217.14329 -8.371301,0.0109"
id="path921"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.58553958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7"
width="1.9557446"
height="11.019188"
x="-69.33577"
y="216.90891"
transform="scale(-1,1)" />
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.60303307;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-5"
width="2.3979976"
height="9.5319748"
x="-81.749748"
y="211.3553"
transform="scale(-1,1)" />
<path
style="display:inline;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92222218"
d="m 84.691994,210.50136 -8.3713,0.0109"
id="path921-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.51650959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-53"
width="2.0247746"
height="8.281888"
x="-91.173843"
y="223.57133"
transform="scale(-1,1)" />
<rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.51650959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-53-5"
width="2.0247746"
height="8.281888"
x="-81.017601"
y="225.57587"
transform="scale(-1,1)" />
<rect
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.51650959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.92222218"
id="rect927-7-53-5-6"
width="2.0247746"
height="8.281888"
x="-94.935867"
y="215.15581"
transform="scale(-1,1)" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

7124
assets/layers/charging_station/charging_station.json
View file

File diff suppressed because it is too large Load diff

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

@ -107,6 +107,14 @@
],
"sources": []
},
{
"path": "bosch-5pin.svg",
"license": "CC0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "under_construction.svg",
"license": "Public domain",

3
assets/layers/charging_station/types.csv
View file

@ -13,4 +13,5 @@ socket:tesla_supercharger_ccs,Type2_CCS.svg,<b>Tesla Supercharger CCS</b> (a bra
socket:tesla_destination,Tesla-hpwc-model-s.svg,<b>Tesla Supercharger (destination)</b>,us,,480,125;350,120 kW;150 kW;250 kW,<b>Tesla Supercharger (destination)</b>,car;motorcar;hgv;bus,bicycle;scooter
socket:tesla_destination,Type2_tethered.svg,<b>Tesla supercharger (destination</b> (A Type 2 with cable branded as tesla),,us,230;400,16;32,11 kW;22 kW,<b>Tesla supercharger (destination</b> (Een Type 2 met kabel en Tesla-logo),car;motorcar;hgv;bus,bicycle;scooter
socket:USB-A,usb_port.svg,<b>USB</b> to charge phones and small electronics,,,5,1;2,5W;10W,<b>USB</b> om GSMs en kleine electronica op te laden,*,
socket:bosch_3pin,bosch-3pin.svg,<b>Bosch Active Connect</b> with cable,,,,,,<b>Bosch Active Connect</b> aan een kabel,bicycle,car;motorcar;hgv;bus
socket:bosch_3pin,bosch-3pin.svg,<b>Bosch Active Connect with 3 pins</b> and cable,,,,,,<b>Bosch Active Connect met 3 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus
socket:bosch_5pin,bosch-5pin.svg,<b>Bosch Active Connect with 5 pins</b> and cable,,,,,,<b>Bosch Active Connect met 5 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus

1 key image description:en countryWhiteList countryBlackList commonVoltages commonCurrents commonOutputs description:nl associatedVehicleTypes neverAssociatedWith
13 socket:tesla_destination Tesla-hpwc-model-s.svg <b>Tesla Supercharger (destination)</b> us 480 125;350 120 kW;150 kW;250 kW <b>Tesla Supercharger (destination)</b> car;motorcar;hgv;bus bicycle;scooter
14 socket:tesla_destination Type2_tethered.svg <b>Tesla supercharger (destination</b> (A Type 2 with cable branded as tesla) us 230;400 16;32 11 kW;22 kW <b>Tesla supercharger (destination</b> (Een Type 2 met kabel en Tesla-logo) car;motorcar;hgv;bus bicycle;scooter
15 socket:USB-A usb_port.svg <b>USB</b> to charge phones and small electronics 5 1;2 5W;10W <b>USB</b> om GSMs en kleine electronica op te laden *
16 socket:bosch_3pin bosch-3pin.svg <b>Bosch Active Connect</b> with cable <b>Bosch Active Connect with 3 pins</b> and cable <b>Bosch Active Connect</b> aan een kabel <b>Bosch Active Connect met 3 pinnen</b> aan een kabel bicycle car;motorcar;hgv;bus
17 socket:bosch_5pin bosch-5pin.svg <b>Bosch Active Connect with 5 pins</b> and cable <b>Bosch Active Connect met 5 pinnen</b> aan een kabel bicycle car;motorcar;hgv;bus

21
assets/themes/uk_addresses/housenumber_unknown_small.svg
View file

@ -37,24 +37,29 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1043"
inkscape:window-height="1003"
id="namedview14"
showgrid="false"
inkscape:zoom="7.375"
inkscape:cx="-1.3561062"
inkscape:cy="19.621117"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:cy="41.316032"
inkscape:window-x="862"
inkscape:window-y="1080"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" />
<path
d="m 42.372766,41.559418 h 3.247468 c 0.421762,0 0.76133,0.339541 0.76133,0.761329 v 3.241506 c 0,0.421761 -0.339541,0.761329 -0.76133,0.761329 h -3.247468 c -0.421762,0 -0.76133,-0.339541 -0.76133,-0.761329 v -3.241506 c 0,-0.421761 0.339541,-0.761329 0.76133,-0.761329 z"
style="fill:#495aad;stroke-width:0.0542103;paint-order:normal"
d="m 27.122405,19.186537 h 33.74819 c 4.383014,0 7.911859,3.528561 7.911859,7.911848 v 33.68623 c 0,4.383006 -3.528563,7.911848 -7.911859,7.911848 h -33.74819 c -4.383014,0 -7.911859,-3.528561 -7.911859,-7.911848 v -33.68623 c 0,-4.383006 3.528563,-7.911848 7.911859,-7.911848 z"
style="fill:#495aad;stroke-width:0.56336182;paint-order:normal"
id="path6"
inkscape:connector-curvature="0" />
<path
d="m 42.085614,42.793949 v 2.289464 c 0.381581,0 0.763173,0.381581 0.763173,0.763173 h 2.289463 c 0,-0.381581 0.381581,-0.763173 0.763173,-0.763173 v -2.289464 c -0.381581,0 -0.763173,-0.381581 -0.763173,-0.763172 h -2.289463 c 0,0.38158 -0.381581,0.763172 -0.763173,0.763172 z"
d="m 24.138277,32.015973 v 23.792462 c 3.965449,0 7.931011,3.965449 7.931011,7.931014 h 23.792453 c 0,-3.965449 3.965449,-7.931014 7.931014,-7.931014 V 32.015973 c -3.965449,0 -7.931014,-3.965449 -7.931014,-7.931002 H 32.069288 c 0,3.965439 -3.965449,7.931002 -7.931011,7.931002 z"
id="path8"
inkscape:connector-curvature="0"
style="fill:none;stroke:#ffffff;stroke-width:0.27187553" />
style="fill:none;stroke:#ffffff;stroke-width:2.8253727" />
<path
id="path3711"
d="m 44.16217,30.966164 c -7.526249,0 -13.627102,6.101307 -13.627102,13.627103 0,7.525795 6.101307,13.627102 13.627102,13.627102 7.525796,0 13.627103,-6.101307 13.627103,-13.627102 0,-7.525796 -6.101307,-13.627103 -13.627103,-13.627103 z m -3.168302,21.803364 -0.0091,-0.0091 -0.0077,0.0091 -6.353865,-6.541009 3.192832,-3.254153 3.16921,3.263237 9.53897,-9.820144 3.176933,3.269596 z"
inkscape:connector-curvature="0"
style="fill:#fdd835;stroke-width:0.45423675" />
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

10
assets/themes/uk_addresses/uk_addresses.json
View file

@ -39,14 +39,14 @@
{
"id": "to_import",
"source": {
"#geoJson": "http://127.0.0.1:8080/islington_small_piece.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/assets/themes/uk_addresses/islington_small_piece.geojson",
"##geoJson": "https://raw.githubusercontent.com/russss/osm-uk-addresses/main/output/islington.geojson",
"#geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/assets/themes/uk_addresses/islington_small_piece.geojson",
"geoJson": "https://osm-uk-addresses.russss.dev/addresses/{z}/{x}/{y}.json",
"osmTags": "inspireid~*",
"geoJsonZoomLevel": 16,
"isOsmCache": false
},
"name": "Addresses to check",
"minzoom": 12,
"minzoom": 14,
"wayHandling": 1,
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
@ -122,7 +122,7 @@
}
},
"calculatedTags": [
"_closest_3_street_names=feat.closestn('named_streets',3, 'name').map(f => ({name: f.feat.properties.name, distance: Math.round(1000*f.distance), id: f.id}))",
"_closest_3_street_names=feat.properties['addr:street'] === undefined ? feat.closestn('named_streets',3, 'name').map(f => ({name: f.feat.properties.name, distance: Math.round(1000*f.distance), id: f.id})) : []",
"_closest_street:0:name=JSON.parse(feat.properties._closest_3_street_names)[0]?.name",
"_closest_street:1:name=JSON.parse(feat.properties._closest_3_street_names)[1]?.name",
"_closest_street:2:name=JSON.parse(feat.properties._closest_3_street_names)[2]?.name",