kopia lustrzana https://github.com/openstreetmap-polska/aed-mapa
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>pull/72/head
ANCMN
GitHub
rodzic
b02e6fd4dd
commit
8196b2421a
|
|
@ -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' \
|
||||
|
|
|
|||
14
README.md
14
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/
|
||||
```
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
18
index.html
18
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>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
requests
|
||||
pyexcel-ods3==0.6.0
|
||||
gspread==5.1.1
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 707 B |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 826 B |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 841 B |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 1.2 KiB |
|
|
@ -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>
|
||||
|
Przed Szerokość: | Wysokość: | Rozmiar: 16 KiB |
191
src/map.js
191
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'],
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 4.0 KiB |
|
|
@ -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
|
||||
}
|
||||
}
|
||||
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 8.1 KiB |
|
|
@ -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"
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
Przed Szerokość: | Wysokość: | Rozmiar: 3.2 KiB Po Szerokość: | Wysokość: | Rozmiar: 3.3 KiB |
|
|
@ -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)">
|
||||
|
Przed Szerokość: | Wysokość: | Rozmiar: 2.2 KiB Po Szerokość: | Wysokość: | Rozmiar: 3.0 KiB |
|
|
@ -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"
|
||||
|
Przed Szerokość: | Wysokość: | Rozmiar: 3.1 KiB Po Szerokość: | Wysokość: | Rozmiar: 3.3 KiB |
|
|
@ -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)">
|
||||
|
Przed Szerokość: | Wysokość: | Rozmiar: 2.2 KiB Po Szerokość: | Wysokość: | Rozmiar: 3.0 KiB |
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -446,6 +446,10 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||
});
|
||||
});
|
||||
|
||||
if (window.innerWidth > 1024) {
|
||||
showSidebar2();
|
||||
}
|
||||
|
||||
});
|
||||
// button listeners
|
||||
sidebarButtonCloseIds.forEach(id => {
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue