Subs form (wip)
This commit is contained in:
vjrj
parent
3d86418d22
commit
df96b6e51e
14 changed files with 530 additions and 75 deletions
|
|
@ -246,7 +246,7 @@
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="0.24748737"
|
inkscape:zoom="0.24748737"
|
||||||
inkscape:cx="680.72767"
|
inkscape:cx="-594.08486"
|
||||||
inkscape:cy="654.87036"
|
inkscape:cy="654.87036"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
|
|
@ -272,64 +272,67 @@
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1">
|
id="layer1">
|
||||||
<g
|
<g
|
||||||
style="fill:#ff0000;stroke-width:2.49893761"
|
style="fill:#d45500;stroke-width:2.49893761"
|
||||||
transform="matrix(0.15677218,0,0,0.1664724,228.27679,-31.257925)"
|
transform="matrix(0.15677218,0,0,0.1664724,230.41495,-36.603316)"
|
||||||
id="g3415">
|
id="g3415"
|
||||||
|
inkscape:export-filename="/mnt/md1/proyectos/dev/todos-contra-el-fuego-web/public/your-position.png"
|
||||||
|
inkscape:export-xdpi="24.116745"
|
||||||
|
inkscape:export-ydpi="24.116745">
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3417"
|
id="path3417"
|
||||||
d="m -1175.4664,736.62077 c -33.3138,-46.82732 -77.1492,-115.69563 -102.6366,-161.24879 -11.7453,-20.99204 -30.2969,-58.12091 -37.2515,-74.55449 -7.183,-16.97323 -15.1659,-40.43141 -18.3579,-53.94551 -3.2265,-13.66018 -3.2134,-40.78621 0.027,-56 13.0118,-61.09044 54.0725,-108.07064 111.0233,-127.02878 21.0744,-7.01539 29.7628,-8.3724 53.6051,-8.3724 18.0191,0 22.4905,0.32004 31.5,2.2546 69.2952,14.87936 118.3985,63.98934 133.1284,133.14658 3.2404,15.21379 3.2535,42.33982 0.027,56 -9.6695,40.93833 -34.9549,94.97325 -78.2137,167.1432 -22.584,37.67742 -55.6479,88.3297 -80.0323,122.60559 -5.6923,8.00126 -7.1265,8.00126 -12.8188,0 z m 17.7947,-267.80868 c 16.0798,-3.70704 31.3478,-18.97505 35.0548,-35.05477 1.2978,-5.6293 1.2978,-17.14138 0,-22.77068 -3.707,-16.07972 -18.975,-31.34773 -35.0548,-35.05477 -5.6293,-1.29778 -17.1413,-1.29778 -22.7706,0 -16.0798,3.70704 -31.3478,18.97505 -35.0548,35.05477 -1.2978,5.6293 -1.2978,17.14138 0,22.77068 3.6281,15.73725 17.9483,30.40113 33.9401,34.75463 5.5299,1.50543 17.9787,1.66186 23.8853,0.30014 z"
|
d="m -1175.4664,736.62077 c -33.3138,-46.82732 -77.1492,-115.69563 -102.6366,-161.24879 -11.7453,-20.99204 -30.2969,-58.12091 -37.2515,-74.55449 -7.183,-16.97323 -15.1659,-40.43141 -18.3579,-53.94551 -3.2265,-13.66018 -3.2134,-40.78621 0.027,-56 13.0118,-61.09044 54.0725,-108.07064 111.0233,-127.02878 21.0744,-7.01539 29.7628,-8.3724 53.6051,-8.3724 18.0191,0 22.4905,0.32004 31.5,2.2546 69.2952,14.87936 118.3985,63.98934 133.1284,133.14658 3.2404,15.21379 3.2535,42.33982 0.027,56 -9.6695,40.93833 -34.9549,94.97325 -78.2137,167.1432 -22.584,37.67742 -55.6479,88.3297 -80.0323,122.60559 -5.6923,8.00126 -7.1265,8.00126 -12.8188,0 z m 17.7947,-267.80868 c 16.0798,-3.70704 31.3478,-18.97505 35.0548,-35.05477 1.2978,-5.6293 1.2978,-17.14138 0,-22.77068 -3.707,-16.07972 -18.975,-31.34773 -35.0548,-35.05477 -5.6293,-1.29778 -17.1413,-1.29778 -22.7706,0 -16.0798,3.70704 -31.3478,18.97505 -35.0548,35.05477 -1.2978,5.6293 -1.2978,17.14138 0,22.77068 3.6281,15.73725 17.9483,30.40113 33.9401,34.75463 5.5299,1.50543 17.9787,1.66186 23.8853,0.30014 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3419"
|
id="path3419"
|
||||||
d="m -1171.7343,740.159 c -0.8549,-0.98286 -6.7152,-9.21202 -13.0229,-18.28702 -57.6746,-82.97704 -106.6281,-166.52227 -130.6675,-223 -7.5823,-17.81379 -15.6335,-42.59765 -18.1919,-56 -1.9075,-9.99286 -2.1192,-13.59689 -1.615,-27.5 0.6601,-18.20107 2.7364,-29.95437 8.149,-46.12976 16.6315,-49.70266 56.2471,-88.97673 106.1932,-105.27769 18.8485,-6.15159 28.6855,-7.59255 51.8324,-7.59255 23.1469,0 32.9839,1.44096 51.8324,7.59255 49.946,16.30096 89.5617,55.57503 106.1932,105.27769 5.4126,16.17539 7.4889,27.92869 8.149,46.12976 0.5042,13.90311 0.2925,17.50714 -1.615,27.5 -9.8997,51.86069 -57.3486,143.38266 -131.1659,253 -21.9938,32.66028 -31.1985,45.43501 -32.9858,45.77921 -0.842,0.16216 -2.2304,-0.50932 -3.0852,-1.49219 z m 14.484,-270.77869 c 8.8507,-2.30531 15.5691,-6.19896 22.2859,-12.91574 15.3233,-15.32331 18.7123,-37.24354 8.7865,-56.83126 -3.3849,-6.67972 -13.4607,-16.75552 -20.1404,-20.14039 -19.5878,-9.92585 -41.508,-6.53684 -56.8313,8.78647 -19.3033,19.30326 -19.3033,48.88192 0,68.18518 12.3601,12.36013 29.5075,17.18527 45.8993,12.91574 z"
|
d="m -1171.7343,740.159 c -0.8549,-0.98286 -6.7152,-9.21202 -13.0229,-18.28702 -57.6746,-82.97704 -106.6281,-166.52227 -130.6675,-223 -7.5823,-17.81379 -15.6335,-42.59765 -18.1919,-56 -1.9075,-9.99286 -2.1192,-13.59689 -1.615,-27.5 0.6601,-18.20107 2.7364,-29.95437 8.149,-46.12976 16.6315,-49.70266 56.2471,-88.97673 106.1932,-105.27769 18.8485,-6.15159 28.6855,-7.59255 51.8324,-7.59255 23.1469,0 32.9839,1.44096 51.8324,7.59255 49.946,16.30096 89.5617,55.57503 106.1932,105.27769 5.4126,16.17539 7.4889,27.92869 8.149,46.12976 0.5042,13.90311 0.2925,17.50714 -1.615,27.5 -9.8997,51.86069 -57.3486,143.38266 -131.1659,253 -21.9938,32.66028 -31.1985,45.43501 -32.9858,45.77921 -0.842,0.16216 -2.2304,-0.50932 -3.0852,-1.49219 z m 14.484,-270.77869 c 8.8507,-2.30531 15.5691,-6.19896 22.2859,-12.91574 15.3233,-15.32331 18.7123,-37.24354 8.7865,-56.83126 -3.3849,-6.67972 -13.4607,-16.75552 -20.1404,-20.14039 -19.5878,-9.92585 -41.508,-6.53684 -56.8313,8.78647 -19.3033,19.30326 -19.3033,48.88192 0,68.18518 12.3601,12.36013 29.5075,17.18527 45.8993,12.91574 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3421"
|
id="path3421"
|
||||||
d="m -1170.2383,741.02946 c -2.9702,-1.95299 -47.5638,-68.36498 -68.9314,-102.65748 -60.3859,-96.91256 -92.6314,-167.65863 -95.9441,-210.5 -0.71,-9.18142 0.7359,-26.96889 3.1702,-39 5.3885,-26.6314 19.6741,-55.21797 38.1803,-76.40168 33.7565,-38.64042 87.425,-60.38026 137.6514,-55.75937 16.142,1.48508 25.2032,3.34552 39.6542,8.14177 49.5805,16.45568 88.4643,55.33946 104.92,104.92 6.514,19.62659 9.7891,41.9139 8.5375,58.09928 -3.7383,48.34554 -45.5692,134.74542 -120.3123,248.5 -19.0693,29.02239 -43.4664,64.32456 -44.8352,64.87575 -0.5999,0.24157 -1.5406,0.14334 -2.0906,-0.21827 z m 14.3311,-271.55241 c 15.9065,-4.23527 29.72,-18.04873 33.9553,-33.95526 1.7594,-6.60785 1.7594,-19.69177 0,-26.29962 -2.0654,-7.7571 -6.4729,-15.22633 -12.6009,-21.35435 -6.1281,-6.12801 -13.5973,-10.53551 -21.3544,-12.60091 -6.6078,-1.75941 -19.6918,-1.75941 -26.2996,0 -15.9065,4.23527 -29.72,18.04873 -33.9553,33.95526 -1.7594,6.60785 -1.7594,19.69177 0,26.29962 4.169,15.65766 17.9617,29.61638 33.4976,33.90073 6.2073,1.71181 20.4242,1.74078 26.7573,0.0545 z"
|
d="m -1170.2383,741.02946 c -2.9702,-1.95299 -47.5638,-68.36498 -68.9314,-102.65748 -60.3859,-96.91256 -92.6314,-167.65863 -95.9441,-210.5 -0.71,-9.18142 0.7359,-26.96889 3.1702,-39 5.3885,-26.6314 19.6741,-55.21797 38.1803,-76.40168 33.7565,-38.64042 87.425,-60.38026 137.6514,-55.75937 16.142,1.48508 25.2032,3.34552 39.6542,8.14177 49.5805,16.45568 88.4643,55.33946 104.92,104.92 6.514,19.62659 9.7891,41.9139 8.5375,58.09928 -3.7383,48.34554 -45.5692,134.74542 -120.3123,248.5 -19.0693,29.02239 -43.4664,64.32456 -44.8352,64.87575 -0.5999,0.24157 -1.5406,0.14334 -2.0906,-0.21827 z m 14.3311,-271.55241 c 15.9065,-4.23527 29.72,-18.04873 33.9553,-33.95526 1.7594,-6.60785 1.7594,-19.69177 0,-26.29962 -2.0654,-7.7571 -6.4729,-15.22633 -12.6009,-21.35435 -6.1281,-6.12801 -13.5973,-10.53551 -21.3544,-12.60091 -6.6078,-1.75941 -19.6918,-1.75941 -26.2996,0 -15.9065,4.23527 -29.72,18.04873 -33.9553,33.95526 -1.7594,6.60785 -1.7594,19.69177 0,26.29962 4.169,15.65766 17.9617,29.61638 33.4976,33.90073 6.2073,1.71181 20.4242,1.74078 26.7573,0.0545 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3423"
|
id="path3423"
|
||||||
d="m -1182.2542,723.62198 c -16.7382,-23.96496 -42.0532,-62.31689 -57.2403,-86.71831 -49.2012,-79.05289 -78.8337,-139.03161 -90.7948,-183.77671 -3.6442,-13.63234 -3.6769,-13.92884 -3.6618,-33.25498 0.013,-16.40263 0.3725,-21.16781 2.2647,-30 14.2597,-66.56303 63.458,-115.76695 130.1294,-130.1443 9.1148,-1.96557 13.4023,-2.26427 32.5,-2.26427 19.0977,0 23.3852,0.2987 32.5,2.26427 66.6714,14.37735 115.8697,63.58127 130.1294,130.1443 1.8922,8.83219 2.2519,13.59737 2.2647,30 0.015,19.32614 -0.018,19.62264 -3.6618,33.25498 -11.9611,44.7451 -41.5936,104.72382 -90.7948,183.77671 -25.1343,40.38391 -68.2121,103.96831 -70.4375,103.96831 -0.632,0 -6.5707,-7.7625 -13.1972,-17.25 z m 25.1556,-253.28119 c 21.7615,-5.66814 37.5416,-25.8312 37.5416,-47.96881 0,-26.74861 -22.7514,-49.5 -49.5,-49.5 -22.1376,0 -42.3007,15.78009 -47.9688,37.54155 -7.9007,30.33286 15.8887,61.07445 47.5087,61.39264 3.5969,0.0362 9.1853,-0.62323 12.4185,-1.46538 z"
|
d="m -1182.2542,723.62198 c -16.7382,-23.96496 -42.0532,-62.31689 -57.2403,-86.71831 -49.2012,-79.05289 -78.8337,-139.03161 -90.7948,-183.77671 -3.6442,-13.63234 -3.6769,-13.92884 -3.6618,-33.25498 0.013,-16.40263 0.3725,-21.16781 2.2647,-30 14.2597,-66.56303 63.458,-115.76695 130.1294,-130.1443 9.1148,-1.96557 13.4023,-2.26427 32.5,-2.26427 19.0977,0 23.3852,0.2987 32.5,2.26427 66.6714,14.37735 115.8697,63.58127 130.1294,130.1443 1.8922,8.83219 2.2519,13.59737 2.2647,30 0.015,19.32614 -0.018,19.62264 -3.6618,33.25498 -11.9611,44.7451 -41.5936,104.72382 -90.7948,183.77671 -25.1343,40.38391 -68.2121,103.96831 -70.4375,103.96831 -0.632,0 -6.5707,-7.7625 -13.1972,-17.25 z m 25.1556,-253.28119 c 21.7615,-5.66814 37.5416,-25.8312 37.5416,-47.96881 0,-26.74861 -22.7514,-49.5 -49.5,-49.5 -22.1376,0 -42.3007,15.78009 -47.9688,37.54155 -7.9007,30.33286 15.8887,61.07445 47.5087,61.39264 3.5969,0.0362 9.1853,-0.62323 12.4185,-1.46538 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3425"
|
id="path3425"
|
||||||
d="m -1173.3221,735.64911 c -14.736,-20.10305 -47.0049,-68.57689 -66.4214,-99.77713 -62.4262,-100.31218 -94.8141,-173.76608 -94.7994,-215 0.019,-52.73909 28.6524,-105.90263 72.9978,-135.53357 69.4255,-46.38905 160.1263,-34.87659 216.3183,27.45683 17.8358,19.78504 32.8422,49.59683 38.0432,75.57674 2.0586,10.28307 3.6096,24.23637 3.6125,32.5 0.017,46.98038 -42.1573,135.99251 -121.7666,257 -16.9567,25.77445 -41.6783,61.54761 -43.1709,62.4701 -0.5199,0.32129 -2.6859,-1.79054 -4.8135,-4.69297 z m 16.6337,-265.22977 c 8.643,-2.30041 16.0792,-6.61994 22.569,-13.10973 19.5461,-19.54606 19.5461,-50.3292 0,-69.87526 -19.546,-19.54606 -50.3292,-19.54606 -69.8752,0 -19.5461,19.54606 -19.5461,50.3292 0,69.87526 6.3152,6.31524 13.9223,10.80572 22.1253,13.06068 6.468,1.778 18.5962,1.80163 25.1809,0.049 z"
|
d="m -1173.3221,735.64911 c -14.736,-20.10305 -47.0049,-68.57689 -66.4214,-99.77713 -62.4262,-100.31218 -94.8141,-173.76608 -94.7994,-215 0.019,-52.73909 28.6524,-105.90263 72.9978,-135.53357 69.4255,-46.38905 160.1263,-34.87659 216.3183,27.45683 17.8358,19.78504 32.8422,49.59683 38.0432,75.57674 2.0586,10.28307 3.6096,24.23637 3.6125,32.5 0.017,46.98038 -42.1573,135.99251 -121.7666,257 -16.9567,25.77445 -41.6783,61.54761 -43.1709,62.4701 -0.5199,0.32129 -2.6859,-1.79054 -4.8135,-4.69297 z m 16.6337,-265.22977 c 8.643,-2.30041 16.0792,-6.61994 22.569,-13.10973 19.5461,-19.54606 19.5461,-50.3292 0,-69.87526 -19.546,-19.54606 -50.3292,-19.54606 -69.8752,0 -19.5461,19.54606 -19.5461,50.3292 0,69.87526 6.3152,6.31524 13.9223,10.80572 22.1253,13.06068 6.468,1.778 18.5962,1.80163 25.1809,0.049 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3427"
|
id="path3427"
|
||||||
d="m -1182.3104,722.62198 c -17.5832,-25.21705 -46.9653,-70.02195 -62.463,-95.25 -53.9505,-87.82403 -84.0083,-153.91828 -88.8089,-195.28273 -2.8568,-24.61567 3.9195,-58.05424 17.0874,-84.31906 14.9367,-29.79285 43.0433,-57.89943 72.8361,-72.83609 46.9071,-23.51687 102.2965,-23.51687 149.2036,0 29.7928,14.93666 57.8994,43.04324 72.8361,72.83609 13.1678,26.26482 19.9443,59.70339 17.0874,84.31906 -4.8006,41.36445 -34.8584,107.4587 -88.8089,195.28273 -25.6831,41.80848 -73.2609,112.5 -75.7164,112.5 -0.6739,0 -6.638,-7.7625 -13.2534,-17.25 z m 28.8636,-252.78714 c 14.9934,-5.05091 26.7945,-16.83777 31.8332,-31.79475 2.84,-8.4305 2.849,-22.87899 0.019,-31.27836 -5.0509,-14.99339 -16.8378,-26.79448 -31.7948,-31.83312 -8.4589,-2.8496 -22.8773,-2.8496 -31.3362,0 -14.957,5.03864 -26.7438,16.83973 -31.7948,31.83312 -4.2232,12.53664 -2.2398,30.34688 4.615,41.43896 6.0015,9.71133 16.2078,17.88124 26.9565,21.57806 8.2521,2.83815 23.1644,2.8647 31.5017,0.0561 z"
|
d="m -1182.3104,722.62198 c -17.5832,-25.21705 -46.9653,-70.02195 -62.463,-95.25 -53.9505,-87.82403 -84.0083,-153.91828 -88.8089,-195.28273 -2.8568,-24.61567 3.9195,-58.05424 17.0874,-84.31906 14.9367,-29.79285 43.0433,-57.89943 72.8361,-72.83609 46.9071,-23.51687 102.2965,-23.51687 149.2036,0 29.7928,14.93666 57.8994,43.04324 72.8361,72.83609 13.1678,26.26482 19.9443,59.70339 17.0874,84.31906 -4.8006,41.36445 -34.8584,107.4587 -88.8089,195.28273 -25.6831,41.80848 -73.2609,112.5 -75.7164,112.5 -0.6739,0 -6.638,-7.7625 -13.2534,-17.25 z m 28.8636,-252.78714 c 14.9934,-5.05091 26.7945,-16.83777 31.8332,-31.79475 2.84,-8.4305 2.849,-22.87899 0.019,-31.27836 -5.0509,-14.99339 -16.8378,-26.79448 -31.7948,-31.83312 -8.4589,-2.8496 -22.8773,-2.8496 -31.3362,0 -14.957,5.03864 -26.7438,16.83973 -31.7948,31.83312 -4.2232,12.53664 -2.2398,30.34688 4.615,41.43896 6.0015,9.71133 16.2078,17.88124 26.9565,21.57806 8.2521,2.83815 23.1644,2.8647 31.5017,0.0561 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3429"
|
id="path3429"
|
||||||
d="m -1177.0361,729.2292 c -12.0748,-17.04099 -42.0178,-61.97211 -55.2177,-82.85722 -54.0333,-85.49299 -89.0481,-156.54229 -98.3182,-199.5 -4.1682,-19.31544 -3.6385,-40.89984 1.5396,-62.72802 17.5765,-74.09457 83.6516,-126.23294 159.9754,-126.23294 76.3238,0 142.3989,52.13837 159.9754,126.23294 5.1781,21.82818 5.7078,43.41258 1.5396,62.72802 -9.2711,42.96238 -44.3741,114.18565 -98.325,199.5 -19.1931,30.35063 -57.9257,87.87564 -62.1857,92.35722 -1.07,1.12557 -2.6032,-0.49583 -8.9834,-9.5 z m 19.386,-257.897 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
d="m -1177.0361,729.2292 c -12.0748,-17.04099 -42.0178,-61.97211 -55.2177,-82.85722 -54.0333,-85.49299 -89.0481,-156.54229 -98.3182,-199.5 -4.1682,-19.31544 -3.6385,-40.89984 1.5396,-62.72802 17.5765,-74.09457 83.6516,-126.23294 159.9754,-126.23294 76.3238,0 142.3989,52.13837 159.9754,126.23294 5.1781,21.82818 5.7078,43.41258 1.5396,62.72802 -9.2711,42.96238 -44.3741,114.18565 -98.325,199.5 -19.1931,30.35063 -57.9257,87.87564 -62.1857,92.35722 -1.07,1.12557 -2.6032,-0.49583 -8.9834,-9.5 z m 19.386,-257.897 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3431"
|
id="path3431"
|
||||||
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 22.6554,-251.78978 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 22.6554,-251.78978 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3433"
|
id="path3433"
|
||||||
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 18.5351,-250.28529 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 18.5351,-250.28529 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3435"
|
id="path3435"
|
||||||
d="m -1182.057,512.8323 c -12.7719,-1.98971 -27.5723,-7.86265 -38.5,-15.27721 -6.7621,-4.58817 -18.715,-16.43678 -23.1795,-22.97738 -5.5725,-8.16373 -11.4255,-20.82211 -13.9666,-30.20573 -3.0901,-11.41104 -3.0901,-32.58896 0,-44 2.386,-8.81088 8.3129,-21.90823 13.2408,-29.25941 4.5234,-6.74778 16.4008,-18.72538 23.1996,-23.3953 8.1117,-5.57172 20.7757,-11.43775 30.2057,-13.99136 11.411,-3.09009 32.589,-3.09009 44,0 16.4827,4.46348 31.3856,13.21179 43.1137,25.30869 8.4566,8.72253 12.1221,14.00001 17.4177,25.07797 14.1075,29.51145 10.8829,63.98309 -8.5367,91.25941 -4.9505,6.95336 -15.862,17.66925 -22.8214,22.41216 -7.1793,4.89282 -20.5797,10.88896 -29.3895,13.1507 -9.0307,2.31843 -26.1035,3.24975 -34.7838,1.89746 z m 20.2866,-39.99561 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
d="m -1182.057,512.8323 c -12.7719,-1.98971 -27.5723,-7.86265 -38.5,-15.27721 -6.7621,-4.58817 -18.715,-16.43678 -23.1795,-22.97738 -5.5725,-8.16373 -11.4255,-20.82211 -13.9666,-30.20573 -3.0901,-11.41104 -3.0901,-32.58896 0,-44 2.386,-8.81088 8.3129,-21.90823 13.2408,-29.25941 4.5234,-6.74778 16.4008,-18.72538 23.1996,-23.3953 8.1117,-5.57172 20.7757,-11.43775 30.2057,-13.99136 11.411,-3.09009 32.589,-3.09009 44,0 16.4827,4.46348 31.3856,13.21179 43.1137,25.30869 8.4566,8.72253 12.1221,14.00001 17.4177,25.07797 14.1075,29.51145 10.8829,63.98309 -8.5367,91.25941 -4.9505,6.95336 -15.862,17.66925 -22.8214,22.41216 -7.1793,4.89282 -20.5797,10.88896 -29.3895,13.1507 -9.0307,2.31843 -26.1035,3.24975 -34.7838,1.89746 z m 20.2866,-39.99561 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path3437"
|
id="path3437"
|
||||||
d="m -1185.1968,510.46379 c -9.5638,-1.82704 -13.4033,-3.1449 -22.8602,-7.84638 -15.9869,-7.94787 -27.9203,-18.61115 -36.7936,-32.8775 -18.0259,-28.98174 -18.2282,-63.68515 -0.5489,-94.19339 5.4971,-9.48599 20.031,-24.01998 29.517,-29.51703 35.9768,-20.84825 78.4966,-16.44436 108.0375,11.18973 11.4776,10.73666 21.2917,27.07499 25.5075,42.46417 3.0222,11.03221 3.0222,34.34497 0,45.37718 -5.4288,19.81723 -19.3068,39.61882 -35.5413,50.71161 -7.0384,4.80928 -22.265,11.78192 -29.7119,13.60586 -9.043,2.21486 -28.7216,2.78302 -37.6061,1.08575 z m 28.9955,-38.176 c 3.3793,-0.87131 8.7044,-2.9444 11.8334,-4.60688 6.9307,-3.68235 17.6134,-14.51236 21.0981,-21.38895 7.5207,-14.84137 7.5207,-32.99859 0,-47.83996 -3.4847,-6.87659 -14.1674,-17.7066 -21.0981,-21.38895 -15.0624,-8.00281 -33.404,-8.18326 -48.6091,-0.47825 -6.8766,3.48463 -17.7066,14.16736 -21.3889,21.09806 -8.0028,15.06242 -8.1833,33.40399 -0.4783,48.6091 3.362,6.63454 13.9756,17.54668 20.5596,21.13793 11.3138,6.17111 25.8154,8.02092 38.0833,4.8579 z"
|
d="m -1185.1968,510.46379 c -9.5638,-1.82704 -13.4033,-3.1449 -22.8602,-7.84638 -15.9869,-7.94787 -27.9203,-18.61115 -36.7936,-32.8775 -18.0259,-28.98174 -18.2282,-63.68515 -0.5489,-94.19339 5.4971,-9.48599 20.031,-24.01998 29.517,-29.51703 35.9768,-20.84825 78.4966,-16.44436 108.0375,11.18973 11.4776,10.73666 21.2917,27.07499 25.5075,42.46417 3.0222,11.03221 3.0222,34.34497 0,45.37718 -5.4288,19.81723 -19.3068,39.61882 -35.5413,50.71161 -7.0384,4.80928 -22.265,11.78192 -29.7119,13.60586 -9.043,2.21486 -28.7216,2.78302 -37.6061,1.08575 z m 28.9955,-38.176 c 3.3793,-0.87131 8.7044,-2.9444 11.8334,-4.60688 6.9307,-3.68235 17.6134,-14.51236 21.0981,-21.38895 7.5207,-14.84137 7.5207,-32.99859 0,-47.83996 -3.4847,-6.87659 -14.1674,-17.7066 -21.0981,-21.38895 -15.0624,-8.00281 -33.404,-8.18326 -48.6091,-0.47825 -6.8766,3.48463 -17.7066,14.16736 -21.3889,21.09806 -8.0028,15.06242 -8.1833,33.40399 -0.4783,48.6091 3.362,6.63454 13.9756,17.54668 20.5596,21.13793 11.3138,6.17111 25.8154,8.02092 38.0833,4.8579 z"
|
||||||
style="fill:#ff0000;stroke-width:2.49893761" />
|
style="fill:#d45500;stroke-width:2.49893761" />
|
||||||
</g>
|
</g>
|
||||||
<g
|
<g
|
||||||
id="g22554"
|
id="g22554"
|
||||||
|
|
@ -369,5 +372,80 @@
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cszzcczcsc" />
|
sodipodi:nodetypes="cszzcczcsc" />
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
id="g4691"
|
||||||
|
transform="translate(-189.69793,-44.436364)">
|
||||||
|
<text
|
||||||
|
id="text6339"
|
||||||
|
y="191.32181"
|
||||||
|
x="87.51506"
|
||||||
|
style="font-style:normal;font-weight:normal;font-size:54.68289185px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.26458329"
|
||||||
|
xml:space="preserve"><tspan
|
||||||
|
style="fill:#cccccc;fill-opacity:1;stroke-width:0.26458329"
|
||||||
|
y="191.32181"
|
||||||
|
x="87.51506"
|
||||||
|
id="tspan6337"
|
||||||
|
sodipodi:role="line"> </tspan></text>
|
||||||
|
<g
|
||||||
|
id="g3415-6"
|
||||||
|
transform="matrix(0.15677218,0,0,0.1664724,299.294,47.789492)"
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761">
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1175.4664,736.62077 c -33.3138,-46.82732 -77.1492,-115.69563 -102.6366,-161.24879 -11.7453,-20.99204 -30.2969,-58.12091 -37.2515,-74.55449 -7.183,-16.97323 -15.1659,-40.43141 -18.3579,-53.94551 -3.2265,-13.66018 -3.2134,-40.78621 0.027,-56 13.0118,-61.09044 54.0725,-108.07064 111.0233,-127.02878 21.0744,-7.01539 29.7628,-8.3724 53.6051,-8.3724 18.0191,0 22.4905,0.32004 31.5,2.2546 69.2952,14.87936 118.3985,63.98934 133.1284,133.14658 3.2404,15.21379 3.2535,42.33982 0.027,56 -9.6695,40.93833 -34.9549,94.97325 -78.2137,167.1432 -22.584,37.67742 -55.6479,88.3297 -80.0323,122.60559 -5.6923,8.00126 -7.1265,8.00126 -12.8188,0 z m 17.7947,-267.80868 c 16.0798,-3.70704 31.3478,-18.97505 35.0548,-35.05477 1.2978,-5.6293 1.2978,-17.14138 0,-22.77068 -3.707,-16.07972 -18.975,-31.34773 -35.0548,-35.05477 -5.6293,-1.29778 -17.1413,-1.29778 -22.7706,0 -16.0798,3.70704 -31.3478,18.97505 -35.0548,35.05477 -1.2978,5.6293 -1.2978,17.14138 0,22.77068 3.6281,15.73725 17.9483,30.40113 33.9401,34.75463 5.5299,1.50543 17.9787,1.66186 23.8853,0.30014 z"
|
||||||
|
id="path3417-2"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1171.7343,740.159 c -0.8549,-0.98286 -6.7152,-9.21202 -13.0229,-18.28702 -57.6746,-82.97704 -106.6281,-166.52227 -130.6675,-223 -7.5823,-17.81379 -15.6335,-42.59765 -18.1919,-56 -1.9075,-9.99286 -2.1192,-13.59689 -1.615,-27.5 0.6601,-18.20107 2.7364,-29.95437 8.149,-46.12976 16.6315,-49.70266 56.2471,-88.97673 106.1932,-105.27769 18.8485,-6.15159 28.6855,-7.59255 51.8324,-7.59255 23.1469,0 32.9839,1.44096 51.8324,7.59255 49.946,16.30096 89.5617,55.57503 106.1932,105.27769 5.4126,16.17539 7.4889,27.92869 8.149,46.12976 0.5042,13.90311 0.2925,17.50714 -1.615,27.5 -9.8997,51.86069 -57.3486,143.38266 -131.1659,253 -21.9938,32.66028 -31.1985,45.43501 -32.9858,45.77921 -0.842,0.16216 -2.2304,-0.50932 -3.0852,-1.49219 z m 14.484,-270.77869 c 8.8507,-2.30531 15.5691,-6.19896 22.2859,-12.91574 15.3233,-15.32331 18.7123,-37.24354 8.7865,-56.83126 -3.3849,-6.67972 -13.4607,-16.75552 -20.1404,-20.14039 -19.5878,-9.92585 -41.508,-6.53684 -56.8313,8.78647 -19.3033,19.30326 -19.3033,48.88192 0,68.18518 12.3601,12.36013 29.5075,17.18527 45.8993,12.91574 z"
|
||||||
|
id="path3419-5"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1170.2383,741.02946 c -2.9702,-1.95299 -47.5638,-68.36498 -68.9314,-102.65748 -60.3859,-96.91256 -92.6314,-167.65863 -95.9441,-210.5 -0.71,-9.18142 0.7359,-26.96889 3.1702,-39 5.3885,-26.6314 19.6741,-55.21797 38.1803,-76.40168 33.7565,-38.64042 87.425,-60.38026 137.6514,-55.75937 16.142,1.48508 25.2032,3.34552 39.6542,8.14177 49.5805,16.45568 88.4643,55.33946 104.92,104.92 6.514,19.62659 9.7891,41.9139 8.5375,58.09928 -3.7383,48.34554 -45.5692,134.74542 -120.3123,248.5 -19.0693,29.02239 -43.4664,64.32456 -44.8352,64.87575 -0.5999,0.24157 -1.5406,0.14334 -2.0906,-0.21827 z m 14.3311,-271.55241 c 15.9065,-4.23527 29.72,-18.04873 33.9553,-33.95526 1.7594,-6.60785 1.7594,-19.69177 0,-26.29962 -2.0654,-7.7571 -6.4729,-15.22633 -12.6009,-21.35435 -6.1281,-6.12801 -13.5973,-10.53551 -21.3544,-12.60091 -6.6078,-1.75941 -19.6918,-1.75941 -26.2996,0 -15.9065,4.23527 -29.72,18.04873 -33.9553,33.95526 -1.7594,6.60785 -1.7594,19.69177 0,26.29962 4.169,15.65766 17.9617,29.61638 33.4976,33.90073 6.2073,1.71181 20.4242,1.74078 26.7573,0.0545 z"
|
||||||
|
id="path3421-2"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1182.2542,723.62198 c -16.7382,-23.96496 -42.0532,-62.31689 -57.2403,-86.71831 -49.2012,-79.05289 -78.8337,-139.03161 -90.7948,-183.77671 -3.6442,-13.63234 -3.6769,-13.92884 -3.6618,-33.25498 0.013,-16.40263 0.3725,-21.16781 2.2647,-30 14.2597,-66.56303 63.458,-115.76695 130.1294,-130.1443 9.1148,-1.96557 13.4023,-2.26427 32.5,-2.26427 19.0977,0 23.3852,0.2987 32.5,2.26427 66.6714,14.37735 115.8697,63.58127 130.1294,130.1443 1.8922,8.83219 2.2519,13.59737 2.2647,30 0.015,19.32614 -0.018,19.62264 -3.6618,33.25498 -11.9611,44.7451 -41.5936,104.72382 -90.7948,183.77671 -25.1343,40.38391 -68.2121,103.96831 -70.4375,103.96831 -0.632,0 -6.5707,-7.7625 -13.1972,-17.25 z m 25.1556,-253.28119 c 21.7615,-5.66814 37.5416,-25.8312 37.5416,-47.96881 0,-26.74861 -22.7514,-49.5 -49.5,-49.5 -22.1376,0 -42.3007,15.78009 -47.9688,37.54155 -7.9007,30.33286 15.8887,61.07445 47.5087,61.39264 3.5969,0.0362 9.1853,-0.62323 12.4185,-1.46538 z"
|
||||||
|
id="path3423-6"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1173.3221,735.64911 c -14.736,-20.10305 -47.0049,-68.57689 -66.4214,-99.77713 -62.4262,-100.31218 -94.8141,-173.76608 -94.7994,-215 0.019,-52.73909 28.6524,-105.90263 72.9978,-135.53357 69.4255,-46.38905 160.1263,-34.87659 216.3183,27.45683 17.8358,19.78504 32.8422,49.59683 38.0432,75.57674 2.0586,10.28307 3.6096,24.23637 3.6125,32.5 0.017,46.98038 -42.1573,135.99251 -121.7666,257 -16.9567,25.77445 -41.6783,61.54761 -43.1709,62.4701 -0.5199,0.32129 -2.6859,-1.79054 -4.8135,-4.69297 z m 16.6337,-265.22977 c 8.643,-2.30041 16.0792,-6.61994 22.569,-13.10973 19.5461,-19.54606 19.5461,-50.3292 0,-69.87526 -19.546,-19.54606 -50.3292,-19.54606 -69.8752,0 -19.5461,19.54606 -19.5461,50.3292 0,69.87526 6.3152,6.31524 13.9223,10.80572 22.1253,13.06068 6.468,1.778 18.5962,1.80163 25.1809,0.049 z"
|
||||||
|
id="path3425-9"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1182.3104,722.62198 c -17.5832,-25.21705 -46.9653,-70.02195 -62.463,-95.25 -53.9505,-87.82403 -84.0083,-153.91828 -88.8089,-195.28273 -2.8568,-24.61567 3.9195,-58.05424 17.0874,-84.31906 14.9367,-29.79285 43.0433,-57.89943 72.8361,-72.83609 46.9071,-23.51687 102.2965,-23.51687 149.2036,0 29.7928,14.93666 57.8994,43.04324 72.8361,72.83609 13.1678,26.26482 19.9443,59.70339 17.0874,84.31906 -4.8006,41.36445 -34.8584,107.4587 -88.8089,195.28273 -25.6831,41.80848 -73.2609,112.5 -75.7164,112.5 -0.6739,0 -6.638,-7.7625 -13.2534,-17.25 z m 28.8636,-252.78714 c 14.9934,-5.05091 26.7945,-16.83777 31.8332,-31.79475 2.84,-8.4305 2.849,-22.87899 0.019,-31.27836 -5.0509,-14.99339 -16.8378,-26.79448 -31.7948,-31.83312 -8.4589,-2.8496 -22.8773,-2.8496 -31.3362,0 -14.957,5.03864 -26.7438,16.83973 -31.7948,31.83312 -4.2232,12.53664 -2.2398,30.34688 4.615,41.43896 6.0015,9.71133 16.2078,17.88124 26.9565,21.57806 8.2521,2.83815 23.1644,2.8647 31.5017,0.0561 z"
|
||||||
|
id="path3427-1"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1177.0361,729.2292 c -12.0748,-17.04099 -42.0178,-61.97211 -55.2177,-82.85722 -54.0333,-85.49299 -89.0481,-156.54229 -98.3182,-199.5 -4.1682,-19.31544 -3.6385,-40.89984 1.5396,-62.72802 17.5765,-74.09457 83.6516,-126.23294 159.9754,-126.23294 76.3238,0 142.3989,52.13837 159.9754,126.23294 5.1781,21.82818 5.7078,43.41258 1.5396,62.72802 -9.2711,42.96238 -44.3741,114.18565 -98.325,199.5 -19.1931,30.35063 -57.9257,87.87564 -62.1857,92.35722 -1.07,1.12557 -2.6032,-0.49583 -8.9834,-9.5 z m 19.386,-257.897 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
||||||
|
id="path3429-3"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 22.6554,-251.78978 c 18.3977,-4.33663 33.2167,-19.15566 37.5533,-37.55329 6.3215,-26.8182 -10.5958,-54.01281 -37.5533,-60.36715 -31.1031,-7.33152 -61.8773,17.01847 -61.8773,48.96022 0,31.94468 30.7714,56.29242 61.8773,48.96022 z"
|
||||||
|
id="path3431-3"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1180.3055,723.12198 c -39.6386,-56.78097 -80.8763,-123.18906 -105.5103,-169.91097 -22.6038,-42.87113 -35.6673,-73.90745 -42.9114,-101.94924 -3.2234,-12.47773 -3.3276,-13.49718 -3.2613,-31.88979 0.056,-15.57539 0.462,-20.83205 2.2515,-29.16436 7.1745,-33.40579 21.3734,-59.65036 45.1194,-83.39628 23.7312,-23.73126 49.8284,-37.85761 83.3962,-45.14216 8.7531,-1.89951 13.219,-2.20577 32.1644,-2.20577 18.9454,0 23.4113,0.30626 32.1644,2.20577 33.5678,7.28455 59.665,21.4109 83.3962,45.14216 23.746,23.74592 37.9449,49.99049 45.1194,83.39628 1.7895,8.33231 2.1954,13.58897 2.2515,29.16436 0.066,18.39261 -0.038,19.41206 -3.2614,31.88979 -13.5578,52.48201 -54.8103,131.45948 -120.1942,230.11021 -16.0695,24.24545 -38.9,57.5 -39.4759,57.5 -0.1395,0 -5.2013,-7.0875 -11.2485,-15.75 z m 18.5351,-250.28529 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
||||||
|
id="path3433-1"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1182.057,512.8323 c -12.7719,-1.98971 -27.5723,-7.86265 -38.5,-15.27721 -6.7621,-4.58817 -18.715,-16.43678 -23.1795,-22.97738 -5.5725,-8.16373 -11.4255,-20.82211 -13.9666,-30.20573 -3.0901,-11.41104 -3.0901,-32.58896 0,-44 2.386,-8.81088 8.3129,-21.90823 13.2408,-29.25941 4.5234,-6.74778 16.4008,-18.72538 23.1996,-23.3953 8.1117,-5.57172 20.7757,-11.43775 30.2057,-13.99136 11.411,-3.09009 32.589,-3.09009 44,0 16.4827,4.46348 31.3856,13.21179 43.1137,25.30869 8.4566,8.72253 12.1221,14.00001 17.4177,25.07797 14.1075,29.51145 10.8829,63.98309 -8.5367,91.25941 -4.9505,6.95336 -15.862,17.66925 -22.8214,22.41216 -7.1793,4.89282 -20.5797,10.88896 -29.3895,13.1507 -9.0307,2.31843 -26.1035,3.24975 -34.7838,1.89746 z m 20.2866,-39.99561 c 13.9837,-2.26924 25.755,-9.26119 33.6522,-19.98875 16.7117,-22.70124 11.9971,-54.88064 -10.4628,-71.41474 -22.7013,-16.7117 -54.8807,-11.99716 -71.4148,10.46282 -22.6861,30.81689 -4.9477,74.57716 32.7855,80.8812 7.2167,1.20568 8.3498,1.21005 15.4399,0.0595 z"
|
||||||
|
id="path3435-5"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
style="fill:#280b0b;stroke-width:2.49893761"
|
||||||
|
d="m -1185.1968,510.46379 c -9.5638,-1.82704 -13.4033,-3.1449 -22.8602,-7.84638 -15.9869,-7.94787 -27.9203,-18.61115 -36.7936,-32.8775 -18.0259,-28.98174 -18.2282,-63.68515 -0.5489,-94.19339 5.4971,-9.48599 20.031,-24.01998 29.517,-29.51703 35.9768,-20.84825 78.4966,-16.44436 108.0375,11.18973 11.4776,10.73666 21.2917,27.07499 25.5075,42.46417 3.0222,11.03221 3.0222,34.34497 0,45.37718 -5.4288,19.81723 -19.3068,39.61882 -35.5413,50.71161 -7.0384,4.80928 -22.265,11.78192 -29.7119,13.60586 -9.043,2.21486 -28.7216,2.78302 -37.6061,1.08575 z m 28.9955,-38.176 c 3.3793,-0.87131 8.7044,-2.9444 11.8334,-4.60688 6.9307,-3.68235 17.6134,-14.51236 21.0981,-21.38895 7.5207,-14.84137 7.5207,-32.99859 0,-47.83996 -3.4847,-6.87659 -14.1674,-17.7066 -21.0981,-21.38895 -15.0624,-8.00281 -33.404,-8.18326 -48.6091,-0.47825 -6.8766,3.48463 -17.7066,14.16736 -21.3889,21.09806 -8.0028,15.06242 -8.1833,33.40399 -0.4783,48.6091 3.362,6.63454 13.9756,17.54668 20.5596,21.13793 11.3138,6.17111 25.8154,8.02092 38.0833,4.8579 z"
|
||||||
|
id="path3437-2"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 37 KiB |
18
imports/startup/client/geolocation.js
Normal file
18
imports/startup/client/geolocation.js
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
import { Meteor } from 'meteor/meteor';
|
||||||
|
const geolocation = new ReactiveVar();
|
||||||
|
|
||||||
|
Meteor.startup(function() {
|
||||||
|
Meteor.call("geo", function (error, response) {
|
||||||
|
if (error) {
|
||||||
|
console.warn(error);
|
||||||
|
} else {
|
||||||
|
var pos = [
|
||||||
|
response.location.latitude,
|
||||||
|
response.location.longitude
|
||||||
|
];
|
||||||
|
geolocation.set(pos);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
export default geolocation;
|
||||||
34
imports/startup/client/gkeys.js
Normal file
34
imports/startup/client/gkeys.js
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
import { Meteor } from 'meteor/meteor';
|
||||||
|
import i18n from 'i18next';
|
||||||
|
|
||||||
|
const gmapkey = new ReactiveVar();
|
||||||
|
|
||||||
|
Meteor.startup(function() {
|
||||||
|
Meteor.call('getMapKey', function (error, key) {
|
||||||
|
if (typeof key !== 'undefined') {
|
||||||
|
// console.log(key);
|
||||||
|
gmapkey.set(key);
|
||||||
|
} else {
|
||||||
|
callback(error, null)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
var getGKeys = function (callback) {
|
||||||
|
Meteor.autorun(function() {
|
||||||
|
var key = gmapkey.get();
|
||||||
|
if (typeof key !== 'undefined') {
|
||||||
|
var script = document.createElement('script');
|
||||||
|
script.type = 'text/javascript';
|
||||||
|
script.onload = function () {
|
||||||
|
// console.log(key);
|
||||||
|
callback(null, key);
|
||||||
|
};
|
||||||
|
// https://stackoverflow.com/questions/28130114/google-maps-places-autocomplete-language-output
|
||||||
|
script.src = `https://maps.googleapis.com/maps/api/js?key=${key}&libraries=places&language=${i18n.language}`
|
||||||
|
document.body.appendChild(script);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export default getGKeys;
|
||||||
|
|
@ -75,7 +75,7 @@ i18n.use(backend)
|
||||||
whitelist: false,
|
whitelist: false,
|
||||||
// whitelist: ['es', 'en'], // allowed languages
|
// whitelist: ['es', 'en'], // allowed languages
|
||||||
load: 'all', // es-ES -> es, en-US -> en
|
load: 'all', // es-ES -> es, en-US -> en
|
||||||
debug: true,
|
debug: false,
|
||||||
ns: 'common',
|
ns: 'common',
|
||||||
defaultNS: 'common',
|
defaultNS: 'common',
|
||||||
saveMissing: true, // if true seems it's fails to getResourceBundle
|
saveMissing: true, // if true seems it's fails to getResourceBundle
|
||||||
|
|
|
||||||
|
|
@ -40,4 +40,11 @@ Meteor.methods({
|
||||||
})
|
})
|
||||||
return promise.await();
|
return promise.await();
|
||||||
},
|
},
|
||||||
|
getMapKey: function () {
|
||||||
|
// http://meteorpedia.com/read/Environment_Variables
|
||||||
|
// https://developers.google.com/maps/documentation/javascript/get-api-key
|
||||||
|
// https://console.developers.google.com/
|
||||||
|
// export GMAPS_KEY=SomeGMapsKey
|
||||||
|
return process.env.GMAPS_KEY || Meteor.settings.gmaps.key;;
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
96
imports/ui/components/DistanceSlider/DistanceSlider.js
Normal file
96
imports/ui/components/DistanceSlider/DistanceSlider.js
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { Trans, translate } from 'react-i18next';
|
||||||
|
import Slider, { Range } from 'rc-slider';
|
||||||
|
import Tooltip from 'rc-tooltip';
|
||||||
|
// We can just import Slider or Range to reduce bundle size
|
||||||
|
// import Slider from 'rc-slider/lib/Slider';
|
||||||
|
// import Range from 'rc-slider/lib/Range';
|
||||||
|
import 'rc-slider/assets/index.css';
|
||||||
|
|
||||||
|
// https://www.npmjs.com/package/rc-slider
|
||||||
|
const createSliderWithTooltip = Slider.createSliderWithTooltip;
|
||||||
|
const Handle = Slider.Handle;
|
||||||
|
|
||||||
|
const handle = (props) => {
|
||||||
|
const { value, dragging, index, ...restProps } = props;
|
||||||
|
return (
|
||||||
|
<Tooltip
|
||||||
|
prefixCls="rc-slider-tooltip"
|
||||||
|
overlay={value}
|
||||||
|
visible={dragging}
|
||||||
|
placement="top"
|
||||||
|
key={index}
|
||||||
|
>
|
||||||
|
<Handle value={value} {...restProps} />
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const wrapperStyle = { width: 400, margin: 50 };
|
||||||
|
|
||||||
|
// https://github.com/react-component/slider/tree/master/examples
|
||||||
|
|
||||||
|
class DistanceSlider extends React.Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
value: 10,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
onSliderChange = (value) => {
|
||||||
|
// console.log(value);
|
||||||
|
this.setState({
|
||||||
|
value,
|
||||||
|
});
|
||||||
|
this.props.onChange(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
onAfterChange = (value) => {
|
||||||
|
// console.log(`After change: ${value}`); //eslint-disable-line
|
||||||
|
this.props.onChange(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
|
||||||
|
<div style={wrapperStyle}>
|
||||||
|
<p><Trans parent="span">¿A que distancia a la redonda quieres recibir notificaciones?</Trans></p>
|
||||||
|
<Slider min={5}
|
||||||
|
max={105}
|
||||||
|
value={this.state.value}
|
||||||
|
trackStyle={{ backgroundColor: 'green', height: 8 }}
|
||||||
|
railStyle={{ backgroundColor: 'orange', height: 8 }}
|
||||||
|
dotStyle={{ top: 0, marginLeft: -1, width: 2, height: 8 }}
|
||||||
|
marks={{
|
||||||
|
10: {style: {}, label: "10"},
|
||||||
|
20: {style: {}, label: "20"},
|
||||||
|
30: {style: {}, label: "30"},
|
||||||
|
40: {style: {}, label: "40"},
|
||||||
|
50: {style: {}, label: "50"},
|
||||||
|
60: {style: {}, label: "60"},
|
||||||
|
70: {style: {}, label: "70"},
|
||||||
|
80: {style: {}, label: "80"},
|
||||||
|
90: {style: {}, label: "90"},
|
||||||
|
100: {style: {}, label: "100"}
|
||||||
|
}}
|
||||||
|
handleStyle={{
|
||||||
|
borderColor: 'green',
|
||||||
|
height: 20,
|
||||||
|
width: 20,
|
||||||
|
marginLeft: -10,
|
||||||
|
marginTop: -6,
|
||||||
|
/* backgroundColor: 'gray', */
|
||||||
|
}}
|
||||||
|
onAfterChange={this.onAfterChange}
|
||||||
|
onChange={this.onSliderChange}
|
||||||
|
defaultValue={10}
|
||||||
|
step={5}
|
||||||
|
handle={handle} />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default translate([], { wait: true })(DistanceSlider);
|
||||||
119
imports/ui/components/SelectionMap/SelectionMap.js
Normal file
119
imports/ui/components/SelectionMap/SelectionMap.js
Normal file
|
|
@ -0,0 +1,119 @@
|
||||||
|
import React, { Component } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { Map, TileLayer, Marker, Popup, CircleMarker, Circle} from 'react-leaflet';
|
||||||
|
import Leaflet from 'leaflet';
|
||||||
|
import { withTracker } from 'meteor/react-meteor-data';
|
||||||
|
import { translate } from 'react-i18next';
|
||||||
|
import geolocation from '/imports/startup/client/geolocation';
|
||||||
|
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css';
|
||||||
|
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js';
|
||||||
|
|
||||||
|
const positionIcon = new Leaflet.Icon({
|
||||||
|
iconUrl: "/your-position.png",
|
||||||
|
/* shadowUrl: require('../public/marker-shadow.png'), */
|
||||||
|
iconSize: [50, 77], // size of the icon
|
||||||
|
/* shadowSize: [50, 64], // size of the shadow */
|
||||||
|
iconAnchor: [25, 82], // point of the icon which will correspond to marker's location
|
||||||
|
/* shadowAnchor: [4, 62], // the same for the shadow
|
||||||
|
* popupAnchor: [-3, -76]// point from which the popup should open relative to the iconAnchor*/
|
||||||
|
})
|
||||||
|
|
||||||
|
class SelectionMap extends Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
center: geolocation.get(),
|
||||||
|
marker: geolocation.get(),
|
||||||
|
zoom: 11,
|
||||||
|
draggable: true,
|
||||||
|
modified: false
|
||||||
|
};
|
||||||
|
// console.log(this.state);
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate = () => {
|
||||||
|
this.fit();
|
||||||
|
}
|
||||||
|
|
||||||
|
getMap = () => {
|
||||||
|
return this.refs.selectionMap.leafletElement;
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleDraggable = () => {
|
||||||
|
this.setState({ draggable: !this.state.draggable })
|
||||||
|
}
|
||||||
|
|
||||||
|
updatePosition = () => {
|
||||||
|
const { lat, lng } = this.refs.marker.leafletElement.getLatLng()
|
||||||
|
this.setState({
|
||||||
|
marker: [ lat, lng ],
|
||||||
|
modified: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fit() {
|
||||||
|
// console.log("fit!");
|
||||||
|
this.getMap().fitBounds(this.refs.distanceCircle.leafletElement.getBounds(), [70, 70]);
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.addScale();
|
||||||
|
}
|
||||||
|
|
||||||
|
addScale = () => {
|
||||||
|
// https://www.npmjs.com/package/leaflet-graphicscale
|
||||||
|
const map = this.getMap();
|
||||||
|
var options = {
|
||||||
|
fill: 'fill',
|
||||||
|
showSubunits: true,
|
||||||
|
}
|
||||||
|
var graphicScale = L.control.graphicScale([options]).addTo(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
this.state.center = !this.state.modified && this.props.lat?
|
||||||
|
[this.props.lat, this.props.lng]: this.state.center;
|
||||||
|
this.state.marker = !this.state.modified && this.props.lat?
|
||||||
|
[this.props.lat, this.props.lng]: this.state.marker;
|
||||||
|
this.state.distance = this.props.distance;
|
||||||
|
this.state.modified = false;
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
{ this.state && this.state.center &&
|
||||||
|
<Map center={this.state.center} zoom={this.state.zoom} ref="selectionMap">
|
||||||
|
<TileLayer
|
||||||
|
attribution="&copy <a href="http://osm.org/copyright">OpenStreetMap</a> contributors"
|
||||||
|
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
|
||||||
|
/>
|
||||||
|
<Marker
|
||||||
|
draggable={this.state.draggable}
|
||||||
|
onDragend={this.updatePosition}
|
||||||
|
position={this.state.marker}
|
||||||
|
icon={positionIcon}
|
||||||
|
ref="marker">
|
||||||
|
</Marker>
|
||||||
|
<CircleMarker
|
||||||
|
center={this.state.marker} color="red"
|
||||||
|
stroke={false}
|
||||||
|
fillOpacity="1"
|
||||||
|
fill={true}
|
||||||
|
radius={3} />
|
||||||
|
<Circle center={this.state.marker}
|
||||||
|
ref="distanceCircle"
|
||||||
|
color="#145A32"
|
||||||
|
fillColor="green"
|
||||||
|
fillOpacity={.1}
|
||||||
|
radius={this.state.distance * 1000} />
|
||||||
|
</Map> }
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SelectionMap.propTypes = {
|
||||||
|
lat: PropTypes.number,
|
||||||
|
lng: PropTypes.number,
|
||||||
|
distance: PropTypes.number
|
||||||
|
};
|
||||||
|
|
||||||
|
export default translate([], { wait: true })(SelectionMap);
|
||||||
|
|
@ -35,6 +35,7 @@ import { I18nextProvider } from 'react-i18next';
|
||||||
import i18n from '/imports/startup/client/i18n';
|
import i18n from '/imports/startup/client/i18n';
|
||||||
import '/imports/startup/client/piwik-start.js';
|
import '/imports/startup/client/piwik-start.js';
|
||||||
import ravenLogger from '/imports/startup/client/ravenLogger';
|
import ravenLogger from '/imports/startup/client/ravenLogger';
|
||||||
|
import geolocation from '/imports/startup/client/geolocation';
|
||||||
// https://github.com/gadicc/meteor-blaze-react-component/
|
// https://github.com/gadicc/meteor-blaze-react-component/
|
||||||
import Blaze from 'meteor/gadicc:blaze-react-component';
|
import Blaze from 'meteor/gadicc:blaze-react-component';
|
||||||
import createHistory from 'history/createBrowserHistory';
|
import createHistory from 'history/createBrowserHistory';
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import LGeo from 'leaflet-geodesy';
|
||||||
import union from 'turf-union';
|
import union from 'turf-union';
|
||||||
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css';
|
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css';
|
||||||
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js';
|
import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js';
|
||||||
|
import _ from 'lodash';
|
||||||
|
|
||||||
// https://stackoverflow.com/questions/35394577/leaflet-js-union-merge-circles
|
// https://stackoverflow.com/questions/35394577/leaflet-js-union-merge-circles
|
||||||
function unify(polyList) {
|
function unify(polyList) {
|
||||||
|
|
@ -163,17 +164,22 @@ class FiresMap extends React.Component {
|
||||||
height.set(this.divElement.clientHeight);
|
height.set(this.divElement.clientHeight);
|
||||||
width.set(this.divElement.clientWidth);
|
width.set(this.divElement.clientWidth);
|
||||||
this.addScale();
|
this.addScale();
|
||||||
|
const self = this;
|
||||||
|
this.handleViewportChangeDebounced = _.debounce(function (viewport) {
|
||||||
|
console.log(`Viewport changed: ${JSON.stringify(this.state.viewport)}`);
|
||||||
|
zoom.set(viewport.zoom);
|
||||||
|
lat.set(viewport.center[0]);
|
||||||
|
lng.set(viewport.center[1]);
|
||||||
|
self.state.viewport = viewport;
|
||||||
|
self.state.modified = true;
|
||||||
|
self.showSubsUnion(self.state.showSubsUnion);
|
||||||
|
}, 2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
onViewportChanged = viewport => {
|
// https://stackoverflow.com/questions/23123138/perform-debounce-in-react-js
|
||||||
// console.log(`Viewport changed: ${JSON.stringify(this.state.viewport)}`);
|
onViewportChanged = (viewport) => {
|
||||||
zoom.set(viewport.zoom);
|
this.handleViewportChangeDebounced(viewport);
|
||||||
lat.set(viewport.center[0]);
|
};
|
||||||
lng.set(viewport.center[1]);
|
|
||||||
this.state.viewport = viewport;
|
|
||||||
this.state.modified = true;
|
|
||||||
this.showSubsUnion(this.state.showSubsUnion);
|
|
||||||
}
|
|
||||||
|
|
||||||
onClickReset = () => {
|
onClickReset = () => {
|
||||||
// console.log("onclick");
|
// console.log("onclick");
|
||||||
|
|
@ -297,7 +303,7 @@ class FiresMap extends React.Component {
|
||||||
</Map>
|
</Map>
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
(*) <Trans parent="span"><em>Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos.</em></Trans>
|
(*) <Trans i18nKey="mapPrivacy" parent="span"><em>Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos.</em></Trans>
|
||||||
</Row>
|
</Row>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,58 +1,145 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Button } from 'react-bootstrap';
|
import { FormGroup, ControlLabel, Button, Row, Col, HelpBlock } from 'react-bootstrap';
|
||||||
import { Trans, translate } from 'react-i18next';
|
import { Trans, translate } from 'react-i18next';
|
||||||
import Slider, { Range } from 'rc-slider';
|
import DistanceSlider from '/imports/ui/components/DistanceSlider/DistanceSlider';
|
||||||
import Tooltip from 'rc-tooltip';
|
import SelectionMap from '/imports/ui/components/SelectionMap/SelectionMap';
|
||||||
// We can just import Slider or Range to reduce bundle size
|
import getGKeys from '/imports/startup/client/gkeys';
|
||||||
// import Slider from 'rc-slider/lib/Slider';
|
import PlacesAutocomplete, { geocodeByAddress, geocodeByPlaceId, getLatLng } from 'react-places-autocomplete'
|
||||||
// import Range from 'rc-slider/lib/Range';
|
import update from 'immutability-helper';
|
||||||
import 'rc-slider/assets/index.css';
|
import { withTracker } from 'meteor/react-meteor-data';
|
||||||
|
|
||||||
// https://www.npmjs.com/package/rc-slider
|
class Sandbox extends React.Component {
|
||||||
const createSliderWithTooltip = Slider.createSliderWithTooltip;
|
constructor(props) {
|
||||||
const Handle = Slider.Handle;
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
adddress: ''
|
||||||
|
};
|
||||||
|
self = this;
|
||||||
|
// this.handleSelect = this.handleSelect.bind(this)
|
||||||
|
// this.handleChange = this.handleChange.bind(this)
|
||||||
|
}
|
||||||
|
|
||||||
const handle = (props) => {
|
onChange = (address) => { this.setState({ address }) }
|
||||||
const { value, dragging, index, ...restProps } = props;
|
|
||||||
return (
|
|
||||||
<Tooltip
|
|
||||||
prefixCls="rc-slider-tooltip"
|
|
||||||
overlay={value}
|
|
||||||
visible={dragging}
|
|
||||||
placement="top"
|
|
||||||
key={index}
|
|
||||||
>
|
|
||||||
<Handle value={value} {...restProps} />
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
const wrapperStyle = { width: 400, margin: 50 };
|
|
||||||
|
|
||||||
const Sandbox = props => (
|
handleSelect = (address) => {
|
||||||
<div style={wrapperStyle}>
|
geocodeByAddress(address)
|
||||||
<Slider min={5}
|
.then((results) => getLatLng(results[0]))
|
||||||
max={100}
|
.then(({ lat, lng }) => {
|
||||||
trackStyle={{ backgroundColor: 'green', height: 8 }}
|
// console.log('Success Yay', { lat, lng })
|
||||||
railStyle={{ backgroundColor: 'orange', height: 8 }}
|
const newState = update(this.state, {$merge: {lat: lat, lng: lng}});
|
||||||
handleStyle={{
|
// console.log(newState);
|
||||||
borderColor: 'green',
|
this.setState(newState);
|
||||||
height: 20,
|
// console.log(this.state);
|
||||||
width: 20,
|
})
|
||||||
marginLeft: -14,
|
.catch(error => {
|
||||||
marginTop: -6,
|
console.log(error);
|
||||||
/* backgroundColor: 'gray', */
|
if (error === 'ZERO_RESULTS') {
|
||||||
}}
|
console.log("No results");
|
||||||
defaultValue={10}
|
}
|
||||||
step={5}
|
});
|
||||||
handle={handle} />
|
}
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
Sandbox.defaultProps = {
|
onSliderChange = (value) => {
|
||||||
};
|
this.setState(update(this.state, {$merge: {distance: value}}));
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
// https://www.npmjs.com/package/react-places-autocomplete
|
||||||
|
|
||||||
|
// https://github.com/kenny-hibino/react-places-autocomplete/issues/103
|
||||||
|
const myStyles = {
|
||||||
|
autocompleteContainer: {
|
||||||
|
paddingBottom: '20px',
|
||||||
|
backgroundSize: 'auto 12px',
|
||||||
|
backgroundPosition: 'bottom left 10px',
|
||||||
|
backgroundRepeat: 'no-repeat',
|
||||||
|
backgroundImage: "url('https://maps.gstatic.com/mapfiles/api-3/images/powered-by-google-on-white3_hdpi.png')",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const AutocompleteItem = ({ formattedSuggestion }) => (
|
||||||
|
<div className="suggestion-item">
|
||||||
|
<i className='fa fa-map-marker suggestion-icon'/>{' '}
|
||||||
|
<strong>{formattedSuggestion.mainText}</strong>{' '}
|
||||||
|
<small className="text-muted">{formattedSuggestion.secondaryText}</small>
|
||||||
|
</div>)
|
||||||
|
|
||||||
|
// https://developers.google.com/places/web-service/search
|
||||||
|
// https://github.com/kenny-hibino/react-places-autocomplete/blob/master/demo/Demo.js
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Row>
|
||||||
|
<Col xs={12} sm={12} md={6} lg={6} >
|
||||||
|
{ typeof this.props.gkey === 'string' &&
|
||||||
|
<div>
|
||||||
|
<h4 className="page-header"><Trans parent="span">Suscríbete a alertas de fuegos</Trans></h4>
|
||||||
|
<form onSubmit={this.handleSelectEnd}>
|
||||||
|
<FormGroup>
|
||||||
|
<ControlLabel>
|
||||||
|
<Trans parent="span">Indícanos la posición a vigilar (por ej. tu pueblo, una calle, etc):</Trans>
|
||||||
|
</ControlLabel>
|
||||||
|
<PlacesAutocomplete
|
||||||
|
styles={myStyles}
|
||||||
|
classNames={{
|
||||||
|
root: 'form-group',
|
||||||
|
input: 'form-control',
|
||||||
|
autocompleteContainer: 'autocomplete-container'}}
|
||||||
|
googleLogo={false}
|
||||||
|
highlightFirstSuggestion={true}
|
||||||
|
onSelect={this.handleSelect}
|
||||||
|
onEnterKeyDown={this.handleSelect}
|
||||||
|
autocompleteItem={AutocompleteItem}
|
||||||
|
options={{
|
||||||
|
// location: new google.maps.LatLng(-34, 151),
|
||||||
|
// radius: 2000,
|
||||||
|
// type: ['address'],
|
||||||
|
language: this.props.i18n.language
|
||||||
|
}}
|
||||||
|
inputProps={
|
||||||
|
{
|
||||||
|
value: this.state.address,
|
||||||
|
onChange: this.onChange,
|
||||||
|
placeholder: this.props.t("Escribe aquí un lugar "),
|
||||||
|
onBlur:() => { console.log('Blur event!'); },
|
||||||
|
onFocus:() => { console.log('Focused!'); },
|
||||||
|
autoFocus:true
|
||||||
|
}} />
|
||||||
|
<HelpBlock><Trans parent="span">También puedes seleccionar el lugar en el mapa arrastrando el puntero naranja.</Trans></HelpBlock>
|
||||||
|
</FormGroup>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</Col>
|
||||||
|
<Col xs={12} sm={12} md={6} lg={6} >
|
||||||
|
<DistanceSlider onChange={this.onSliderChange} />
|
||||||
|
<Button bsStyle="success" type="submit"><Trans parent="span">Subscribir</Trans></Button>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row className="align-items-center justify-content-center">
|
||||||
|
<SelectionMap lat={this.state.lat} lng={this.state.lng} distance={this.state.distance || 10} />
|
||||||
|
</Row>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Sandbox.propTypes = {
|
Sandbox.propTypes = {
|
||||||
};
|
gkey: PropTypes.string
|
||||||
|
}
|
||||||
|
|
||||||
export default translate([], { wait: true })(Sandbox);
|
const gkey = new ReactiveVar();
|
||||||
|
|
||||||
|
getGKeys(function(err, key) {
|
||||||
|
if (err) {
|
||||||
|
console.log(err);
|
||||||
|
} else {
|
||||||
|
gkey.set(key);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export default translate([], { wait: true }) (withTracker(() => {
|
||||||
|
return {
|
||||||
|
gkey: gkey.get()
|
||||||
|
};
|
||||||
|
})(Sandbox));
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
"i18next-browser-languagedetector": "^2.1.0",
|
"i18next-browser-languagedetector": "^2.1.0",
|
||||||
"i18next-localstorage-cache": "^1.1.1",
|
"i18next-localstorage-cache": "^1.1.1",
|
||||||
"i18next-xhr-backend": "^1.5.0",
|
"i18next-xhr-backend": "^1.5.0",
|
||||||
|
"immutability-helper": "^2.5.1",
|
||||||
"indexof": "0.0.1",
|
"indexof": "0.0.1",
|
||||||
"jquery": "^2.2.4",
|
"jquery": "^2.2.4",
|
||||||
"jquery-validation": "^1.17.0",
|
"jquery-validation": "^1.17.0",
|
||||||
|
|
@ -42,6 +43,7 @@
|
||||||
"react-dom": "^15.6.1",
|
"react-dom": "^15.6.1",
|
||||||
"react-i18next": "^6.1.0",
|
"react-i18next": "^6.1.0",
|
||||||
"react-leaflet": "^1.7.7",
|
"react-leaflet": "^1.7.7",
|
||||||
|
"react-places-autocomplete": "^5.4.3",
|
||||||
"react-resize-detector": "^1.1.0",
|
"react-resize-detector": "^1.1.0",
|
||||||
"react-router-bootstrap": "^0.24.3",
|
"react-router-bootstrap": "^0.24.3",
|
||||||
"react-router-dom": "^4.2.2",
|
"react-router-dom": "^4.2.2",
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 1.7 KiB |
|
|
@ -119,5 +119,12 @@
|
||||||
"activeNeigFireInMapCount":
|
"activeNeigFireInMapCount":
|
||||||
"En naranja, los fuegos notificados por nuestros usuarios/as recientemente.",
|
"En naranja, los fuegos notificados por nuestros usuarios/as recientemente.",
|
||||||
"Centrar el mapa en tu ubicación":
|
"Centrar el mapa en tu ubicación":
|
||||||
"Centrar el mapa en tu ubicación"
|
"Centrar el mapa en tu ubicación",
|
||||||
|
"Resaltar en verde el área vigilada por nuestros usuarios/as":
|
||||||
|
"Resaltar en verde el área vigilada por nuestros usuarios/as",
|
||||||
|
"Resaltar los fuegos con un marcador":
|
||||||
|
"Resaltar los fuegos con un marcador",
|
||||||
|
"mapPrivacy":
|
||||||
|
"<0>Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos.</0> <0>Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos.</0>"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
public/your-position.png
Normal file
BIN
public/your-position.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Loading…
Add table
Add a link
Reference in a new issue