Better icons for reports and matching markers

This commit is contained in:
Lucas Verney 2018-06-27 14:59:45 +02:00
parent ca526a9b71
commit e65be07fc1
10 changed files with 668 additions and 186 deletions

View File

@ -5,35 +5,11 @@
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"
id="svg8"
version="1.1"
viewBox="0 0 52.916666 26.458334"
height="100"
width="200"
sodipodi:docname="obstacle.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1916"
inkscape:window-height="1041"
id="namedview884"
showgrid="false"
inkscape:zoom="3.435"
inkscape:cx="22.296447"
inkscape:cy="16.085255"
inkscape:window-x="0"
inkscape:window-y="37"
inkscape:window-maximized="0"
inkscape:current-layer="layer1" />
height="100"
viewBox="0 0 52.916666 26.458334"
version="1.1"
id="svg8">
<defs
id="defs2" />
<metadata
@ -44,78 +20,43 @@
<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>
<g
transform="translate(0,-270.54165)"
id="layer1">
id="layer1"
transform="translate(0,-270.54165)">
<g
id="layer1-6"
transform="matrix(0,-0.09010182,0.09010182,0,-14.971939,321.52926)">
<rect
style="opacity:0.99800002;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
transform="matrix(0,-0.09010182,0.09010182,0,-14.971939,321.52926)"
id="layer1-6">
<path
id="path4144"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065" />
<path
id="path4146"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065" />
<path
id="path4148"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065" />
<g
id="g4319">
<g
id="g4315">
<path
id="rect4136"
width="205.71428"
height="417.14291"
x="279.74295"
y="311.09451"
ry="26.981987"
rx="82.600098" />
<rect
style="opacity:0.99800002;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
transform="matrix(0,2.9364926,-2.9364928,0,565.88879,166.16689)"
d="M 58.542969 27.390625 C 53.452535 27.390625 49.353516 39.936161 49.353516 55.519531 L 49.353516 69.316406 C 49.353516 84.899777 53.452535 97.445312 58.542969 97.445312 L 182.2207 97.445312 C 187.31114 97.445312 191.4082 84.899777 191.4082 69.316406 L 191.4082 55.519531 C 191.4082 39.936161 187.31114 27.390625 182.2207 27.390625 L 58.542969 27.390625 z M 96.675781 32.056641 L 135.64648 32.091797 L 137.41211 41.945312 L 115.70117 42.048828 L 96.675781 32.056641 z M 138.70508 32.115234 L 167.14453 32.414062 L 161.50391 41.9375 L 140.47656 41.9375 L 138.70508 32.115234 z M 86.726562 35.146484 L 113.33789 44.386719 L 113.60547 80.21875 L 86.546875 89.443359 C 76.054013 62.29422 86.726562 35.146484 86.726562 35.146484 z M 176.66406 39.482422 L 176.49219 86.082031 L 165.42578 80.365234 L 165.59766 44.46875 L 176.66406 39.482422 z M 137.44141 82.550781 L 135.67578 92.404297 L 96.791016 92.548828 L 115.73242 82.578125 L 137.44141 82.550781 z M 140.50586 82.558594 L 161.5332 82.558594 L 167.17188 92.082031 L 138.73242 92.380859 L 140.50586 82.558594 z "
style="opacity:0.99800002;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065" />
<path
id="rect4138"
width="206.07112"
height="315.1676"
x="280.14145"
y="431.77679"
rx="30.126019"
ry="38.8909" />
<path
style="fill:none;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 331.42857,377.36221 C 378.57143,363.79078 450,373.07649 450,373.07649 l -8.57143,60 h -100 l -9.28572,-52.85714 h 1.42858 z"
id="path4140" />
<path
style="fill:none;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 325.10647,448.44447 c 51.42857,-25 124.28571,-7.85714 124.28571,-7.85714 l -22.85714,70 -80,-0.71429 z"
id="path4142" />
<path
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
id="path4144" />
<path
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
id="path4146" />
<path
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
id="path4148" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1.2476511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 303.24036,420.31238 c 79.72325,-30.81221 159.43908,0.52898 159.43908,0.52898 l -27.13272,78.13931 -105.21688,0.7877 z"
id="path4152" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 294.12237,450.39219 0.42244,114.18283 28.93312,5.1884 -0.0784,-63.74925 z"
id="path4156" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 295.49018,657.06797 -0.87993,-83.51205 28.84382,5.20489 10e-6,61.74557 z"
id="path4156-17" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 313.11041,684.43623 136.84084,0.50508 -14.64285,-32.5 -105.41227,-0.50509 z"
id="path4152-7" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 471.75636,450.05562 -0.10677,114.43537 -28.93312,5.1884 -0.30424,-63.75625 z"
id="path4156-8" />
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 470.70422,656.98394 0.87993,-83.51205 -28.84382,5.20489 -10e-6,61.74557 z"
id="path4156-17-0" />
transform="matrix(0,2.9364926,-2.9364928,0,565.88879,166.16689)"
d="M 103.69531 27.132812 C 96.763976 27.132812 91.116078 31.217464 90.511719 36.460938 L 113.33789 44.386719 L 113.60547 80.21875 L 90.519531 88.089844 C 91.187404 93.281995 96.810793 97.308594 103.69531 97.308594 L 184.53516 97.308594 C 191.87233 97.308594 197.7793 92.734369 197.7793 87.050781 L 197.7793 37.392578 C 197.7793 31.70899 191.87233 27.132818 184.53516 27.132812 L 103.69531 27.132812 z M 96.675781 32.056641 L 135.64648 32.091797 L 137.41211 41.945312 L 115.70117 42.048828 L 96.675781 32.056641 z M 138.70508 32.115234 L 167.14453 32.414062 L 161.50391 41.9375 L 140.47656 41.9375 L 138.70508 32.115234 z M 176.66406 39.482422 L 176.49219 86.082031 L 165.42578 80.365234 L 165.59766 44.46875 L 176.66406 39.482422 z M 137.44141 82.550781 L 135.67578 92.404297 L 96.791016 92.548828 L 115.73242 82.578125 L 137.44141 82.550781 z M 140.50586 82.558594 L 161.5332 82.558594 L 167.17188 92.082031 L 138.73242 92.380859 L 140.50586 82.558594 z "
style="opacity:0.99800002;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065" />
</g>
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 279.71068,337.56407 c 11.61675,0 18.22075,0 28.22075,-5 10,-5 15,-18.60364 15,-18.60364"
@ -125,23 +66,22 @@
d="m 485.4792,337.55068 c -11.61675,0 -18.22075,0 -28.22075,-5 -10,-5 -15,-18.60364 -15,-18.60364"
id="path4298-1" />
</g>
</g>
<g
transform="matrix(0,0.22831338,-0.22831338,0,11.761749,281.5442)"
id="g1611">
id="g1611"
transform="matrix(0,0.22831338,-0.22831338,0,11.761749,281.5442)">
<path
style="fill:none"
d="M 0,0 H 48 V 48 H 0 Z"
id="path1597"
inkscape:connector-curvature="0" />
d="M 0,0 H 48 V 48 H 0 Z"
style="fill:none" />
<path
style="fill:#231f20;fill-opacity:1"
d="m 32,9.6 c 1.98,0 3.6,-1.61 3.6,-3.6 0,-1.99 -1.62,-3.6 -3.6,-3.6 -1.99,0 -3.6,1.61 -3.6,3.6 0,1.99 1.61,3.6 3.6,3.6 z M 38,24 c -5.52,0 -10,4.48 -10,10 0,5.52 4.48,10 10,10 5.52,0 10,-4.48 10,-10 0,-5.52 -4.48,-10 -10,-10 z m 0,17 c -3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z M 29.6,20 H 38 V 16.4 H 31.6 L 27.73,9.87 C 27.14,8.87 26.05,8.2 24.8,8.2 c -0.94,0 -1.79,0.38 -2.4,1 L 15,16.59 c -0.62,0.62 -1,1.47 -1,2.41 0,1.26 0.67,2.32 1.7,2.94 L 22.4,26 V 36 H 26 V 23.04 L 21.5,19.7 26.14,15.04 Z M 10,24 C 4.48,24 0,28.48 0,34 0,39.52 4.48,44 10,44 15.52,44 20,39.52 20,34 20,28.48 15.52,24 10,24 Z m 0,17 c -3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
id="path1599"
inkscape:connector-curvature="0" />
d="m 32,9.6 c 1.98,0 3.6,-1.61 3.6,-3.6 0,-1.99 -1.62,-3.6 -3.6,-3.6 -1.99,0 -3.6,1.61 -3.6,3.6 0,1.99 1.61,3.6 3.6,3.6 z M 38,24 c -5.52,0 -10,4.48 -10,10 0,5.52 4.48,10 10,10 5.52,0 10,-4.48 10,-10 0,-5.52 -4.48,-10 -10,-10 z m 0,17 c -3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z M 29.6,20 H 38 V 16.4 H 31.6 L 27.73,9.87 C 27.14,8.87 26.05,8.2 24.8,8.2 c -0.94,0 -1.79,0.38 -2.4,1 L 15,16.59 c -0.62,0.62 -1,1.47 -1,2.41 0,1.26 0.67,2.32 1.7,2.94 L 22.4,26 V 36 H 26 V 23.04 L 21.5,19.7 26.14,15.04 Z M 10,24 C 4.48,24 0,28.48 0,34 0,39.52 4.48,44 10,44 15.52,44 20,39.52 20,34 20,28.48 15.52,24 10,24 Z m 0,17 c -3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
style="fill:#231f20;fill-opacity:1" />
</g>
<path
id="path5302"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.29166667, 5.29166667;stroke-dashoffset:0;stroke-opacity:1"
d="M 1.0299374,274.54935 H 51.276607"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.29166667, 5.29166667;stroke-dashoffset:0;stroke-opacity:1" />
id="path5302" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

117
src/assets/gcumMarker.svg Normal file
View File

@ -0,0 +1,117 @@
<?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"
xml:space="preserve"
style="enable-background:new 0 0 64.001 60;"
viewBox="0 0 64.001 60"
height="60px"
width="64.001px"
y="0px"
x="0px"
id="Layer_1"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="gcumMarker.svg"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1923"
inkscape:window-height="1041"
id="namedview4165"
showgrid="false"
inkscape:zoom="8"
inkscape:cx="15.324518"
inkscape:cy="34.227055"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g4175" /><metadata
id="metadata6294"><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><defs
id="defs6292" /><g
id="g6260"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6262"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6264"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6266"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6268"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6270"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6272"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6274"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6276"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6278"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6280"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6282"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6284"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6286"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g6288"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)" /><g
id="g4175"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"><path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 31.900595,7.540345 C 16.429597,7.5408504 3.7633026,12.208019 3.7638758,27.679017 3.7805174,42.386984 13.481637,44.266947 28.154501,45.282648 l 3.710938,13.369025 2.917968,-13.324978 C 49.48909,44.336591 59.787139,42.417993 59.789267,27.679017 59.78984,12.207256 47.372356,7.5397717 31.900595,7.540345 Z"
id="path4169"
inkscape:connector-curvature="0"
sodipodi:nodetypes="scccccs" /></g><g
id="layer1"
transform="matrix(1.3531368,0,0,1.3531368,-27.096012,-400.13443)"><g
transform="matrix(0,-0.09010182,0.09010182,0,-3.8056259,347.0907)"
id="layer1-6"><path
id="path4144"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
inkscape:connector-curvature="0" /><path
id="path4146"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
inkscape:connector-curvature="0" /><path
id="path4148"
d="m 303.82209,745.69644 c -9.80734,-3.02858 -18.08768,-12.63143 -21.93158,-25.43443 -1.21307,-4.04041 -1.2892,-13.81396 -1.47025,-188.74669 l -0.19094,-184.48564 1.52464,-3.54411 c 1.00125,-2.32747 3.15974,-5.07869 6.28775,-8.01436 17.40981,-16.33933 62.93969,-26.20028 108.75284,-23.55389 43.92414,2.53727 77.08927,14.20562 85.9746,30.24809 l 2.12437,3.83555 0.53235,84.28571 c 0.29279,46.35714 0.44453,129.76786 0.33719,185.35714 -0.21629,112.01593 0.16279,103.22653 -4.89694,113.53905 -2.7649,5.63528 -9.46708,12.57863 -14.54403,15.06737 l -3.57143,1.75073 -78.57143,0.12345 c -43.21428,0.0679 -79.375,-0.12468 -80.35714,-0.42797 z"
style="opacity:0.99800002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
inkscape:connector-curvature="0" /><g
id="g4319"><g
id="g4315"><path
id="rect4136"
d="m 58.542969,27.390625 c -5.090434,0 -9.189453,12.545536 -9.189453,28.128906 l 0,13.796875 c 0,15.583371 4.099019,28.128906 9.189453,28.128906 l 123.677731,0 c 5.09044,0 9.1875,-12.545535 9.1875,-28.128906 l 0,-13.796875 c 0,-15.58337 -4.09706,-28.128906 -9.1875,-28.128906 l -123.677731,0 z m 38.132812,4.666016 38.970699,0.03516 1.76563,9.853515 -21.71094,0.103516 -19.025389,-9.992187 z m 42.029299,0.05859 28.43945,0.298828 -5.64062,9.523438 -21.02735,0 -1.77148,-9.822266 z m -51.978518,3.03125 26.611328,9.240235 0.26758,35.832031 -27.058595,9.224609 C 76.054013,62.29422 86.726562,35.146484 86.726562,35.146484 Z m 89.937498,4.335938 -0.17187,46.599609 -11.06641,-5.716797 0.17188,-35.896484 11.0664,-4.986328 z m -39.22265,43.068359 -1.76563,9.853516 -38.884764,0.144531 18.941404,-9.970703 21.70899,-0.02734 z m 3.06445,0.0078 21.02734,0 5.63868,9.523437 -28.43946,0.298828 1.77344,-9.822265 z"
style="opacity:0.99800002;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
inkscape:connector-curvature="0"
transform="matrix(0,2.9364926,-2.9364928,0,565.88879,166.16689)" /><path
id="rect4138"
transform="matrix(0,2.9364926,-2.9364928,0,565.88879,166.16689)"
d="m 103.69531,27.132812 c -6.931334,0 -12.579232,4.084652 -13.183591,9.328126 l 22.826171,7.925781 0.26758,35.832031 -23.085939,7.871094 c 0.667873,5.192151 6.291262,9.21875 13.175779,9.21875 l 80.83985,0 c 7.33717,0 13.24414,-4.574225 13.24414,-10.257813 l 0,-49.658203 c 0,-5.683588 -5.90697,-10.25976 -13.24414,-10.259766 l -80.83985,0 z m -7.019529,4.923829 38.970699,0.03516 1.76563,9.853515 -21.71094,0.103516 -19.025389,-9.992187 z m 42.029299,0.05859 28.43945,0.298828 -5.64062,9.523438 -21.02735,0 -1.77148,-9.822266 z m 37.95898,7.367188 -0.17187,46.599609 -11.06641,-5.716797 0.17188,-35.896484 11.0664,-4.986328 z m -39.22265,43.068359 -1.76563,9.853516 -38.884764,0.144531 18.941404,-9.970703 21.70899,-0.02734 z m 3.06445,0.0078 21.02734,0 5.63868,9.523437 -28.43946,0.298828 1.77344,-9.822265 z"
style="opacity:0.99800002;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.77287065"
inkscape:connector-curvature="0" /></g><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 279.71068,337.56407 c 11.61675,0 18.22075,0 28.22075,-5 10,-5 15,-18.60364 15,-18.60364"
id="path4298"
inkscape:connector-curvature="0" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 485.4792,337.55068 c -11.61675,0 -18.22075,0 -28.22075,-5 -10,-5 -15,-18.60364 -15,-18.60364"
id="path4298-1"
inkscape:connector-curvature="0" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 9.4 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 218 KiB

View File

@ -0,0 +1,100 @@
<?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"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="64"
height="64"
viewBox="0 0 64.000001 64"
xml:space="preserve"><metadata
id="metadata6294"><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><defs
id="defs6292" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6260" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6262" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6264" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6266" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6268" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6270" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6272" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6274" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6276" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6278" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6280" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6282" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6284" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6286" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6288" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
id="g4175"><path
id="path4169"
d="M 31.900595,7.540345 C 16.429597,7.5408504 3.7633026,12.208019 3.7638758,27.679017 3.7805174,42.386984 13.481637,44.266947 28.154501,45.282648 l 3.710938,13.369025 2.917968,-13.324978 C 49.48909,44.336591 59.787139,42.417993 59.789267,27.679017 59.78984,12.207256 47.372356,7.5397717 31.900595,7.540345 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="matrix(0.5077287,0,0,0.5077287,15.528999,11.806231)"
id="g4572"><g
id="Stand_1_"><g
id="g6236"><rect
id="rect6238"
height="8"
width="32"
style="fill:#b3b3b3"
y="44"
x="16.000999" /></g></g><g
id="Leg"><g
id="g6241"><path
id="path6243"
d="m 8.001,56 c 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4 l 0,-50 -8,0 0,50 z m 40,-50 0,50 c 0,2.209 1.79,4 4,4 2.209,0 4,-1.791 4,-4 l 0,-50 -8,0 z"
style="fill:#cccccc" /></g></g><g
id="Bar"><g
id="g6246"><path
id="path6248"
d="m 60.445,15.999 -56.889,0 C 1.592,15.999 0,17.609 0,19.596 l 0,8.789 c 0,1.986 1.592,3.597 3.556,3.597 l 56.89,0 c 1.963,0 3.555,-1.61 3.555,-3.597 l 0,-8.789 C 64,17.609 62.408,15.999 60.445,15.999 Z"
style="fill:#e6e6e6" /></g></g><g
id="Stripes_1_"><g
id="g6251"><path
id="path6253"
d="m 10.001,16 -10,10 0,2.395 c 0.005,1.981 1.594,3.587 3.555,3.587 l 2.464,0 L 22.001,16 l -12,0 z m 50.454,0 -2.454,0 -15.981,15.981 12,0 9.98,-9.98 0,-2.405 C 64,17.612 62.413,16.006 60.455,16 Z m -26.454,0 -16,16 12,0 16,-16 -12,0 z"
style="clip-rule:evenodd;fill:#ff8833;fill-rule:evenodd" /></g></g><g
id="Lights"><g
id="g6256"><path
id="path6258"
d="m 12.001,0 c -3.313,0 -6,2.686 -6,6 0,3.313 2.687,6 6,6 3.313,0 6,-2.687 6,-6 0,-3.314 -2.687,-6 -6,-6 z m 40,0 c -3.313,0 -6,2.686 -6,6 0,3.313 2.687,6 6,6 3.313,0 6,-2.687 6,-6 0,-3.314 -2.687,-6 -6,-6 z"
style="clip-rule:evenodd;fill:#ffcc66;fill-rule:evenodd" /></g></g><g
id="g6260-8" /><g
id="g6262-7" /><g
id="g6264-4" /><g
id="g6266-3" /><g
id="g6268-8" /><g
id="g6270-1" /><g
id="g6272-4" /><g
id="g6274-7" /><g
id="g6276-8" /><g
id="g6278-4" /><g
id="g6280-0" /><g
id="g6282-7" /><g
id="g6284-6" /><g
id="g6286-7" /><g
id="g6288-2" /></g></g></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -0,0 +1,81 @@
<?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"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="64"
height="64"
viewBox="0 0 64.000001 64"
xml:space="preserve"><metadata
id="metadata6294"><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><defs
id="defs6292" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6260" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6262" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6264" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6266" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6268" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6270" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6272" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6274" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6276" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6278" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6280" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6282" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6284" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6286" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
id="g6288" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
id="g4175"><path
id="path4169"
d="M 31.900595,7.540345 C 16.429597,7.5408504 3.7633026,12.208019 3.7638758,27.679017 3.7805174,42.386984 13.481637,44.266947 28.154501,45.282648 l 3.710938,13.369025 2.917968,-13.324978 C 49.48909,44.336591 59.787139,42.417993 59.789267,27.679017 59.78984,12.207256 47.372356,7.5397717 31.900595,7.540345 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="matrix(0.84123921,0,0,0.84123921,4.8564957,4.6638366)"
id="g4336"><g
id="g6260-3" /><g
id="g6262-8" /><g
id="g6264-9" /><g
id="g6266-7" /><g
id="g6268-6" /><g
id="g6270-6" /><g
id="g6272-6" /><g
id="g6274-4" /><g
id="g6276-5" /><g
id="g6278-3" /><g
id="g6280-9" /><g
id="g6282-7" /><g
id="g6284-4" /><g
id="g6286-0" /><g
id="g6288-3" /><g
transform="matrix(3.7795277,0,0,3.7795277,-39.876785,-1073.1206)"
id="layer1-1"><g
transform="matrix(0.35277777,0,0,-0.35277777,5.2364181,288.02794)"
id="g10"><g
transform="scale(0.1,0.1)"
id="g12"><path
id="path18"
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76795506"
d="m 176.78264,-175.99622 0.6165,68.56146 0,0 c 3.38513,0.0569 7.01945,0.30265 10.33733,0.9226 3.47911,0.65012 6.82976,2.16593 9.28195,4.67503 2.94712,3.065237 5.43295,7.180687 7.35573,10.929687 3.72571,7.40314 9.56218,18.30524 14.71576,24.772 8.6896,10.87278 21.91283,17.71634 35.41543,21.18596 15.27104,3.93008 31.47501,3.31013 46.18387,-2.3582 12.60673,-4.7992 23.12859,-12.97405 31.38363,-23.62696 4.83972,-6.28138 10.64342,-15.63835 15.88753,-21.60674 7.63853,-8.705977 18.31559,-14.280327 29.6488,-16.698897 7.19794,-1.51581 14.65195,-1.63997 21.84903,-0.11812 9.33973,1.94692 18.24833,6.25809 24.7996,13.186147 6.30551,6.60558 12.23339,17.03603 17.6318,24.37193 7.1066,9.70014 16.38595,17.62149 27.18801,22.88629 12.97667,6.34519 27.56744,8.48784 41.84174,6.56419 12.51267,-1.67359 24.40205,-6.47365 34.39448,-14.15271 7.97568,-6.12963 14.56058,-13.99407 19.68052,-22.69057 1.9866,-3.37824 8.44387,-14.34155 10.71066,-17.53096 2.26337,-3.15923 5.52347,-5.668327 8.9086,-7.531617 3.07135,-1.69688 6.54096,-2.93677 10.05368,-3.17906 3.29028,-0.1621 6.64177,0.0905 9.84153,0.33628 l 0,0 -0.1923,-68.74254 -427.53388,-0.1552 0,0" /></g></g></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -8,7 +8,7 @@
<v-lcircle v-if="shouldDisplayAccuracy" :lat-lng="latlng" :radius="radiusFromAccuracy"></v-lcircle>
<v-lmarker v-for="marker in markers" :key="marker.id" :lat-lng="marker.latLng"></v-lmarker>
<ReportMarker v-for="marker in markers" :key="marker.id" :marker="marker"></ReportMarker>
</v-lmap>
</div>
</template>
@ -19,7 +19,8 @@ import iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
import iconUrl from 'leaflet/dist/images/marker-icon.png';
import shadowUrl from 'leaflet/dist/images/marker-shadow.png';
import { EARTH_RADIUS } from '@/constants';
import * as constants from '@/constants';
import ReportMarker from './ReportMarker.vue';
// Fix for a bug in Leaflet default icon
// see https://github.com/PaulLeCam/react-leaflet/issues/255#issuecomment-261904061
@ -30,13 +31,10 @@ L.Icon.Default.mergeOptions({
shadowUrl,
});
export const DEFAULT_ZOOM = 17;
export const MIN_ZOOM = 15;
export const MAX_ZOOM = 18;
export const TILE_SERVER = process.env.TILE_SERVER || 'https://a.tile.thunderforest.com/cycle/{z}/{x}/{y}.png';
export default {
components: {
ReportMarker,
},
props: {
accuracy: {
type: Number,
@ -51,7 +49,7 @@ export default {
radiusFromAccuracy() {
if (this.accuracy) {
return this.accuracy / (
(EARTH_RADIUS * 2 * Math.PI * Math.cos(this.lat)) /
(constants.EARTH_RADIUS * 2 * Math.PI * Math.cos(this.lat)) /
(2 ** (this.zoom + 8))
);
}
@ -79,11 +77,11 @@ export default {
data() {
return {
attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
zoom: DEFAULT_ZOOM,
zoom: constants.DEFAULT_ZOOM,
markerRadius: 10.0,
minZoom: MIN_ZOOM,
maxZoom: MAX_ZOOM,
tileServer: TILE_SERVER,
minZoom: constants.MIN_ZOOM,
maxZoom: constants.MAX_ZOOM,
tileServer: constants.TILE_SERVER,
};
},
};

View File

@ -11,27 +11,10 @@
</template>
<script>
import GCUMIcon from '@/assets/gcum.svg';
import ObstacleIcon from '@/assets/obstacle.svg';
import PotHoleIcon from '@/assets/pothole.svg';
import { REPORT_TYPES } from '@/constants';
import ReportTile from './ReportTile.vue';
const REPORT_TYPES = {
gcum: {
label: 'reportLabels.gcum',
image: GCUMIcon,
},
interrupt: {
label: 'reportLabels.interrupt',
image: ObstacleIcon,
},
pothole: {
label: 'reportLabels.pothole',
image: PotHoleIcon,
},
};
export default {
components: {
ReportTile,

View File

@ -0,0 +1,22 @@
<template>
<v-lmarker :lat-lng="marker.latLng" :icon="icons[marker.type]"></v-lmarker>
</template>
<script>
import { REPORT_TYPES } from '@/constants';
export default {
props: {
marker: Object,
},
data() {
const icons = {};
Object.keys(REPORT_TYPES).forEach((type) => {
icons[type] = REPORT_TYPES[type].marker;
});
return {
icons,
};
},
};
</script>

View File

@ -1,6 +1,50 @@
import L from 'leaflet';
import gcumMarker from '@/assets/gcumMarker.svg';
import obstacleMarker from '@/assets/obstacleMarker.svg';
import potholeMarker from '@/assets/potholeMarker.svg';
import GCUMIcon from '@/assets/gcum.svg';
import ObstacleIcon from '@/assets/obstacle.svg';
import PotHoleIcon from '@/assets/pothole.svg';
export const REPORT_TYPES = {
gcum: {
label: 'reportLabels.gcum',
image: GCUMIcon,
marker: L.icon({
iconUrl: gcumMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
},
interrupt: {
label: 'reportLabels.interrupt',
image: ObstacleIcon,
marker: L.icon({
iconUrl: obstacleMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
},
pothole: {
label: 'reportLabels.pothole',
image: PotHoleIcon,
marker: L.icon({
iconUrl: potholeMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
},
};
export const MOCK_LOCATION = false;
export const MOCK_LOCATION_UPDATE_INTERVAL = 30 * 1000;
export const UPDATE_REPORTS_DISTANCE_THRESHOLD = 500;
export const EARTH_RADIUS = 6378137;
export const DEFAULT_ZOOM = 17;
export const MIN_ZOOM = 15;
export const MAX_ZOOM = 18;
export const TILE_SERVER = process.env.TILE_SERVER || 'https://a.tile.thunderforest.com/cycle/{z}/{x}/{y}.png';

View File

@ -58,6 +58,7 @@ export default {
reportsMarkers() {
return this.$store.state.reports.map(report => ({
id: report.id,
type: report.attributes.type,
latLng: [report.attributes.lat, report.attributes.lng],
}));
},