From 4008ab7f6c88a1ec341379bd9a017b9184d5590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 17 Oct 2013 15:16:50 +0200 Subject: [PATCH] Vector examples display feature info on click again --- examples/gpx.js | 14 +++++++++++--- examples/kml-earthquakes.js | 14 +++++++++++--- examples/kml-timezones.js | 14 +++++++++++--- examples/kml.js | 14 +++++++++++--- examples/vector-layer.js | 14 +++++++++++--- 5 files changed, 55 insertions(+), 15 deletions(-) diff --git a/examples/gpx.js b/examples/gpx.js index 0f005a900f..899b9cdb31 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -28,9 +28,7 @@ var map = new ol.Map({ }) }); -// FIXME support touch devices -$(map.getViewport()).on('mousemove', function(evt) { - var pixel = map.getEventPixel(evt.originalEvent); +var displayFeatureInfo = function(pixel) { map.getFeatures({ pixel: pixel, layers: [vector], @@ -43,4 +41,14 @@ $(map.getViewport()).on('mousemove', function(evt) { document.getElementById('info').innerHTML = info.join(', ') || ' '; } }); +}; + +$(map.getViewport()).on('mousemove', function(evt) { + var pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function(evt) { + var pixel = evt.getPixel(); + displayFeatureInfo(pixel); }); diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index 80ecfecfdd..fd2405cea9 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -60,9 +60,7 @@ info.tooltip({ trigger: 'manual' }); -// FIXME support touch devices -$(map.getViewport()).on('mousemove', function(evt) { - var pixel = map.getEventPixel(evt.originalEvent); +var displayFeatureInfo = function(pixel) { info.css({ left: pixel[0] + 'px', top: (pixel[1] - 15) + 'px' @@ -82,4 +80,14 @@ $(map.getViewport()).on('mousemove', function(evt) { } } }); +}; + +$(map.getViewport()).on('mousemove', function(evt) { + var pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function(evt) { + var pixel = evt.getPixel(); + displayFeatureInfo(pixel); }); diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 704c87d336..6657961593 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -82,9 +82,7 @@ info.tooltip({ trigger: 'manual' }); -// FIXME support touch devices -$(map.getViewport()).on('mousemove', function(evt) { - var pixel = map.getEventPixel(evt.originalEvent); +var displayFeatureInfo = function(pixel) { info.css({ left: pixel[0] + 'px', top: (pixel[1] - 15) + 'px' @@ -104,4 +102,14 @@ $(map.getViewport()).on('mousemove', function(evt) { } } }); +}; + +$(map.getViewport()).on('mousemove', function(evt) { + var pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function(evt) { + var pixel = evt.getPixel(); + displayFeatureInfo(pixel); }); diff --git a/examples/kml.js b/examples/kml.js index 666529ef95..bce5752903 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -39,9 +39,7 @@ var map = new ol.Map({ }) }); -// FIXME support touch devices -$(map.getViewport()).on('mousemove', function(evt) { - var pixel = map.getEventPixel(evt.originalEvent); +var displayFeatureInfo = function(pixel) { map.getFeatures({ pixel: pixel, layers: [vector], @@ -54,4 +52,14 @@ $(map.getViewport()).on('mousemove', function(evt) { document.getElementById('info').innerHTML = info.join(', ') || ' '; } }); +}; + +$(map.getViewport()).on('mousemove', function(evt) { + var pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function(evt) { + var pixel = evt.getPixel(); + displayFeatureInfo(pixel); }); diff --git a/examples/vector-layer.js b/examples/vector-layer.js index fc02c28a3c..f1c2df3d7a 100644 --- a/examples/vector-layer.js +++ b/examples/vector-layer.js @@ -64,9 +64,7 @@ var map = new ol.Map({ }) }); -// FIXME support touch devices -$(map.getViewport()).on('mousemove', function(evt) { - var pixel = map.getEventPixel(evt.originalEvent); +var displayFeatureInfo = function(pixel) { map.getFeatures({ pixel: pixel, layers: [vector], @@ -77,4 +75,14 @@ $(map.getViewport()).on('mousemove', function(evt) { ' '; } }); +}; + +$(map.getViewport()).on('mousemove', function(evt) { + var pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function(evt) { + var pixel = evt.getPixel(); + displayFeatureInfo(pixel); });