diff --git a/README.md b/README.md index db6ff67..cd408a2 100644 --- a/README.md +++ b/README.md @@ -67,11 +67,25 @@ cp /home/aeduser/data_dir/aed_poland.csv /var/www/html/aed_poland.csv #### Editing style +You can use [Maputnik](https://maputnik.github.io/) editor to prepare new style for the map. + +Steps: +1. Open https://aed.openstreetmap.org.pl/maputnik/?layer=1311944204%7E0#6/52/20 (it's a copy of maputnik editor with newer version than what is available on the official site). +2. If the AED map style has not been loaded click _open_ and select it. +3. Once finished click _export_ and create PR or an issue with your style attached. + #### Creating sprites with icons +If you want to add new icons to the sprite sheet please place the SVG files in ./src/marker_icons/ folder. + +SVG should be scaled to 50x50px size. + ```bash +# install requirements (assumes NVM has been installed) nvm use 8 npm install -g @mapbox/spritezero-cli +# create sprite for regular screens spritezero --ratio 1 ./src/map_style/sprite ./src/marker_icons/ +# create sprite for high-dpi screens spritezero --ratio 2 ./src/map_style/sprite@2x ./src/marker_icons/ ``` diff --git a/index.html b/index.html index bee9cf9..cbaf3b4 100644 --- a/index.html +++ b/index.html @@ -162,10 +162,7 @@
-
-
- -
+
@@ -175,9 +172,11 @@
-
-
-

Pobierz dane o AED dodanych do OSM:

+
+
+

+ + Pobierz dane o dodanych AED do OSM

Excel -
-

(otwiera nowe okno) @@ -443,6 +442,21 @@

+
+
+
+ +
+
+
+

lek. med. Dorota Konaszczuk

+ Konsultant wojewódzki ds. zdrowia publicznego (lubuskie) +
+
+
@@ -479,7 +493,7 @@ - +
diff --git a/src/css/main.css b/src/css/main.css index 155f3e0..e0f5ddb 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -60,16 +60,16 @@ .sidebar-right { position: relative; float: right; - right: 40px; top: 50px; z-index: 1; margin: 0.5rem !important; - width: 400px; + width: 375px; 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; overflow: auto !important; z-index: 10 !important; + border: 2px solid hsl(0, 0%, 96%); } } diff --git a/src/map_style/style.json b/src/map_style/style.json index f6336e9..ddee210 100644 --- a/src/map_style/style.json +++ b/src/map_style/style.json @@ -44,7 +44,7 @@ "layout": { "icon-image": "marker_default", "icon-size": 0.5, - "icon-overlap": "always" + "icon-allow-overlap": true } }, {