franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enlarge hover event triggering surface

Browse Source
This commit is contained in:
Franzz
2020-02-03 19:53:07 +01:00
parent b2904b70a0
commit 76ee2f9ada
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
inc/project.php
View File

@@ -45,7 +45,18 @@ class Project extends PhpObject {
* Selected Project [-------Project 1-------][------------Project 2-------------][---------------Project 3------------------ * Selected Project [-------Project 1-------][------------Project 2-------------][---------------Project 3------------------
* Mode --P--][--------B--------][--P--][-----------B---------------][---P---][-----B-----][---------H---------- * Mode --P--][--------B--------][--P--][-----------B---------------][---P---][-----B-----][---------H----------
*/ */
$sQuery = "SELECT MAX(id_project) FROM projects WHERE active_to = (SELECT MIN(active_to) FROM projects WHERE active_to > NOW() OR active_to = (SELECT MAX(active_to) FROM projects))"; $sQuery =
"SELECT MAX(id_project) ".
"FROM projects ".
"WHERE active_to = (".
"SELECT MIN(active_to) ". //Select closest project in the future
"FROM projects ".
"WHERE active_to > NOW() ". //Select Next project
"OR active_to = (". //In case there is no next project, select the last one
"SELECT MAX(active_to) ".
"FROM projects".
")".
")";
$asResult = $this->oDb->getArrayQuery($sQuery, true); $asResult = $this->oDb->getArrayQuery($sQuery, true);
$this->iProjectId = array_shift($asResult); $this->iProjectId = array_shift($asResult);
} }

13
masks/project.html
View File

@@ -282,10 +282,14 @@ function initSpotMessages(aoMessages, aoTracks) {
L.control.layers(aoLayers, null, {position: 'topleft'}).addTo(oMap); L.control.layers(aoLayers, null, {position: 'topleft'}).addTo(oMap);
//Tracks, colors & popup //Tracks, colors & popup
var oTracks = L.geoJson(aoTracks, { var oActualTracks = L.geoJson(aoTracks, {
style: function(oTrack) { style: function(oTrack) {
return self.tmp(['track-type-styles', oTrack.properties.type]); return self.tmp(['track-type-styles', oTrack.properties.type]);
}, }
}).addTo(oMap);
var oTracks = L.geoJson(aoTracks, {
style: {weight: 20, opacity: 0},
onEachFeature: function(feature, oLayer) { onEachFeature: function(feature, oLayer) {
var asProperties = feature.properties; var asProperties = feature.properties;
var $Tooltip = $('<div>', {'class':'track_tooltip'}); var $Tooltip = $('<div>', {'class':'track_tooltip'});
@@ -348,8 +352,9 @@ function initSpotMessages(aoMessages, aoTracks) {
oLayer oLayer
.bindPopup($Tooltip[0]) .bindPopup($Tooltip[0])
.on('mouseover', function(e) {console.log(e.target); .on('mouseover click', function(e) {
e.target.getPopup().setLatLng(e.latlng).openOn(self.tmp('map')); var oLatLng = L.GeometryUtil.closest(self.tmp('map'), e.sourceTarget, e.latlng);
e.target.getPopup().setLatLng(oLatLng).openOn(self.tmp('map'));
var asTrailMarkers = self.tmp(['trail-markers', e.target.feature.properties.name]); var asTrailMarkers = self.tmp(['trail-markers', e.target.feature.properties.name]);
var oPointStart = self.tmp('map').latLngToLayerPoint(asTrailMarkers.start.getLatLng()); var oPointStart = self.tmp('map').latLngToLayerPoint(asTrailMarkers.start.getLatLng());

3
script/leaflet.min.js vendored
View File

File diff suppressed because one or more lines are too long