From fe3440a83d6fd3fee4ef3c76c56013f999ea046f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Thu, 17 Oct 2013 14:35:33 +0200
Subject: [PATCH] Use jQuery to listen to map mousemove in examples

This commit also removes the click listener, which was used for touch devices. The click listener will be added back when the lib will correctly handle clicks on touch devices.
---
 examples/gpx.html           | 1 +
 examples/gpx.js             | 6 ++++--
 examples/kml-earthquakes.js | 6 ++++--
 examples/kml-timezones.js   | 6 ++++--
 examples/kml.html           | 1 +
 examples/kml.js             | 6 ++++--
 examples/vector-layer.html  | 1 +
 examples/vector-layer.js    | 6 ++++--
 8 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/examples/gpx.html b/examples/gpx.html
index f0997c44fb..fbb0d2b084 100644
--- a/examples/gpx.html
+++ b/examples/gpx.html
@@ -47,6 +47,7 @@
 
     </div>
 
+    <script src="jquery.min.js" type="text/javascript"></script>
     <script src="loader.js?id=gpx" type="text/javascript"></script>
     <script src="../resources/example-behaviour.js" type="text/javascript"></script>
 
diff --git a/examples/gpx.js b/examples/gpx.js
index bf0dbcff35..0f005a900f 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -28,9 +28,11 @@ var map = new ol.Map({
   })
 });
 
-map.on(['click', 'mousemove'], function(evt) {
+// FIXME support touch devices
+$(map.getViewport()).on('mousemove', function(evt) {
+  var pixel = map.getEventPixel(evt.originalEvent);
   map.getFeatures({
-    pixel: evt.getPixel(),
+    pixel: pixel,
     layers: [vector],
     success: function(featuresByLayer) {
       var features = featuresByLayer[0];
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index 826f1fb54f..80ecfecfdd 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -59,8 +59,10 @@ info.tooltip({
   animation: false,
   trigger: 'manual'
 });
-map.on(['click', 'mousemove'], function(evt) {
-  var pixel = evt.getPixel();
+
+// FIXME support touch devices
+$(map.getViewport()).on('mousemove', function(evt) {
+  var pixel = map.getEventPixel(evt.originalEvent);
   info.css({
     left: pixel[0] + 'px',
     top: (pixel[1] - 15) + 'px'
diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js
index 80524a9e00..704c87d336 100644
--- a/examples/kml-timezones.js
+++ b/examples/kml-timezones.js
@@ -81,8 +81,10 @@ info.tooltip({
   animation: false,
   trigger: 'manual'
 });
-map.on(['click', 'mousemove'], function(evt) {
-  var pixel = evt.getPixel();
+
+// FIXME support touch devices
+$(map.getViewport()).on('mousemove', function(evt) {
+  var pixel = map.getEventPixel(evt.originalEvent);
   info.css({
     left: pixel[0] + 'px',
     top: (pixel[1] - 15) + 'px'
diff --git a/examples/kml.html b/examples/kml.html
index c3d95e7119..8dab466f48 100644
--- a/examples/kml.html
+++ b/examples/kml.html
@@ -48,6 +48,7 @@
 
     </div>
 
+    <script src="jquery.min.js" type="text/javascript"></script>
     <script src="loader.js?id=kml" type="text/javascript"></script>
     <script src="../resources/example-behaviour.js" type="text/javascript"></script>
 
diff --git a/examples/kml.js b/examples/kml.js
index d99e343ecc..666529ef95 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -39,9 +39,11 @@ var map = new ol.Map({
   })
 });
 
-map.on(['click', 'mousemove'], function(evt) {
+// FIXME support touch devices
+$(map.getViewport()).on('mousemove', function(evt) {
+  var pixel = map.getEventPixel(evt.originalEvent);
   map.getFeatures({
-    pixel: evt.getPixel(),
+    pixel: pixel,
     layers: [vector],
     success: function(featuresByLayer) {
       var features = featuresByLayer[0];
diff --git a/examples/vector-layer.html b/examples/vector-layer.html
index e9ecdd5aea..038a1b9eea 100644
--- a/examples/vector-layer.html
+++ b/examples/vector-layer.html
@@ -48,6 +48,7 @@
 
     </div>
 
+    <script src="jquery.min.js" type="text/javascript"></script>
     <script src="loader.js?id=vector-layer" type="text/javascript"></script>
     <script src="../resources/example-behaviour.js" type="text/javascript"></script>
 
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 8ce9b792bf..fc02c28a3c 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -64,9 +64,11 @@ var map = new ol.Map({
   })
 });
 
-map.on(['click', 'mousemove'], function(evt) {
+// FIXME support touch devices
+$(map.getViewport()).on('mousemove', function(evt) {
+  var pixel = map.getEventPixel(evt.originalEvent);
   map.getFeatures({
-    pixel: evt.getPixel(),
+    pixel: pixel,
     layers: [vector],
     success: function(featuresByLayer) {
       var features = featuresByLayer[0];