Quellcode durchsuchen

Use leafletjs instead of buggy mapboxgl

Johannes Zellner vor 7 Jahren
Ursprung
Commit
0036dc6495

+ 3 - 3
.dockerignore

@@ -1,7 +1,7 @@
-.git
+.git/
 .gitignore
 .dockerignore
-node_modules
-opt/
+node_modules/
+otp/
 otp-1.3.0-shaded.jar
 

+ 635 - 0
public/3rdparty/leaflet/leaflet.css

@@ -0,0 +1,635 @@
+/* required styles */
+
+.leaflet-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-container,
+.leaflet-pane > svg,
+.leaflet-pane > canvas,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
+.leaflet-container {
+	overflow: hidden;
+	}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	        user-select: none;
+	  -webkit-user-drag: none;
+	}
+/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
+.leaflet-safari .leaflet-tile {
+	image-rendering: -webkit-optimize-contrast;
+	}
+/* hack that prevents hw layers "stretching" when loading new tiles */
+.leaflet-safari .leaflet-tile-container {
+	width: 1600px;
+	height: 1600px;
+	-webkit-transform-origin: 0 0;
+	}
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	display: block;
+	}
+/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
+/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-shadow-pane img,
+.leaflet-container .leaflet-tile-pane img,
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile {
+	max-width: none !important;
+	max-height: none !important;
+	}
+
+.leaflet-container.leaflet-touch-zoom {
+	-ms-touch-action: pan-x pan-y;
+	touch-action: pan-x pan-y;
+	}
+.leaflet-container.leaflet-touch-drag {
+	-ms-touch-action: pinch-zoom;
+	/* Fallback for FF which doesn't support pinch-zoom */
+	touch-action: none;
+	touch-action: pinch-zoom;
+}
+.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.leaflet-container {
+	-webkit-tap-highlight-color: transparent;
+}
+.leaflet-container a {
+	-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
+.leaflet-tile {
+	filter: inherit;
+	visibility: hidden;
+	}
+.leaflet-tile-loaded {
+	visibility: inherit;
+	}
+.leaflet-zoom-box {
+	width: 0;
+	height: 0;
+	-moz-box-sizing: border-box;
+	     box-sizing: border-box;
+	z-index: 800;
+	}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+	-moz-user-select: none;
+	}
+
+.leaflet-pane         { z-index: 400; }
+
+.leaflet-tile-pane    { z-index: 200; }
+.leaflet-overlay-pane { z-index: 400; }
+.leaflet-shadow-pane  { z-index: 500; }
+.leaflet-marker-pane  { z-index: 600; }
+.leaflet-tooltip-pane   { z-index: 650; }
+.leaflet-popup-pane   { z-index: 700; }
+
+.leaflet-map-pane canvas { z-index: 100; }
+.leaflet-map-pane svg    { z-index: 200; }
+
+.leaflet-vml-shape {
+	width: 1px;
+	height: 1px;
+	}
+.lvml {
+	behavior: url(#default#VML);
+	display: inline-block;
+	position: absolute;
+	}
+
+
+/* control positioning */
+
+.leaflet-control {
+	position: relative;
+	z-index: 800;
+	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+	pointer-events: auto;
+	}
+.leaflet-top,
+.leaflet-bottom {
+	position: absolute;
+	z-index: 1000;
+	pointer-events: none;
+	}
+.leaflet-top {
+	top: 0;
+	}
+.leaflet-right {
+	right: 0;
+	}
+.leaflet-bottom {
+	bottom: 0;
+	}
+.leaflet-left {
+	left: 0;
+	}
+.leaflet-control {
+	float: left;
+	clear: both;
+	}
+.leaflet-right .leaflet-control {
+	float: right;
+	}
+.leaflet-top .leaflet-control {
+	margin-top: 10px;
+	}
+.leaflet-bottom .leaflet-control {
+	margin-bottom: 10px;
+	}
+.leaflet-left .leaflet-control {
+	margin-left: 10px;
+	}
+.leaflet-right .leaflet-control {
+	margin-right: 10px;
+	}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile {
+	will-change: opacity;
+	}
+.leaflet-fade-anim .leaflet-popup {
+	opacity: 0;
+	-webkit-transition: opacity 0.2s linear;
+	   -moz-transition: opacity 0.2s linear;
+	        transition: opacity 0.2s linear;
+	}
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+	opacity: 1;
+	}
+.leaflet-zoom-animated {
+	-webkit-transform-origin: 0 0;
+	    -ms-transform-origin: 0 0;
+	        transform-origin: 0 0;
+	}
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	will-change: transform;
+	}
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+	}
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile {
+	-webkit-transition: none;
+	   -moz-transition: none;
+	        transition: none;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+	visibility: hidden;
+	}
+
+
+/* cursors */
+
+.leaflet-interactive {
+	cursor: pointer;
+	}
+.leaflet-grab {
+	cursor: -webkit-grab;
+	cursor:    -moz-grab;
+	cursor:         grab;
+	}
+.leaflet-crosshair,
+.leaflet-crosshair .leaflet-interactive {
+	cursor: crosshair;
+	}
+.leaflet-popup-pane,
+.leaflet-control {
+	cursor: auto;
+	}
+.leaflet-dragging .leaflet-grab,
+.leaflet-dragging .leaflet-grab .leaflet-interactive,
+.leaflet-dragging .leaflet-marker-draggable {
+	cursor: move;
+	cursor: -webkit-grabbing;
+	cursor:    -moz-grabbing;
+	cursor:         grabbing;
+	}
+
+/* marker & overlays interactivity */
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-image-layer,
+.leaflet-pane > svg path,
+.leaflet-tile-container {
+	pointer-events: none;
+	}
+
+.leaflet-marker-icon.leaflet-interactive,
+.leaflet-image-layer.leaflet-interactive,
+.leaflet-pane > svg path.leaflet-interactive {
+	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+	pointer-events: auto;
+	}
+
+/* visual tweaks */
+
+.leaflet-container {
+	background: #ddd;
+	outline: 0;
+	}
+.leaflet-container a {
+	color: #0078A8;
+	}
+.leaflet-container a.leaflet-active {
+	outline: 2px solid orange;
+	}
+.leaflet-zoom-box {
+	border: 2px dotted #38f;
+	background: rgba(255,255,255,0.5);
+	}
+
+
+/* general typography */
+.leaflet-container {
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+	border-radius: 4px;
+	}
+.leaflet-bar a,
+.leaflet-bar a:hover {
+	background-color: #fff;
+	border-bottom: 1px solid #ccc;
+	width: 26px;
+	height: 26px;
+	line-height: 26px;
+	display: block;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	}
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	display: block;
+	}
+.leaflet-bar a:hover {
+	background-color: #f4f4f4;
+	}
+.leaflet-bar a:first-child {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	}
+.leaflet-bar a:last-child {
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	border-bottom: none;
+	}
+.leaflet-bar a.leaflet-disabled {
+	cursor: default;
+	background-color: #f4f4f4;
+	color: #bbb;
+	}
+
+.leaflet-touch .leaflet-bar a {
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
+	}
+.leaflet-touch .leaflet-bar a:first-child {
+	border-top-left-radius: 2px;
+	border-top-right-radius: 2px;
+	}
+.leaflet-touch .leaflet-bar a:last-child {
+	border-bottom-left-radius: 2px;
+	border-bottom-right-radius: 2px;
+	}
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+	font: bold 18px 'Lucida Console', Monaco, monospace;
+	text-indent: 1px;
+	}
+
+.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out  {
+	font-size: 22px;
+	}
+
+
+/* layers control */
+
+.leaflet-control-layers {
+	box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+	background: #fff;
+	border-radius: 5px;
+	}
+.leaflet-control-layers-toggle {
+	background-image: url(images/layers.png);
+	width: 36px;
+	height: 36px;
+	}
+.leaflet-retina .leaflet-control-layers-toggle {
+	background-image: url(images/layers-2x.png);
+	background-size: 26px 26px;
+	}
+.leaflet-touch .leaflet-control-layers-toggle {
+	width: 44px;
+	height: 44px;
+	}
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+	display: none;
+	}
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+	display: block;
+	position: relative;
+	}
+.leaflet-control-layers-expanded {
+	padding: 6px 10px 6px 6px;
+	color: #333;
+	background: #fff;
+	}
+.leaflet-control-layers-scrollbar {
+	overflow-y: scroll;
+	overflow-x: hidden;
+	padding-right: 5px;
+	}
+.leaflet-control-layers-selector {
+	margin-top: 2px;
+	position: relative;
+	top: 1px;
+	}
+.leaflet-control-layers label {
+	display: block;
+	}
+.leaflet-control-layers-separator {
+	height: 0;
+	border-top: 1px solid #ddd;
+	margin: 5px -10px 5px -6px;
+	}
+
+/* Default icon URLs */
+.leaflet-default-icon-path {
+	background-image: url(images/marker-icon.png);
+	}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+	background: #fff;
+	background: rgba(255, 255, 255, 0.7);
+	margin: 0;
+	}
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+	padding: 0 5px;
+	color: #333;
+	}
+.leaflet-control-attribution a {
+	text-decoration: none;
+	}
+.leaflet-control-attribution a:hover {
+	text-decoration: underline;
+	}
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+	font-size: 11px;
+	}
+.leaflet-left .leaflet-control-scale {
+	margin-left: 5px;
+	}
+.leaflet-bottom .leaflet-control-scale {
+	margin-bottom: 5px;
+	}
+.leaflet-control-scale-line {
+	border: 2px solid #777;
+	border-top: none;
+	line-height: 1.1;
+	padding: 2px 5px 1px;
+	font-size: 11px;
+	white-space: nowrap;
+	overflow: hidden;
+	-moz-box-sizing: border-box;
+	     box-sizing: border-box;
+
+	background: #fff;
+	background: rgba(255, 255, 255, 0.5);
+	}
+.leaflet-control-scale-line:not(:first-child) {
+	border-top: 2px solid #777;
+	border-bottom: none;
+	margin-top: -2px;
+	}
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+	border-bottom: 2px solid #777;
+	}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	box-shadow: none;
+	}
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	border: 2px solid rgba(0,0,0,0.2);
+	background-clip: padding-box;
+	}
+
+
+/* popup */
+
+.leaflet-popup {
+	position: absolute;
+	text-align: center;
+	margin-bottom: 20px;
+	}
+.leaflet-popup-content-wrapper {
+	padding: 1px;
+	text-align: left;
+	border-radius: 12px;
+	}
+.leaflet-popup-content {
+	margin: 13px 19px;
+	line-height: 1.4;
+	}
+.leaflet-popup-content p {
+	margin: 18px 0;
+	}
+.leaflet-popup-tip-container {
+	width: 40px;
+	height: 20px;
+	position: absolute;
+	left: 50%;
+	margin-left: -20px;
+	overflow: hidden;
+	pointer-events: none;
+	}
+.leaflet-popup-tip {
+	width: 17px;
+	height: 17px;
+	padding: 1px;
+
+	margin: -10px auto 0;
+
+	-webkit-transform: rotate(45deg);
+	   -moz-transform: rotate(45deg);
+	    -ms-transform: rotate(45deg);
+	        transform: rotate(45deg);
+	}
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+	background: white;
+	color: #333;
+	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+	}
+.leaflet-container a.leaflet-popup-close-button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 4px 4px 0 0;
+	border: none;
+	text-align: center;
+	width: 18px;
+	height: 14px;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
+	color: #c3c3c3;
+	text-decoration: none;
+	font-weight: bold;
+	background: transparent;
+	}
+.leaflet-container a.leaflet-popup-close-button:hover {
+	color: #999;
+	}
+.leaflet-popup-scrolled {
+	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	}
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+	zoom: 1;
+	}
+.leaflet-oldie .leaflet-popup-tip {
+	width: 24px;
+	margin: 0 auto;
+
+	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+	}
+.leaflet-oldie .leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+	border: 1px solid #999;
+	}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+	background: #fff;
+	border: 1px solid #666;
+	}
+
+
+/* Tooltip */
+/* Base styles for the element that has a tooltip */
+.leaflet-tooltip {
+	position: absolute;
+	padding: 6px;
+	background-color: #fff;
+	border: 1px solid #fff;
+	border-radius: 3px;
+	color: #222;
+	white-space: nowrap;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	pointer-events: none;
+	box-shadow: 0 1px 3px rgba(0,0,0,0.4);
+	}
+.leaflet-tooltip.leaflet-clickable {
+	cursor: pointer;
+	pointer-events: auto;
+	}
+.leaflet-tooltip-top:before,
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+	position: absolute;
+	pointer-events: none;
+	border: 6px solid transparent;
+	background: transparent;
+	content: "";
+	}
+
+/* Directions */
+
+.leaflet-tooltip-bottom {
+	margin-top: 6px;
+}
+.leaflet-tooltip-top {
+	margin-top: -6px;
+}
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-top:before {
+	left: 50%;
+	margin-left: -6px;
+	}
+.leaflet-tooltip-top:before {
+	bottom: 0;
+	margin-bottom: -12px;
+	border-top-color: #fff;
+	}
+.leaflet-tooltip-bottom:before {
+	top: 0;
+	margin-top: -12px;
+	margin-left: -6px;
+	border-bottom-color: #fff;
+	}
+.leaflet-tooltip-left {
+	margin-left: -6px;
+}
+.leaflet-tooltip-right {
+	margin-left: 6px;
+}
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+	top: 50%;
+	margin-top: -6px;
+	}
+.leaflet-tooltip-left:before {
+	right: 0;
+	margin-right: -12px;
+	border-left-color: #fff;
+	}
+.leaflet-tooltip-right:before {
+	left: 0;
+	margin-left: -12px;
+	border-right-color: #fff;
+	}

Datei-Diff unterdrückt, da er zu groß ist
+ 4 - 0
public/3rdparty/leaflet/leaflet.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 199
public/3rdparty/mapbox/mapbox-gl.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 28
public/3rdparty/mapbox/mapbox-gl.js


+ 13 - 1
public/index.css

@@ -11,11 +11,23 @@ html, body {
     font-family: 'IBM Plex Sans', sans-serif;
 }
 
+#app {
+    position: absolute;
+    height: 100vh;
+    width: 100%;
+}
+
 .map {
+    position: absolute;
     height: 100vh;
     width: 100%;
 }
 
+.map-overlay {
+    position: absolute;
+    z-index: 500; /* leaflet is on 400 */
+}
+
 .container {
     display: flex;
     border: 1px solid rgba(0,0,0,0.15);
@@ -111,7 +123,7 @@ html, body {
 }
 
 .side-panel.open {
-    width: 700px;
+    width: 470px;
 }
 
 .side-panel-toggle-button {

+ 14 - 12
public/index.html

@@ -7,23 +7,24 @@
 
   <link rel="icon" type="image/png" href="favicon.png"/>
 
+  <link href="/3rdparty/leaflet/leaflet.css" rel="stylesheet"/>
+  <script src="/3rdparty/leaflet/leaflet.js"></script>
+
   <script src="/3rdparty/vue.js"></script>
   <script src="/3rdparty/axios.min.js"></script>
-  <script src="/3rdparty/mapbox/mapbox-gl.js"></script>
   <script src="/3rdparty/element-ui/index.js"></script>
 
   <script src="/3rdparty/fontawesome-v5.6.1.js"></script>
 
-  <link href="/3rdparty/mapbox/mapbox-gl.css" rel="stylesheet"/>
   <link href="/3rdparty/element-ui/index.css" rel="stylesheet"/>
-
   <link href="/index.css" rel="stylesheet"/>
 
 </head>
 <body>
 
-<el-container id="app">
-  <div class="side-panel" :class="{ 'open': sidePanelOpen }">
+<div id="app">
+  <div id="map" class="map"></div>
+  <div class="side-panel map-overlay" :class="{ 'open': sidePanelOpen }">
     <div class="query-search-input-placeholder" :class="{ 'second': directionsOpen }">
       <el-tooltip class="item" effect="dark" content="Directions" placement="bottom-start">
         <el-button type="primary" icon="el-icon-share" @click="directionsOpen = !directionsOpen"></el-button>
@@ -55,10 +56,12 @@
           <p v-if="markerDetails.businessDetails"><el-rate v-model="markerDetails.businessDetails.rating" disabled></el-rate></p>
           <p v-if="markerDetails.businessDetails.price">Price: {{ markerDetails.businessDetails.price }}</p>
           <p v-if="markerDetails.businessDetails.display_phone">Phone: {{ markerDetails.businessDetails.display_phone }}</p>
-          <p v-if="markerDetails.businessDetails.hours && markerDetails.businessDetails.hours.length">
-            <p v-if="typeof markerDetails.businessDetails.hours[0].is_open_now !== 'undefined'">Open Now: {{ markerDetails.businessDetails.hours[0].is_open_now ? 'yes' : 'no' }}</p>
-          </p>
+          <p v-if="markerDetails.businessDetails.hours && markerDetails.businessDetails.hours[0] && typeof markerDetails.businessDetails.hours[0].is_open_now !== 'undefined'">Open Now: {{ markerDetails.businessDetails.hours[0].is_open_now ? 'yes' : 'no' }}</p>
         </div>
+        <div v-if="markerDetails.class === 'street'">
+            <h3>{{ markerDetails.name }}</h3>
+            <p>{{ markerDetails.address.road || markerDetails.address.pedestrian }} {{ markerDetails.address.house_number }}, {{ markerDetails.address.city || markerDetails.address.town || markerDetails.address.village }} ({{ markerDetails.address.city_district }} {{ markerDetails.address.postcode }} {{ markerDetails.address.country }})</p>
+          </div>
         <div v-if="markerDetails.class === ''">
           <h3>{{ markerDetails.name }}</h3>
           <p><a :href="markerDetails.businessDetails.url" target="_blank">Wikipedia</a></p>
@@ -68,11 +71,10 @@
       </div>
     </div>
   </div>
-  <div id="map" class="map"></div>
-  <el-input placeholder="Search ..." v-model="querySearchString" id="querySearchInput" class="query-search-input" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="searchPlaces()"></el-input>
+  <el-input placeholder="Search ..." v-model="querySearchString" id="querySearchInput" class="query-search-input map-overlay" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="searchPlaces()"></el-input>
   <el-input placeholder="Search ..." v-show="directionsOpen" v-model="querySearchStringTo" class="query-search-input second" :class="{ 'open': sidePanelOpen }" @keyup.enter.native="searchPlaces()"></el-input>
-  <el-button :class="{ 'open': sidePanelOpen, 'el-icon-arrow-left': sidePanelOpen, 'el-icon-arrow-right': !sidePanelOpen }" circle @click="sidePanelOpen = !sidePanelOpen" class="side-panel-toggle-button"></el-button>
-</el-container>
+  <el-button :class="{ 'open': sidePanelOpen, 'el-icon-arrow-left': sidePanelOpen, 'el-icon-arrow-right': !sidePanelOpen }" circle @click="sidePanelOpen = !sidePanelOpen" class="side-panel-toggle-button map-overlay"></el-button>
+</div>
 
 <script src='index.js'></script>
 

+ 42 - 44
public/index.js

@@ -1,33 +1,23 @@
-mapboxgl.accessToken = 'pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w';
-
 var app, map;
 
-function setupMap() {
-    map = new mapboxgl.Map({
-        container: 'map',
-        // style: 'mapbox://styles/nebulon/cjpa4rr8f0bjw2sruosd5r196',
-        style: 'mapbox://styles/nebulon/cjpmm73gq0fbg2speu42o2y8a', // with railway stations
-        center: [ 13.404954, 52.520008 ], // Berlin
-        zoom: 5
-    });
-
-    var scale = new mapboxgl.ScaleControl({
-        maxWidth: 80,
-        unit: 'metric'
-    });
-    map.addControl(scale, 'bottom-right');
-
-    const locationControl = new mapboxgl.GeolocateControl({
-        positionOptions: {
-            enableHighAccuracy: true
-        },
-        trackUserLocation: true
-    });
-
-    map.addControl(locationControl);
+var DEFAULT_ZOOM = 18;
+var DEFAULT_MARKER_ICON = L.icon({
+    iconUrl: 'pin.svg',
+    iconSize: [80, 80]
+});
 
-    var nav = new mapboxgl.NavigationControl();
-    map.addControl(nav, 'top-right');
+function setupMap() {
+    map = new L.map('map', { zoomControl: false });
+    map.setView([ 52.520008, 13.404954 ], 15);
+    L.control.scale({ position: 'bottomright', imperial: false }).addTo(map);
+    L.control.zoom({ position: 'topright' }).addTo(map);
+
+    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: DEFAULT_ZOOM,
+        id: 'cjpmm73gq0fbg2speu42o2y8a',
+        accessToken: 'pk.eyJ1IjoibmVidWxvbiIsImEiOiI3NmNkODc5ZDMyNjcxMWM2M2UyODEyMjdkM2YyMjVlOSJ9.Cpz0-WRwBwE-DNdNfGDu_w'
+    }).addTo(map);
 
     // set map position either based on url or default
     var u = new URL(window.location);
@@ -36,10 +26,10 @@ function setupMap() {
     var zoom = u.searchParams.get('zoom');
 
     if (lon && lat) {
-        map.jumpTo({ center: [ lon, lat ], zoom: zoom || 12 });
+        map.flyTo(L.latLng(lat, lon), zoom || DEFAULT_ZOOM);
     } else {
-        navigator.geolocation.getCurrentPosition(function (position) {
-            map.jumpTo({ center: [ position.coords.longitude, position.coords.latitude ], zoom: 12 });
+        navigator.geolocation.getCurrentPosition(function (pos) {
+            map.flyTo(L.latLng(pos.coords.latitude, pos.coords.longitude), DEFAULT_ZOOM);
         });
     }
 
@@ -63,7 +53,7 @@ app = new Vue({
         querySearchStringTo: '',
         querySearchResults: [],
         searchPositionMarker: null,
-        searchMarker: [],
+        searchMarker: {},
         markerDetailsOpen: false,
         markerDetails: {
             businessDetails: null
@@ -98,29 +88,37 @@ app = new Vue({
             that.clearSearchMarker();
 
             items.forEach(function (item) {
-                var el = document.createElement('div');
-                el.className = 'search-result-marker';
-                el.addEventListener('click', function (e) {
+                var m = L.marker(L.latLng(item.lat, item.lon), { icon: DEFAULT_MARKER_ICON, opacity: 0.5 });
+                m.on('click', function (e) {
                     that.openPlaceDetails(item);
+                    that.activateSearchMarker(item);
                 });
 
-                var m = new mapboxgl.Marker({ element: el });
-                m.setLngLat([ item.lon, item.lat ]);
                 m.addTo(map);
 
-                that.searchMarker.push(m);
+                that.searchMarker[item.id] = m;
             });
         },
         clearSearchMarker: function () {
-            this.searchMarker.forEach(function (marker) {
-                marker.remove();
+            var that = this;
+
+            Object.keys(this.searchMarker).forEach(function (placeId) {
+                that.searchMarker[placeId].remove();
             });
 
-            this.searchMarker = [];
+            this.searchMarker = {};
+        },
+        activateSearchMarker: function (item) {
+            var that = this;
+
+            Object.keys(this.searchMarker).forEach(function (id) {
+                that.searchMarker[id].setOpacity(id === item.id ? 1 : 0.6);
+            });
         },
         activateSearchItem: function (item) {
-            this.querySearchString = item.display_name;
-            map.flyTo({ center: [ item.lon, item.lat ], zoom: 16 });
+            this.querySearchString = item.displayName;
+            map.flyTo(L.latLng(item.lat, item.lon), DEFAULT_ZOOM);
+            this.activateSearchMarker(item);
         },
         searchPlaces: function () {
             var that = this;
@@ -140,9 +138,9 @@ app = new Vue({
                 that.querySearchResults = response.data;
                 that.sidePanelOpen = true;
 
-                that.addSearchMarker(that.querySearchResults.slice(0,1));
+                that.addSearchMarker(that.querySearchResults);
 
-                if (that.querySearchResults[0]) map.flyTo({ center: [ that.querySearchResults[0].lon, that.querySearchResults[0].lat ], zoom: 16 });
+                if (that.querySearchResults[0]) that.activateSearchItem(that.querySearchResults[0]);
             }).catch(function (error) {
                 console.error(error);
             });

+ 11 - 1
src/places.js

@@ -42,7 +42,12 @@ function search(req, res, next) {
             'hotel',
             'hostel',
             'supermarket',
-            'retail'
+            'retail',
+            'nightclub'
+        ];
+
+        var classStreet = [
+            'highway'
         ];
 
         return results.filter(function (r) {
@@ -53,6 +58,7 @@ function search(req, res, next) {
             return true;
         }).map(function (r) {
             var tmp = {
+                id: r.place_id,
                 icon: 'fa-address-card',
                 address: r.address,
                 lat: r.lat,
@@ -65,6 +71,7 @@ function search(req, res, next) {
 
             if (classBusiness.indexOf(r.type) !== -1) tmp.class = 'business';
             if (classCity.indexOf(r.type) !== -1) tmp.class = 'city';
+            if (classStreet.indexOf(r.class) !== -1) tmp.class = 'street';
 
             // icons
             if (r.type === 'fast_food' || r.type === 'restaurant') tmp.icon = 'fa-utensils';
@@ -84,6 +91,7 @@ function search(req, res, next) {
             if (r.type === 'city' || r.type === 'village' || r.type === 'town' || r.type === 'hamlet') tmp.icon = 'fa-city';
             if (r.type === 'administrative' || r.class === 'office') tmp.icon = 'fa-building';
             if (r.type === 'pub' || r.type === 'bar') tmp.icon = 'fa-beer';
+            if (r.type === 'nightclub') tmp.icon = 'fa-glass-cheers';
             if (r.type === 'hotel' || r.type === 'hostel') tmp.icon = 'fa-bed';
             if (r.type === 'supermarket' || r.type === 'retail') tmp.icon = 'fa-shopping-cart';
             if (r.class === 'highway') tmp.icon = 'fa-road';
@@ -197,6 +205,8 @@ function details(req, res, next) {
         }).catch(e => {
             console.log(e);
         });
+    } else if (itemClass === 'street') {
+        res.status(200).send({});
     } else {
         wiki.find(name).then(function (page) {
             page.info().then(function (info) {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.