Add a new obstacle report type

This commit is contained in:
Lucas Verney 2018-06-30 22:54:38 +02:00
parent f499538717
commit 7e5cdb881a
9 changed files with 809 additions and 297 deletions

View File

@ -109,3 +109,15 @@ to spawn the server-side part, listening on `localhost:8081`.
This software is licensed under an MIT license, unless explicitly mentionned This software is licensed under an MIT license, unless explicitly mentionned
otherwise. otherwise.
Icons are made from the original works:
* [Bike icon](https://commons.wikimedia.org/wiki/File:Ic_directions_bike_48px.svg)
licensed under CC BY on Wikimedia.
* [Car icon](https://commons.wikimedia.org/wiki/File:Car_icon_top.svg)
licensed under CC BY-SA on Wikimedia.
* [Pothole icon](https://commons.wikimedia.org/wiki/File:France_road_sign_A2a.svg)
licensed under CC BY-SA on Wikimedia.
* [Work icons](https://www.vecteezy.com/vector-art/87351-road-traffic-cartoon-icons-vector)
were designed by Vecteezy.
* [Trash icon](https://pixabay.com/en/trash-waste-trashcan-garbage-99257/) is
coming from Pixabay under CC0 license.

371
src/assets/interrupt.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 250 KiB

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"
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"
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
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="956"
inkscape:window-height="1041"
id="namedview4089"
showgrid="false"
inkscape:zoom="3.6875"
inkscape:cx="16.329941"
inkscape:cy="76.508307"
inkscape:window-x="960"
inkscape:window-y="37"
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,-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
id="surface625762"
transform="matrix(1.0686403,0,0,1.0686403,-551.54966,-408.32772)"><g
id="g4969"
transform="matrix(0.08826235,0,0,0.08826235,495.97381,390.41273)"><path
inkscape:connector-curvature="0"
style="fill:#211e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 707.05859,106.41016 c -2.52734,-2.01953 -5.39453,-4.3125 -84.57422,-4.3125 -43.2539,0 -100.82031,0.82812 -150.42187,2.15625 -0.49609,-0.10938 -1,-0.16016 -1.51172,-0.16016 -0.64062,0 -1.27344,0.082 -1.88281,0.25 -119.69141,3.28906 -125.73828,7.3125 -128.01563,8.83203 -2.60547,1.73438 -9.51953,6.34766 -8.22656,43.66797 1.28516,37.45703 7.42188,40.96094 9.43359,42.10937 2.12891,1.21875 3.41407,1.94922 49.17579,1.94922 7.46875,0 16.47265,-0.0312 26.625,-0.0937 0.67968,22.80469 2.34375,76.91407 3.02343,83.03907 0.625,5.58593 5.26953,9.80859 12.42578,11.28515 1.88672,0.39453 4.03516,0.59766 6.20704,0.59766 4,0 13.71875,-0.73438 17.61328,-7.55078 1,-1.7461 4,-7 2.61718,-87.75391 50.82422,-0.58203 102.44922,-1.55078 143.26172,-2.6875 v 81.36328 c 0,2.09375 0.85547,9.06641 11.87891,10.85547 1.74609,0.28125 3.82031,0.43359 6,0.43359 4.30469,0 18.5625,-0.65625 21.35937,-9.03906 1.26954,-3.80469 1.41797,-32.39062 0.44922,-84.89844 62.33985,-2.36328 64.99219,-4.48046 66.94141,-6.03906 3.24609,-2.59765 7.55859,-9.01953 7.55859,-34.71875 0,-9.69531 -0.71875,-41.90625 -9.9375,-49.28515"
id="path4659" /><path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 681.28516,112.34766 c -6.47266,12.08593 -16.41016,31.00781 -17.4961,34.0664 0.49219,3.3125 9.36719,22.09375 17.87891,38.76953 12.1914,-0.74218 20.04687,-1.51172 21.9375,-2.28906 1.89062,-1.78906 3.88672,-10.95312 3.88672,-27.19922 0,-21.375 -3.26953,-38.96875 -6.25,-41.75781 -0.92578,-0.33984 -4.72657,-1.04297 -19.95703,-1.58984"
id="path4745" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 612.3125,279.10156 c 0.10156,0.24219 1.29297,1.25 5.24219,1.65235 7.34375,0.73437 14.65625,-1.23047 15.51953,-2.50391 0.99609,-3.82422 0.4375,-54.91016 -0.16406,-86.20313 -6.60157,0.23047 -13.48438,0.45313 -20.59766,0.66407 v 86.39062"
id="path4755" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 675.98828,112.17578 c -8.57422,-0.24219 -20.03906,-0.4375 -35.33203,-0.52344 -10.91406,13.875 -22.62109,30.4961 -22.79688,33.60547 0.20704,3.30078 12.83985,23.66016 24.92969,41.41797 0.0664,0.0937 0.0781,0.20313 0.125,0.29688 12.86719,-0.47657 24.23828,-0.97266 33.57422,-1.48829 -12.16797,-23.9414 -18.02344,-37.42187 -17.37109,-40.02343 0.71875,-2.88672 12.11328,-24.37891 16.87109,-33.28516"
id="path4769" /><path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 563.23828,149.48437 c 1.03516,3.62891 12.90234,22.3125 24.10938,38.77735 0.0898,0.1289 0.11328,0.26953 0.17187,0.40625 17.92969,-0.45703 34.80859,-0.96094 49.87109,-1.49219 -7.2539,-10.73437 -24.28515,-36.51953 -24.28515,-41.93359 0,-5.15625 14.15625,-24.08985 21.53906,-33.61719 -3.83203,-0.0156 -7.875,-0.0234 -12.16016,-0.0234 -12.78515,0 -26.1875,0.0625 -39.89453,0.17969 -6.98437,13.09766 -18.0039,34.15234 -19.35156,37.70312"
id="path4773" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 558.52734,148.62891 c 0.73828,-2.94922 13.69141,-27.46875 18.64844,-36.79688 -20.80469,0.19922 -42.22656,0.52344 -63.26172,0.94531 -0.0586,0.16407 -0.0898,0.33204 -0.1875,0.48829 -9.60547,14.93359 -19.83594,31.78906 -20.94922,35.10546 1.41407,3.70313 14.64844,23.89063 26.89063,41.7461 21.24219,-0.375 42.35547,-0.81641 62.3125,-1.3086 -24.45703,-36.07031 -23.73438,-39.05078 -23.45313,-40.17968"
id="path4783" /><path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 393.32031,159.23437 c -0.86328,-1.29296 -2.28125,-3.44921 18.70703,-43.42968 -9.57031,0.40625 -18.38281,0.83203 -26.26953,1.26953 -11.93359,17.01562 -24.84765,36.25 -26.09765,39.58203 0.71093,3.39844 11.8789,19.74609 22.48828,33.89453 0.19531,0.25781 0.32422,0.54297 0.39843,0.83594 2.63672,0.008 5.44532,0.0117 8.47657,0.0117 h 0.0234 c 7.57422,0 15.58594,-0.0195 23.92188,-0.0586 -4.6875,-6.94531 -20.30469,-30.08593 -21.64844,-32.10547"
id="path4787" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 354.94922,155.86719 c 0.73437,-3.67188 16.83594,-27.08203 24.76562,-38.44141 -19.14453,1.16406 -31.59375,2.41406 -33.8125,3.67188 -0.33984,0.22656 -2.19531,1.90625 -3.3164,11.3789 -2.37891,20.11719 0.96484,53.73438 4.0039,58.14063 1.44922,0.20703 7.25,0.625 30.23828,0.74609 -15.14453,-20.32812 -22.52343,-32.28516 -21.8789,-35.49609"
id="path4789" /><path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 487.96484,148.41406 c 0,-3.04687 10.75,-20.51953 20.35547,-35.52343 -12.39062,0.26171 -24.60937,0.55468 -36.44922,0.8789 -6.59765,12.65625 -16.40625,32.18359 -17.17578,35.67969 0.61719,3.71094 15.05078,23.6914 28.79688,41.05078 l 0.0937,0.17969 c 10.05859,-0.13672 20.23047,-0.29297 30.39453,-0.46485 -17.25,-25.23047 -26.01563,-39.3125 -26.01563,-41.80078"
id="path4791" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 449.98047,148.8125 c 0.6914,-4.15625 11.46484,-25.26562 16.45703,-34.89062 -17.46484,0.49218 -34,1.05078 -48.92188,1.65625 -9.38281,17.80859 -19.01171,37.51171 -19.86328,41.58203 3.27344,4.875 22.58203,33.48437 22.58203,33.48437 l -0.99218,0.67188 c 18.29297,-0.10157 38.07422,-0.29297 58.40234,-0.55469 -13.52344,-17.20313 -28.42578,-37.40235 -27.66406,-41.94922"
id="path4793" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 430.13281,282.79687 c 0.14063,1.27344 2.02344,2.4336 4.90625,3.03125 5.82813,1.20313 12.46875,-0.32031 13.63672,-2.36328 2.03516,-4.53515 1.87109,-55.9375 1.28516,-87.6875 -8.03907,0.082 -15.72266,0.15625 -22.9336,0.21094 0.34375,11.625 2.39453,80.41406 3.10547,86.80859"
id="path4795" /><path
inkscape:connector-curvature="0"
style="fill:#211e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 703.60547,182.89453 c -1.89063,0.77734 -9.7461,1.54688 -21.9375,2.28906 -8.51172,-16.67578 -17.38672,-35.45703 -17.87891,-38.76953 1.08594,-3.05859 11.02344,-21.98047 17.4961,-34.0664 15.23046,0.54687 19.03125,1.25 19.95703,1.58984 2.98047,2.78906 6.25,20.38281 6.25,41.75781 0,16.2461 -1.9961,25.41016 -3.88672,27.19922 z M 633.07422,278.25 c -0.86328,1.27344 -8.17578,3.23828 -15.51953,2.50391 -3.94922,-0.40235 -5.14063,-1.41016 -5.24219,-1.65235 v -86.39062 c 7.11328,-0.21094 13.99609,-0.4336 20.59766,-0.66407 0.60156,31.29297 1.16015,82.37891 0.16406,86.20313 z m -184.39844,5.21484 c -1.16797,2.04297 -7.80859,3.56641 -13.63672,2.36328 -2.88281,-0.59765 -4.76562,-1.75781 -4.90625,-3.03125 -0.71094,-6.39453 -2.76172,-75.18359 -3.10547,-86.80859 7.21094,-0.0547 14.89453,-0.12891 22.9336,-0.21094 0.58593,31.75 0.75,83.15235 -1.28516,87.6875 z m -57.65234,-92.0664 c -3.03125,0 -5.83985,-0.004 -8.47657,-0.0117 -0.0742,-0.29297 -0.20312,-0.57813 -0.39843,-0.83594 -10.60938,-14.14844 -21.77735,-30.49609 -22.48828,-33.89453 1.25,-3.33203 14.16406,-22.56641 26.09765,-39.58203 7.88672,-0.4375 16.69922,-0.86328 26.26953,-1.26953 -20.98828,39.98047 -19.57031,42.13672 -18.70703,43.42968 1.34375,2.01954 16.96094,25.16016 21.64844,32.10547 -8.33594,0.0391 -16.34766,0.0586 -23.92188,0.0586 z m -48.4375,-58.92188 c 1.12109,-9.47265 2.97656,-11.15234 3.3164,-11.3789 2.21875,-1.25782 14.66797,-2.50782 33.8125,-3.67188 -7.92968,11.35938 -24.03125,34.76953 -24.76562,38.44141 -0.64453,3.21093 6.73437,15.16797 21.8789,35.49609 -22.98828,-0.12109 -28.78906,-0.53906 -30.23828,-0.74609 -3.03906,-4.40625 -6.38281,-38.02344 -4.0039,-58.14063 z M 483.49219,190.5 c -13.7461,-17.35938 -28.17969,-37.33984 -28.79688,-41.05078 0.76953,-3.4961 10.57813,-23.02344 17.17578,-35.67969 11.83985,-0.32422 24.0586,-0.61719 36.44922,-0.8789 -9.60547,15.0039 -20.35547,32.47656 -20.35547,35.52343 0,2.48828 8.76563,16.57031 26.01563,41.80078 -10.16406,0.17188 -20.33594,0.32813 -30.39453,0.46485 z m -64.25,0.81641 0.99218,-0.67188 c 0,0 -19.30859,-28.60937 -22.58203,-33.48437 0.85157,-4.07032 10.48047,-23.77344 19.86328,-41.58203 14.92188,-0.60547 31.45704,-1.16407 48.92188,-1.65625 -4.99219,9.625 -15.76563,30.73437 -16.45703,34.89062 -0.76172,4.54687 14.14062,24.74609 27.66406,41.94922 -20.32812,0.26172 -40.10937,0.45312 -58.40234,0.55469 z m 100.42578,-1.19922 c -12.24219,-17.85547 -25.47656,-38.04297 -26.89063,-41.7461 1.11328,-3.3164 11.34375,-20.17187 20.94922,-35.10546 0.0977,-0.15625 0.12891,-0.32422 0.1875,-0.48829 21.03516,-0.42187 42.45703,-0.74609 63.26172,-0.94531 -4.95703,9.32813 -17.91016,33.84766 -18.64844,36.79688 -0.28125,1.1289 -1.0039,4.10937 23.45313,40.17968 -19.95703,0.49219 -41.07031,0.9336 -62.3125,1.3086 z M 634.64453,111.625 c -7.38281,9.52734 -21.53906,28.46094 -21.53906,33.61719 0,5.41406 17.03125,31.19922 24.28515,41.93359 -15.0625,0.53125 -31.9414,1.03516 -49.87109,1.49219 -0.0586,-0.13672 -0.082,-0.27735 -0.17187,-0.40625 -11.20704,-16.46485 -23.07422,-35.14844 -24.10938,-38.77735 1.34766,-3.55078 12.36719,-24.60546 19.35156,-37.70312 13.70703,-0.11719 27.10938,-0.17969 39.89453,-0.17969 4.28516,0 8.32813,0.008 12.16016,0.0234 z m 41.84375,73.85937 c -9.33594,0.51563 -20.70703,1.01172 -33.57422,1.48829 -0.0469,-0.0937 -0.0586,-0.20313 -0.125,-0.29688 -12.08984,-17.75781 -24.72265,-38.11719 -24.92969,-41.41797 0.17579,-3.10937 11.88282,-19.73047 22.79688,-33.60547 15.29297,0.0859 26.75781,0.28125 35.33203,0.52344 -4.75781,8.90625 -16.15234,30.39844 -16.87109,33.28516 -0.65235,2.60156 5.20312,16.08203 17.37109,40.02343 z m -54.00391,-78.63281 c -41.19921,0 -98.80859,0.76563 -151.03906,2.17188 -0.64062,-0.26563 -1.3164,-0.22656 -1.91015,0.0508 -64.85938,1.77344 -120.97266,4.53906 -126.2461,8.05469 -6.36719,4.24609 -6.5625,26.60156 -6.11328,39.55078 0.19531,5.8125 1.48438,34.97265 7.04688,38.14843 0.91796,0.52735 2.30859,1.32422 46.80078,1.32422 h 0.0117 c 8.57812,0 19.1875,-0.043 31.23828,-0.1289 0.34375,11.73437 2.39453,80.625 3.13281,87.29687 0.39062,3.49219 3.55078,6.10156 8.66797,7.16016 1.55859,0.32422 3.36719,0.5 5.24219,0.5 5.40234,0 11.375,-1.46094 13.48437,-5.16016 3.21094,-5.61328 2.29297,-69.5664 1.91016,-90.09375 46.72265,-0.51172 104.4375,-1.48437 152.85156,-2.875 v 86.25 c 0,1.82031 1.02734,5.05078 7.88672,6.16406 1.48828,0.24219 3.29687,0.3711 5.23828,0.3711 6.91406,0 15.47266,-1.65235 16.85156,-5.78516 1.62891,-4.89453 0.38672,-74.09765 0.1211,-87.92187 l -0.0117,-0.0508 c 38.55859,-1.40235 66.26953,-3.13672 68.82031,-5.17579 4.77344,-3.82031 5.77344,-18.97265 5.77344,-31.00781 0,-13.50781 -1.70313,-40.41406 -8.14844,-45.57422 -1.22656,-0.97656 -4.09375,-3.26953 -81.60938,-3.26953"
id="path4803" /></g><g
id="g4978"
transform="matrix(0.05169852,0,0,0.05169852,552.02603,400.16366)"><path
inkscape:connector-curvature="0"
style="fill:#211e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 239.71875,232.24609 c -2.51953,-10.83593 -7.17969,-27.61328 -14.19141,-51.08593 -4.30859,-14.41797 -18.66797,-61.83203 -22.50781,-66.63282 -3.16016,-3.9414 -8.75391,-6.11328 -15.75781,-6.11328 -2.33203,0 -10.28125,0.32813 -14.4961,4.54688 -9.38281,9.3789 -22,57.78125 -25.64453,72.39062 -2.51562,10.09375 -10.42187,42.92578 -11.44531,61.02344 -7.05469,3.5 -23.4375,13.80469 -22.95312,33.88281 0.14453,6.02735 3.14062,11.69141 8.66797,16.39063 10.69921,9.07812 29.79687,14.07812 53.78515,14.07812 h 0.0156 c 8.70703,0 17.85156,-0.66406 27.17968,-1.96875 55.8711,-7.82422 69.375,-26.74609 72.1875,-32.36328 3.08985,-6.17969 8.83985,-17.69141 -6.25,-32.78516 -6.82422,-6.82421 -21.69531,-10.14453 -28.58984,-11.36328"
id="path4653" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 185.92969,267.79687 h 0.008 c 13.61328,0 32.70312,-3.85546 46.64844,-22.14453 0.0352,-2.80078 -3.03907,-15.24218 -7.44922,-31.28125 -11.59375,8.98828 -25.26563,11.8086 -37.82422,11.8086 -18.35938,0 -34.29297,-5.98047 -37.92969,-7.44922 -3.70703,18.1914 -5.60547,32.48828 -3.875,35.66015 2.57813,4.72657 19.88281,13.40235 40.42188,13.40625"
id="path4673" /><path
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 150.49609,214.05078 c 0.45313,0.19531 45.26563,18.92969 73.26172,-4.66016 -3.10156,-11.125 -6.71484,-23.57031 -10.3125,-35.55468 -10.8125,6.14843 -22.7539,7.96484 -32.8789,7.96484 -10.14844,0 -18.42579,-1.75781 -21.875,-2.62109 -3.09766,11.78125 -5.99219,23.86718 -8.32813,34.84375 l 0.13281,0.0273"
id="path4675" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 263.65625,252.55469 c -0.625,-0.71875 -1.29688,-1.45703 -2.06641,-2.22266 -4.80859,-4.80859 -18.49218,-7.89453 -24.83593,-8.94141 0.89843,5.40235 0.34375,6.17188 -0.0703,6.71875 -15.14453,20.19532 -35.95703,24.4375 -50.74609,24.4375 h -0.008 c -20.56641,-0.004 -40.50391,-8.38671 -44.59375,-15.88281 -0.29688,-0.54297 -0.51953,-1.26953 -0.6836,-2.14453 -4.0625,1.85547 -14.51171,7.61328 -17.5664,18.61328 6.55468,3.7461 72.6875,37.66406 140.57031,-20.57812"
id="path4677" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 177.67578,291.15625 c -5.98828,0 -11.57422,-0.42578 -16.66406,-1.09766 -18.47656,-2.4414 -32.4961,-8.34765 -38.70703,-11.87109 -0.0312,0.61328 -0.0937,1.20312 -0.082,1.83984 0.082,3.28907 1.87109,6.44532 5.32031,9.3711 9.4375,8.01562 34.34765,15.42578 73.51172,9.94531 53.71875,-7.51953 64.0039,-25.20313 65,-27.19531 2.23047,-4.46485 4.49218,-9.0586 0.41797,-15.78125 -32.07813,27.40234 -63.91797,34.78906 -88.79688,34.78906"
id="path4679" /><path
inkscape:connector-curvature="0"
style="fill:#f04f19;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 212.04687,169.19531 c -7.35546,-24.28906 -14.35937,-45.67187 -16.47656,-48.76562 -1.23047,-1.53516 -4.42187,-2.51172 -8.30859,-2.51172 -4.10547,0 -7.06641,1.05078 -7.77735,1.76172 -4.48828,4.48828 -12.42187,28.39453 -19.5664,54.89843 6.53906,1.57422 32.14453,6.58594 52.1289,-5.38281"
id="path4731" /><path
inkscape:connector-curvature="0"
style="fill:#211e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 266.05469,272.14844 c -0.9961,1.99218 -11.28125,19.67578 -65,27.19531 -39.16407,5.48047 -64.07422,-1.92969 -73.51172,-9.94531 -3.44922,-2.92578 -5.23828,-6.08203 -5.32031,-9.3711 -0.0117,-0.63672 0.0508,-1.22656 0.082,-1.83984 6.21093,3.52344 20.23047,9.42969 38.70703,11.87109 5.08984,0.67188 10.67578,1.09766 16.66406,1.09766 24.87891,0 56.71875,-7.38672 88.79688,-34.78906 4.07421,6.72265 1.8125,11.3164 -0.41797,15.78125 z M 140.65234,254.51953 c 0.16407,0.875 0.38672,1.60156 0.6836,2.14453 4.08984,7.4961 24.02734,15.87891 44.59375,15.88281 h 0.008 c 14.78906,0 35.60156,-4.24218 50.74609,-24.4375 0.41407,-0.54687 0.96875,-1.3164 0.0703,-6.71875 6.34375,1.04688 20.02734,4.13282 24.83593,8.94141 0.76953,0.76563 1.44141,1.50391 2.06641,2.22266 -67.88281,58.24218 -134.01563,24.32422 -140.57031,20.57812 3.05469,-11 13.5039,-16.75781 17.5664,-18.61328 z m 8.73047,-35.78906 c 3.63672,1.46875 19.57031,7.44922 37.92969,7.44922 12.55859,0 26.23047,-2.82032 37.82422,-11.8086 4.41015,16.03907 7.48437,28.48047 7.44922,31.28125 -13.94532,18.28907 -33.03516,22.14453 -46.64844,22.14453 h -0.008 c -20.53907,-0.004 -37.84375,-8.67968 -40.42188,-13.40625 -1.73047,-3.17187 0.16797,-17.46875 3.875,-35.66015 z m 9.3086,-39.55078 c 3.44921,0.86328 11.72656,2.62109 21.875,2.62109 10.125,0 22.0664,-1.81641 32.8789,-7.96484 3.59766,11.98437 7.21094,24.42968 10.3125,35.55468 -27.99609,23.58985 -72.80859,4.85547 -73.26172,4.66016 l -0.13281,-0.0273 c 2.33594,-10.97657 5.23047,-23.0625 8.32813,-34.84375 z m 20.79296,-59.5 c 0.71094,-0.71094 3.67188,-1.76172 7.77735,-1.76172 3.88672,0 7.07812,0.97656 8.30859,2.51172 2.11719,3.09375 9.1211,24.47656 16.47656,48.76562 -19.98437,11.96875 -45.58984,6.95703 -52.1289,5.38281 7.14453,-26.5039 15.07812,-50.41015 19.5664,-54.89843 z m 56.61719,116.79687 c -0.10547,-0.0156 -0.19922,0.0195 -0.30078,0.0156 -1.90625,-8.85157 -6.10937,-24.80078 -14.82812,-53.96875 -5.03516,-16.84766 -18.73829,-61.36719 -21.66407,-65.02735 -2.20312,-2.75 -6.59375,-4.32812 -12.04687,-4.32812 -3.6836,0 -8.8086,0.82422 -11.13672,3.15234 -6.76953,6.76953 -17.37109,42.03906 -24.39063,70.1836 -2.13671,8.5664 -11.24609,46.05078 -11.41406,62.98828 -2.88281,1.13281 -23.34765,9.91015 -22.84765,30.65234 0.10937,4.63672 2.53125,9.08984 6.99218,12.87891 9.92188,8.42187 28.31641,12.95312 50.72657,12.95312 8.35546,0 17.27734,-0.6289 26.51953,-1.92578 54.96484,-7.69531 66.78125,-26.15625 68.59375,-29.77734 2.91406,-5.82813 7.3164,-14.62891 -5.35547,-27.30078 -7.35156,-7.35157 -27.97266,-10.3711 -28.84766,-10.4961"
id="path4797" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 21 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 217 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 217 KiB

View File

@ -9,13 +9,13 @@
<h2 class="body-2">{{ $t('about.availableReportsTitle') }}</h2> <h2 class="body-2">{{ $t('about.availableReportsTitle') }}</h2>
<ul class="ml-3"> <ul class="ml-3">
<li><strong>{{ $t('reportLabels.gcum') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('about.gcumDescription') }}</li> <li><strong>{{ $t('reportLabels.gcum') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.gcumDescription') }}</li>
<li><strong>{{ $t('reportLabels.interrupt') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('about.interruptDescription') }}</li> <li><strong>{{ $t('reportLabels.interrupt') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('reportLabels.interruptDescription') }}</li>
<li><strong>{{ $t('reportLabels.pothole') }}</strong>{{ $t('misc.spaceBeforeDoublePunctuations') }}: {{ $t('about.potholeDescription') }}</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>
</ul> </ul>
<p class="mt-3" v-html="$t('about.license')"></p> <p class="mt-3" v-html="$t('about.license')"></p>
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-container> </v-container>

View File

@ -1,11 +1,13 @@
import L from 'leaflet'; import L from 'leaflet';
import gcumMarker from '@/assets/gcumMarker.svg'; import gcumMarker from '@/assets/gcumMarker.svg';
import interruptMarker from '@/assets/interruptMarker.svg';
import obstacleMarker from '@/assets/obstacleMarker.svg'; import obstacleMarker from '@/assets/obstacleMarker.svg';
import potholeMarker from '@/assets/potholeMarker.svg'; import potholeMarker from '@/assets/potholeMarker.svg';
import GCUMIcon from '@/assets/gcum.svg'; import GCUMIcon from '@/assets/gcum.svg';
import ObstacleIcon from '@/assets/obstacle.svg'; import interruptIcon from '@/assets/interrupt.svg';
import PotHoleIcon from '@/assets/pothole.svg'; import obstacleIcon from '@/assets/obstacle.svg';
import potholeIcon from '@/assets/pothole.svg';
export const REPORT_TYPES = { export const REPORT_TYPES = {
gcum: { gcum: {
@ -19,7 +21,16 @@ export const REPORT_TYPES = {
}, },
interrupt: { interrupt: {
label: 'reportLabels.interrupt', label: 'reportLabels.interrupt',
image: ObstacleIcon, image: interruptIcon,
marker: L.icon({
iconUrl: interruptMarker,
iconSize: [40, 40],
iconAnchor: [20, 40],
}),
},
obstacle: {
label: 'reportLabels.obstacle',
image: obstacleIcon,
marker: L.icon({ marker: L.icon({
iconUrl: obstacleMarker, iconUrl: obstacleMarker,
iconSize: [40, 40], iconSize: [40, 40],
@ -28,7 +39,7 @@ export const REPORT_TYPES = {
}, },
pothole: { pothole: {
label: 'reportLabels.pothole', label: 'reportLabels.pothole',
image: PotHoleIcon, image: potholeIcon,
marker: L.icon({ marker: L.icon({
iconUrl: potholeMarker, iconUrl: potholeMarker,
iconSize: [40, 40], iconSize: [40, 40],

View File

@ -2,11 +2,8 @@
export default { export default {
about: { about: {
availableReportsTitle: 'The available reports so far are:', availableReportsTitle: 'The available reports so far are:',
gcumDescription: 'A car poorly parked on a bike lane. Such reports are automatically deleted after one hour, as they are by nature temporary.',
geolocationDescription: 'As of current version, your geolocation is handled within your device and never sent from it to any external service.', geolocationDescription: 'As of current version, your geolocation is handled within your device and never sent from it to any external service.',
interruptDescription: 'An interruption of the bike lane (works, unexpected end of the bike lane, etc.).', license: 'It is released under an <a href="https://opensource.org/licenses/MIT">MIT license</a> (<a href="https://framagit.org/phyks/cyclassist">source code</a>). Icons are based on creations from Wikimedia and Vecteezy. The map background is using tiles from <a href="https://www.opencyclemap.org/docs/">OpenCycleMap</a>, thanks to <a href="https://www.openstreetmap.org/copyright">OpenStreetMap contributors</a> and <a href="http://leafletjs.com/">Leaflet</a>. Collected reports are available under <a href="https://opendatacommons.org/licenses/odbl/">ODbL license</a>.',
license: 'It is released under an <a href="https://opensource.org/licenses/MIT">MIT license</a> (<a href="https://framagit.org/phyks/cyclassist">source code</a>). The map background is using tiles from <a href="https://www.opencyclemap.org/docs/">OpenCycleMap</a>, thanks to <a href="https://www.openstreetmap.org/copyright">OpenStreetMap contributors</a> and <a href="http://leafletjs.com/">Leaflet</a>. Collected reports are available under <a href="https://opendatacommons.org/licenses/odbl/">ODbL license</a>.',
potholeDescription: 'A pothole in the ground.',
summary: 'This app lets you track and share issues with bike lanes.', summary: 'This app lets you track and share issues with bike lanes.',
usage: 'How to use', usage: 'How to use',
usageDescription: 'Use the button in the lower right corner to add a new report at your current location. To add a report elsewhere, do a long press (or right click) where you want the report to be shown.', usageDescription: 'Use the button in the lower right corner to add a new report at your current location. To add a report elsewhere, do a long press (or right click) where you want the report to be shown.',
@ -25,8 +22,13 @@ export default {
}, },
reportLabels: { reportLabels: {
gcum: 'GCUM', 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', interrupt: 'Interruption',
interruptDescription: 'An interruption of the bike lane (works, unexpected end of the bike lane, etc.).',
obstacle: 'Obstacle',
obstacleDescription: 'An obstacle on the bike lane (stones, bulky waste, etc.).',
pothole: 'Pothole', pothole: 'Pothole',
potholeDescription: 'A pothole in the ground.',
}, },
settings: { settings: {
locale: 'Language', locale: 'Language',

View File

@ -2,11 +2,8 @@
export default { export default {
about: { about: {
availableReportsTitle: "Les signalements disponibles pour l'instant sont :", availableReportsTitle: "Les signalements disponibles pour l'instant sont :",
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.",
geolocationDescription: "Dans la version actuelle, votre position est traitée directement par votre appareil et n'est jamais envoyée à un service externe.", geolocationDescription: "Dans la version actuelle, votre position est traitée directement par votre appareil et n'est jamais envoyée à un service externe.",
interruptDescription: "Une interruption d'itinéraire cyclable (travaux, arrêt inattendu d'une piste cyclable, etc)", license: "Le code source est sous <a href='https://opensource.org/licenses/MIT'>licence MIT license</a> (<a href='https://framagit.org/phyks/cyclassist'>code source</a>). Les icones sont basées sur des travaux de Wikimedia et Vecteezy. Les tuiles de fond de carte proviennent de chez <a href='https://www.opencyclemap.org/docs/'>OpenCycleMap</a>, grace aux <a href='https://www.openstreetmap.org/copyright'>contributeurs OpenStreetMap</a> et à <a href='http://leafletjs.com/'>Leaflet</a>. Les signalements sont disponibles sous <a href='https://opendatacommons.org/licenses/odbl/'>licence ODbL</a>.",
license: "Le code source est sous <a href='https://opensource.org/licenses/MIT'>licence MIT license</a> (<a href='https://framagit.org/phyks/cyclassist'>code source</a>). Les tuiles de fond de carte proviennent de chez <a href='https://www.opencyclemap.org/docs/'>OpenCycleMap</a>, grace aux <a href='https://www.openstreetmap.org/copyright'>contributeurs OpenStreetMap</a> et à <a href='http://leafletjs.com/'>Leaflet</a>. Les signalements sont disponibles sous <a href='https://opendatacommons.org/licenses/odbl/'>licence ODbL</a>.",
potholeDescription: 'Un nid de poule dans la route.',
summary: 'Cette application vous permet de signaler et de partager des problèmes avec les itinéraires cyclables.', summary: 'Cette application vous permet de signaler et de partager des problèmes avec les itinéraires cyclables.',
usage: 'Utilisation', usage: 'Utilisation',
usageDescription: "Utilisez le bouton en bas à droite pour ajouter un signalement à votre emplacement actuel. Pour ajouter un signalement ailleurs, faites un appui long (ou clic droit) à l'emplacement souhaité sur la carte.", usageDescription: "Utilisez le bouton en bas à droite pour ajouter un signalement à votre emplacement actuel. Pour ajouter un signalement ailleurs, faites un appui long (ou clic droit) à l'emplacement souhaité sur la carte.",
@ -25,8 +22,13 @@ export default {
}, },
reportLabels: { reportLabels: {
gcum: 'GCUM', 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', interrupt: 'Interruption',
interruptDescription: "Une interruption d'itinéraire cyclable (travaux, arrêt inattendu d'une piste cyclable, etc)",
obstacle: 'Obstacle',
obstacleDescription: 'Un obstacle sur la piste cyclable (granit de bordure, encombrants, etc)',
pothole: 'Nid de poule', pothole: 'Nid de poule',
potholeDescription: 'Un nid de poule dans la route.',
}, },
settings: { settings: {
locale: 'Langue', locale: 'Langue',