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

Use named imports from extent

Browse Source
This commit is contained in:
Andreas Hocevar
2017-12-13 14:05:42 +01:00
parent 7247ccbf38
commit c0c43bca84
77 changed files with 360 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ol/interaction/DragZoom.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_easing_ from '../easing.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_extent_ from '../extent.js';
import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js';
import _ol_interaction_DragBox_ from '../interaction/DragBox.js';
/**
@@ -63,19 +63,19 @@ _ol_interaction_DragZoom_.prototype.onBoxEnd = function() {
if (this.out_) {
var mapExtent = view.calculateExtent(size);
var boxPixelExtent = _ol_extent_.createOrUpdateFromCoordinates([
map.getPixelFromCoordinate(_ol_extent_.getBottomLeft(extent)),
map.getPixelFromCoordinate(_ol_extent_.getTopRight(extent))]);
var boxPixelExtent = createOrUpdateFromCoordinates([
map.getPixelFromCoordinate(getBottomLeft(extent)),
map.getPixelFromCoordinate(getTopRight(extent))]);
var factor = view.getResolutionForExtent(boxPixelExtent, size);
_ol_extent_.scaleFromCenter(mapExtent, 1 / factor);
scaleFromCenter(mapExtent, 1 / factor);
extent = mapExtent;
}
var resolution = view.constrainResolution(
view.getResolutionForExtent(extent, size));
var center = _ol_extent_.getCenter(extent);
var center = getCenter(extent);
center = view.constrainCenter(center);
view.animate({

14
src/ol/interaction/Draw.js
View File

@@ -9,7 +9,7 @@ import _ol_coordinate_ from '../coordinate.js';
import _ol_events_ from '../events.js';
import _ol_events_Event_ from '../events/Event.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_extent_ from '../extent.js';
import {boundingExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../extent.js';
import _ol_functions_ from '../functions.js';
import _ol_geom_Circle_ from '../geom/Circle.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
@@ -823,14 +823,14 @@ _ol_interaction_Draw_.createBox = function() {
* @return {ol.geom.SimpleGeometry}
*/
function(coordinates, opt_geometry) {
var extent = _ol_extent_.boundingExtent(coordinates);
var extent = boundingExtent(coordinates);
var geometry = opt_geometry || new _ol_geom_Polygon_(null);
geometry.setCoordinates([[
_ol_extent_.getBottomLeft(extent),
_ol_extent_.getBottomRight(extent),
_ol_extent_.getTopRight(extent),
_ol_extent_.getTopLeft(extent),
_ol_extent_.getBottomLeft(extent)
getBottomLeft(extent),
getBottomRight(extent),
getTopRight(extent),
getTopLeft(extent),
getBottomLeft(extent)
]]);
return geometry;
}

10
src/ol/interaction/Extent.js
View File

@@ -7,7 +7,7 @@ import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
import _ol_coordinate_ from '../coordinate.js';
import _ol_events_Event_ from '../events/Event.js';
import _ol_extent_ from '../extent.js';
import {boundingExtent, getArea} from '../extent.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_Point_ from '../geom/Point.js';
import _ol_geom_Polygon_ from '../geom/Polygon.js';
@@ -230,7 +230,7 @@ _ol_interaction_Extent_.handleUpEvent_ = function(mapBrowserEvent) {
this.pointerHandler_ = null;
//If bbox is zero area, set to null;
var extent = this.getExtent();
if (!extent || _ol_extent_.getArea(extent) === 0) {
if (!extent || getArea(extent) === 0) {
this.setExtent(null);
}
return false; //Stop handling downup sequence
@@ -269,7 +269,7 @@ _ol_interaction_Extent_.getDefaultPointerStyleFunction_ = function() {
*/
_ol_interaction_Extent_.getPointHandler_ = function(fixedPoint) {
return function(point) {
return _ol_extent_.boundingExtent([fixedPoint, point]);
return boundingExtent([fixedPoint, point]);
};
};
@@ -282,11 +282,11 @@ _ol_interaction_Extent_.getPointHandler_ = function(fixedPoint) {
_ol_interaction_Extent_.getEdgeHandler_ = function(fixedP1, fixedP2) {
if (fixedP1[0] == fixedP2[0]) {
return function(point) {
return _ol_extent_.boundingExtent([fixedP1, [point[0], fixedP2[1]]]);
return boundingExtent([fixedP1, [point[0], fixedP2[1]]]);
};
} else if (fixedP1[1] == fixedP2[1]) {
return function(point) {
return _ol_extent_.boundingExtent([fixedP1, [fixedP2[0], point[1]]]);
return boundingExtent([fixedP1, [fixedP2[0], point[1]]]);
};
} else {
return null;

27
src/ol/interaction/Modify.js
View File

@@ -13,7 +13,7 @@ import _ol_events_ from '../events.js';
import _ol_events_Event_ from '../events/Event.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_extent_ from '../extent.js';
import {boundingExtent, buffer, createOrUpdateFromCoordinate} from '../extent.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_Point_ from '../geom/Point.js';
import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js';
@@ -442,7 +442,7 @@ _ol_interaction_Modify_.prototype.writeLineStringGeometry_ = function(feature, g
index: i,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
};
@@ -466,7 +466,7 @@ _ol_interaction_Modify_.prototype.writeMultiLineStringGeometry_ = function(featu
index: i,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
};
@@ -491,7 +491,7 @@ _ol_interaction_Modify_.prototype.writePolygonGeometry_ = function(feature, geom
index: i,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
};
@@ -518,7 +518,7 @@ _ol_interaction_Modify_.prototype.writeMultiPolygonGeometry_ = function(feature,
index: i,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
}
@@ -552,7 +552,7 @@ _ol_interaction_Modify_.prototype.writeCircleGeometry_ = function(feature, geome
});
var featureSegments = [centerSegmentData, circumferenceSegmentData];
centerSegmentData.featureSegments = circumferenceSegmentData.featureSegments = featureSegments;
this.rBush_.insert(_ol_extent_.createOrUpdateFromCoordinate(coordinates), centerSegmentData);
this.rBush_.insert(createOrUpdateFromCoordinate(coordinates), centerSegmentData);
this.rBush_.insert(geometry.getExtent(), circumferenceSegmentData);
};
@@ -620,7 +620,7 @@ _ol_interaction_Modify_.handleDownEvent_ = function(evt) {
var insertVertices = [];
var geometry = /** @type {ol.geom.Point} */ (vertexFeature.getGeometry());
var vertex = geometry.getCoordinates();
var vertexExtent = _ol_extent_.boundingExtent([vertex]);
var vertexExtent = boundingExtent([vertex]);
var segmentDataMatches = this.rBush_.getInExtent(vertexExtent);
var componentSegments = {};
segmentDataMatches.sort(_ol_interaction_Modify_.compareIndexes_);
@@ -774,10 +774,10 @@ _ol_interaction_Modify_.handleUpEvent_ = function(evt) {
var circumferenceSegmentData = segmentData.featureSegments[1];
centerSegmentData.segment[0] = centerSegmentData.segment[1] = coordinates;
circumferenceSegmentData.segment[0] = circumferenceSegmentData.segment[1] = coordinates;
this.rBush_.update(_ol_extent_.createOrUpdateFromCoordinate(coordinates), centerSegmentData);
this.rBush_.update(createOrUpdateFromCoordinate(coordinates), centerSegmentData);
this.rBush_.update(geometry.getExtent(), circumferenceSegmentData);
} else {
this.rBush_.update(_ol_extent_.boundingExtent(segmentData.segment),
this.rBush_.update(boundingExtent(segmentData.segment),
segmentData);
}
}
@@ -850,8 +850,7 @@ _ol_interaction_Modify_.prototype.handlePointerAtPixel_ = function(pixel, map) {
_ol_interaction_Modify_.pointDistanceToSegmentDataSquared_(pixelCoordinate, b);
};
var box = _ol_extent_.buffer(
_ol_extent_.createOrUpdateFromCoordinate(pixelCoordinate),
var box = buffer(createOrUpdateFromCoordinate(pixelCoordinate),
map.getView().getResolution() * this.pixelTolerance_);
var rBush = this.rBush_;
@@ -1004,7 +1003,7 @@ _ol_interaction_Modify_.prototype.insertVertex_ = function(segmentData, vertex)
depth: depth,
index: index
});
rTree.insert(_ol_extent_.boundingExtent(newSegmentData.segment),
rTree.insert(boundingExtent(newSegmentData.segment),
newSegmentData);
this.dragSegments_.push([newSegmentData, 1]);
@@ -1015,7 +1014,7 @@ _ol_interaction_Modify_.prototype.insertVertex_ = function(segmentData, vertex)
depth: depth,
index: index + 1
});
rTree.insert(_ol_extent_.boundingExtent(newSegmentData2.segment),
rTree.insert(boundingExtent(newSegmentData2.segment),
newSegmentData2);
this.dragSegments_.push([newSegmentData2, 0]);
this.ignoreNextSingleClick_ = true;
@@ -1142,7 +1141,7 @@ _ol_interaction_Modify_.prototype.removeVertex_ = function() {
index: newIndex,
segment: segments
});
this.rBush_.insert(_ol_extent_.boundingExtent(newSegmentData.segment),
this.rBush_.insert(boundingExtent(newSegmentData.segment),
newSegmentData);
}
this.updateSegmentIndices_(geometry, index, segmentData.depth, -1);

17
src/ol/interaction/Snap.js
View File

@@ -7,7 +7,7 @@ import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_coordinate_ from '../coordinate.js';
import _ol_events_ from '../events.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_extent_ from '../extent.js';
import {boundingExtent, createEmpty} from '../extent.js';
import _ol_functions_ from '../functions.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_Polygon_ from '../geom/Polygon.js';
@@ -166,8 +166,7 @@ _ol_interaction_Snap_.prototype.addFeature = function(feature, opt_listen) {
if (geometry) {
var segmentWriter = this.SEGMENT_WRITERS_[geometry.getType()];
if (segmentWriter) {
this.indexedFeaturesExtents_[feature_uid] = geometry.getExtent(
_ol_extent_.createEmpty());
this.indexedFeaturesExtents_[feature_uid] = geometry.getExtent(createEmpty());
segmentWriter.call(this, feature, geometry);
}
}
@@ -346,7 +345,7 @@ _ol_interaction_Snap_.prototype.snapTo = function(pixel, pixelCoordinate, map) {
[pixel[0] - this.pixelTolerance_, pixel[1] + this.pixelTolerance_]);
var upperRight = map.getCoordinateFromPixel(
[pixel[0] + this.pixelTolerance_, pixel[1] - this.pixelTolerance_]);
var box = _ol_extent_.boundingExtent([lowerLeft, upperRight]);
var box = boundingExtent([lowerLeft, upperRight]);
var segments = this.rBush_.getInExtent(box);
@@ -445,7 +444,7 @@ _ol_interaction_Snap_.prototype.writeCircleGeometry_ = function(feature, geometr
feature: feature,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
};
@@ -480,7 +479,7 @@ _ol_interaction_Snap_.prototype.writeLineStringGeometry_ = function(feature, geo
feature: feature,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
};
@@ -501,7 +500,7 @@ _ol_interaction_Snap_.prototype.writeMultiLineStringGeometry_ = function(feature
feature: feature,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
};
@@ -544,7 +543,7 @@ _ol_interaction_Snap_.prototype.writeMultiPolygonGeometry_ = function(feature, g
feature: feature,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
}
@@ -582,7 +581,7 @@ _ol_interaction_Snap_.prototype.writePolygonGeometry_ = function(feature, geomet
feature: feature,
segment: segment
});
this.rBush_.insert(_ol_extent_.boundingExtent(segment), segmentData);
this.rBush_.insert(boundingExtent(segment), segmentData);
}
}
};