From 9cc8390dfd931ee5c03ec1540dfc5770ecc51156 Mon Sep 17 00:00:00 2001
From: tsauerwein <tobias.sauerwein@camptocamp.com>
Date: Fri, 30 Jan 2015 09:16:19 +0100
Subject: [PATCH] Use `dragging` in examples

---
 examples/drag-and-drop-image-vector.js |  5 ++++-
 examples/drag-and-drop.js              |  5 ++++-
 examples/gpx.js                        |  5 ++++-
 examples/icon-sprite-webgl.js          |  5 ++++-
 examples/icon.js                       |  6 +++++-
 examples/igc.js                        |  5 ++++-
 examples/image-vector-layer.js         |  5 ++++-
 examples/kml-earthquakes.js            |  6 +++++-
 examples/kml-timezones.js              |  6 +++++-
 examples/kml.js                        |  5 ++++-
 examples/measure.js                    |  7 +++++--
 examples/synthetic-points.js           | 18 ++++++++++--------
 examples/tileutfgrid.js                |  5 ++++-
 examples/vector-layer.js               |  5 ++++-
 14 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js
index 90a6f54b83..6e35336d4c 100644
--- a/examples/drag-and-drop-image-vector.js
+++ b/examples/drag-and-drop-image-vector.js
@@ -145,7 +145,10 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });
diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js
index c481a7f9a9..830b6bc77b 100644
--- a/examples/drag-and-drop.js
+++ b/examples/drag-and-drop.js
@@ -141,7 +141,10 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });
diff --git a/examples/gpx.js b/examples/gpx.js
index 13024a6a2b..d98dceba31 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -85,7 +85,10 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });
diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js
index 79993c97bf..8487020b8b 100644
--- a/examples/icon-sprite-webgl.js
+++ b/examples/icon-sprite-webgl.js
@@ -132,7 +132,10 @@ map.on('click', function(evt) {
   }, 1);
 });
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   var hit = map.hasFeatureAtPixel(pixel);
   map.getTarget().style.cursor = hit ? 'pointer' : '';
diff --git a/examples/icon.js b/examples/icon.js
index 1316d68799..f435b0f0b5 100644
--- a/examples/icon.js
+++ b/examples/icon.js
@@ -86,7 +86,11 @@ map.on('click', function(evt) {
 });
 
 // change mouse cursor when over marker
-$(map.getViewport()).on('mousemove', function(e) {
+map.on('pointermove', function(e) {
+  if (e.dragging) {
+    $(element).popover('destroy');
+    return;
+  }
   var pixel = map.getEventPixel(e.originalEvent);
   var hit = map.hasFeatureAtPixel(pixel);
   map.getTarget().style.cursor = hit ? 'pointer' : '';
diff --git a/examples/igc.js b/examples/igc.js
index afb3e004bd..95b380dc1e 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -126,7 +126,10 @@ var displaySnap = function(coordinate) {
   map.render();
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var coordinate = map.getEventCoordinate(evt.originalEvent);
   displaySnap(coordinate);
 });
diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js
index 01e79fe4e8..6cf67e6450 100644
--- a/examples/image-vector-layer.js
+++ b/examples/image-vector-layer.js
@@ -80,7 +80,10 @@ var displayFeatureInfo = function(pixel) {
 
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index 793ebf4688..10ae729347 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -85,7 +85,11 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    info.tooltip('hide');
+    return;
+  }
   displayFeatureInfo(map.getEventPixel(evt.originalEvent));
 });
 
diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js
index f7b5244d9d..8b8038e167 100644
--- a/examples/kml-timezones.js
+++ b/examples/kml-timezones.js
@@ -92,7 +92,11 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    info.tooltip('hide');
+    return;
+  }
   displayFeatureInfo(map.getEventPixel(evt.originalEvent));
 });
 
diff --git a/examples/kml.js b/examples/kml.js
index ac86d71adc..33236288f3 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -52,7 +52,10 @@ var displayFeatureInfo = function(pixel) {
   }
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });
diff --git a/examples/measure.js b/examples/measure.js
index 6f6c9f27b6..5b624f9934 100644
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -57,7 +57,10 @@ var sketchElement;
  * handle pointer move
  * @param {Event} evt
  */
-var mouseMoveHandler = function(evt) {
+var pointerMoveHandler = function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   if (sketch) {
     var output;
     var geom = (sketch.getGeometry());
@@ -81,7 +84,7 @@ var map = new ol.Map({
   })
 });
 
-$(map.getViewport()).on('mousemove', mouseMoveHandler);
+map.on('pointermove', pointerMoveHandler);
 
 var typeSelect = document.getElementById('type');
 
diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js
index 4381fd355c..606eb7c1f8 100644
--- a/examples/synthetic-points.js
+++ b/examples/synthetic-points.js
@@ -83,7 +83,10 @@ var displaySnap = function(coordinate) {
   map.render();
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var coordinate = map.getEventCoordinate(evt.originalEvent);
   displaySnap(coordinate);
 });
@@ -116,13 +119,12 @@ map.on('postcompose', function(evt) {
   }
 });
 
-$(map.getViewport()).on('mousemove', function(e) {
-  var pixel = map.getEventPixel(e.originalEvent);
-
-  var hit = map.forEachFeatureAtPixel(pixel, function(feature, layer) {
-    return true;
-  });
-
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
+  var pixel = map.getEventPixel(evt.originalEvent);
+  var hit = map.hasFeatureAtPixel(pixel);
   if (hit) {
     map.getTarget().style.cursor = 'pointer';
   } else {
diff --git a/examples/tileutfgrid.js b/examples/tileutfgrid.js
index b6462e37dd..89a26759b3 100644
--- a/examples/tileutfgrid.js
+++ b/examples/tileutfgrid.js
@@ -58,7 +58,10 @@ var displayCountryInfo = function(coordinate) {
       });
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var coordinate = map.getEventCoordinate(evt.originalEvent);
   displayCountryInfo(coordinate);
 });
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 25f70d6cde..390ffe8081 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -114,7 +114,10 @@ var displayFeatureInfo = function(pixel) {
 
 };
 
-$(map.getViewport()).on('mousemove', function(evt) {
+map.on('pointermove', function(evt) {
+  if (evt.dragging) {
+    return;
+  }
   var pixel = map.getEventPixel(evt.originalEvent);
   displayFeatureInfo(pixel);
 });