add icons

This commit is contained in:
Tykayn 2024-12-16 12:13:19 +01:00 committed by tykayn
parent b01ad5507e
commit 614fd9b6ac
9 changed files with 193 additions and 38 deletions

View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="100mm" height="88.855431mm" viewBox="0 0 100 88.855431" version="1.1" id="svg5" inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)" sodipodi:docname="type2.svg" 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"><script xmlns=""/></svg>

After

Width:  |  Height:  |  Size: 509 B

40
img/chademo.svg Normal file
View File

@ -0,0 +1,40 @@
<?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="512" height="512" viewBox="0 0 480 480.00001" id="svg2" version="1.1" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="Chademo_type4.svg" inkscape:export-filename="/Users/sss/Desktop/Plug/chademo type4.png" inkscape:export-xdpi="600" inkscape:export-ydpi="600">
<defs id="defs4"/>
<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.5" inkscape:cx="128" inkscape:cy="561.25983" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:snap-grids="false" inkscape:snap-to-guides="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" units="px">
<inkscape:grid type="xygrid" id="grid4211"/>
</sodipodi:namedview>
<metadata id="metadata7">
<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(0,-572.36208)">
<ellipse style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:46.69181061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4213" cx="344.98901" cy="813.22186" rx="49.640533" ry="52.206017"/>
<ellipse ry="52.206017" rx="49.640533" cy="813.22186" cx="144.88124" id="ellipse4215" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:46.69181061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
<g style="stroke:#000000;stroke-opacity:1" id="g4234" transform="matrix(0.71833557,0,0,0.71833557,-22.901399,449.27867)">
<circle r="70" cy="330.93365" cx="371.42859" id="path4221" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
</g>
<ellipse style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4223" cx="206.86337" cy="687.00006" rx="11.764912" ry="12.27801"/>
<ellipse ry="12.27801" rx="11.764912" cy="687.00006" cx="279.92838" id="ellipse4225" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
<ellipse style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="ellipse4227" cx="244.42207" cy="722.50641" rx="11.764912" ry="12.27801"/>
<g style="stroke:#000000;stroke-opacity:1" id="g4231" transform="matrix(0.71833557,0,0,0.71833557,-22.901399,452.15202)">
<ellipse style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.30948782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="ellipse4229" cx="372.14288" cy="276.64792" rx="16.378016" ry="17.092304"/>
</g>
<g style="stroke:#000000;stroke-opacity:1" id="g4248" transform="matrix(0.71833557,0,0,0.71833557,-22.901399,700.69613)">
<circle style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="circle4250" cx="371.42859" cy="330.93365" r="70"/>
</g>
<ellipse ry="12.27801" rx="11.764912" cy="938.4176" cx="206.86337" id="ellipse4252" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
<ellipse style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="ellipse4254" cx="279.92838" cy="938.4176" rx="11.764912" ry="12.27801"/>
<ellipse ry="12.27801" rx="11.764912" cy="973.92383" cx="244.42207" id="ellipse4256" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.25066519;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
<g style="stroke:#000000;stroke-opacity:1" id="g4258" transform="matrix(0.71833557,0,0,0.71833557,-22.901399,703.56947)">
<ellipse ry="17.092304" rx="16.378016" cy="276.64792" cx="372.14288" id="ellipse4260" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.30948782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
</g>
<path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:12.93004036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 119.73952,631.58562 c 0,0 37.7745,-21.1165 58.2365,-27.70723 20.10134,-6.47456 41.22429,-11.04832 62.34126,-11.28813 24.15232,-0.27427 48.5286,4.06449 71.57701,11.28813 20.21908,6.3369 57.2103,27.70723 57.2103,27.70723 l 27.70722,-6.15716 38.99537,38.99535 -8.20955,28.73343 c 0,0 22.40604,40.10835 28.22032,62.08471 5.31496,20.08905 6.49095,41.32174 5.64406,62.08472 -0.97633,23.93683 -4.31466,48.22572 -12.31432,70.80734 -6.80079,19.19752 -17.50133,37.0978 -29.75961,53.36206 -12.08331,16.03225 -26.72349,30.25465 -42.48442,42.68968 -13.08926,10.32715 -27.48114,19.23305 -42.68966,26.06535 -15.49637,6.9616 -32.08906,11.5321 -48.7442,14.8798 -13.04406,2.6218 -26.4093,3.8806 -39.71369,4.0022 -13.12772,0.1199 -26.33284,-0.8983 -39.25191,-3.2325 -13.30952,-2.4049 -26.47163,-6.0522 -39.04668,-11.0316 -14.15359,-5.6046 -27.83969,-12.6362 -40.53464,-21.03701 C 109.90252,982.56892 93.46122,969.92543 79.717967,954.83664 65.790647,939.54572 53.629326,922.24346 44.827383,903.52694 36.719055,886.2853 32.022817,867.42448 28.921382,848.62557 25.827955,829.8752 24.662417,810.60005 26.355897,791.67183 c 1.719279,-19.21657 6.673953,-38.15495 12.82742,-56.44066 5.151102,-15.30707 20.010775,-44.12632 20.010775,-44.12632 l -6.772877,-29.96486 35.5063,-35.71153 z" id="path4271" inkscape:connector-curvature="0" sodipodi:nodetypes="caaaccccaaaaaaaaaaaaaaaacccc"/>
</g>
<script xmlns=""/></svg>

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
img/prise-de-courant.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

19
img/prise_inconnue.svg Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="512" height="512" viewBox="0 0 135.46666 135.46666" version="1.1" id="svg8" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" sodipodi:docname="Unknown.svg" 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" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs id="defs2"/>
<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" inkscape:cx="-267.18535" inkscape:cy="415.67777" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" inkscape:window-width="2600" inkscape:window-height="1304" inkscape:window-x="4025" inkscape:window-y="280" inkscape:window-maximized="0" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1"/>
<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(0,-161.53334)">
<path style="opacity:0.986;fill:none;stroke:#000000;stroke-width:2.29734;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" d="m 81.781819,229.65037 -38.986346,23.44786 23.009929,-22.77671 -11.436024,-6.40553 35.230278,-26.54244 -21.011103,25.50163 13.365441,6.67149" id="path850" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
<path id="path4231" d="m 40.74534,185.12919 c 17.37062,0 34.74124,0 52.11186,0 5.693793,3.71687 10.39331,8.90701 13.49924,15.16354 5.78279,10.07042 7.93917,22.31372 5.63141,33.86424 -2.95501,15.15742 -13.820793,27.66083 -26.79416,34.383 -6.188637,2.63455 -12.786355,4.56798 -19.525615,3.92156 -7.442728,-0.35441 -14.705963,-2.93654 -21.290848,-6.49655 -12.052399,-6.71518 -20.397232,-19.64428 -23.436489,-33.453 -2.444786,-12.05058 -0.269096,-25.17821 6.802282,-35.12819 3.286032,-5.07609 7.819791,-9.41532 13.00232,-12.2546 z" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:currentColor;stroke-width:5.501;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0"/>
</g>
<script xmlns=""/></svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

30
img/type2_combo.svg Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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" version="1.1" id="svg2" viewBox="0 0 479.99998 479.99998" height="512" width="512" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="Type2_CCS.svg" inkscape:export-filename="/Users/sss/Desktop/Plug/combo-ccs-eu.png" inkscape:export-xdpi="600" inkscape:export-ydpi="600">
<sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1588" inkscape:window-height="862" id="namedview18" showgrid="true" inkscape:zoom="0.50645487" inkscape:cx="-336.156" inkscape:cy="175.04524" inkscape:window-x="545" inkscape:window-y="71" inkscape:window-maximized="0" inkscape:current-layer="layer1" units="px">
<inkscape:grid type="xygrid" id="grid4146"/>
</sodipodi:namedview>
<defs id="defs4"/>
<metadata id="metadata7">
<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 id="layer1" transform="translate(0,-572.3623)">
<ellipse ry="25.405434" rx="26.01803" cy="784.30536" cx="294.6178" id="ellipse4206" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<ellipse style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="ellipse4208" cx="211.30386" cy="784.30536" rx="26.01803" ry="25.405434"/>
<ellipse ry="25.405434" rx="26.01803" cy="715.69385" cx="172.09726" id="ellipse4210" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<ellipse style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="ellipse4212" cx="252.96086" cy="715.69385" rx="26.01803" ry="25.405434"/>
<ellipse ry="25.405434" rx="26.01803" cy="715.69385" cx="332.59918" id="ellipse4214" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<ellipse style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="ellipse4216" cx="294.00519" cy="659.94702" rx="18.99448" ry="19.60709"/>
<ellipse ry="19.60709" rx="18.99448" cy="659.94702" cx="214.36687" id="ellipse4218" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<path id="path4231" d="m 170.872,602.3623 h 166.62799 c 0,0 17.47217,11.81438 24.83307,19.93225 7.36094,8.11789 14.37279,19.03261 19.27416,27.85052 4.90134,8.81791 8.87216,16.71607 12.25223,26.95479 3.38006,10.2387 6.47778,20.90654 7.35124,34.30575 0.87345,13.3992 -0.39632,31.73339 -3.67562,45.33259 -3.2793,13.59923 -9.37082,25.97493 -14.70245,35.531 -5.33165,9.55607 -9.23696,14.3983 -15.9277,22.0537 -6.69072,7.65533 -15.48267,16.28912 -24.50411,23.27887 -9.02144,6.98974 -18.51455,13.38674 -29.40493,18.37812 -10.89037,4.99137 -35.53097,11.02681 -35.53097,11.02681 0,0 -33.36559,4.47525 -60.03509,-4.90075 -10.6006,-3.72682 -17.54705,-4.99721 -29.40494,-11.02691 -14.85446,-7.55335 -29.16138,-17.12948 -40.43179,-29.40491 -15.48969,-16.87101 -27.90375,-37.21391 -35.53096,-58.80986 -6.03962,-17.10081 -8.01754,-35.78533 -7.35123,-53.90908 0.50616,-13.76782 3.72625,-27.53661 8.57643,-40.43178 4.11963,-10.95285 11.11006,-21.48823 17.15289,-30.63015 5.9113,-8.94293 16.32005,-18.74683 23.2789,-24.50411 6.95885,-5.75726 17.15288,-11.02685 17.15288,-11.02685 z" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:31.08729172;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" sodipodi:nodetypes="ccscccccccccssssssssc"/>
<ellipse ry="41.485447" rx="40.872837" cy="963.1853" cx="185.57449" id="path4151" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<ellipse style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="ellipse4204" cx="319.12195" cy="961.96027" rx="40.872837" ry="41.485447"/>
<rect ry="74.562355" y="889.23578" x="101.21027" height="149.12471" width="302.27545" id="rect4235" style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:23.66584206;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
<path id="path4237" d="m 190.4751,873.13268 124.97101,1.22522" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:17.87519264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0"/>
</g>
<script xmlns=""/></svg>

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -63,14 +63,10 @@
<div class="bottom-content">
<h1>
Carte des IRVE
<img class="icon-img" src="img/prise-de-courant.png" alt="prise"> Libre Charge Map
</h1>
<!-- <a href="#" class="button edit-button josm" data-href="http://127.0.0.1:8111/load_and_zoom?left=1.1486915000000002&top=49.4144783&right=1.1506915&bottom=49.412478300000004&select=12014929487">-->
<!--test télécommande josm-->
<!-- </a>-->
<div id="bars_power">
</div>
<div id="round_power_legend">
<br>
<span class="marker-demo">
@ -95,8 +91,26 @@
<span class="map-marker-circle-demo color-6"></span> > 300 kW
</span>
</div>
<div id="bars_power">
</div>
<p>Cartes des stations de recharge pour véhicules électriques basée sur les données collaborative <a
href="https://openstreetmap.org">OpenStreetMap</a></p>
<div class="icones">
<img class="icon-img" src="img/Type2_Connector_Outline.svg" alt="type2">
<img class="icon-img" src="img/type2_combo.svg" alt="prise">
<img class="icon-img" src="img/socket_type2.svg" alt="prise">
<img class="icon-img" src="img/socket_typee.svg" alt="prise">
<img class="icon-img" src="img/chademo.svg" alt="prise">
</div>
<button id="test">
effacer les marqueurs
</button>
<button id="toggle">
toggle : montrer les stations avec à minima 150kW de puissance dispo
</button>
<div id="infos_carte"></div>
<div id="filter">
filtres: <br>
@ -135,6 +149,9 @@
Fait par <a href="https://mastodon.cipherbliss.com/@tykayn">Tykayn</a> - <a href="https://www.cipherbliss.com">www.cipherbliss.com</a>.
<a href="https://forge.chapril.org/tykayn/">Sources disponibles sur la forge du Chapril.</a>
<br>
icones
câble électrique <a href="https://www.flaticon.com/fr/icones-gratuites/energie" title="energie icônes">Energie icônes créées par rukanicon - Flaticon</a>
</div>
<script src='js/leaflet.js'></script>
<script src='js/jquery-3.2.1.min.js'></script>

View File

@ -135,7 +135,6 @@ const tags_to_display_in_popup = [
const margin_josm_bbox = 0.00001
function createJOSMEditLink (feature) {
console.log('createJOSMEditLink feature', feature)
var coordinates = feature.geometry.coordinates
var nodeId = feature.properties.id
var left = coordinates[0] - margin_josm_bbox
@ -186,12 +185,12 @@ function guessOutputPowerFromFeature (feature) {
}
if (tag.indexOf('chademo') !== -1) {
found_type_chademo = true
console.log('tag chademo', tag)
// console.log('tag chademo', tag)
power = 63
}
let value = feature.properties.tags[tag]
if (value && tag.toLowerCase().indexOf('output') !== -1) {
console.log('tag contient output', tag, value)
// console.log('tag contient output', tag, value)
value = '' + value
if (value.replace) {
value = value.replace(' ')
@ -200,13 +199,13 @@ function guessOutputPowerFromFeature (feature) {
let power = parseInt(value)
// deviner les types de prises présents
if (power) {
console.log('power', power)
console.log('outputPower', outputPower)
}
// if (power) {
// console.log('power', power)
// console.log('outputPower', outputPower)
// }
if (power > outputPower) {
outputPower = power
console.log('power', power)
// console.log('power', power)
}
}
}
@ -215,15 +214,20 @@ function guessOutputPowerFromFeature (feature) {
return outputPower
}
// 2024-12-16: au delà d'une valeur de 400kW on peut dire qu'il existe une erreur de saisie, nous n'avons pas de chargeur de 1800kW en production.
const max_out_legit_power = 400
const error_color = 'red'
function getColor (feature) {
let outputPower = guessOutputPowerFromFeature(feature)
feature.properties.tags.has_output_of_irve_specified = outputPower
if (outputPower) {
if(outputPower> max_out_legit_power){
return error_color;
}
let index = Math.min(Math.floor(outputPower / 10), colors.length - 1)
console.log('outputPower', outputPower)
// console.log('colors[index]', colors[index])
return colors[index]
}
// autrement, sans puissance max trouvée, on met la couleur des indéfinis
@ -268,7 +272,7 @@ function displayStatsFromGeoJson (resultAsGeojson) {
// console.log('tagKey', tagKey)
if (tagKey.indexOf('type2_combo') !== -1) {
found_type2_combo = true
console.log('tagkey trouvé combo', tagKey)
// console.log('tagkey trouvé combo', tagKey)
}
if (tagKey.indexOf('type2') !== -1) {
found_type2 = true
@ -341,11 +345,11 @@ let geojsondata
function bindEventsOnJosmRemote () {
let josm_remote_buttons = $(`.josm`)
console.log('josm_remote_buttons', josm_remote_buttons[0])
// console.log('josm_remote_buttons', josm_remote_buttons[0])
$(josm_remote_buttons[0]).on('click', () => {
console.log('link', josm_remote_buttons[0])
// console.log('link', josm_remote_buttons[0])
let josm_link = $(josm_remote_buttons[0]).attr('data-href')
console.log('lancer la télécommande josm', josm_link)
// console.log('lancer la télécommande josm', josm_link)
$.get(josm_link, (res) => {
console.log('res', res)
})
@ -357,7 +361,7 @@ const ratio_circle = 0.9
function displayPointsFromApi (points) {
geojsondata = osmtogeojson(points)
console.log('resultAsGeojson', geojsondata)
// console.log('resultAsGeojson', geojsondata)
displayStatsFromGeoJson(geojsondata)
let resultLayer = L.geoJson(geojsondata, {
@ -380,13 +384,32 @@ function displayPointsFromApi (points) {
return true
},
onmoveend: function (event) {
console.log('déplacement terminé')
// console.log('déplacement terminé')
},
onzoomend: function (event) {
console.log('event', event)
// console.log('event', event)
},
onEachFeature: function (feature, layer) {
let popupContent = ''
popupContent+='<div class="sockets-list" >'
let type2 = feature.properties.tags['socket:type2']
let type2_combo = feature.properties.tags['socket:type2_combo']
if(type2){
popupContent+=' <img class="icon-img" src="img/socket_type2.svg" alt="prise de type 2">'
if(type2!=='yes'){
popupContent+= '<span class="socket-counter">x '+type2+'</span>'
}
}
if(feature.properties.tags['socket:type2_combo']){
popupContent+=' <img class="icon-img" src="img/type2_combo.svg" alt="prise de type 2 combo CCS">'
if(type2_combo!=='yes'){
popupContent+= '<span class="socket-counter">x '+type2_combo+'</span>'
}
}
popupContent+='</div>'
popupContent+='<div class="key-values" >'
// ne montrer que certains champs dans la popup
tags_to_display_in_popup.forEach(function (key) {
if (tags_to_display_in_popup.indexOf(key)) {
@ -399,7 +422,7 @@ function displayPointsFromApi (points) {
}
}
})
// popupContent = popupContent + '</dl>'
popupContent += '</div>'
layer.bindPopup(popupContent)
let outPowerGuessed = guessOutputPowerFromFeature(feature)
@ -409,8 +432,7 @@ function displayPointsFromApi (points) {
displayOutPowerGuessed = outPowerGuessed + ' kW max'
}
if (!popupContent) {
popupContent = `<span class="no-data"> Aucune information renseignée,
popupContent = `<span class="no-data"> Aucune information renseignée,
<a class="edit-button" href="https://www.openstreetmap.org/edit?editor=remote&node=${feature.properties.id}">ajoutez la dans OpenStreetMap!</a></span>`
}
let link_josm = createJOSMEditLink(feature)
@ -449,7 +471,7 @@ function displayPointsFromApi (points) {
bindEventsOnJosmRemote()
},
mouseout: function () {
setTimeout(() => this.closePopup(), 3000)
// setTimeout(() => this.closePopup(), 15000)
},
click: function () {
this.openPopup()
@ -458,14 +480,12 @@ function displayPointsFromApi (points) {
},
})
// link josm buttons to get request
}
function makeCssClassFromTags (tags) {
console.log('tags', tags)
// console.log('tags', tags)
let tagKeys = Object.keys(tags)
console.log('tagKeys', tagKeys)
// console.log('tagKeys', tagKeys)
if (!tags) {
return ''
}
@ -490,10 +510,7 @@ function getIconFromTags (tags) {
// $('#toggleMinPower_50').on('click', toggleMinPower(50))
// $('#toggleMinPower_100').on('click', toggleMinPower(100))
// document.getElementById('toggleMinPower_300').addEventListener('click', toggleMinPower(showHighPower))
$('#query-button').on('click', function () {
supprimerMarqueurs(map)
loadOverpassQuery()
})
function toggleMinPower (showHighPower) {
console.log('toggle', showHighPower)
@ -557,3 +574,14 @@ $(document).ready(function () {
bindEventsOnJosmRemote()
onMapMoveEnd()
})
/*
boutons de toggle
*/
// test
$('#test').on('click', function () {
console.log('filteredMarkers', filteredMarkers)
supprimerMarqueurs(map)
// loadOverpassQuery()
})

BIN
styles/images/layers.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -179,6 +179,8 @@ a {
}
.popup-content {
width: 100%;
display: block;
overflow: auto;
min-width: 10rem;
max-width: 20rem;
@ -296,3 +298,19 @@ button{
/*background: grey;*/
/*border-right: 1px solid white;*/
}
.key-values{
max-height: 4rem;
overflow: auto;
width: 100%;
display: block;
}
.icon-img{
width: 3rem;
height: 3rem;
fill: #000;
}
.sockets-list{
margin-top: 1rem;
}