Use dragging in examples

This commit is contained in:
tsauerwein
2015-01-30 09:16:19 +01:00
parent f2518e4c08
commit 9cc8390dfd
14 changed files with 66 additions and 22 deletions

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

View File

@@ -132,7 +132,10 @@ map.on('click', function(evt) {
}, 1); }, 1);
}); });
$(map.getViewport()).on('mousemove', function(evt) { map.on('pointermove', function(evt) {
if (evt.dragging) {
return;
}
var pixel = map.getEventPixel(evt.originalEvent); var pixel = map.getEventPixel(evt.originalEvent);
var hit = map.hasFeatureAtPixel(pixel); var hit = map.hasFeatureAtPixel(pixel);
map.getTarget().style.cursor = hit ? 'pointer' : ''; map.getTarget().style.cursor = hit ? 'pointer' : '';

View File

@@ -86,7 +86,11 @@ map.on('click', function(evt) {
}); });
// change mouse cursor when over marker // 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 pixel = map.getEventPixel(e.originalEvent);
var hit = map.hasFeatureAtPixel(pixel); var hit = map.hasFeatureAtPixel(pixel);
map.getTarget().style.cursor = hit ? 'pointer' : ''; map.getTarget().style.cursor = hit ? 'pointer' : '';

View File

@@ -126,7 +126,10 @@ var displaySnap = function(coordinate) {
map.render(); map.render();
}; };
$(map.getViewport()).on('mousemove', function(evt) { map.on('pointermove', function(evt) {
if (evt.dragging) {
return;
}
var coordinate = map.getEventCoordinate(evt.originalEvent); var coordinate = map.getEventCoordinate(evt.originalEvent);
displaySnap(coordinate); displaySnap(coordinate);
}); });

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

View File

@@ -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)); displayFeatureInfo(map.getEventPixel(evt.originalEvent));
}); });

View File

@@ -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)); displayFeatureInfo(map.getEventPixel(evt.originalEvent));
}); });

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

View File

@@ -57,7 +57,10 @@ var sketchElement;
* handle pointer move * handle pointer move
* @param {Event} evt * @param {Event} evt
*/ */
var mouseMoveHandler = function(evt) { var pointerMoveHandler = function(evt) {
if (evt.dragging) {
return;
}
if (sketch) { if (sketch) {
var output; var output;
var geom = (sketch.getGeometry()); 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'); var typeSelect = document.getElementById('type');

View File

@@ -83,7 +83,10 @@ var displaySnap = function(coordinate) {
map.render(); map.render();
}; };
$(map.getViewport()).on('mousemove', function(evt) { map.on('pointermove', function(evt) {
if (evt.dragging) {
return;
}
var coordinate = map.getEventCoordinate(evt.originalEvent); var coordinate = map.getEventCoordinate(evt.originalEvent);
displaySnap(coordinate); displaySnap(coordinate);
}); });
@@ -116,13 +119,12 @@ map.on('postcompose', function(evt) {
} }
}); });
$(map.getViewport()).on('mousemove', function(e) { map.on('pointermove', function(evt) {
var pixel = map.getEventPixel(e.originalEvent); if (evt.dragging) {
return;
var hit = map.forEachFeatureAtPixel(pixel, function(feature, layer) { }
return true; var pixel = map.getEventPixel(evt.originalEvent);
}); var hit = map.hasFeatureAtPixel(pixel);
if (hit) { if (hit) {
map.getTarget().style.cursor = 'pointer'; map.getTarget().style.cursor = 'pointer';
} else { } else {

View File

@@ -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); var coordinate = map.getEventCoordinate(evt.originalEvent);
displayCountryInfo(coordinate); displayCountryInfo(coordinate);
}); });

View File

@@ -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); var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });