kopia lustrzana https://github.com/openstreetmap-polska/aed-mapa
Different colors of icons + minor fixes
Maciej
rodzic
6b9ea17269
commit
1b3fca4e20
|
|
@ -298,7 +298,7 @@
|
|||
<div class="media-left">
|
||||
<figure class="image">
|
||||
<img
|
||||
alt="Logo Fundacji Powszechnego Dostępu do Defibrylacji w Polsce"
|
||||
alt="Logo OpenStreetMap Polska"
|
||||
src="./src/img/logos/logo-osm-polska.png"
|
||||
style="height: 55px"
|
||||
/>
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 826 B |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 826 B Po Szerokość: | Wysokość: | Rozmiar: 841 B |
|
|
@ -5,38 +5,13 @@
|
|||
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"
|
||||
sodipodi:docname="marker_default.svg"
|
||||
inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 63.499999 63.500002"
|
||||
width="240"
|
||||
height="240"
|
||||
width="240">
|
||||
viewBox="0 0 63.499999 63.500002"
|
||||
version="1.1"
|
||||
id="svg8">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:window-y="49"
|
||||
inkscape:window-x="1814"
|
||||
inkscape:window-height="1198"
|
||||
inkscape:window-width="1560"
|
||||
inkscape:snap-page="true"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="120.25104"
|
||||
inkscape:cx="118.74481"
|
||||
inkscape:zoom="2.3334524"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
|
|
@ -50,30 +25,28 @@
|
|||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Warstwa 1">
|
||||
id="layer1">
|
||||
<g
|
||||
transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)"
|
||||
id="g911">
|
||||
id="g911"
|
||||
transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)">
|
||||
<path
|
||||
style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.215962"
|
||||
d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
|
||||
id="path2421"
|
||||
d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z" />
|
||||
style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.215962" />
|
||||
<g
|
||||
id="g904">
|
||||
<path
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.263878"
|
||||
d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
|
||||
id="path2830"
|
||||
d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z" />
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.263878" />
|
||||
<path
|
||||
style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
|
||||
id="path3611"
|
||||
d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z" />
|
||||
style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.263878" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
|
||||
id="rect3634"
|
||||
d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z" />
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
|
|
|
|||
|
Przed Szerokość: | Wysokość: | Rozmiar: 3.1 KiB Po Szerokość: | Wysokość: | Rozmiar: 2.2 KiB |
|
|
@ -0,0 +1,80 @@
|
|||
<?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"
|
||||
sodipodi:docname="marker_private.svg"
|
||||
inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 63.499999 63.500002"
|
||||
height="240"
|
||||
width="240">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:window-y="49"
|
||||
inkscape:window-x="1814"
|
||||
inkscape:window-height="1198"
|
||||
inkscape:window-width="1560"
|
||||
inkscape:snap-page="true"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="120.25104"
|
||||
inkscape:cx="118.74481"
|
||||
inkscape:zoom="2.3334524"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base" />
|
||||
<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></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Warstwa 1">
|
||||
<g
|
||||
transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)"
|
||||
id="g911">
|
||||
<path
|
||||
style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.215962"
|
||||
id="path2421"
|
||||
d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z" />
|
||||
<g
|
||||
id="g904">
|
||||
<path
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.263878"
|
||||
id="path2830"
|
||||
d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z" />
|
||||
<path
|
||||
style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
id="path3611"
|
||||
d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
id="rect3634"
|
||||
d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Po Szerokość: | Wysokość: | Rozmiar: 3.1 KiB |
|
|
@ -5,38 +5,13 @@
|
|||
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"
|
||||
sodipodi:docname="marker_private.svg"
|
||||
inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 63.499999 63.500002"
|
||||
width="240"
|
||||
height="240"
|
||||
width="240">
|
||||
viewBox="0 0 63.499999 63.500002"
|
||||
version="1.1"
|
||||
id="svg8">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:window-y="49"
|
||||
inkscape:window-x="1814"
|
||||
inkscape:window-height="1198"
|
||||
inkscape:window-width="1560"
|
||||
inkscape:snap-page="true"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="120.25104"
|
||||
inkscape:cx="118.74481"
|
||||
inkscape:zoom="2.3334524"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
|
|
@ -50,30 +25,28 @@
|
|||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Warstwa 1">
|
||||
id="layer1">
|
||||
<g
|
||||
transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)"
|
||||
id="g911">
|
||||
id="g911"
|
||||
transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)">
|
||||
<path
|
||||
style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.215962"
|
||||
d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
|
||||
id="path2421"
|
||||
d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z" />
|
||||
style="fill:#3e8ed0;fill-opacity:1;stroke:none;stroke-width:0.215962" />
|
||||
<g
|
||||
id="g904">
|
||||
<path
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.263878"
|
||||
d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
|
||||
id="path2830"
|
||||
d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z" />
|
||||
style="fill:#ffffff;stroke:none;stroke-width:0.263878" />
|
||||
<path
|
||||
style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
|
||||
id="path3611"
|
||||
d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z" />
|
||||
style="fill:#3e8ed0;fill-opacity:1;stroke:none;stroke-width:0.263878" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878"
|
||||
d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
|
||||
id="rect3634"
|
||||
d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z" />
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
|
|
|
|||
|
Przed Szerokość: | Wysokość: | Rozmiar: 3.1 KiB Po Szerokość: | Wysokość: | Rozmiar: 2.2 KiB |
14
src/map.js
14
src/map.js
|
|
@ -168,9 +168,6 @@ map.loadImage('./src/img/marker-image-private.png', (error, image) => {
|
|||
map.addImage('aed-icon-private', image, {
|
||||
'sdf': false
|
||||
});
|
||||
map.addImage('aed-icon-', image, {
|
||||
'sdf': false
|
||||
});
|
||||
});
|
||||
|
||||
map.loadImage('./src/img/marker-image-customers.png', (error, image) => {
|
||||
|
|
@ -190,6 +187,17 @@ map.loadImage('./src/img/marker-image-customers.png', (error, image) => {
|
|||
});
|
||||
});
|
||||
|
||||
map.loadImage('./src/img/marker-image-no.png', (error, image) => {
|
||||
if (error) throw error;
|
||||
|
||||
map.addImage('aed-icon-no', image, {
|
||||
'sdf': false
|
||||
});
|
||||
|
||||
map.addImage('aed-icon-', image, {
|
||||
'sdf': false
|
||||
});
|
||||
});
|
||||
|
||||
map.on('mouseenter', 'clustered-circle', () => {
|
||||
map.getCanvas().style.cursor = 'pointer';
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue