From 3564364c96459b7661ce35c0e99441990bf5218b Mon Sep 17 00:00:00 2001 From: tomasz t Date: Sun, 27 Mar 2022 19:38:40 +0200 Subject: [PATCH] clean up --- .github/workflows/deploy_to_dev.yaml | 1 - .github/workflows/deploy_to_prod.yaml | 1 + index.html | 16 +- src/css/main.css | 3 +- src/img/marker-image-customers.png | Bin 707 -> 0 bytes src/img/marker-image-no.png | Bin 826 -> 0 bytes src/img/marker-image-private.png | Bin 841 -> 0 bytes src/img/marker-image-yes.png | Bin 1231 -> 0 bytes src/img/markers_collection.svg | 305 ------------------ src/map.js | 4 +- src/map_style/sprite.json | 30 ++ src/map_style/sprite.png | Bin 0 -> 4107 bytes src/{map_style.json => map_style/style.json} | 8 +- .../marker_customers.svg | 52 +-- src/{img => marker_icons}/marker_default.svg | 44 ++- src/{img => marker_icons}/marker_no.svg | 54 ++-- src/{img => marker_icons}/marker_private.svg | 44 ++- src/osm-integration.js | 2 +- src/other-ui-stuff.js | 4 + src/sprites/aed-style.json | 9 - src/sprites/aed-style.png | Bin 1689 -> 0 bytes src/sprites/aed-style@2x.json | 9 - src/sprites/aed-style@2x.png | Bin 1689 -> 0 bytes 23 files changed, 176 insertions(+), 410 deletions(-) delete mode 100644 src/img/marker-image-customers.png delete mode 100644 src/img/marker-image-no.png delete mode 100644 src/img/marker-image-private.png delete mode 100644 src/img/marker-image-yes.png delete mode 100644 src/img/markers_collection.svg create mode 100644 src/map_style/sprite.json create mode 100644 src/map_style/sprite.png rename src/{map_style.json => map_style/style.json} (89%) rename src/{img => marker_icons}/marker_customers.svg (79%) rename src/{img => marker_icons}/marker_default.svg (69%) rename src/{img => marker_icons}/marker_no.svg (76%) rename src/{img => marker_icons}/marker_private.svg (69%) delete mode 100644 src/sprites/aed-style.json delete mode 100644 src/sprites/aed-style.png delete mode 100644 src/sprites/aed-style@2x.json delete mode 100644 src/sprites/aed-style@2x.png diff --git a/.github/workflows/deploy_to_dev.yaml b/.github/workflows/deploy_to_dev.yaml index f5544de..987360f 100644 --- a/.github/workflows/deploy_to_dev.yaml +++ b/.github/workflows/deploy_to_dev.yaml @@ -42,7 +42,6 @@ jobs: --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \ --quiet /home/${{ secrets.SSH_USER }}/aed-mapa-dev/ /home/${{ secrets.SSH_USER }}/temp_deploy_dev/ sed -i "s/<< oauth_consumer_key >>/$OAUTH_CONSUMER_KEY/;s/<< oauth_secret >>/$OAUTH_SECRET/;s|<< url >>|$OSM_API_URL|" /home/${{ secrets.SSH_USER }}/temp_deploy_dev/src/osm-integration.js - sed -i "s|https://aed.openstreetmap.org.pl/|https://aed.openstreetmap.org.pl/dev/|g" /home/${{ secrets.SSH_USER }}/temp_deploy_dev/src/map_style.json rsync --update --recursive --delete \ --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \ --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \ diff --git a/.github/workflows/deploy_to_prod.yaml b/.github/workflows/deploy_to_prod.yaml index 95b48d3..a460d2a 100644 --- a/.github/workflows/deploy_to_prod.yaml +++ b/.github/workflows/deploy_to_prod.yaml @@ -42,6 +42,7 @@ jobs: --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \ --quiet /home/${{ secrets.SSH_USER }}/aed-mapa/ /home/${{ secrets.SSH_USER }}/temp_deploy_prod/ sed -i "s/<< oauth_consumer_key >>/$OAUTH_CONSUMER_KEY/;s/<< oauth_secret >>/$OAUTH_SECRET/;s|<< url >>|$OSM_API_URL|" /home/${{ secrets.SSH_USER }}/temp_deploy_prod/src/osm-integration.js + sed -i "s|https://aed.openstreetmap.org.pl/dev/|https://aed.openstreetmap.org.pl/|g" /home/${{ secrets.SSH_USER }}/temp_deploy_dev/src/map_style/style.json rsync --update --recursive --delete \ --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \ --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \ diff --git a/index.html b/index.html index 0802a18..bee9cf9 100644 --- a/index.html +++ b/index.html @@ -81,7 +81,7 @@
- Kontakt
-
- - @@ -164,12 +164,12 @@
-

Ustawienia

+
- -
diff --git a/src/css/main.css b/src/css/main.css index dec8607..155f3e0 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -61,9 +61,10 @@ position: relative; float: right; right: 40px; + top: 50px; z-index: 1; margin: 0.5rem !important; - width: 425px; + width: 400px; border-radius: 10px; box-shadow: 0 .5em 1em -0.125em rgba(10, 10, 10, 0.1), 0 0 0 1px rgba(10, 10, 10, 0.02); max-height: 90vh; diff --git a/src/img/marker-image-customers.png b/src/img/marker-image-customers.png deleted file mode 100644 index f4861b1ca6a07178595d5546292101487db59d69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 707 zcmV;!0zCbRP)P000>X1^@s6#OZ}&00009a7bBm0004r z0004r0iG@qH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10#Hdr zK~zYI#gMZH87|{2MxVG-g%$r9YuSN z#u}TgqS2Z!K>K5;Ik<)pcL#X8VO^8qwo;Mh+H@Hljo|45dmSX-KxPIOZ-Y97{ht8< zz8-LH*2k``awW$ADg+6ifhr#~^n)t^>NWWG2$F9r2#JNn`;P$uSa}BOjbE}E;_3kZ zQE)Ut`Xi{<#RFi2+QU$@ACziXc`AB7A@bZM0WOakLK;7O!&%rE1f@!!v2X>JMj(D4 zTJL~wukoeQ?_pveWTuNIs&C=-Jzid)SoImBRdPR zyWrVTGzjkP;N5Kj;@(z3)&$}TfX!1J0^shn0MW8$HMa=)loT02ZVtW-6pmErc@re@ z!mMUz#e2IT{s7)}LQX9lDe=+*WPZ@B=Az=&A^31Wpq`!PdCAvO8)YF&4-Xd97kTHgnXQ?&G?d8xkMglMoNz?=y{;uVZ{L-w-{$b_Y}cz5aZ76xIe7s&qw z1RymA<9i@AA>+A=l1VHi)gKMQ%t=cCD0gVtT++*G4+*qo7$WB&e$P^HYmlGj@0D{q pd|H<753MrCZyBrXkHr6k`~Yglz4Q8ZRBZqN002ovPDHLkV1j2pFzWyS diff --git a/src/img/marker-image-no.png b/src/img/marker-image-no.png deleted file mode 100644 index 08572afb53af8a19069fff624188cc442bcdbef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 zcmV-A1I7G_P)P000>X1^@s6#OZ}&00009a7bBm0004r z0004r0iG@qH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10>?>2 zK~zYI#g@BE>tGnhf3d|5Vn7NZwOGXqf(}w03R1gPU33+6^^b5m|AU(dE;R{JRSf7fdIq9!^GopVzF3jAcKR0 zbai!EYgv|&Wtr#aXP`xu93CFxa=8eFLP(N?q9~+NDW0C5S_era5&-!9ek4gEolc{w zs^!-}JRT2YV`GS-$lKc+s;Z*vIsk$oFfua2(9jT0r<1$8J5*K0G)(|bPEJT965QO} z*fMR9U@%BH9Hy=9&(MjY$o2I#S65doEiKXC-*0(-zn@?*$i~J7nM?*v)9O}gr40-W zFf%h_0{|$BLa9_@adFWGsLJhjv#_v$AP98qhIqYRdV71n zhIDs#*O-+`1;a3qB#HL+_J$#V^^P=!luD%jss}<*y+R z4-Yk_VHg1Td_I!NB&(~dGao? zB$G+v@wm;*<#GU+rpd&_1cD&cK+5GZ`}_M;DveJJ+q~}V?2yT1taU!0Clm^?yu6IV z;lS;7)6vmk3phGD;`a8oA)p3QC=}S*+Oql{2m}a+!#ErcbX~6*(~FA>B9TZ_Kn(;w z`@6QbMlP4b>HK_T*=!bF*KMsjJ3C{0d%J0y8bSbGUS3#VU+4Ap6@cU8V{~0d(=>|3 zB9Tah-QC@90RS9RQ&Yd{86O`XD2js1mGZ@(WNW8b#|cK`qY07*qoM6N<$ Ef~#V8rvLx| diff --git a/src/img/marker-image-private.png b/src/img/marker-image-private.png deleted file mode 100644 index ba33712b8c7f3d99816a96d8a79fd1bd6c6c0ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmV-P1GfB$P)P000>X1^@s6#OZ}&00009a7bBm0004r z0004r0iG@qH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10@g`H zK~zYI#g<8EQ&AL#zn3;?(kUI1YU0$GpwcJ~MM2T51VzLFM8&0D6cOEsJ3$aE2qGeN zou&LSB0)xDS2OB3i0Ec=hIN7#G+RNuxq7`^`=^$ z4T#vC{?b5N7uI0Vs&da}of@-F&9FZTl&F%6&pc>U3J$Do!qlkdey^YRBOyNfN(g!3 z5&_uS(txQEoMRCl_62fz8N{O3uz6V>x@sk!U>tj&A5Sn2fI@(cW-aTQYfzOb==Fwq z;0zE=rUAIsGfB5g#NiH0G=-o0WPhuk_Du#9f{+_<*Wu^gNQhU1A{{$TtXWVk5f}}| zICgW8v8i~$N^=%&U0A~*n^6J)xaaf}Po_D&Lk<9#Usu7Y?Tb(dvXmUMXSFWx0AD!4 z%Rv#Vp|YUJ(m9o^FjoB1QgM$}2RGXa4udS@^cYhs~muB>mwe z0Cs19p3x8h%MJ3i|1>c}pEvUBO5O}j^Zb*Tw~|;g%{FTT0$?>t4UkG_IRC^=vGYQ* zn`a)5;1z%PJs3%HU~Lnf`z(}~2`s3upiU$0-^;JYaCoH6R}>P8r8seW2yrI6OuJX< zXy0g{Tp{2Q<5*|e^wGxv*WTtgLO}>**Y`-5i^)&|Wm&evCPE23!I-2M?l^pO*uPN3 zRD~e`!~Q5oZ@3rS#)9n(8r!ri9JI>k1qrU|x2mx>hW3*lA=jMk=_N>w| zw^qf$^>a9RXNXJP-l7{lJA~i4NNj1TXTxGGolo6Ngc5%s{|Au2jgnp@{ww4wHnI_b Tjx~mn00000NkvXXu0mjf4FiE0 diff --git a/src/img/marker-image-yes.png b/src/img/marker-image-yes.png deleted file mode 100644 index 2b9554a9b527af6f191a98c3d477c42424c71f2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1231 zcmV;=1Tg!FP)P000>X1^@s6#OZ}&00009a7bBm0009M z0009M0X=4e#{d8Xfk{L`R7l6Im0N67MI6R|Gjq;v+ocq+Eulyulma3a(xTN^q?%{} zi6I2hh*2NVVAK#^Opq9Y@l7ERFNq0iP)J1uBA^fmpzy#&YS}=zZ5O0XTWD$Nh3$6t z?9BME+ogn3P??vLoXdQ3zW;X-tgp1(uVoEb3qpbr>D%&t>@9@^li>XsuTZ=A8x|H< zf)~Y+>i&VC>x{NMcrf{&kE%H$D+Ov{@9z{29EDIfJP zyDlANLvY)F2N8g^7AYlj#+5TYZvw^|07`O;D9xWpbEKUOM&Ax1g+wASSfmgbYttVK zKuLv#~Ye_`Al4wGLPJlnap1MPr*bSa5ETf{JgflH6wjA4tn^OSNy$K=_n0SP;f@!=w z@fk)2hI6_53cp-D!inb7V8M}!`BUcbY+)Ihj*ps_5Sz~K;d*Zua!4N47Y-2WXk>3w z5QY_Cl@E+Yu)fktAu;hDmOr|fPiMY^6as54LI^gU-^Y&^4)8}qE!EGjX71Q>jJ3(1 z5rR-hBlCBx;7nT>X)VT!f-egkf09x_Dj_kk8&nllu=c5U5du7uK&R&L^{E}SMmyQF zU=4G}mZPo4ScA3(&m<@wHkysISK_*vST_TANG`G;0D!buP!3C`&Pz((7+mS#NQJhB z_IQ*(n@%w)XH3e~0!Jzwsc@x(wuTw`lbAd1acnGtF$QCA4H0RK#_tPIl3SD>zD?=} zPbaAFzRJYh@dSLCY3=qsCnaNmX}Lw9J!HQ)=@%-2b6^l{HNqcYSKT4DhYur##7j}v(sLcJvx$J?=k=-cz?Vh&$jPbG-8{_d zV;hP0cBRt54m6X#FcK^~xQ>fm&15Ja0Bx~u-g;sQ`xmSw+n2?Ntl<>pj84x$3CZWd zZEQcc7wHe&aW1k?AokN{~Vj(;lvL*cv{} z^554ZoDA$B)hGL_L-~hL(-`E19V@ufbDg2S012z9>ujX{Mhj&rs{G1jYxpp){88DM z=UNz` - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PRIVATE/OTHER - YES - CUSTOMERS - ACCESS - - - - - - - - - EMPTY - - - - - - - - - - - - MOBILE - - diff --git a/src/map.js b/src/map.js index 1e08db1..76aa19c 100644 --- a/src/map.js +++ b/src/map.js @@ -14,10 +14,10 @@ const map = new maplibregl.Map({ "maxPitch": 0, "dragRotate": false, "preserveDrawingBuffer": true, - "style": "./src/map_style.json" + "style": "./src/map_style/style.json" }); -//map.scrollZoom.setWheelZoomRate(1 / 100); +// how fast mouse scroll wheel zooms map.scrollZoom.setWheelZoomRate(1); // disable map rotation using right click + drag diff --git a/src/map_style/sprite.json b/src/map_style/sprite.json new file mode 100644 index 0000000..cbd4b35 --- /dev/null +++ b/src/map_style/sprite.json @@ -0,0 +1,30 @@ +{ + "marker_customers": { + "height": 50, + "pixelRatio": 1, + "width": 50, + "x": 0, + "y": 0 + }, + "marker_default": { + "height": 50, + "pixelRatio": 1, + "width": 50, + "x": 50, + "y": 0 + }, + "marker_no": { + "height": 50, + "pixelRatio": 1, + "width": 49, + "x": 0, + "y": 50 + }, + "marker_private": { + "height": 50, + "pixelRatio": 1, + "width": 50, + "x": 49, + "y": 50 + } +} \ No newline at end of file diff --git a/src/map_style/sprite.png b/src/map_style/sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..4f6f019c0064fd25c2f909052702cd462d614816 GIT binary patch literal 4107 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 JPDHLkV1h6ovZw$6 literal 0 HcmV?d00001 diff --git a/src/map_style.json b/src/map_style/style.json similarity index 89% rename from src/map_style.json rename to src/map_style/style.json index 7a7fc9d..41c3217 100644 --- a/src/map_style.json +++ b/src/map_style/style.json @@ -21,14 +21,14 @@ }, "aed-locations": { "type": "geojson", - "data": "https://aed.openstreetmap.org.pl/aed_poland.geojson", + "data": "https://aed.openstreetmap.org.pl/dev/aed_poland.geojson", "cluster": true, "clusterRadius": 32, "maxzoom": 12 } }, "glyphs": "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf", - "sprite": "https://aed.openstreetmap.org.pl/src/sprites/aed-style", + "sprite": "https://aed.openstreetmap.org.pl/dev/src/map_style/sprite", "layers": [{ "id": "background", "type": "raster", @@ -42,8 +42,8 @@ "source": "aed-locations", "filter": ["!", ["has", "point_count"]], "layout": { - "icon-image": "aed-default", - "icon-size": 0.9, + "icon-image": "marker_default", + "icon-size": 0.5, "icon-overlap": "always" } }, diff --git a/src/img/marker_customers.svg b/src/marker_icons/marker_customers.svg similarity index 79% rename from src/img/marker_customers.svg rename to src/marker_icons/marker_customers.svg index a7705e1..f9ea49d 100644 --- a/src/img/marker_customers.svg +++ b/src/marker_icons/marker_customers.svg @@ -1,42 +1,47 @@ + viewBox="0 0 50 50" + height="50" + width="50" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="base" + inkscape:pagecheckerboard="true"> + + @@ -45,7 +50,6 @@ image/svg+xml - @@ -56,7 +60,7 @@ + id="svg8" + sodipodi:docname="marker_default.svg" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + image/svg+xml - + id="layer1" + transform="scale(0.78511925,0.78740158)"> diff --git a/src/img/marker_no.svg b/src/marker_icons/marker_no.svg similarity index 76% rename from src/img/marker_no.svg rename to src/marker_icons/marker_no.svg index be87a99..aa5073f 100644 --- a/src/img/marker_no.svg +++ b/src/marker_icons/marker_no.svg @@ -1,42 +1,49 @@ + viewBox="0 0 49.999996 50.000004" + height="50.000004" + width="49.999996" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="base" + inkscape:pagecheckerboard="true" + viewbox-width="50.10003" + scale-x="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> @@ -45,7 +52,6 @@ image/svg+xml - @@ -54,7 +60,7 @@ inkscape:groupmode="layer" inkscape:label="Warstwa 1"> + id="svg8" + sodipodi:docname="marker_private.svg" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + image/svg+xml - + id="layer1" + transform="scale(0.78511925,0.78740158)"> diff --git a/src/osm-integration.js b/src/osm-integration.js index ecb0e8b..73e766b 100644 --- a/src/osm-integration.js +++ b/src/osm-integration.js @@ -324,7 +324,7 @@ function authenticateAction() { } function renderLoginButton() { - return ''; + return ''; } function renderUserLoggedIn(username) { diff --git a/src/other-ui-stuff.js b/src/other-ui-stuff.js index 3577fc7..3631061 100644 --- a/src/other-ui-stuff.js +++ b/src/other-ui-stuff.js @@ -446,6 +446,10 @@ document.addEventListener('DOMContentLoaded', () => { }); }); + if (window.innerWidth > 1024) { + showSidebar2(); + } + }); // button listeners sidebarButtonCloseIds.forEach(id => { diff --git a/src/sprites/aed-style.json b/src/sprites/aed-style.json deleted file mode 100644 index 9e8b39a..0000000 --- a/src/sprites/aed-style.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "aed-default": { - "height": 50, - "pixelRatio": 2, - "width": 50, - "x": 0, - "y": 0 - } -} \ No newline at end of file diff --git a/src/sprites/aed-style.png b/src/sprites/aed-style.png deleted file mode 100644 index 57e1267f0d85086d97355ba503b27f2b7dbb7741..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1689 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