phyks
/
cygnal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 2 new report types: accident + misc. Fix #15.

This commit is contained in:
Lucas Verney 2018-07-10 15:19:24 +02:00
parent 3e2e034fc8
commit bc52d4f929
15 changed files with 610 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -84,8 +84,8 @@ the server side part.
The `scripts` folder contain some useful scripts:
* `purge_old_gcum.py` deletes `gcum`-type report older than one hour. You
should set a crontask to call it regularly.
* `purge_old_gcum_and_accidents.py` deletes `gcum` and `accident` type report
older than one hour. You should set a crontask to call it regularly.
## Contributing
@ -121,3 +121,5 @@ Icons are made from the original works:
were designed by Vecteezy.
* [Trash icon](https://pixabay.com/en/trash-waste-trashcan-garbage-99257/) is
coming from Pixabay under CC0 license.
* [Accident icon](https://www.flaticon.com/free-icon/car-running-over-a-bicycle_91680) is
coming from Flaticon.

4
scripts/purge_old_gcum.py
View File

@ -13,9 +13,9 @@ if __name__ == "__main__":
db.connect()
one_hour_ago = arrow.utcnow().shift(hours=-1).datetime
nb = Report.delete().where(
(Report.type == 'gcum') &
((Report.type == 'accident') | (Report.type == 'gcum')) &
(Report.datetime < one_hour_ago)
).execute()
print("%d GCUM reports purged." % nb)
print("%d accident/GCUM reports purged." % nb)
if not db.is_closed():
db.close()

160
src/assets/accident.svg Normal file
View File

@ -0,0 +1,160 @@
<?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"
id="svg8"
version="1.1"
viewBox="0 0 52.916666 26.458334"
height="100"
width="200">
<defs
id="defs2" />
<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
transform="matrix(0.9407631,0,0,0.94076314,-62.698317,-17.421275)"
id="g4381">
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6260" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6262" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6264" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6266" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6268" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6270" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6272" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6274" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6276" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6278" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6280" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6282" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6284" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6286" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6288" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-70.354377,39.213078)"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
id="g4175">
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
transform="matrix(0.09547544,0,0,0.09547544,8.6851351,5.1561065)"
id="g4666">
<g
transform="translate(1218.1199,-359.71327)"
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4616">
<path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 193.455,277.068 -4.063,0 0,-13.097 c 0,-7.512 -6.93,-11.178 -12.21,-12.474 l -8.87,-16.68 c -0.61,-1.148 -1.741,-1.928 -3.031,-2.091 L 100.987,224.614 41.98,131.121 c -0.733,-1.161 -2.01,-1.865 -3.383,-1.865 l -34.597,0 c -2.209,0 -4,1.791 -4,4 l 0,179.547 c 0,1.061 0.421,2.078 1.171,2.829 0.75,0.75 1.768,1.171 2.829,1.171 l 54.244,0 c 2.233,22.782 21.492,40.643 44.848,40.643 23.36,0 42.623,-17.861 44.856,-40.643 l 45.508,-10e-4 c 7.461,0 13.53,-6.07 13.53,-13.532 l 0,-12.67 c -10e-4,-7.462 -6.07,-13.532 -13.531,-13.532 z m -90.364,62.377 c -14.925,0 -27.068,-12.145 -27.068,-27.073 0,-14.928 12.143,-27.072 27.068,-27.072 14.93,0 27.076,12.145 27.076,27.072 0,14.928 -12.146,27.073 -27.076,27.073 z"
id="path4618" />
<path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 430.407,241.856 c -6.451,0 -12.647,1.105 -18.422,3.111 l -17.592,-37.339 24.674,0 c 2.189,0 3.971,1.826 3.971,4.015 l 0,0.591 c 0,2.189 -1.781,3.969 -3.971,3.969 -3.314,0 -6,2.687 -6,6 0,3.314 2.686,6 6,6 8.807,0 15.971,-7.163 15.971,-15.969 l 0,-0.591 c 0,-8.806 -7.164,-16.015 -15.971,-16.015 l -34.144,0 c -3.314,0 -6,2.687 -6,6 0,1.041 0.266,2.019 0.731,2.872 l 6.498,13.792 -66.29,0.002 -4.271,-10.214 -0.159,-0.452 6.196,0 c 3.313,0 6,-2.686 6,-6 0,-3.313 -2.687,-6 -6,-6 l -27.413,0 c -3.314,0 -6,2.687 -6,6 0,3.314 2.686,6 6,6 l 8.495,0 1.354,3.849 c 0.067,0.244 0.145,0.487 0.245,0.727 l 0.067,0.16 0.257,0.731 c 0.124,0.351 0.283,0.678 0.462,0.99 l 3.71,8.873 -12.955,23.342 c -6.741,-2.861 -14.149,-4.444 -21.922,-4.444 -31.042,0 -56.296,25.253 -56.296,56.294 0,31.041 25.254,56.295 56.296,56.295 31.042,0 56.297,-25.254 56.297,-56.295 0,-18.986 -9.458,-35.794 -23.899,-45.996 l 8.379,-15.093 25.755,61.598 c -2.759,2.803 -4.467,6.643 -4.467,10.876 0,8.556 6.961,15.517 15.517,15.517 8.556,0 15.516,-6.961 15.516,-15.517 0,-3.003 -0.872,-5.801 -2.354,-8.179 l 10.717,-15.104 c -0.829,3.838 -1.276,7.815 -1.276,11.897 0,31.041 25.254,56.295 56.296,56.295 31.04,0 56.293,-25.254 56.293,-56.295 -0.002,-31.04 -25.255,-56.293 -56.295,-56.293 z m -35.179,-4.301 -40.336,56.846 c -1.085,-0.243 -2.209,-0.381 -3.367,-0.382 l -26.644,-63.725 66.926,-0.002 3.421,7.263 z m -77.003,60.595 c 0,24.424 -19.871,44.295 -44.297,44.295 -24.425,0 -44.296,-19.871 -44.296,-44.295 0,-24.424 19.871,-44.294 44.296,-44.294 5.66,0 11.069,1.079 16.05,3.021 l -15.488,27.898 c -0.188,-0.008 -0.372,-0.028 -0.561,-0.028 -7.39,0 -13.402,6.012 -13.402,13.402 0,7.391 6.013,13.403 13.402,13.403 7.39,0 13.401,-6.013 13.401,-13.403 0,-2.802 -0.867,-5.404 -2.344,-7.557 l 15.482,-27.885 c 10.773,8.088 17.757,20.965 17.757,35.443 z m 112.182,44.295 c -24.425,0 -44.296,-19.871 -44.296,-44.295 0,-15.532 8.042,-29.212 20.175,-37.122 l 13.593,28.852 c -1.796,2.281 -2.877,5.149 -2.877,8.27 0,7.391 6.012,13.403 13.401,13.403 7.392,0 13.405,-6.013 13.405,-13.403 0,-7.279 -5.837,-13.208 -13.075,-13.386 L 417.13,255.891 c 4.193,-1.32 8.652,-2.035 13.276,-2.035 24.423,0 44.293,19.87 44.293,44.294 10e-4,24.424 -19.869,44.295 -44.292,44.295 z"
id="path4620" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4622">
<path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 185.563,174.784 c -0.963,-3.169 -4.31,-4.957 -7.486,-3.995 -3.17,0.964 -4.959,4.316 -3.995,7.486 l 24.761,81.435 c 0.787,2.588 3.166,4.256 5.739,4.256 0.578,0 1.166,-0.084 1.748,-0.261 3.17,-0.964 4.959,-4.316 3.995,-7.486 l -24.762,-81.435 z"
id="path4624" />
<path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 269.934,209.279 c -1.97,-2.665 -5.728,-3.228 -8.392,-1.259 l -37.966,28.062 c -2.665,1.97 -3.229,5.727 -1.259,8.392 1.177,1.592 2.991,2.434 4.83,2.434 1.239,0 2.489,-0.383 3.562,-1.175 l 37.966,-28.062 c 2.665,-1.97 3.228,-5.727 1.259,-8.392 z"
id="path4626" />
<path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 239.516,140.802 c 0.684,-3.243 -1.391,-6.425 -4.633,-7.109 -3.248,-0.683 -6.425,1.391 -7.109,4.633 l -17.057,80.885 c -0.684,3.243 1.391,6.425 4.633,7.109 0.418,0.088 0.834,0.13 1.244,0.13 2.776,0 5.27,-1.938 5.865,-4.763 l 17.057,-80.885 z"
id="path4628" />
</g>
</g>
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4630" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4632" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4634" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4636" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4638" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4640" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4642" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4644" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4646" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4648" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4650" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4652" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4654" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4656" />
<g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4658" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

131
src/assets/accidentMarker.svg Normal file
View File

@ -0,0 +1,131 @@
<?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="Layer_1"
x="0px"
y="0px"
width="64.001px"
height="60px"
viewBox="0 0 64.001 60"
style="enable-background:new 0 0 64.001 60;"
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="accidentMarker.svg"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1513"
inkscape:window-height="923"
id="namedview11462"
showgrid="false"
inkscape:zoom="3.9333333"
inkscape:cx="-1.8130596"
inkscape:cy="30"
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
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6260" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6262" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6264" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6266" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6268" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6270" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6272" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6274" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6276" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6278" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6280" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6282" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6284" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6286" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6288" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.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:#231f20;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
transform="matrix(0.09547544,0,0,0.09547544,8.6851351,5.1561065)"
id="g4666"><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4616"><path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 193.455,277.068 -4.063,0 0,-13.097 c 0,-7.512 -6.93,-11.178 -12.21,-12.474 l -8.87,-16.68 c -0.61,-1.148 -1.741,-1.928 -3.031,-2.091 L 100.987,224.614 41.98,131.121 c -0.733,-1.161 -2.01,-1.865 -3.383,-1.865 l -34.597,0 c -2.209,0 -4,1.791 -4,4 l 0,179.547 c 0,1.061 0.421,2.078 1.171,2.829 0.75,0.75 1.768,1.171 2.829,1.171 l 54.244,0 c 2.233,22.782 21.492,40.643 44.848,40.643 23.36,0 42.623,-17.861 44.856,-40.643 l 45.508,-10e-4 c 7.461,0 13.53,-6.07 13.53,-13.532 l 0,-12.67 c -10e-4,-7.462 -6.07,-13.532 -13.531,-13.532 z m -90.364,62.377 c -14.925,0 -27.068,-12.145 -27.068,-27.073 0,-14.928 12.143,-27.072 27.068,-27.072 14.93,0 27.076,12.145 27.076,27.072 0,14.928 -12.146,27.073 -27.076,27.073 z"
id="path4618" /><path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 430.407,241.856 c -6.451,0 -12.647,1.105 -18.422,3.111 l -17.592,-37.339 24.674,0 c 2.189,0 3.971,1.826 3.971,4.015 l 0,0.591 c 0,2.189 -1.781,3.969 -3.971,3.969 -3.314,0 -6,2.687 -6,6 0,3.314 2.686,6 6,6 8.807,0 15.971,-7.163 15.971,-15.969 l 0,-0.591 c 0,-8.806 -7.164,-16.015 -15.971,-16.015 l -34.144,0 c -3.314,0 -6,2.687 -6,6 0,1.041 0.266,2.019 0.731,2.872 l 6.498,13.792 -66.29,0.002 -4.271,-10.214 -0.159,-0.452 6.196,0 c 3.313,0 6,-2.686 6,-6 0,-3.313 -2.687,-6 -6,-6 l -27.413,0 c -3.314,0 -6,2.687 -6,6 0,3.314 2.686,6 6,6 l 8.495,0 1.354,3.849 c 0.067,0.244 0.145,0.487 0.245,0.727 l 0.067,0.16 0.257,0.731 c 0.124,0.351 0.283,0.678 0.462,0.99 l 3.71,8.873 -12.955,23.342 c -6.741,-2.861 -14.149,-4.444 -21.922,-4.444 -31.042,0 -56.296,25.253 -56.296,56.294 0,31.041 25.254,56.295 56.296,56.295 31.042,0 56.297,-25.254 56.297,-56.295 0,-18.986 -9.458,-35.794 -23.899,-45.996 l 8.379,-15.093 25.755,61.598 c -2.759,2.803 -4.467,6.643 -4.467,10.876 0,8.556 6.961,15.517 15.517,15.517 8.556,0 15.516,-6.961 15.516,-15.517 0,-3.003 -0.872,-5.801 -2.354,-8.179 l 10.717,-15.104 c -0.829,3.838 -1.276,7.815 -1.276,11.897 0,31.041 25.254,56.295 56.296,56.295 31.04,0 56.293,-25.254 56.293,-56.295 -0.002,-31.04 -25.255,-56.293 -56.295,-56.293 z m -35.179,-4.301 -40.336,56.846 c -1.085,-0.243 -2.209,-0.381 -3.367,-0.382 l -26.644,-63.725 66.926,-0.002 3.421,7.263 z m -77.003,60.595 c 0,24.424 -19.871,44.295 -44.297,44.295 -24.425,0 -44.296,-19.871 -44.296,-44.295 0,-24.424 19.871,-44.294 44.296,-44.294 5.66,0 11.069,1.079 16.05,3.021 l -15.488,27.898 c -0.188,-0.008 -0.372,-0.028 -0.561,-0.028 -7.39,0 -13.402,6.012 -13.402,13.402 0,7.391 6.013,13.403 13.402,13.403 7.39,0 13.401,-6.013 13.401,-13.403 0,-2.802 -0.867,-5.404 -2.344,-7.557 l 15.482,-27.885 c 10.773,8.088 17.757,20.965 17.757,35.443 z m 112.182,44.295 c -24.425,0 -44.296,-19.871 -44.296,-44.295 0,-15.532 8.042,-29.212 20.175,-37.122 l 13.593,28.852 c -1.796,2.281 -2.877,5.149 -2.877,8.27 0,7.391 6.012,13.403 13.401,13.403 7.392,0 13.405,-6.013 13.405,-13.403 0,-7.279 -5.837,-13.208 -13.075,-13.386 L 417.13,255.891 c 4.193,-1.32 8.652,-2.035 13.276,-2.035 24.423,0 44.293,19.87 44.293,44.294 10e-4,24.424 -19.869,44.295 -44.292,44.295 z"
id="path4620" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4622"><path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 185.563,174.784 c -0.963,-3.169 -4.31,-4.957 -7.486,-3.995 -3.17,0.964 -4.959,4.316 -3.995,7.486 l 24.761,81.435 c 0.787,2.588 3.166,4.256 5.739,4.256 0.578,0 1.166,-0.084 1.748,-0.261 3.17,-0.964 4.959,-4.316 3.995,-7.486 l -24.762,-81.435 z"
id="path4624" /><path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 269.934,209.279 c -1.97,-2.665 -5.728,-3.228 -8.392,-1.259 l -37.966,28.062 c -2.665,1.97 -3.229,5.727 -1.259,8.392 1.177,1.592 2.991,2.434 4.83,2.434 1.239,0 2.489,-0.383 3.562,-1.175 l 37.966,-28.062 c 2.665,-1.97 3.228,-5.727 1.259,-8.392 z"
id="path4626" /><path
style="fill:#231f20;fill-opacity:1;stroke:none"
d="m 239.516,140.802 c 0.684,-3.243 -1.391,-6.425 -4.633,-7.109 -3.248,-0.683 -6.425,1.391 -7.109,4.633 l -17.057,80.885 c -0.684,3.243 1.391,6.425 4.633,7.109 0.418,0.088 0.834,0.13 1.244,0.13 2.776,0 5.27,-1.938 5.865,-4.763 l 17.057,-80.885 z"
id="path4628" /></g></g><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4630" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4632" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4634" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4636" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4638" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4640" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4642" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4644" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4646" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4648" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4650" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4652" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4654" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4656" /><g
style="fill:#231f20;fill-opacity:1;stroke:none"
id="g4658" /></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

8
src/assets/gcumMarker.svg
View File

@ -26,12 +26,12 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1923"
inkscape:window-height="1041"
inkscape:window-width="1920"
inkscape:window-height="1036"
id="namedview4165"
showgrid="false"
inkscape:zoom="8"
inkscape:cx="15.324518"
inkscape:cx="-9.800482"
inkscape:cy="34.227055"
inkscape:window-x="0"
inkscape:window-y="0"
@ -74,7 +74,7 @@
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"
style="fill:#ffffff;fill-opacity:1;stroke:#231f20;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"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

12
src/assets/interruptMarker.svg
View File

@ -15,8 +15,8 @@
height="64"
viewBox="0 0 64.000001 64"
xml:space="preserve"
sodipodi:docname="workMarker.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"><sodipodi:namedview
sodipodi:docname="interruptMarker.svg"
inkscape:version="0.91 r13725"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
@ -26,16 +26,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="956"
inkscape:window-height="1041"
inkscape:window-height="1036"
id="namedview4089"
showgrid="false"
inkscape:zoom="3.6875"
inkscape:cx="16.329941"
inkscape:cx="14.597579"
inkscape:cy="76.508307"
inkscape:window-x="960"
inkscape:window-y="37"
inkscape:window-maximized="0"
inkscape:current-layer="g4175" /><metadata
inkscape:current-layer="surface625762" /><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
@ -75,7 +75,7 @@
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
style="fill:#ffffff;fill-opacity:1;stroke:#231f20;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
id="surface625762"
transform="matrix(1.0686403,0,0,1.0686403,-551.54966,-408.32772)"><g
id="g4969"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

99
src/assets/misc.svg Normal file
View File

@ -0,0 +1,99 @@
<?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"
id="svg8"
version="1.1"
viewBox="0 0 52.916666 26.458334"
height="100"
width="200">
<defs
id="defs2" />
<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
transform="matrix(0.26458333,0,0,0.26458334,24.893047,2.0104165)"
id="g4642">
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6260" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6262" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6264" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6266" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6268" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6270" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6272" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6274" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6276" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6278" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6280" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6282" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6284" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6286" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6288" />
<g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
id="g4175">
<g
style="fill:#231f20;fill-opacity:1;stroke:none;stroke-opacity:1"
transform="matrix(3.7237245,0,0,3.7237245,152.99815,-36.205933)"
id="g5660">
<path
style="fill:#231f20;fill-opacity:1;stroke:none;stroke-opacity:1"
d="m -55.05135,31.101127 22,0 -11,-19 -11,19 z m 12,-3 -2,0 0,-2 2,0 0,2 z m 0,-4 -2,0 0,-4 2,0 0,4 z"
id="path5652" />
</g>
<text
id="text4663"
y="78.779724"
x="25.805107"
style="font-style:normal;font-weight:normal;font-size:93.10049438px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#231f20;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
y="78.779724"
x="25.805107"
id="tspan4665">?</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

62
src/assets/miscMarker.svg Normal file
View File

@ -0,0 +1,62 @@
<?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.001px"
height="60px"
viewBox="0 0 64.001 60"
style="enable-background:new 0 0 64.001 60;"
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,-6.8738791)"
id="g6260" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6262" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6264" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6266" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6268" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6270" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6272" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6274" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6276" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6278" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6280" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6282" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6284" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6286" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.8738791)"
id="g6288" /><g
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-6.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:#231f20;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
style="fill:#231f20;fill-opacity:1;stroke:none;stroke-opacity:1"
transform="matrix(1.3136345,0,0,1.3136345,16.010715,11.025868)"
id="g5660"><path
style="fill:#231f20;fill-opacity:1;stroke:none;stroke-opacity:1"
d="M 1,21 23,21 12,2 1,21 Z m 12,-3 -2,0 0,-2 2,0 0,2 z m 0,-4 -2,0 0,-4 2,0 0,4 z"
id="path5652" /></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

29
src/assets/obstacleMarker.svg
View File

@ -6,6 +6,8 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xml:space="preserve"
viewBox="0 0 64.000001 64"
height="64"
@ -13,10 +15,31 @@
y="0px"
x="0px"
id="Layer_1"
version="1.1"><metadata
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="obstacleMarker.svg"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1735"
inkscape:window-height="960"
id="namedview9414"
showgrid="false"
inkscape:zoom="3.6875"
inkscape:cx="32"
inkscape:cy="32"
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></dc:title></cc:Work></rdf:RDF></metadata><defs
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs6292"><pattern
xlink:href="#pattern6063"
id="pattern6074"
@ -86,7 +109,7 @@
id="g4175"
style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
transform="matrix(1.1140552,0,0,1.1140552,-3.3978567,-2.8738791)"><path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:#ffffff;fill-opacity:1;stroke:#231f20;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" /><g
transform="matrix(0.46231861,1.8711507,-2.0608233,1.0803093,681.71675,-310.17134)"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 KiB

After

Width:  |  Height:  |  Size: 218 KiB

90
src/assets/potholeMarker.svg
View File

@ -5,6 +5,8 @@
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="Layer_1"
x="0px"
@ -12,10 +14,31 @@
width="64"
height="64"
viewBox="0 0 64.000001 64"
xml:space="preserve"><metadata
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="potholeMarker.svg"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1741"
inkscape:window-height="914"
id="namedview10730"
showgrid="false"
inkscape:zoom="3.6875"
inkscape:cx="32"
inkscape:cy="32"
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></dc:title></cc:Work></rdf:RDF></metadata><defs
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><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
@ -48,34 +71,53 @@
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"
style="fill:#ffffff;stroke:#231f20;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
style="fill:#ffffff;fill-opacity:1;stroke:#231f20;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
id="g4336"
style="stroke:#231f20;stroke-opacity:1"><g
id="g6260-3"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6262-8"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6264-9"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6266-7"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6268-6"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6270-6"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6272-6"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6274-4"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6276-5"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6278-3"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6280-9"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6282-7"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6284-4"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6286-0"
style="stroke:#231f20;stroke-opacity:1" /><g
id="g6288-3"
style="stroke:#231f20;stroke-opacity:1" /><g
transform="matrix(3.7795277,0,0,3.7795277,-39.876785,-1073.1206)"
id="layer1-1"><g
id="layer1-1"
style="stroke:#231f20;stroke-opacity:1"><g
transform="matrix(0.35277777,0,0,-0.35277777,5.2364181,288.02794)"
id="g10"><g
id="g10"
style="stroke:#231f20;stroke-opacity:1"><g
transform="scale(0.1,0.1)"
id="g12"><path
id="g12"
style="stroke:#231f20;stroke-opacity:1"><path
id="path18"
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76795506"
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:#231f20;stroke-width:1.76795506;stroke-opacity:1"
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>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

2
src/components/About.vue
View File

@ -9,10 +9,12 @@
<h2 class="body-2">{{ $t('about.availableReportsTitle') }}</h2>
<ul class="ml-3">
<li><strong>{{ $t('reportLabels.accident') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.accidentDescription') }}</li>
<li><strong>{{ $t('reportLabels.gcum') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.gcumDescription') }}</li>
<li><strong>{{ $t('reportLabels.interrupt') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.interruptDescription') }}</li>
<li><strong>{{ $t('reportLabels.obstacle') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.obstacleDescription') }}</li>
<li><strong>{{ $t('reportLabels.pothole') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.potholeDescription') }}</li>
<li><strong>{{ $t('reportLabels.misc') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.miscDescription') }}</li>
</ul>
<p class="mt-3" v-html="$t('about.license')"></p>

5
src/components/ReportDialog/index.vue
View File

@ -26,7 +26,7 @@
<v-card>
<v-container fluid>
<v-layout row wrap>
<ReportTile v-for="(item, type) in REPORT_TYPES" :type="type" :imageSrc="item.image" :label="$t(item.label)" :save="saveReport" :key="type"></ReportTile>
<ReportTile v-for="type in REPORT_TYPES_ORDER" :type="type" :imageSrc="REPORT_TYPES[type].image" :label="$t(REPORT_TYPES[type].label)" :save="saveReport" :key="type"></ReportTile>
</v-layout>
</v-container>
</v-card>
@ -35,7 +35,7 @@
</template>
<script>
import { REPORT_TYPES } from '@/constants';
import { REPORT_TYPES, REPORT_TYPES_ORDER } from '@/constants';
import ReportTile from './ReportTile.vue';
@ -62,6 +62,7 @@ export default {
return {
error: null,
REPORT_TYPES,
REPORT_TYPES_ORDER,
};
},
methods: {

39
src/constants.js
View File

@ -1,18 +1,37 @@
import L from 'leaflet';
import accidentMarker from '@/assets/accidentMarker.svg';
import gcumMarker from '@/assets/gcumMarker.svg';
import interruptMarker from '@/assets/interruptMarker.svg';
import miscMarker from '@/assets/miscMarker.svg';
import obstacleMarker from '@/assets/obstacleMarker.svg';
import potholeMarker from '@/assets/potholeMarker.svg';
import GCUMIcon from '@/assets/gcum.svg';
import accidentIcon from '@/assets/accident.svg';
import gcumIcon from '@/assets/gcum.svg';
import interruptIcon from '@/assets/interrupt.svg';
import miscIcon from '@/assets/misc.svg';
import obstacleIcon from '@/assets/obstacle.svg';
import potholeIcon from '@/assets/pothole.svg';
export const REPORT_TYPES = {
accident: {
label: 'reportLabels.accident',
image: accidentIcon,
marker: L.icon({
iconUrl: accidentMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
markerLarge: L.icon({
iconUrl: accidentMarker,
iconSize: [60, 60],
iconAnchor: [30, 60],
}),
},
gcum: {
label: 'reportLabels.gcum',
image: GCUMIcon,
image: gcumIcon,
marker: L.icon({
iconUrl: gcumMarker,
iconSize: [40, 40],
@ -39,6 +58,20 @@ export const REPORT_TYPES = {
iconAnchor: [30, 60],
}),
},
misc: {
label: 'reportLabels.misc',
image: miscIcon,
marker: L.icon({
iconUrl: miscMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
markerLarge: L.icon({
iconUrl: miscMarker,
iconSize: [60, 60],
iconAnchor: [30, 60],
}),
},
obstacle: {
label: 'reportLabels.obstacle',
image: obstacleIcon,
@ -68,6 +101,8 @@ export const REPORT_TYPES = {
}),
},
};
// Display order of the report types
export const REPORT_TYPES_ORDER = ['gcum', 'interrupt', 'obstacle', 'pothole', 'accident', 'misc'];
export const MOCK_LOCATION = false;
export const MOCK_LOCATION_UPDATE_INTERVAL = 10 * 1000;

4
src/i18n/en.js
View File

@ -33,10 +33,14 @@ export default {
unableToSendTitle: 'Unable to send latest report',
},
reportLabels: {
accident: 'Accident',
accidentDescription: 'Any accident on the road',
gcum: 'GCUM',
gcumDescription: 'A car poorly parked on a bike lane. Such reports are automatically deleted after one hour, as they are by nature temporary.',
interrupt: 'Interruption',
interruptDescription: 'An interruption of the bike lane (works, unexpected end of the bike lane, etc.).',
misc: 'Other',
miscDescription: 'A problem on the road which does not fit in any other category.',
obstacle: 'Obstacle',
obstacleDescription: 'An obstacle on the bike lane (stones, bulky waste, etc.).',
pothole: 'Pothole',

4
src/i18n/fr.js
View File

@ -33,10 +33,14 @@ export default {
unableToSendTitle: "Impossible d'envoyer le dernier signalement",
},
reportLabels: {
accident: 'Accident',
accidentDescription: 'Un accident sur la route.',
gcum: 'GCUM',
gcumDescription: "Une voiture (mal) garée sur la piste cyclable. Ces signalements sont automatiquement supprimés au bout d'une heure car ils sont par essence temporaires.",
interrupt: 'Interruption',
interruptDescription: "Une interruption d'itinéraire cyclable (travaux, arrêt inattendu d'une piste cyclable, etc)",
misc: 'Autre',
miscDescription: 'Un problème qui ne rentre dans aucune autre catégorie.',
obstacle: 'Obstacle',
obstacleDescription: 'Un obstacle sur la piste cyclable (granit de bordure, encombrants, etc)',
pothole: 'Nid de poule',