Merge pull request #6499 from tchandelle/circle-modify

Be more tolerant when comparing vertices when modifying a circle
openlayers · Feb 16, 2017 · b05136e · b05136e
2 parents 6020c14 + 9bf6dcb
commit b05136e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ol/interaction/modify.js b/src/ol/interaction/modify.js
@@ -550,6 +550,7 @@ ol.interaction.Modify.handleDownEvent_ = function(evt) {
     return false;
   }
   this.handlePointerAtPixel_(evt.pixel, evt.map);
+  var pixelCoordinate = evt.map.getCoordinateFromPixel(evt.pixel);
   this.dragSegments_.length = 0;
   this.modified_ = false;
   var vertexFeature = this.vertexFeature_;
@@ -575,7 +576,7 @@ ol.interaction.Modify.handleDownEvent_ = function(evt) {
       if (segmentDataMatch.geometry.getType() === ol.geom.GeometryType.CIRCLE &&
       segmentDataMatch.index === ol.interaction.Modify.MODIFY_SEGMENT_CIRCLE_CIRCUMFERENCE_INDEX) {
 
-        var closestVertex = ol.interaction.Modify.closestOnSegmentData_(vertex, segmentDataMatch);
+        var closestVertex = ol.interaction.Modify.closestOnSegmentData_(pixelCoordinate, segmentDataMatch);
         if (ol.coordinate.equals(closestVertex, vertex) && !componentSegments[uid][0]) {
           this.dragSegments_.push([segmentDataMatch, 0]);
           componentSegments[uid][0] = segmentDataMatch;

diff --git a/test/spec/ol/interaction/modify.test.js b/test/spec/ol/interaction/modify.test.js
@@ -392,8 +392,8 @@ describe('ol.interaction.Modify', function() {
       expect(circleFeature.getGeometry().getCenter()).to.eql([5, 5]);
 
       // Increase radius
-      simulateEvent('pointermove', 25, -5, false, 0);
-      simulateEvent('pointerdown', 25, -5, false, 0);
+      simulateEvent('pointermove', 25, -4, false, 0);
+      simulateEvent('pointerdown', 25, -4, false, 0);
       simulateEvent('pointermove', 30, -5, false, 0);
       simulateEvent('pointerdrag', 30, -5, false, 0);
       simulateEvent('pointerup', 30, -5, false, 0);