From 2b6e44283009bd8e443862134aadbec214826569 Mon Sep 17 00:00:00 2001
From: BNDR <bandurr@gmail.com>
Date: Wed, 9 Feb 2022 11:44:32 +0100
Subject: [PATCH 1/2] Fixed esacaping

Fixed bug with wrong escaped values.
---
 src/osm-integration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osm-integration.js b/src/osm-integration.js
index 899245c..ecb0e8b 100644
--- a/src/osm-integration.js
+++ b/src/osm-integration.js
@@ -165,7 +165,7 @@ function addDefibrillatorToOSM(changesetId, data) {
         Object.entries(data.tags).map(arr => {
             var tag = document.createElementNS(null, "tag");
             tag.setAttribute("k", arr[0]);
-            tag.setAttribute("v", escape(arr[1]));
+            tag.setAttribute("v", arr[1]);
             return tag;
         }).forEach(el => {
             node.appendChild(el);

From 8196b2421a7bfda49038d0db8a8da8542a67c881 Mon Sep 17 00:00:00 2001
From: ANCMN <bandurr@gmail.com>
Date: Mon, 28 Mar 2022 18:48:54 +0200
Subject: [PATCH 2/2] Development (#67)

* Added layers.js (settings in separate file) and sprite test (#66)

* sprites fix, hardcoded url

* aed icon

* Fixed icon size

* icon-size -> 0.5

* icon-size -> 0.33

* size -> 0.36

* new sprites

* aed icon fix

* Sprites fix

* removed uneccesary code / formatting code

* removed unecessary attribution + code formatting

* Fixed sprite on mobile

* width + height fixed

* fixed hash #map

* fixed hash

* added formatting + missing "icon-overlap"

* removed download of custom_layer data

* changed map style from js to json

* changed data urls to be absolute

* clean up

* changed size of cluster circles

* added info about generating sprites

* added sprites for high dpi screens

Co-authored-by: tomasz t <tomasztaras@outlook.com>
---
 .github/workflows/deploy_to_prod.yaml         |   1 +
 README.md                                     |  14 +
 download_data.py                              |  42 ---
 index.html                                    |  18 +-
 requirements.txt                              |   1 -
 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                                    | 191 ++---------
 src/map_style/sprite.json                     |  30 ++
 src/map_style/sprite.png                      | Bin 0 -> 4107 bytes
 src/map_style/sprite@2x.json                  |  30 ++
 src/map_style/sprite@2x.png                   | Bin 0 -> 8290 bytes
 src/map_style/style.json                      |  79 +++++
 .../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 +
 23 files changed, 316 insertions(+), 598 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
 create mode 100644 src/map_style/sprite@2x.json
 create mode 100644 src/map_style/sprite@2x.png
 create mode 100644 src/map_style/style.json
 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%)

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/README.md b/README.md
index 3e3b684..db6ff67 100644
--- a/README.md
+++ b/README.md
@@ -61,3 +61,17 @@ cp /home/aeduser/data_dir/aed_poland.csv /var/www/html/aed_poland.csv
 ### Alternatives / Inne podobne
 
 * https://github.com/chnuessli/defikarte.ch - https://defikarte.ch/
+
+
+### Additional info about development
+
+#### Editing style
+
+#### Creating sprites with icons
+
+```bash
+nvm use 8
+npm install -g @mapbox/spritezero-cli
+spritezero --ratio 1 ./src/map_style/sprite ./src/marker_icons/
+spritezero --ratio 2 ./src/map_style/sprite@2x ./src/marker_icons/
+```
diff --git a/download_data.py b/download_data.py
index 03d2a81..7673ad7 100644
--- a/download_data.py
+++ b/download_data.py
@@ -9,7 +9,6 @@ from datetime import datetime, timezone
 from pathlib import Path
 
 import pyexcel_ods3
-import gspread
 
 logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger(__file__)
@@ -219,46 +218,6 @@ def main_overpass(
         save_json(file_path=json_metadata_file_path, data=json_metadata)
 
 
-def main_google_sheets(output_dir: Path, config_files_dir: Path) -> None:
-    sa_credentials_json_path = (
-        config_files_dir.joinpath("sa-credentials.json").resolve().as_posix()
-    )
-    config_path = config_files_dir.joinpath("gsheetsurl").resolve().as_posix()
-
-    custom_layer_file_path = output_dir.joinpath("custom_layer.geojson")
-    geojson = deepcopy(geojson_template)
-
-    try:
-        with open(config_path, "r").read() as gsheets_url:
-            logger.info("Reading Google Sheets credentials.")
-            gc = gspread.service_account(filename=sa_credentials_json_path)
-            logger.info("Opening Google Sheets url.")
-            gsheet = gc.open_by_url(gsheets_url)
-            data = gsheet.worksheet("dane_raw").get_all_records()
-            logger.info(
-                f"Reading rows from Google Sheets. Rows to process: {len(data)}."
-            )
-            counter = 0
-            for row in data:
-                if (
-                    all([row["latitude"], row["longitude"]])
-                    and row.get("import", "UNKNOWN") == "FALSE"
-                ):
-                    geojson["features"].append(
-                        geojson_point_feature(
-                            lat=row["latitude"],
-                            lon=row["longitude"],
-                            properties={"type": row.get("typ")},
-                        )
-                    )
-                    counter += 1
-            logger.info(f"{counter} features to export.")
-            if len(geojson["features"]) > 0:
-                save_json(file_path=custom_layer_file_path.as_posix(), data=geojson)
-    except FileNotFoundError:
-        logger.error(f"Config file not found. [config_path={config_path}]")
-
-
 if __name__ == "__main__":
 
     this_files_dir = Path(__file__).parent.resolve()
@@ -275,4 +234,3 @@ if __name__ == "__main__":
         prefixes=prefix_to_add,
         col_name_map=tag_name_mapping,
     )
-    main_google_sheets(output_dir=arg1, config_files_dir=arg2)
diff --git a/index.html b/index.html
index 07bf7ce..bee9cf9 100644
--- a/index.html
+++ b/index.html
@@ -81,7 +81,7 @@
   <div class="navbar-menu" id="navMenu">
     <div class="navbar-end">
       <div class="navbar-item px-1">
-        <a class="button is-success has-text-weight-light is-outlined"
+        <a class="button is-white is-outlined"
            href="https://wiki.openstreetmap.org/wiki/Pl:Przewodnik_dla_pocz%C4%85tkuj%C4%85cych" rel="noopener"
            target="_blank">Przewodnik OSM</a>
       </div>
@@ -102,11 +102,11 @@
         </div>
       </div>
       <div class="navbar-item px-1">
-        <a class="button is-success has-text-weight-light is-outlined px-4"
+        <a class="button is-white is-outlined px-4"
            href="mailto:aed@openstreetmap.pl">Kontakt</a>
       </div>
       <div class="navbar-item px-1">
-        <button class="button is-success is-outlined has-text-weight-light has-text-white-ter" onclick="showSidebar2()">
+        <button class="button is-white is-outlined" onclick="showSidebar2()" aria-label="Otwórz panel">
           <svg class="icon" style="width:24px;height:24px" viewBox="0 0 24 24">
             <path
               d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"
@@ -133,10 +133,10 @@
         <div class="column">
           <p class="title has-text-white-ter has-text-weight-light" id="sidebar-caption"></p>
         </div>
-        <button aria-label="Zamknij ekran boczny"
+        <button aria-label="Zamknij panel boczny"
                 class="delete is-medium is-hidden-touch is-pulled-right close-button mr-2 mt-4"
                 id="sidebar-button-close-touch"></button>
-        <button aria-label="Zamknij ekran boczny"
+        <button aria-label="Zamknij panel boczny"
                 class="delete is-large is-hidden-desktop is-pulled-right close-button mr-2 mt-4"
                 id="sidebar-button-close-desktop"></button>
       </div>
@@ -164,12 +164,12 @@
     <div id="sidebar2-header">
       <div class="columns is-vcentered is-flex mr-0">
         <div class="column ml-4 my-3">
-          <p class="title has-text-weight-light" id="sidebar2-caption">Ustawienia</p>
+<!--          <p class="title has-text-weight-light" id="sidebar2-caption">Ustawienia</p>-->
         </div>
-        <button aria-label="Zamknij ekran boczny"
+        <button aria-label="Zamknij panel boczny"
                 class="delete is-medium is-hidden-touch is-pulled-right close-button mr-2 mt-5"
                 id="sidebar2-button-close-touch"></button>
-        <button aria-label="Zamknij ekran boczny"
+        <button aria-label="Zamknij panel boczny"
                 class="delete is-large is-hidden-desktop is-pulled-right close-button mr-2 mt-5"
                 id="sidebar2-button-close-desktop"></button>
       </div>
@@ -569,8 +569,6 @@
               });
             });
           }
-
-
 </script>
 <script src="./src/other-ui-stuff.js"></script>
 <script src="./src/map.js"></script>
diff --git a/requirements.txt b/requirements.txt
index 79ff74f..2f6a484 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 requests
 pyexcel-ods3==0.6.0
-gspread==5.1.1
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)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm0004r
z0004r0iG@qH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10#Hdr
zK~zYI#g<J-6k!<0f3xnk?pF$HDkemzd00q;4p|`)QV>MZH87|{2M<vM-s-v_(V<&X
zVbLj)Es6pU5f~9fUqqsnAF-{QI=O4Q-|cjGsBxP8m};d5hKG0l?>xVG-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=-J<vR01OTX4K}$nx$P55*wn57+N>zid)SoImBRdPR
zyWrVTGzjkP;N5Kj;@(z3)&$}TfX!1J0^shn0MW8$HMa=)loT02ZVtW-6pmErc@re@
z!mMUz#e2IT{s7)}LQX9lDe=+*WPZ@B=Az=&A^31Wpq`!PdCAvO8)YF&4<R;eR5KCr
z`2^G*2NcO_wP`u{)CVP6pmE<#pMdn#s!Zmgu^-w;L2*F!7O-zHMu?n;<tIe}@O#C7
zkHO>-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)<h;3K|Lk000e1NJLTq000>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;<Q<7u+05
z5fM#;LmMqZRjT4Gr480XdO3qMhn!wi=;1uu_dUt;<9+icUxbyFl?wk@&Q^xa&d%cX
zdWlA(TwY#U`)#d+$g)gdUmv0<+V)#g$^860ot>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$AP98<Hpt}UWZer4!$8wCdU|>qhIqYRdV71n
zhIDs#*O-+`1;a3qB#HL+_J$#V^^P=!luD%<vrs5dEEe(kd;q+^zY~o{>jss}<*y+R
z4-Yk_VHg1Td_I!NB&(~d<n#HuLG|vh%9^h8^K(W=N9#gju^6dT$^!na$Hzy~>Gao?
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`XD2js1<zjq%98J@ho10^AZ;#W{({F`W)$~(unkEMa
z2i)J^Gd(@c=H@2ZZ1zWhFCkT_s%kqQeyW!KNc>mGZ@(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)<h;3K|Lk000e1NJLTq000>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
z<HD5#RCMDM2gIQ$4rn1XmDbeOHc4rl;k8McIWD5n*Ox@ah-dfSx%dCxx%WTsUcq**
zC&NDuMJdG&+l*Y;YhlCU+J6Tz>ou&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^FjoB<vZP5POJ=@7nj6)qmBstkl4rgQl1$5gVbjqR@ni<8A^Vkq
zNRsRC#`6m0n=ga(kI%@GzHkBntD%zDL({Zf>1QgM$}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@3r<!~p1eKY>S#)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)<h;3K|Lk000e1NJLTq000>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<KXpD^1yhe=S`qEXB5P`5k>>x{NMcrf{&kE%H$D+Ov{@9z{29EDIfJP
zyDlANLvY)F2N8g^7AYlj#+5TYZvw^|07`O;D9xWpbEKUOM&Ax1g+wASSfmgbYttVK
zKuLv#<bb8XTEogC8yM~%%F;*XQBhFBme4_VUOGa3*Hv(Qw}MC^F<um-;~-s(_CUD^
zH!~>~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)=@%<WnI=r4Uj`*Fkwh;YJ?%V}KMB8b
z33oQJuJ$JqDJS1z`V_qb#*UN<FCO7!YaIXvlRjy4qz$ZL)`O)Szj}@--@itv?e7##
z8Ve|yOs12qb)ekas7kVf0HdiszdtSIzSo)~ZMePwU!C4b#Scq~_jFKESVo^0tu+V)
z!E0gm)t>-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?A<FU7(AmhMUsur@?Ev77hpPCZav1=%Eg>okN{~Vj(;lvL*cv{}
z^554ZoDA$B)hGL_L-~hL(-`E19V@ufbDg2S012z9>ujX{Mhj&rs{G1jYxpp){<ew)
z7Ni`IrU9E#8;#1y=4iuT%=-B~g4e=iC?DUR+0Dg<8qT&~0^qaYb{6gYfSAz;>88DM
z=UNz`<CRqCcn{hBY`&ZQA*K1nytMlx*35jH&FA;?<%!KGUlvBly8_%1B<+0dVYSDb
zr7u!7W(J?sRCDa|aa86ojJ1PObWb3pQdU@t^?FgtC1E_28^ENDc&}^F`b|<H5WXz5
tHAv;6t^U_leb<h+*fj5UkbD|!{R6S?2*M=b#(@9;002ovPDHLkV1mL+Jv{&b

diff --git a/src/img/markers_collection.svg b/src/img/markers_collection.svg
deleted file mode 100644
index e1e9cac..0000000
--- a/src/img/markers_collection.svg
+++ /dev/null
@@ -1,305 +0,0 @@
-<?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"
-   width="240"
-   height="240"
-   viewBox="0 0 63.499999 63.500002"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
-   sodipodi:docname="markers_collection.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.18463586"
-     inkscape:cx="2458.7674"
-     inkscape:cy="-993.33426"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     units="px"
-     inkscape:snap-page="true"
-     inkscape:window-width="2134"
-     inkscape:window-height="1198"
-     inkscape:window-x="123"
-     inkscape:window-y="58"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Warstwa 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       id="g911"
-       transform="matrix(0.31728341,0,0,0.30446264,-37.329044,48.059331)">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
-         id="path2421"
-         style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.215962" />
-      <g
-         id="g904">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
-           id="path2830"
-           style="fill:#ffffff;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
-           id="path3611"
-           style="fill:#009140;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
-           id="rect3634"
-           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-      </g>
-    </g>
-    <g
-       id="g911-1"
-       transform="matrix(0.31728341,0,0,0.30446264,-37.329047,111.55933)"
-       inkscape:export-xdpi="44.351269"
-       inkscape:export-ydpi="44.351269">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
-         id="path2421-0"
-         style="fill:#ffc100;fill-opacity:1;stroke:none;stroke-width:0.215962" />
-      <g
-         id="g904-9">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
-           id="path2830-9"
-           style="fill:#ffffff;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
-           id="path3611-0"
-           style="fill:#ffc100;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
-           id="rect3634-9"
-           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       id="g911-3"
-       transform="matrix(0.31728341,0,0,0.30446264,-37.329041,-15.440668)">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
-         id="path2421-7"
-         style="fill:#3e83d0;fill-opacity:1;stroke:none;stroke-width:0.215962" />
-      <g
-         id="g904-94">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
-           id="path2830-7"
-           style="fill:#ffffff;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
-           id="path3611-9"
-           style="fill:#3e83d0;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
-           id="rect3634-4"
-           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878" />
-      </g>
-    </g>
-    <text
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       transform="scale(1.0660781,0.93801759)"
-       id="text884"
-       y="29.886772"
-       x="71.560883"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639028"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.639028"
-         y="29.886772"
-         x="71.560883"
-         id="tspan882"
-         sodipodi:role="line">PRIVATE/OTHER</tspan></text>
-    <text
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639027"
-       x="73.768013"
-       y="96.644188"
-       id="text884-5"
-       transform="scale(1.0660781,0.93801759)"><tspan
-         sodipodi:role="line"
-         id="tspan882-0"
-         x="73.768013"
-         y="96.644188"
-         style="stroke-width:0.639027">YES</tspan></text>
-    <text
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       transform="scale(1.0660781,0.93801759)"
-       id="text884-5-7"
-       y="164.30304"
-       x="71.79332"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639027"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.639027"
-         y="164.30304"
-         x="71.79332"
-         id="tspan882-0-0"
-         sodipodi:role="line">CUSTOMERS</tspan></text>
-    <text
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639027"
-       x="71.511421"
-       y="-98.327507"
-       id="text884-1"
-       transform="scale(1.0660781,0.93801759)"><tspan
-         sodipodi:role="line"
-         id="tspan882-5"
-         x="71.511421"
-         y="-98.327507"
-         style="font-weight:bold;stroke-width:0.639027">ACCESS</tspan></text>
-    <g
-       transform="matrix(0.31728341,0,0,0.30446263,-37.329038,-78.940666)"
-       id="g911-3-6"
-       inkscape:export-xdpi="44.351269"
-       inkscape:export-ydpi="44.351269">
-      <path
-         style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.215962"
-         id="path2421-7-4"
-         d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g904-94-3">
-        <path
-           style="fill:#ffffff;stroke:none;stroke-width:0.263878"
-           id="path2830-7-3"
-           d="m 180.16118,67.104956 c -20.78208,0.190752 -39.30043,20.758612 -33.72333,47.974104 4.25146,20.7465 26.34438,47.72564 64.88549,73.87681 38.54111,-26.15117 60.63403,-53.13031 64.88549,-73.87681 5.5771,-27.215492 -12.94125,-47.783352 -33.72333,-47.974104 -10.68087,-0.163774 -24.04125,5.482921 -31.16216,19.123583 -7.12091,-13.640662 -20.48129,-19.287357 -31.16216,-19.123583 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.263878"
-           id="path3611-9-3"
-           d="m 195.90696,74.635486 -7.07407,74.826384 25.12573,-18.11621 -4.33174,33.40847 -7.80701,-2.74137 9.31406,21.70807 15.62226,-17.36481 h -7.80701 l 13.26697,-60.0213 -30.11628,21.79891 7.97995,-37.173738 -1.67176,-3.203778 c -3.14968,-6.033466 -7.63747,-10.315452 -12.5011,-13.120628 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.263878"
-           id="rect3634-4-3"
-           d="m 283.52996,16.364706 v 17.174893 h -17.12931 v 17.174894 h 17.12931 v 17.174893 h 17.1293 V 50.714493 h 17.12931 V 33.539599 H 300.65926 V 16.364706 Z"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <text
-       transform="scale(1.0660781,0.93801759)"
-       id="text884-5-1"
-       y="-37.157387"
-       x="72.651192"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639027"
-       xml:space="preserve"
-       inkscape:export-xdpi="44.351269"
-       inkscape:export-ydpi="44.351269"><tspan
-         style="stroke-width:0.639027;font-style:italic"
-         y="-37.157387"
-         x="72.651192"
-         id="tspan882-0-5"
-         sodipodi:role="line">EMPTY</tspan></text>
-    <g
-       inkscape:export-ydpi="44.351269"
-       inkscape:export-xdpi="44.351269"
-       transform="matrix(0.31728341,0,0,0.30446263,-37.32905,175.05933)"
-       id="g911-1-3">
-      <path
-         style="fill:#3e83d0;fill-opacity:1;stroke:none;stroke-width:0.215962"
-         id="path2421-0-9"
-         d="M 128.83989,5.9689433 V 214.53312 H 329.5582 l 10e-6,-208.5641767 z"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g904-9-2">
-        <path
-           style="fill:#ffffff;stroke:none;stroke-width:0.243576"
-           id="path2830-9-5"
-           d="m 171.21577,30.074419 c -19.14525,0.176425 -36.20506,19.199465 -31.06722,44.370847 3.9166,19.188266 24.26945,44.141044 59.775,68.328034 35.50555,-24.18699 55.85839,-49.139768 59.775,-68.328034 5.13784,-25.171382 -11.92198,-44.194422 -31.06723,-44.370847 -9.83962,-0.151473 -22.14772,5.071108 -28.70777,17.68724 -6.56006,-12.616132 -18.86815,-17.838713 -28.70778,-17.68724 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#3e83d0;fill-opacity:1;stroke:none;stroke-width:0.243576"
-           id="path3611-0-6"
-           d="m 185.72139,37.039343 -6.51691,69.206297 23.14679,-16.755528 -3.99057,30.899208 -7.19211,-2.53547 8.58047,20.07761 14.39182,-16.06057 h -7.19212 l 12.22205,-55.513195 -27.74428,20.161639 7.35144,-34.381687 -1.54009,-2.963147 c -2.90161,-5.580301 -7.03593,-9.540674 -11.51649,-12.135157 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.219923"
-           id="rect3634-9-7"
-           d="M 286.45745,16.364706 V 30.488833 H 271.9895 v 14.124128 h 14.46795 V 58.737088 H 300.9254 V 44.612961 h 14.46795 V 30.488833 H 300.9254 V 16.364706 Z"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="44"
-       inkscape:export-xdpi="44"
-       style="fill:#ffffff;fill-opacity:1"
-       transform="matrix(0.16538642,0,0,0.18004519,7.6776561,162.47291)"
-       id="g1008">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0"
-         stroke-linejoin="miter"
-         d="m 244.67888,270.81639 c -9.05993,0.004 -18.08824,0.0149 -18.08824,0.0149 l -22.25845,0.31354 c -8.41261,-0.28768 -15.65655,2.34534 -20.12722,11.79519 l -16.15734,39.04399 c -11.761,3.13424 -16.87477,11.39571 -17.14572,18.17098 v 51.15205 h 15.50843 v 17.2151 c -0.7516,16.40596 27.07386,17.06173 27.69588,-0.14931 l 0.32438,-16.90173 h 100.62029 l 0.32156,16.89613 c 0.62202,17.21102 28.44758,16.55525 27.69588,0.1493 v -17.2151 h 15.49315 v -51.15206 c -0.27126,-6.77475 -5.38473,-15.03633 -17.14573,-18.17097 l -16.15734,-39.04402 c -4.47066,-9.4498 -11.69879,-12.08307 -20.1114,-11.79519 l -22.25845,-0.31355 c -0.0711,-0.0179 -9.15218,-0.0194 -18.21159,-0.0149 z m -38.49327,13.88581 c 0.70362,-0.003 1.42576,0.0153 2.17798,0.0448 l 72.98767,0.22396 c 6.67937,-0.15063 9.51696,-0.0124 12.35719,6.09199 l 11.63133,30.2943 -121.05748,-0.16424 11.49216,-29.45817 c 1.79227,-5.89938 5.48541,-7.00608 10.41099,-7.03258 z m -25.42496,51.79406 c 7.23814,0 13.11416,5.665 13.11416,12.6614 0,6.9964 -5.87602,12.67617 -13.11416,12.67617 -7.23815,0 -13.09888,-5.67977 -13.09888,-12.67617 0,-6.9964 5.86073,-12.6614 13.09888,-12.6614 z m 128.66935,0 c 7.23815,0 13.11417,5.665 13.11417,12.6614 0,6.9964 -5.87602,12.67617 -13.11417,12.67617 -7.23814,0 -13.09888,-5.67977 -13.09888,-12.67617 0,-6.9964 5.86074,-12.6614 13.09888,-12.6614 z"
-         fill-rule="evenodd"
-         stroke="#000000"
-         stroke-linecap="butt"
-         stroke-miterlimit="4"
-         stroke-width="1.03652"
-         fill="#000000"
-         id="path998" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.5611px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.639027"
-       x="72.618195"
-       y="232.91438"
-       id="text884-5-7-6"
-       transform="scale(1.0660781,0.93801759)"
-       inkscape:export-xdpi="44.351269"
-       inkscape:export-ydpi="44.351269"><tspan
-         sodipodi:role="line"
-         id="tspan882-0-0-6"
-         x="72.618195"
-         y="232.91438"
-         style="stroke-width:0.639027">MOBILE</tspan></text>
-  </g>
-</svg>
diff --git a/src/map.js b/src/map.js
index 7b606d0..76aa19c 100644
--- a/src/map.js
+++ b/src/map.js
@@ -1,5 +1,3 @@
-const aedSource = './aed_poland.geojson';
-const customLayerSource = './custom_layer.geojson';
 const aedMetadata = './aed_poland_metadata.json';
 const controlsLocation = 'bottom-right';
 let aedNumberElements = [
@@ -7,87 +5,19 @@ let aedNumberElements = [
     document.getElementById('aed-number-mobile'),
 ];
 let aedNumberComment = document.getElementById('aed-number-comment');
-
 let fetchMetadata = fetch(aedMetadata);
 
-var map = new maplibregl.Map({
-    'container': 'map', // container id
-    'center': [20, 52], // starting position [lng, lat]
-    'maxZoom': 19, // max zoom to allow
-    'zoom': 6, // starting zoom
-    'hash': 'map',
-    'maxPitch': 0,
-    'dragRotate': false,
-    'preserveDrawingBuffer': true,
-    'style': {
-        'version': 8,
-        "glyphs": "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
-        'sources': {
-            'raster-tiles': {
-                'type': 'raster',
-                'tiles': [
-                    'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                    'https://b.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                    'https://c.tile.openstreetmap.org/{z}/{x}/{y}.png'
-                ],
-                'tileSize': 256,
-                'maxzoom': 19,
-                'paint': {
-                    'raster-fade-duration': 100
-                }
-                //'attribution': `<span id="refresh-time"></span>dane © <a target="_top" rel="noopener" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors.`,
-            },
-            'aed-locations': {
-                'type': 'geojson',
-                'data': aedSource,
-                'cluster': true,
-                'clusterRadius': 32,
-                'maxzoom': 12,
-            },
-            'custom-source': {
-                'type': 'geojson',
-                'data': customLayerSource,
-                'cluster': false,
-                'maxzoom': 12,
-            },
-        },
-        'layers': [{
-            'id': 'background',
-            'type': 'raster',
-            'source': 'raster-tiles',
-            'minZoom': 0,
-            'maxZoom': 19,
-        }, {
-            'id': 'clustered-circle',
-            'type': 'circle',
-            'source': 'aed-locations',
-            'paint': {
-                'circle-color': 'rgba(0,145,64, 0.85)',
-                'circle-radius': 20,
-                'circle-stroke-color': 'rgba(245, 245, 245, 0.88)',
-                'circle-stroke-width': 3,
-            },
-            'filter': ['has', 'point_count'],
-        }, {
-            'id': 'clustered-label',
-            'type': 'symbol',
-            'source': 'aed-locations',
-            'layout': {
-                'text-field': '{point_count_abbreviated}',
-                'text-font': ['Open Sans Bold'],
-                'text-size': 14,
-                'text-letter-spacing': 0.05,
-                'text-overlap': 'always',
-            },
-            'paint': {
-                'text-color': '#f5f5f5',
-            },
-            'filter': ['has', 'point_count'],
-        }, ],
-    },
+const map = new maplibregl.Map({
+    "container": "map",
+    "hash": "map",
+    "maxZoom": 19,
+    "maxPitch": 0,
+    "dragRotate": false,
+    "preserveDrawingBuffer": true,
+    "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
@@ -96,16 +26,17 @@ map.dragRotate.disable();
 // disable map rotation using touch rotation gesture
 map.touchZoomRotate.disableRotation();
 
-let control = new maplibregl.NavigationControl({showCompass: false});
-map.addControl(control, controlsLocation);
+let control = new maplibregl.NavigationControl({
+    showCompass: false
+});
+
 let geolocate = new maplibregl.GeolocateControl({
     positionOptions: {
         enableHighAccuracy: true
     }
 });
-map.addControl(geolocate, controlsLocation);
 
-var geocoder_api = {
+let geocoder_api = {
     forwardGeocode: async (config) => {
         const features = [];
         try {
@@ -145,60 +76,20 @@ var geocoder_api = {
         };
     }
 };
+
+// Map controls
+map.addControl(control, controlsLocation);
+
+map.addControl(geolocate, controlsLocation);
+
 map.addControl(
     new MaplibreGeocoder(geocoder_api, {
         maplibregl: maplibregl
     }),
-    'top-right'
-);
+    'top-right');
 
-console.log('Loading icon...');
-
-map.loadImage('./src/img/marker-image-yes.png', (error, image) => {
-    if (error) throw error;
-
-    map.addImage('aed-icon-yes', image, {
-        'sdf': false
-    });
-});
-
-map.loadImage('./src/img/marker-image-private.png', (error, image) => {
-    if (error) throw error;
-
-    map.addImage('aed-icon-private', image, {
-        'sdf': false
-    });
-});
-
-map.loadImage('./src/img/marker-image-customers.png', (error, image) => {
-    if (error) throw error;
-
-    map.addImage('aed-icon-customers', image, {
-        'sdf': false
-    });
-    map.addImage('aed-icon-permit', image, {
-        'sdf': false
-    });
-    map.addImage('aed-icon-permissive', image, {
-        'sdf': false
-    });
-    map.addImage('aed-icon-emergency', image, {
-        'sdf': false
-    });
-});
-
-map.loadImage('./src/img/marker-image-no.png', (error, image) => {
-    if (error) throw error;
-
-    map.addImage('aed-icon-no', image, {
-        'sdf': false
-    });
-
-    map.addImage('aed-icon-', image, {
-        'sdf': false
-    });
-});
 
+// Map interaction
 map.on('mouseenter', 'clustered-circle', () => {
     map.getCanvas().style.cursor = 'pointer';
 });
@@ -243,19 +134,6 @@ map.on('load', (e) => {
             refreshTime.innerHTML = `Ostatnia aktualizacja danych OSM: <span class="has-text-grey-dark" title="${refreshTimeValueLocale}">${dateDiffMinutes} minut temu </span>`;
         });
 
-    console.log('Adding layers...');
-    map.addLayer({
-        'id': 'unclustered',
-        'type': 'symbol',
-        'source': 'aed-locations',
-        'layout': {
-            'icon-image': 'aed-icon-yes', //['concat', 'aed-icon-', ['get', 'access']], 
-            'icon-size': 1,
-            'icon-overlap': 'always',
-        },
-        'filter': ['!', ['has', 'point_count']],
-    });
-
     map.on('click', 'unclustered', function (e) {
         if (e.features[0].properties !== undefined) {
             let properties = {
@@ -275,27 +153,4 @@ map.on('load', (e) => {
     });
 
     console.log('Map ready.');
-});
-
-function toggleCustomLayer() {
-    const customLayerId = "mobile-aed";
-    let layer = map.getLayer(customLayerId);
-    if (layer) {
-        console.log("Removing " + customLayerId + " layer from map.");
-        map.removeLayer(customLayerId);
-    } else {
-        console.log("Adding " + customLayerId + " layer to map.");
-        map.addLayer({
-            'id': customLayerId,
-            'type': 'circle',
-            'source': 'custom-source',
-            'paint': {
-                'circle-color': 'rgba(237, 223, 1, 0.85)',
-                'circle-radius': 22,
-                'circle-stroke-color': 'rgba(245, 245, 245, 0.88)',
-                'circle-stroke-width': 3,
-            },
-            'filter': ['==', 'type', 'mobile'],
-        });
-    }
-}
\ No newline at end of file
+});
\ No newline at end of file
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/sprite@2x.json b/src/map_style/sprite@2x.json
new file mode 100644
index 0000000..aecaf3b
--- /dev/null
+++ b/src/map_style/sprite@2x.json
@@ -0,0 +1,30 @@
+{
+  "marker_customers": {
+    "height": 100,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 0,
+    "y": 0
+  },
+  "marker_default": {
+    "height": 100,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 100,
+    "y": 0
+  },
+  "marker_no": {
+    "height": 100,
+    "pixelRatio": 2,
+    "width": 99,
+    "x": 0,
+    "y": 100
+  },
+  "marker_private": {
+    "height": 100,
+    "pixelRatio": 2,
+    "width": 100,
+    "x": 99,
+    "y": 100
+  }
+}
\ No newline at end of file
diff --git a/src/map_style/sprite@2x.png b/src/map_style/sprite@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4f21bc1bae62ff3c0a0d17d4dadae0dbf7bf85
GIT binary patch
literal 8290
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

literal 0
HcmV?d00001

diff --git a/src/map_style/style.json b/src/map_style/style.json
new file mode 100644
index 0000000..f6336e9
--- /dev/null
+++ b/src/map_style/style.json
@@ -0,0 +1,79 @@
+{
+  "version": 8,
+  "metadata": {
+    "maputnik:renderer": "mbgljs"
+  },
+  "center": [20, 52],
+  "zoom": 6,
+  "sources": {
+    "raster-tiles": {
+      "type": "raster",
+      "tiles": [
+        "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png",
+        "https://b.tile.openstreetmap.org/{z}/{x}/{y}.png",
+        "https://c.tile.openstreetmap.org/{z}/{x}/{y}.png"
+      ],
+      "tileSize": 256,
+      "maxzoom": 19,
+      "paint": {
+        "raster-fade-duration": 100
+      }
+    },
+    "aed-locations": {
+      "type": "geojson",
+      "data": "https://aed.openstreetmap.org.pl/dev/aed_poland.geojson",
+      "cluster": true,
+      "clusterRadius": 30,
+      "maxzoom": 15
+    }
+  },
+  "glyphs": "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
+  "sprite": "https://aed.openstreetmap.org.pl/dev/src/map_style/sprite",
+  "layers": [{
+      "id": "background",
+      "type": "raster",
+      "source": "raster-tiles",
+      "minZoom": 0,
+      "maxZoom": 19
+    },
+    {
+      "id": "unclustered",
+      "type": "symbol",
+      "source": "aed-locations",
+      "filter": ["!", ["has", "point_count"]],
+      "layout": {
+        "icon-image": "marker_default",
+        "icon-size": 0.5,
+        "icon-overlap": "always"
+      }
+    },
+    {
+      "id": "clustered-circle",
+      "type": "circle",
+      "source": "aed-locations",
+      "filter": ["has", "point_count"],
+      "paint": {
+        "circle-color": "rgba(0,145,64, 0.85)",
+        "circle-radius": 16,
+        "circle-stroke-color": "rgba(245, 245, 245, 0.88)",
+        "circle-stroke-width": 2
+      }
+    },
+    {
+      "id": "clustered-label",
+      "type": "symbol",
+      "source": "aed-locations",
+      "filter": ["has", "point_count"],
+      "layout": {
+        "text-field": "{point_count_abbreviated}",
+        "text-font": ["Open Sans Bold"],
+        "text-size": 12,
+        "text-letter-spacing": 0.05
+      },
+      "paint": {
+        "text-color": "#f5f5f5"
+      }
+    }
+  ],
+  "id": "aed_map_style"
+}
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 @@
 <?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"
    sodipodi:docname="marker_customers.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
    id="svg8"
    version="1.1"
-   viewBox="0 0 63.499999 63.500002"
-   height="240"
-   width="240">
+   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/">
   <defs
      id="defs2" />
   <sodipodi:namedview
-     inkscape:window-maximized="0"
-     inkscape:window-y="49"
-     inkscape:window-x="1814"
-     inkscape:window-height="1198"
-     inkscape:window-width="1560"
+     inkscape:window-maximized="1"
+     inkscape:window-y="32"
+     inkscape:window-x="64"
+     inkscape:window-height="1011"
+     inkscape:window-width="1856"
      inkscape:snap-page="true"
      units="px"
-     showgrid="false"
+     showgrid="true"
      inkscape:document-rotation="0"
      inkscape:current-layer="layer1"
-     inkscape:document-units="mm"
-     inkscape:cy="120.25104"
-     inkscape:cx="118.74481"
-     inkscape:zoom="2.3334524"
+     inkscape:document-units="px"
+     inkscape:cy="23.030303"
+     inkscape:cx="7.1212121"
+     inkscape:zoom="6.6000001"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
      bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base" />
+     id="base"
+     inkscape:pagecheckerboard="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid828" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -45,7 +50,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -56,7 +60,7 @@
     <g
        inkscape:export-ydpi="10"
        inkscape:export-xdpi="10"
-       transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)"
+       transform="matrix(0.24910531,0,0,0.23973439,-32.0947,-1.4309611)"
        id="g911">
       <path
          style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:0.215962"
diff --git a/src/img/marker_default.svg b/src/marker_icons/marker_default.svg
similarity index 69%
rename from src/img/marker_default.svg
rename to src/marker_icons/marker_default.svg
index 0caa84d..40fe422 100644
--- a/src/img/marker_default.svg
+++ b/src/marker_icons/marker_default.svg
@@ -1,15 +1,37 @@
 <?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"
-   width="240"
-   height="240"
-   viewBox="0 0 63.499999 63.500002"
+   width="50"
+   height="50"
+   viewBox="0 0 50 50"
    version="1.1"
-   id="svg8">
+   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/">
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     showgrid="false"
+     inkscape:zoom="9.8877098"
+     inkscape:cx="19.620317"
+     inkscape:cy="17.395333"
+     inkscape:window-width="1856"
+     inkscape:window-height="1011"
+     inkscape:window-x="64"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
   <defs
      id="defs2" />
   <metadata
@@ -20,12 +42,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1">
+     id="layer1"
+     transform="scale(0.78511925,0.78740158)">
     <g
        id="g911"
        transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)">
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 @@
 <?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"
-   sodipodi:docname="marker_private.svg"
-   inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)"
+   sodipodi:docname="marker_no.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
    id="svg8"
    version="1.1"
-   viewBox="0 0 63.499999 63.500002"
-   height="240"
-   width="240">
+   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/">
   <defs
      id="defs2" />
   <sodipodi:namedview
-     inkscape:window-maximized="0"
-     inkscape:window-y="49"
-     inkscape:window-x="1814"
-     inkscape:window-height="1198"
-     inkscape:window-width="1560"
+     inkscape:window-maximized="1"
+     inkscape:window-y="32"
+     inkscape:window-x="64"
+     inkscape:window-height="1011"
+     inkscape:window-width="1856"
      inkscape:snap-page="true"
      units="px"
      showgrid="false"
      inkscape:document-rotation="0"
      inkscape:current-layer="layer1"
-     inkscape:document-units="mm"
-     inkscape:cy="120.25104"
-     inkscape:cx="118.74481"
-     inkscape:zoom="2.3334524"
+     inkscape:document-units="px"
+     inkscape:cy="41.060606"
+     inkscape:cx="3.9393939"
+     inkscape:zoom="6.6000001"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
      bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base" />
+     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" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -45,7 +52,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,7 +60,7 @@
      inkscape:groupmode="layer"
      inkscape:label="Warstwa 1">
     <g
-       transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)"
+       transform="matrix(0.24910531,0,0,0.23973436,-32.094704,-1.4309608)"
        id="g911">
       <path
          style="fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.215962"
diff --git a/src/img/marker_private.svg b/src/marker_icons/marker_private.svg
similarity index 69%
rename from src/img/marker_private.svg
rename to src/marker_icons/marker_private.svg
index 6938edb..7c8dfd7 100644
--- a/src/img/marker_private.svg
+++ b/src/marker_icons/marker_private.svg
@@ -1,15 +1,37 @@
 <?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"
-   width="240"
-   height="240"
-   viewBox="0 0 63.499999 63.500002"
+   width="50"
+   height="50"
+   viewBox="0 0 50 50"
    version="1.1"
-   id="svg8">
+   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/">
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     showgrid="false"
+     inkscape:zoom="6.9916667"
+     inkscape:cx="11.585221"
+     inkscape:cy="21.597139"
+     inkscape:window-width="1856"
+     inkscape:window-height="1011"
+     inkscape:window-x="64"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
   <defs
      id="defs2" />
   <metadata
@@ -20,12 +42,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1">
+     id="layer1"
+     transform="scale(0.78511925,0.78740158)">
     <g
        id="g911"
        transform="matrix(0.31728341,0,0,0.30446264,-40.878757,-1.8173203)">
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 '<button class="button is-success has-text-weight-light is-outlined" onclick="authenticateAction()">Zaloguj kontem OSM</button>';
+    return '<button class="button is-white is-outlined" onclick="authenticateAction()">Zaloguj kontem OSM</button>';
 }
 
 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 => {