kopia lustrzana https://github.com/openstreetmap-polska/aed-mapa
Porównaj commity
6 Commity
8fd8a14ca0
...
a7f48fdeb9
Autor | SHA1 | Data |
---|---|---|
Maciej | a7f48fdeb9 | |
Maciej | 23ae4625aa | |
Maciej | e10f90fe51 | |
Maciej | c4a6583d6a | |
Maciej | 79f22d4543 | |
Maciej | a8d2e7803d |
|
@ -106,7 +106,7 @@
|
||||||
href="mailto:aed@openstreetmap.pl">Kontakt</a>
|
href="mailto:aed@openstreetmap.pl">Kontakt</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-item px-1">
|
<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-success is-outlined has-text-weight-light has-text-white-ter" onclick="showSidebar2()" aria-label="Ustawienia">
|
||||||
<svg class="icon" style="width:24px;height:24px" viewBox="0 0 24 24">
|
<svg class="icon" style="width:24px;height:24px" viewBox="0 0 24 24">
|
||||||
<path
|
<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"
|
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"
|
||||||
|
|
60
src/map.js
60
src/map.js
|
@ -5,21 +5,12 @@ let aedNumberElements = [
|
||||||
document.getElementById('aed-number-mobile'),
|
document.getElementById('aed-number-mobile'),
|
||||||
];
|
];
|
||||||
let aedNumberComment = document.getElementById('aed-number-comment');
|
let aedNumberComment = document.getElementById('aed-number-comment');
|
||||||
|
|
||||||
let fetchMetadata = fetch(aedMetadata);
|
let fetchMetadata = fetch(aedMetadata);
|
||||||
|
|
||||||
const map = new maplibregl.Map({
|
const map = new maplibregl.Map({
|
||||||
"container": "map",
|
"container": "map",
|
||||||
"style": layers
|
"style": layers
|
||||||
});
|
});
|
||||||
|
|
||||||
map.loadImage('./src/img/marker-image-yes.png', (error, image) => {
|
|
||||||
if (error) throw error;
|
|
||||||
|
|
||||||
map.addImage('aed-icon-yes', image, {
|
|
||||||
'sdf': false
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
//map.scrollZoom.setWheelZoomRate(1 / 100);
|
//map.scrollZoom.setWheelZoomRate(1 / 100);
|
||||||
map.scrollZoom.setWheelZoomRate(1);
|
map.scrollZoom.setWheelZoomRate(1);
|
||||||
|
@ -30,16 +21,17 @@ map.dragRotate.disable();
|
||||||
// disable map rotation using touch rotation gesture
|
// disable map rotation using touch rotation gesture
|
||||||
map.touchZoomRotate.disableRotation();
|
map.touchZoomRotate.disableRotation();
|
||||||
|
|
||||||
let control = new maplibregl.NavigationControl({showCompass: false});
|
let control = new maplibregl.NavigationControl({
|
||||||
map.addControl(control, controlsLocation);
|
showCompass: false
|
||||||
|
});
|
||||||
|
|
||||||
let geolocate = new maplibregl.GeolocateControl({
|
let geolocate = new maplibregl.GeolocateControl({
|
||||||
positionOptions: {
|
positionOptions: {
|
||||||
enableHighAccuracy: true
|
enableHighAccuracy: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
map.addControl(geolocate, controlsLocation);
|
|
||||||
|
|
||||||
var geocoder_api = {
|
let geocoder_api = {
|
||||||
forwardGeocode: async (config) => {
|
forwardGeocode: async (config) => {
|
||||||
const features = [];
|
const features = [];
|
||||||
try {
|
try {
|
||||||
|
@ -79,15 +71,20 @@ var geocoder_api = {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Map controls
|
||||||
|
map.addControl(control, controlsLocation);
|
||||||
|
|
||||||
|
map.addControl(geolocate, controlsLocation);
|
||||||
|
|
||||||
map.addControl(
|
map.addControl(
|
||||||
new MaplibreGeocoder(geocoder_api, {
|
new MaplibreGeocoder(geocoder_api, {
|
||||||
maplibregl: maplibregl
|
maplibregl: maplibregl
|
||||||
}),
|
}),
|
||||||
'top-right'
|
'top-right' );
|
||||||
);
|
|
||||||
|
|
||||||
console.log('Loading icon...');
|
|
||||||
|
|
||||||
|
// Map interaction
|
||||||
map.on('mouseenter', 'clustered-circle', () => {
|
map.on('mouseenter', 'clustered-circle', () => {
|
||||||
map.getCanvas().style.cursor = 'pointer';
|
map.getCanvas().style.cursor = 'pointer';
|
||||||
});
|
});
|
||||||
|
@ -151,27 +148,4 @@ map.on('load', (e) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('Map ready.');
|
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'],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,30 +1,9 @@
|
||||||
{
|
{
|
||||||
"aed-customers": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"aed-default": {
|
"aed-default": {
|
||||||
"height": 240,
|
"height": 50,
|
||||||
"pixelRatio": 1,
|
"pixelRatio": 2,
|
||||||
"width": 240,
|
"width": 50,
|
||||||
"x": 240,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"aed-no": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 240
|
"y": 0
|
||||||
},
|
|
||||||
"aed-private": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 240,
|
|
||||||
"y": 240
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Plik binarny nie jest wyświetlany.
Przed Szerokość: | Wysokość: | Rozmiar: 7.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 1.6 KiB |
|
@ -1,30 +1,9 @@
|
||||||
{
|
{
|
||||||
"aed-customers": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"aed-default": {
|
"aed-default": {
|
||||||
"height": 240,
|
"height": 100,
|
||||||
"pixelRatio": 1,
|
"pixelRatio": 2,
|
||||||
"width": 240,
|
"width": 100,
|
||||||
"x": 240,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"aed-no": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 240
|
"y": 0
|
||||||
},
|
|
||||||
"aed-private": {
|
|
||||||
"height": 240,
|
|
||||||
"pixelRatio": 1,
|
|
||||||
"width": 240,
|
|
||||||
"x": 240,
|
|
||||||
"y": 240
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Plik binarny nie jest wyświetlany.
Przed Szerokość: | Wysokość: | Rozmiar: 7.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 1.6 KiB |
|
@ -13,8 +13,7 @@ let layers = {
|
||||||
],
|
],
|
||||||
"tileSize": 256,
|
"tileSize": 256,
|
||||||
"maxzoom": 19,
|
"maxzoom": 19,
|
||||||
"paint": {"raster-fade-duration": 100},
|
"paint": {"raster-fade-duration": 100}
|
||||||
"attribution": "data © <a target=\"_top\" rel=\"noopener\" href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors."
|
|
||||||
},
|
},
|
||||||
"aed-locations": {
|
"aed-locations": {
|
||||||
"type": "geojson",
|
"type": "geojson",
|
||||||
|
@ -39,7 +38,7 @@ let layers = {
|
||||||
"type": "symbol",
|
"type": "symbol",
|
||||||
"source": "aed-locations",
|
"source": "aed-locations",
|
||||||
"filter": ["!", ["has", "point_count"]],
|
"filter": ["!", ["has", "point_count"]],
|
||||||
"layout": {"icon-image": "aed-default", "icon-size": 0.36}
|
"layout": {"icon-image": "aed-default", "icon-size": 0.9}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "clustered-circle",
|
"id": "clustered-circle",
|
||||||
|
|
Ładowanie…
Reference in New Issue