|
|
@@ -1,4 +1,4 @@
|
|
|
-var app, map, placesMarkerLayer, currentPositionMarker, overpassFrontend;
|
|
|
+var app, map, placesMarkerLayer, currentPositionMarker;
|
|
|
|
|
|
var DEFAULT_ZOOM = 15;
|
|
|
var DEFAULT_MARKER_ICON = L.icon({
|
|
|
@@ -13,18 +13,42 @@ var CURRENT_POSITION_ICON = new L.DivIcon({
|
|
|
html: '<div class="current-location-icon"></div>'
|
|
|
});
|
|
|
|
|
|
+var overpassFrontend = new OverpassFrontend('//overpass-api.de/api/interpreter', {
|
|
|
+ timeGap: 10,
|
|
|
+ effortPerRequest: 100
|
|
|
+});
|
|
|
|
|
|
function setupMap() {
|
|
|
map = new L.map('map', { zoomControl: false, attributionControl: false });
|
|
|
|
|
|
- overpassFrontend = new OverpassFrontend('//overpass-api.de/api/interpreter', {
|
|
|
- timeGap: 10,
|
|
|
- effortPerRequest: 100
|
|
|
+ map.setView([ 52.520008, 13.404954 ], 15);
|
|
|
+ L.control.scale({ position: 'bottomright', imperial: false }).addTo(map);
|
|
|
+ // L.control.zoom({ position: 'topright' }).addTo(map);
|
|
|
+
|
|
|
+ mapboxLayer = L.tileLayer('https://api.mapbox.com/styles/v1/nebulon/{id}/tiles/256/{z}/{x}/{y}@2x?access_token=pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w', {
|
|
|
+ attribution: 'Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
|
|
|
+ maxZoom: 20,
|
|
|
+ id: 'cjpmm73gq0fbg2speu42o2y8a',
|
|
|
+ accessToken: 'pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w'
|
|
|
});
|
|
|
|
|
|
- var amenityTypes = 'restaurant|cafe|bar|pub|pharmacy|toilets';
|
|
|
+ satelliteLayer = L.tileLayer('http://{s}.google.com/vt/lyrs=s&x={x}&y={y}&z={z}',{
|
|
|
+ maxZoom: 20,
|
|
|
+ subdomains:['mt0','mt1','mt2','mt3']
|
|
|
+ });
|
|
|
+
|
|
|
+ var baseLayers = {
|
|
|
+ 'Map': mapboxLayer,
|
|
|
+ 'Satellite': satelliteLayer
|
|
|
+ };
|
|
|
+
|
|
|
+ L.control.layers(baseLayers, {}).addTo(map);
|
|
|
|
|
|
- var overpassLayer = new OverpassLayer({
|
|
|
+ // set the default layers
|
|
|
+ map.addLayer(mapboxLayer);
|
|
|
+
|
|
|
+ var amenityTypes = 'restaurant|cafe|bar|pub|pharmacy|toilets';
|
|
|
+ var amenityLayer = new OverpassLayer({
|
|
|
query: '(node[amenity~"^(' + amenityTypes + ')$"];way[amenity~"^(' + amenityTypes + ')$"];relation[amenity~"^(' + amenityTypes + ')$"];);',
|
|
|
minZoom: 18,
|
|
|
updateAssets: function (domNode, objectData, layer) {
|
|
|
@@ -40,7 +64,7 @@ function setupMap() {
|
|
|
fill: false
|
|
|
},
|
|
|
markerSign: '<span>{{ tags.name }}</span>',
|
|
|
- markerSymbol: '{% if tags.amenity=="restaurant" %}\<i class="fas fa-utensils"></i>' +
|
|
|
+ markerSymbol: '{% if tags.amenity=="restaurant" %}<i class="fas fa-utensils"></i>' +
|
|
|
'{% elseif tags.amenity=="cafe" %}<i class="fas fa-coffee"></i>' +
|
|
|
'{% elseif tags.amenity=="bar" %}<i class="fas fa-glass-cheers"></i>' +
|
|
|
'{% elseif tags.amenity=="pub" %}<i class="fas fa-beer"></i>' +
|
|
|
@@ -49,33 +73,32 @@ function setupMap() {
|
|
|
'{% endif %}'
|
|
|
}
|
|
|
});
|
|
|
+ amenityLayer.addTo(map);
|
|
|
|
|
|
- map.setView([ 52.520008, 13.404954 ], 15);
|
|
|
- L.control.scale({ position: 'bottomright', imperial: false }).addTo(map);
|
|
|
- // L.control.zoom({ position: 'topright' }).addTo(map);
|
|
|
-
|
|
|
- mapboxLayer = L.tileLayer('https://api.mapbox.com/styles/v1/nebulon/{id}/tiles/256/{z}/{x}/{y}@2x?access_token=pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w', {
|
|
|
- attribution: 'Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
|
|
|
- maxZoom: 20,
|
|
|
- id: 'cjpmm73gq0fbg2speu42o2y8a',
|
|
|
- accessToken: 'pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w'
|
|
|
- });
|
|
|
-
|
|
|
- satelliteLayer = L.tileLayer('http://{s}.google.com/vt/lyrs=s&x={x}&y={y}&z={z}',{
|
|
|
- maxZoom: 20,
|
|
|
- subdomains:['mt0','mt1','mt2','mt3']
|
|
|
+ var publicTransportLayer = new OverpassLayer({
|
|
|
+ query: '(node[public_transport="stop_position"];node[public_transport="station"];);',
|
|
|
+ minZoom: 18,
|
|
|
+ updateAssets: function (domNode, objectData, layer) {
|
|
|
+ domNode.onclick = function (event) {
|
|
|
+ event.stopPropagation();
|
|
|
+ app.openPoi(objectData.twigData);
|
|
|
+ };
|
|
|
+ },
|
|
|
+ feature: {
|
|
|
+ body: '',
|
|
|
+ style: {
|
|
|
+ width: 0,
|
|
|
+ fill: false
|
|
|
+ },
|
|
|
+ // markerSign: '<span>{{ tags.name }}</span>',
|
|
|
+ markerSymbol: '{% if tags.subway=="yes" %}<img src="ubahn.svg" width="32" height="32"/>' +
|
|
|
+ '{% elseif tags.bus=="yes" %}<img src="bus.svg" width="32" height="32"/>' +
|
|
|
+ '{% elseif tags.light_rail=="yes" %}<img src="sbahn.svg" width="32" height="32"/>' +
|
|
|
+ '{% elseif tags.tram=="yes" %}<img src="tram.svg" width="32" height="32"/>' +
|
|
|
+ '{% endif %}'
|
|
|
+ }
|
|
|
});
|
|
|
-
|
|
|
- var baseLayers = {
|
|
|
- 'Map': mapboxLayer,
|
|
|
- 'Satellite': satelliteLayer
|
|
|
- };
|
|
|
-
|
|
|
- L.control.layers(baseLayers, {}).addTo(map);
|
|
|
-
|
|
|
- // set the default layers
|
|
|
- map.addLayer(mapboxLayer);
|
|
|
- // map.addLayer(overpassLayer);
|
|
|
+ publicTransportLayer.addTo(map);
|
|
|
|
|
|
L.easyPrint({
|
|
|
title: 'Export tis map!',
|
|
|
@@ -172,6 +195,7 @@ app = new Vue({
|
|
|
el: '#app',
|
|
|
data: {
|
|
|
sidePanelOpen: false,
|
|
|
+ sidePanelBusy: false,
|
|
|
querySearchString: '',
|
|
|
querySearchResults: [],
|
|
|
searchMarker: {},
|
|
|
@@ -258,6 +282,8 @@ app = new Vue({
|
|
|
|
|
|
this.querySearchResults = [];
|
|
|
this.markerDetailsOpen = false;
|
|
|
+ this.sidePanelOpen = true;
|
|
|
+ this.sidePanelBusy = true;
|
|
|
|
|
|
var params = {
|
|
|
search: this.querySearchString,
|
|
|
@@ -269,11 +295,9 @@ app = new Vue({
|
|
|
params: params
|
|
|
}).then(function (response) {
|
|
|
that.querySearchResults = response.data;
|
|
|
- that.sidePanelOpen = true;
|
|
|
+ that.sidePanelBusy = false;
|
|
|
|
|
|
that.addSearchMarker(that.querySearchResults);
|
|
|
-
|
|
|
- if (that.querySearchResults[0]) that.activateSearchItem(that.querySearchResults[0]);
|
|
|
}).catch(function (error) {
|
|
|
console.error(error);
|
|
|
});
|