ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3396 from fredj/sort-compareFn

Browse Source 
Move the compare function out of ol.interaction.Modify.handleDownEvent_
This commit is contained in:
Frédéric Junod
2015-03-25 14:57:50 +01:00
parent 683097d62a 6a770f03b8
commit bb87b8e7ce
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ol/interaction/modifyinteraction.js
View File

@@ -391,6 +391,17 @@ ol.interaction.Modify.prototype.createOrUpdateVertexFeature_ =
};
/**
* @param {ol.interaction.SegmentDataType} a
* @param {ol.interaction.SegmentDataType} b
* @return {number}
* @private
*/
ol.interaction.Modify.compareIndexes_ = function(a, b) {
return a.index - b.index;
};
/**
* @param {ol.MapBrowserPointerEvent} evt Event.
* @return {boolean} Start drag sequence?
@@ -398,13 +409,6 @@ ol.interaction.Modify.prototype.createOrUpdateVertexFeature_ =
* @private
*/
ol.interaction.Modify.handleDownEvent_ = function(evt) {
/**
* @param {ol.interaction.SegmentDataType} a
* @param {ol.interaction.SegmentDataType} b
* @return {number}
*/
function sorter(a, b) { return a.index - b.index; }
this.handlePointerAtPixel_(evt.pixel, evt.map);
this.dragSegments_ = [];
var vertexFeature = this.vertexFeature_;
@@ -415,7 +419,7 @@ ol.interaction.Modify.handleDownEvent_ = function(evt) {
var vertexExtent = ol.extent.boundingExtent([vertex]);
var segmentDataMatches = this.rBush_.getInExtent(vertexExtent);
var componentSegments = {};
segmentDataMatches.sort(sorter);
segmentDataMatches.sort(ol.interaction.Modify.compareIndexes_);
for (var i = 0, ii = segmentDataMatches.length; i < ii; ++i) {
var segmentDataMatch = segmentDataMatches[i];
var segment = segmentDataMatch.segment;