Johannes Zellner преди 7 години
родител
ревизия
82a38bc45e
променени са 7 файла, в които са добавени 155 реда и са изтрити 35 реда
  1. 29 0
      public/bus.svg
  2. 1 0
      public/index.html
  3. 59 35
      public/index.js
  4. 47 0
      public/poi.svg
  5. 14 0
      public/sbahn.svg
  6. 0 0
      public/tram.svg
  7. 5 0
      public/ubahn.svg

+ 29 - 0
public/bus.svg

@@ -0,0 +1,29 @@
+<?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"
+   viewBox="0 0 450 450.00253"
+   height="450.00253"
+   width="450"
+   xml:space="preserve"
+   version="1.1"
+   id="svg5354"><metadata
+     id="metadata5360"><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><defs
+     id="defs5358" /><g
+     transform="matrix(1.25,0,0,-1.25,0,450.00252)"
+     id="g5362"><g
+       id="g5364"><path
+         id="path5366"
+         style="fill:#f0c900;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 180,0.002 c -99.41,0 -180,80.586 -180,180 0,99.41 80.59,180 180,180 99.41,0 180,-80.59 180,-180 0,-99.414 -80.59,-180 -180,-180 z" /><path
+         id="path5368"
+         style="fill:#008754;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 352,180.002 c 0,96.566 -78.785,172 -172.027,172 C 86.727,352.002 8,276.568 8,180.002 c 0,-96.566 78.727,-172 171.973,-172 93.242,0 172.027,75.434 172.027,172 z m -48,0 c 0,-68.484 -55.516,-124 -124,-124 -68.484,0 -124,55.516 -124,124 0,68.484 55.516,124 124,124 68.484,0 124,-55.516 124,-124 z" /><path
+         id="path5370"
+         style="fill:#008754;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 113.258,260.002 c -0.696,0 -1.258,-0.562 -1.258,-1.262 l 0,-157.48 c 0,-0.695 0.562,-1.258 1.258,-1.258 l 33.484,0 c 0.696,0 1.258,0.563 1.258,1.258 l 0,60.742 64,0 0,-60.742 c 0,-0.695 0.562,-1.258 1.258,-1.258 l 33.484,0 c 0.696,0 1.258,0.563 1.258,1.258 l 0,157.48 c 0,0.7 -0.562,1.262 -1.258,1.262 l -33.484,0 c -0.696,0 -1.258,-0.562 -1.258,-1.262 l 0,-60.738 -64,0 0,60.738 c 0,0.7 -0.562,1.262 -1.258,1.262 l -33.484,0 z" /></g></g></svg>

+ 1 - 0
public/index.html

@@ -36,6 +36,7 @@
     </div>
     <div :class="{ 'open': !markerDetailsOpen }" class="query-search-result-container">
       <div class="query-search-result-container-inner">
+        <div v-show="sidePanelBusy" style="text-align: center; margin-top: 50px;"><i class="fas fa-3x fa-circle-notch fa-spin"></i></div>
         <div v-for="item in querySearchResults" class="query-search-result-item" @click="activateSearchItem(item)">
           <h4><i class="fas" :class="[ item.icon ]"></i> {{ item.name }}</h4>
           <p v-if="item.class === 'city'">{{ item.address.postcode }} {{ item.address.country }}</p>

+ 59 - 35
public/index.js

@@ -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 &copy; <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 &copy; <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);
             });

+ 47 - 0
public/poi.svg

@@ -0,0 +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"
+   style="enable-background:new 0 0 48 48;"
+   version="1.1"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg17"
+   sodipodi:docname="poi.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
+     id="metadata23"><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><defs
+     id="defs21" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2880"
+     inkscape:window-height="1564"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="19.666667"
+     inkscape:cx="24.713602"
+     inkscape:cy="22.155915"
+     inkscape:window-x="0"
+     inkscape:window-y="56"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g14" /><g
+     id="Icons"
+     transform="matrix(1.5101758,0,0,1.5101758,-12.244227,-12.244093)"><g
+       id="g14"><circle
+         style="fill:#62e6b6;fill-opacity:0.68805033;stroke:none;stroke-width:1.86119092;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path819"
+         cx="24.000006"
+         cy="23.999916"
+         r="14.999937" /></g></g></svg>

+ 14 - 0
public/sbahn.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="350px" height="353px" viewBox="0 0 350 353" enable-background="new 0 0 350 353" xml:space="preserve">
+<g>
+	<path fill="#006F35" d="M175.4,341.586c-91.5,0-165.899-74.399-165.899-165.9c0-91.5,74.399-165.9,165.899-165.9
+		c91.501,0,165.901,74.4,165.901,165.9C341.303,267.187,266.901,341.586,175.4,341.586z"/>
+	<path fill="#FFFFFF" d="M133.4,102.186c0-14.4,13.2-26.7,36.301-26.7c40.8,0,75.6,21.9,98.7,46.8v-43.5
+		c-26.7-20.7-60.301-33-97.801-33c-45,0-95.1,27.601-95.1,78.9c0,97.801,148.5,62.701,148.5,119.4c0,15-19.799,29.101-44.399,29.101
+		c-40.2,0-80.1-24.3-102-55.8v52.199c23.1,20.7,65.4,37.2,102,37.2c65.7,0,104.701-46.801,104.701-87.001
+		C284.303,120.186,133.4,162.784,133.4,102.186z"/>
+</g>
+</svg>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
public/tram.svg


+ 5 - 0
public/ubahn.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500">
+  <path fill="#039" d="M0 0h500v500H0z"/>
+  <path d="M269 462c32.5-3.1 62.8-13.5 86.9-29.5 12.1-8.1 29.2-24.9 36.6-35.9 10.8-16.2 18.7-35.6 22.9-56.6 1.7-8.1 1.9-22.4 2.2-155l.4-146.1H317.9v133.8c0 87.9-.4 137.2-1.1 143.8-1.4 11.9-5.3 26.1-9.2 33.4-5 9.3-14.2 18-23.8 22.7-26.4 13-65 8.3-83.3-10-9.3-9.3-15.7-24.3-18.4-43.1-.6-4.6-1-58.7-1-144V38.9h-99v138.4c0 138.7.3 150.4 3.8 168 8.8 43.3 35.8 77.7 77.1 98.4 30.4 15.1 69.6 21.9 106 18.3z" fill="#fff"/>
+</svg>

Някои файлове не бяха показани, защото твърде много файлове са промени