convert to leaflet

inc/spot.php

@@ -7,7 +7,6 @@ class Spot extends Main
 	const MODE_BLOG = 'blog';
 	
 	//Spot feed
-	const FEED_ID = '0Y5LrvigElWeAieBGnFol0KBEuOTkFJmm';
 	const FEED_HOOK = 'https://api.findmespot.com/spot-main-web/consumer/rest-api/2.0/public/feed/';
 	const FEED_TYPE_XML = '/message.xml';
 	const FEED_TYPE_JSON = '/message.json';
@@ -37,7 +36,7 @@ class Spot extends Main
 		$this->oDb->install();
 		
 		//Add feed
-		//$this->oDb->insertRow(self::FEED_TABLE, array('ref_feed_id'=>self::FEED_ID));
+		//$this->oDb->insertRow(self::FEED_TABLE, array('ref_feed_id'=>Settings::FEED_ID));
 	}
 	
 	protected function getSqlOptions()
@@ -89,27 +88,26 @@ class Spot extends Main
 		return parent::getMainPage(
 			array(
 				'vars' => array(
-					'feed_id'	=> self::FEED_ID, 
+					'feed_id'	=> Settings::FEED_ID, 
 					'chunk_size'=> self::FEED_CHUNK_SIZE,
 					'mode'		=> Settings::MODE,
-					'google_api'=> Settings::GOOGLE_MAPS_API_KEY
+					'mapbox_key'=> Settings::MAPBOX_KEY
 				)
 			),
-			'index',
+			'index'
-			array('GOOGLE_MAPS_API_KEY' => Settings::GOOGLE_MAPS_API_KEY)
 		);
 	}
 	
 	/* Getting & Storing messages */
 	
-	private function getFeed($sRefFeedId=self::FEED_ID)
+	private function getFeed($sRefFeedId=Settings::FEED_ID)
 	{
 		$sUrl = self::FEED_HOOK.$sRefFeedId.self::FEED_TYPE_JSON;
 		$sContent = file_get_contents($sUrl);
 		return json_decode($sContent, true);
 	}
 	
-	private function updateFeed($sRefFeedId=self::FEED_ID)
+	private function updateFeed($sRefFeedId=Settings::FEED_ID)
 	{
 		$asData = $this->getFeed($sRefFeedId);
 		$asMsgs = $asData['response']['feedMessageResponse']['messages'];
@@ -152,7 +150,7 @@ class Spot extends Main
 		}
 	}
 	
-	public function getMessages($sRefFeedId=self::FEED_ID)
+	public function getMessages($sRefFeedId=Settings::FEED_ID)
 	{
 		/* Adding another point to test
 		$test = $this->oDb->selectRow(self::MSG_TABLE, 1);

masks/index.html

@@ -5,7 +5,7 @@
 	<link type="image/x-icon" href="images/favicon.ico" rel="shortcut icon" />
 	<link type="image/png" href="images/favicon.png" rel="icon" sizes="32x32" />
 	<link type="text/css" href="style/spot.css" rel="stylesheet" media="all" />
-	<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.exp&amp;key=[#]GOOGLE_MAPS_API_KEY[#]"></script>
+	<script type="text/javascript" src="script/leaflet.js"></script>
 	<script type="text/javascript" src="script/jquery.min.js"></script>
 	<script type="text/javascript" src="script/jquery.mods.js"></script>
 	<script type="text/javascript" src="script/spot.js"></script>

masks/messages.html

@@ -55,6 +55,7 @@ oSpot.pageInit = function(asHash)
 		else
 		{
 			var iMapRatio = 0.7;
+			var iConfidenceInterval = 0.05;
 			var iMinLat, iMaxLat, iMinLng, iMaxLng;
 			iMinLat = iMinLng = 180;
 			iMaxLat = iMaxLng = -180;
@@ -66,20 +67,34 @@ oSpot.pageInit = function(asHash)
 			});
 			
 			//Get Marker bounds
-			var oSouthWest = {lat:iMinLat, lng:iMinLng};
+			var oSouthWest = L.latLng(iMinLat, iMinLng);
-			var oNorthEast = {lat:iMaxLat, lng:iMaxLng};
+			var oNorthEast = L.latLng(iMaxLat, iMaxLng);
-			oMarkerBounds = new google.maps.LatLngBounds(oSouthWest, oNorthEast);
+			oMarkerBounds = new L.LatLngBounds(oSouthWest, oNorthEast);
 			agCenter = oMarkerBounds.getCenter();
 			
 			//Calculate adequate zoom (map.fitBounds is dezooming too much)
-			var oMapDim = {height: self.tmp('$Map').height()*0.95, width: self.tmp('$Map').width()*(iMapRatio - 0.05)};
+			var oMapDim = {
+				height: self.tmp('$Map').height()*(1 - iConfidenceInterval), 
+				width: self.tmp('$Map').width()*(iMapRatio - iConfidenceInterval)
+			};
 			iZoom = getBoundsZoomLevel(oMarkerBounds, oMapDim);
 		}
 		
-		var oMap = new google.maps.Map(self.tmp('$Map')[0], {
+		//Tile layers
+		var oMapBoxSat		= L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}@2x.png?access_token='+self.vars('mapbox_key'), {id: 'mapbox.satellite', minZoom: 0, maxZoom: 19}),
+			oMapBoxStreet	= L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token='+self.vars('mapbox_key'), {id: 'mapbox.streets'}),
+			oOpenTopoMap	= L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {id: 'OpenTopoMap', minZoom: 2, maxZoom: 19});
+			//oLinz = L.tileLayer('http://tiles-{s}.data-cdn.linz.govt.nz/services;key=92193c0af382409a98694d3e4aa8bd46/tiles/v4/layer=50767/EPSG:3857/{z}/{x}/{y}.png', {id: 'Linz', maxZoom: 17, continuousWorld: true, attribution: 'Sourced from LINZ. CC BY 4.0', subdomains:'abcd'});
+			//oGoogleSatellite = L.tileLayer('https://mt.google.com/vt/lyrs=y&x={x}&y={y}&z={z}', {id: 'GoogleSatellite', minZoom: 1, maxZoom: 22});
+		
+		//Map
+		var oMap = L.map(self.tmp('$Map')[0], {
 			center: agCenter,
 			zoom: iZoom,
-			mapTypeId: google.maps.MapTypeId.SATELLITE,
+			layers: [oMapBoxSat/*, oMapBoxSreet, oOpenTopoMap, oLinz, oGoogleSatellite*/],
+			attributionControl: false
+			/*mapTypeId: google.maps.MapTypeId.SATELLITE,
+			
 			scaleControl: true,
 			scaleControlOptions: {
 				position: google.maps.ControlPosition.TOP_LEFT
@@ -97,92 +112,89 @@ oSpot.pageInit = function(asHash)
 			fullscreenControlOptions: {
 				position: google.maps.ControlPosition.LEFT_BOTTOM
 			},
-			streetViewControl: false
+			streetViewControl: false*/
 		});
-
+		
-		var oKmlLayer = new google.maps.KmlLayer({
+		//Controls
-			url: 'http://spot.lutran.fr/kml/TeAraroaTrail_simplified.kmz?v3',
+		//L.control.layers({'Map Box': oMapBox, 'Open Topo Map': oOpenTopoMap/*, 'LINZ': oLinz, 'Google Satellite': oGoogleSatellite*/}).addTo(oMap);
-			preserveViewport: true,
+		
-			map: oMap
+		//Te Araroa track
+		$.ajax({
+			dataType: 'json',
+			url: 'kml/TeAraroaTrail_simplified.geojson',
+			mimeType: 'application/json',
+			success: function(data) {
+				L.geoJson(data, {
+				    style: function(oTrack) {
+						var sColor = '';
+						switch (oTrack.properties.type) {
+							case 'te_araroa':	sColor = '#00ff78'; break;
+							case 'routeburn':	sColor = '#0000ff'; break;
+							case 'hitchhiking':	sColor = '#FF7814'; break;
+						}
+						return {color: sColor};
+					}}).addTo(oMap);
+			}
 		});
-
+		
 		//Building messages
 		$.each(oMessages, function(iKey, oMsg){
-			var oMarker = new google.maps.Marker({
+			
+			//Marker
+			var oMarker = L.marker(L.latLng(oMsg.latitude, oMsg.longitude), {
 				id: oMsg.id_message,
-				position: {lat:oMsg.latitude, lng:oMsg.longitude},
+				riseOnHover: true,
-				//animation: google.maps.Animation.DROP,
+				icon: L.icon({
-				icon: (iKey%2==0)?'images/footprint_alt.png':'images/footprint.png',
+					iconUrl: (iKey%2==0)?'images/footprint_alt.png':'images/footprint.png',
-				map: oMap,
+					iconSize: [32, 37],
-			   	draggable: false
+					iconAnchor: [16, 37]
+				})
+			}).addTo(oMap);
+			
+			//Marker events
+			oMarker.on({
+				mouseover: function(){
+					
+				},
+				mouseout: function(){
+					
+			    },
+			    click: function(oPoint){
+					self.tmp('map').setView(oPoint.latlng, 15);
+			    }
 			});
 			
-			var $InfoWindow = $('<div>', {'class':'info-window'})
+			//Tooltip
+			$Tooltip = $('<div>', {'class':'info-window'})
 				.append($('<h1>').append('Message '+oMsg.type+' #'+oMsg.id_message))
 				.append($('<p>', {'class':'time'}).addIcon('fa-clock-o').append(oMsg.formatted_time+' ('+oMsg.relative_time+')'))
-				.append($('<p>', {'class':'coordinates'}).addIcon('fa-compass').append('Lat : '+oMsg.latitude+', Lng : '+oMsg.longitude))
+				.append($('<p>', {'class':'coordinates'}).addIcon('fa-compass').append('Lat : '+oMsg.latitude+', Lng : '+oMsg.longitude));
-				.hover(
+			
-					function(){
+			//Tooltip pictures
-						self.tmp('infowindow', true);
-					},
-					function(){
-						self.tmp('infowindow', false);
-						oInfoWindow.close(oMap, oMarker);
-					}
-				);
-				//.append($('<p>', {'class':'battery'}).addIcon('fa-battery-three-quarters').append(oMsg.battery_state))
 			if(oMsg.pics) {
 				var $Pics = $('<div>', {'class':'pics'});
 				$.each(oMsg.pics, function(iKey, asPic){
 					$Pics.append($('<a>', {href: asPic.path, 'data-lightbox': self.consts.title, 'data-title': asPic.formatted_time})
 						.append($('<img>', {'src': asPic.thumb_path})));
 				});
-				$InfoWindow
+				$Tooltip
 					.append($('<p>').addIcon('fa-image').append('Photos'))
 					.append($Pics);
 			}
 			
-			var oInfoWindow = new google.maps.InfoWindow({
+			oMarker.bindTooltip($Tooltip[0], {
-				content: $InfoWindow[0]
+				offset: [-16, -18],
-			});
+				direction: 'left'
-			
-			oMarker.addListener('mouseover', function(){
-				oInfoWindow.open(oMap, oMarker);
-			});
-			oMarker.addListener('mouseout', function(){
-				setTimeout(function(){
-					if(!self.tmp('infowindow')) oInfoWindow.close(oMap, oMarker);
-				}, 400);
-			});
-			oMarker.addListener('click', function(){
-				self.tmp('map').panTo(oMarker.getPosition());
-				self.tmp('map').setZoom(15);
 			});
 		});
 		
 		//Recenter map once loaded to be at the center of 70% (iMapRatio) of the page
-		if(self.vars('mode')!='blog')
+		if(self.vars('mode')!='blog') offsetMap(oMap, iMapRatio);
-		{
-			oProjListener = oMap.addListener('projection_changed', function() {
-				
-				var iZoom = self.tmp('map').getZoom();
-				
-				var oCenterLatLng = self.tmp('map').getCenter();
-				var oCenterPoint = self.tmp('map').getProjection().fromLatLngToPoint(oCenterLatLng);
-				
-				var iOffsetX = self.tmp('$Map').width()*(iMapRatio - 1)/2;
-			    var iOffsetPointX = new google.maps.Point(iOffsetX / Math.pow(2, iZoom), 0).x;
-
-			    var oNewCenterPoint = new google.maps.Point(oCenterPoint.x - iOffsetPointX, oCenterPoint.y);
-			    var oNewCenterLatLng = self.tmp('map').getProjection().fromPointToLatLng(oNewCenterPoint);
-			    self.tmp('map').setCenter(oNewCenterLatLng);
-				
-				oProjListener.remove();
-			});
-		}
 		
 		//Legend
-		oMap.controls[google.maps.ControlPosition.BOTTOM_RIGHT].push($('#legend')[0]);
+		var oLegend = L.control({position: 'bottomleft'});
+		oLegend.onAdd = function() {return L.DomUtil.get('legend');};
+		oLegend.addTo(oMap);
 		
 		self.tmp('map', oMap);
 	});
@@ -234,9 +246,9 @@ function getBoundsZoomLevel(bounds, mapDim) {
 	var ne = bounds.getNorthEast();
 	var sw = bounds.getSouthWest();
 
-	var latFraction = (latRad(ne.lat()) - latRad(sw.lat())) / Math.PI;
+	var latFraction = (latRad(ne.lat) - latRad(sw.lat)) / Math.PI;
 
-	var lngDiff = ne.lng() - sw.lng();
+	var lngDiff = ne.lng - sw.lng;
 	var lngFraction = ((lngDiff < 0) ? (lngDiff + 360) : lngDiff) / 360;
 
 	var latZoom = zoom(mapDim.height, WORLD_DIM.height, latFraction);
@@ -245,6 +257,15 @@ function getBoundsZoomLevel(bounds, mapDim) {
 	return Math.min(latZoom, lngZoom, ZOOM_MAX);
 }
 
+//Offset map longitude by iMapRatio (%)
+function offsetMap(oMap, iMapRatio) {
+	var oBounds = oMap.getBounds();
+	var oCenter = oMap.getCenter();
+	var iOffsetX = (oBounds.getEast() - oBounds.getWest())*(iMapRatio - 1)/2;
+	oCenter.lng = oCenter.lng - iOffsetX;
+	oMap.panTo(oCenter);
+}
+
 function onFeedScroll(){
 	var $Box = $(this);
 	var $BoxContent = $Box.find('.simplebar-content');
@@ -306,8 +327,7 @@ function getPost(asPost) {
 								.data('lng', asPost.longitude)
 								.click(function(){
 									var $This = $(this);
-									self.tmp('map').panTo({lat: parseFloat($This.data('lat')), lng: parseFloat($This.data('lng'))});
+									self.tmp('map').setView(L.latLng(parseFloat($This.data('lat')), parseFloat($This.data('lng'))), 13);
-									self.tmp('map').setZoom(13);
 								})
 						);
 			sClass = 'compass';
@@ -349,16 +369,13 @@ function getPost(asPost) {
 }
 
 function getStaticMapUrl(oCenterLat, oCenterLng){
-	var sDomain = 'https://maps.googleapis.com/maps/api/staticmap';
+	var asParams = [
-	var asParams = {
+		'https://api.mapbox.com/v4/mapbox.satellite',												//Domain
-		center: oCenterLat+','+oCenterLng,
+		'url-http%3A%2F%2Fspot.lutran.fr%2Fimages%2Ffootprint.png('+oCenterLng+','+oCenterLat+')',	//Marker
-		zoom: '13',
+		oCenterLng+','+oCenterLat+',13',															//Center + zoom
-		size: '400x300',
+		'400x300.png?access_token='+self.vars('mapbox_key')											//Image size + access token
-		maptype: 'satellite',
+	];
-		markers: 'color:green|label:|'+oCenterLat+','+oCenterLng,
+	
-		key: self.vars('google_api')
+	return asParams.join('/');
-	};
-
-	return sDomain+'?'+Object.keys(asParams).map(k => k+'='+asParams[k]).join('&');
 }
 </script>

settings-sample.php

@@ -9,10 +9,10 @@ class Settings
 	const DB_ENC = 'utf8mb4';
 	const TEXT_ENC = 'UTF-8';
 	const TIMEZONE = 'Europe/Paris';
-	const API_KEY = '';
+	const MAPBOX_KEY = '';
 	const MODE = Spot::MODE_BLOG; //Spot::MODE_HISTO/MODE_BLOG
 	const HISTO_SPAN = array('from'=>'2015-12-29 00:00:00', 'to'=>'2016-02-23 23:59:59');
-	const GOOGLE_MAPS_API_KEY = '';
+	const FEED_ID = ''; //Spot Feed ID
 	const DEBUG = true;
 }
 

style/_leaflet.scss

@@ -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;
+	}

style/spot.scss

@@ -3,6 +3,7 @@
 @import 'fa';
 @import 'lightbox';
 @import 'simplebar';
+@import 'leaflet';
 @import 'common';
 
 #map {
@@ -30,9 +31,6 @@
 		background: rgba(255, 255, 255, 0.5);
 		border-radius: 3px;
 		padding: 1px 0 0 0;
-		margin-bottom: 1em;
-		right: calc(30% + 3em) !important;
-		bottom: calc(1em - 10px) !important;
 		
 		.line {
 			display: inline-block;
@@ -63,6 +61,7 @@
 	top: 0em;
 	bottom: 0em;
 	width: calc(30% - 1em);
+	z-index: 999;
 	
 	input, button {
 		border: none;