diff --git a/src/ol/Graticule.js b/src/ol/Graticule.js index 07bf3b887a..ad15ccaebf 100644 --- a/src/ol/Graticule.js +++ b/src/ol/Graticule.js @@ -2,7 +2,7 @@ * @module ol/Graticule */ import _ol_coordinate_ from './coordinate.js'; -import _ol_extent_ from './extent.js'; +import {intersects, getCenter} from './extent.js'; import _ol_geom_GeometryLayout_ from './geom/GeometryLayout.js'; import _ol_geom_LineString_ from './geom/LineString.js'; import _ol_geom_Point_ from './geom/Point.js'; @@ -254,7 +254,7 @@ _ol_Graticule_.intervals_ = [90, 45, 30, 20, 10, 5, 2, 1, 0.5, 0.2, 0.1, 0.05, _ol_Graticule_.prototype.addMeridian_ = function(lon, minLat, maxLat, squaredTolerance, extent, index) { var lineString = this.getMeridian_(lon, minLat, maxLat, squaredTolerance, index); - if (_ol_extent_.intersects(lineString.getExtent(), extent)) { + if (intersects(lineString.getExtent(), extent)) { if (this.meridiansLabels_) { var textPoint = this.getMeridianPoint_(lineString, extent, index); this.meridiansLabels_[index] = { @@ -302,7 +302,7 @@ _ol_Graticule_.prototype.getMeridianPoint_ = function(lineString, extent, index) _ol_Graticule_.prototype.addParallel_ = function(lat, minLon, maxLon, squaredTolerance, extent, index) { var lineString = this.getParallel_(lat, minLon, maxLon, squaredTolerance, index); - if (_ol_extent_.intersects(lineString.getExtent(), extent)) { + if (intersects(lineString.getExtent(), extent)) { if (this.parallelsLabels_) { var textPoint = this.getParallelPoint_(lineString, extent, index); this.parallelsLabels_[index] = { @@ -632,8 +632,7 @@ _ol_Graticule_.prototype.updateProjectionInfo_ = function(projection) { this.toLonLatTransform_ = _ol_proj_.getTransform( projection, epsg4326Projection); - this.projectionCenterLonLat_ = this.toLonLatTransform_( - _ol_extent_.getCenter(extent)); + this.projectionCenterLonLat_ = this.toLonLatTransform_(getCenter(extent)); this.projection_ = projection; }; diff --git a/src/ol/Image.js b/src/ol/Image.js index ae4c7fce1e..f694b2e1e8 100644 --- a/src/ol/Image.js +++ b/src/ol/Image.js @@ -6,7 +6,7 @@ import _ol_ImageBase_ from './ImageBase.js'; import _ol_ImageState_ from './ImageState.js'; import _ol_events_ from './events.js'; import _ol_events_EventType_ from './events/EventType.js'; -import _ol_extent_ from './extent.js'; +import {getHeight} from './extent.js'; /** * @constructor @@ -88,7 +88,7 @@ _ol_Image_.prototype.handleImageError_ = function() { */ _ol_Image_.prototype.handleImageLoad_ = function() { if (this.resolution === undefined) { - this.resolution = _ol_extent_.getHeight(this.extent) / this.image_.height; + this.resolution = getHeight(this.extent) / this.image_.height; } this.state = _ol_ImageState_.LOADED; this.unlistenImage_(); diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js index ffc10b58c7..5daa65d2af 100644 --- a/src/ol/Overlay.js +++ b/src/ol/Overlay.js @@ -8,7 +8,7 @@ import _ol_OverlayPositioning_ from './OverlayPositioning.js'; import _ol_css_ from './css.js'; import _ol_dom_ from './dom.js'; import _ol_events_ from './events.js'; -import _ol_extent_ from './extent.js'; +import {containsExtent} from './extent.js'; /** * @classdesc @@ -363,7 +363,7 @@ _ol_Overlay_.prototype.panIntoView = function() { [_ol_dom_.outerWidth(element), _ol_dom_.outerHeight(element)]); var margin = this.autoPanMargin; - if (!_ol_extent_.containsExtent(mapRect, overlayRect)) { + if (!containsExtent(mapRect, overlayRect)) { // the overlay is not completely inside the viewport, so pan the map var offsetLeft = overlayRect[0] - mapRect[0]; var offsetRight = mapRect[2] - overlayRect[2]; diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index c72de4f313..c4d19859e9 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -20,7 +20,7 @@ import _ol_dom_ from './dom.js'; import _ol_events_ from './events.js'; import _ol_events_Event_ from './events/Event.js'; import _ol_events_EventType_ from './events/EventType.js'; -import _ol_extent_ from './extent.js'; +import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEmpty} from './extent.js'; import _ol_functions_ from './functions.js'; import _ol_has_ from './has.js'; import _ol_layer_Group_ from './layer/Group.js'; @@ -1135,7 +1135,7 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) { var size = this.getSize(); var view = this.getView(); - var extent = _ol_extent_.createEmpty(); + var extent = createEmpty(); var previousFrameState = this.frameState_; /** @type {?olx.FrameState} */ var frameState = null; @@ -1175,7 +1175,7 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) { } if (frameState) { - frameState.extent = _ol_extent_.getForViewAndSize(viewState.center, + frameState.extent = getForViewAndSize(viewState.center, viewState.resolution, viewState.rotation, frameState.size, extent); } @@ -1191,24 +1191,24 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) { if (previousFrameState) { var moveStart = !this.previousExtent_ || - (!_ol_extent_.isEmpty(this.previousExtent_) && - !_ol_extent_.equals(frameState.extent, this.previousExtent_)); + (!isEmpty(this.previousExtent_) && + !equals(frameState.extent, this.previousExtent_)); if (moveStart) { this.dispatchEvent( new _ol_MapEvent_(_ol_MapEventType_.MOVESTART, this, previousFrameState)); - this.previousExtent_ = _ol_extent_.createOrUpdateEmpty(this.previousExtent_); + this.previousExtent_ = createOrUpdateEmpty(this.previousExtent_); } } var idle = this.previousExtent_ && !frameState.viewHints[_ol_ViewHint_.ANIMATING] && !frameState.viewHints[_ol_ViewHint_.INTERACTING] && - !_ol_extent_.equals(frameState.extent, this.previousExtent_); + !equals(frameState.extent, this.previousExtent_); if (idle) { this.dispatchEvent( new _ol_MapEvent_(_ol_MapEventType_.MOVEEND, this, frameState)); - _ol_extent_.clone(frameState.extent, this.previousExtent_); + clone(frameState.extent, this.previousExtent_); } } diff --git a/src/ol/VectorImageTile.js b/src/ol/VectorImageTile.js index 7c9f42c355..ff24693c2c 100644 --- a/src/ol/VectorImageTile.js +++ b/src/ol/VectorImageTile.js @@ -6,7 +6,7 @@ import _ol_Tile_ from './Tile.js'; import _ol_TileState_ from './TileState.js'; import _ol_dom_ from './dom.js'; import _ol_events_ from './events.js'; -import _ol_extent_ from './extent.js'; +import {getHeight, getIntersection, getWidth} from './extent.js'; import _ol_events_EventType_ from './events/EventType.js'; import _ol_featureloader_ from './featureloader.js'; @@ -93,14 +93,14 @@ var _ol_VectorImageTile_ = function(tileCoord, state, sourceRevision, format, var resolution = tileGrid.getResolution(tileCoord[0]); var sourceZ = sourceTileGrid.getZForResolution(resolution); sourceTileGrid.forEachTileCoord(extent, sourceZ, function(sourceTileCoord) { - var sharedExtent = _ol_extent_.getIntersection(extent, + var sharedExtent = getIntersection(extent, sourceTileGrid.getTileCoordExtent(sourceTileCoord)); var sourceExtent = sourceTileGrid.getExtent(); if (sourceExtent) { - sharedExtent = _ol_extent_.getIntersection(sharedExtent, sourceExtent); + sharedExtent = getIntersection(sharedExtent, sourceExtent); } - if (_ol_extent_.getWidth(sharedExtent) / resolution >= 0.5 && - _ol_extent_.getHeight(sharedExtent) / resolution >= 0.5) { + if (getWidth(sharedExtent) / resolution >= 0.5 && + getHeight(sharedExtent) / resolution >= 0.5) { // only include source tile if overlap is at least 1 pixel var sourceTileKey = sourceTileCoord.toString(); var sourceTile = sourceTiles[sourceTileKey]; diff --git a/src/ol/View.js b/src/ol/View.js index 6d1bbe8eb4..5146cbfcb6 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -13,7 +13,7 @@ import _ol_array_ from './array.js'; import _ol_asserts_ from './asserts.js'; import _ol_coordinate_ from './coordinate.js'; import _ol_easing_ from './easing.js'; -import _ol_extent_ from './extent.js'; +import {getForViewAndSize, getCenter, getHeight, getWidth, isEmpty} from './extent.js'; import _ol_geom_GeometryType_ from './geom/GeometryType.js'; import _ol_geom_Polygon_ from './geom/Polygon.js'; import _ol_geom_SimpleGeometry_ from './geom/SimpleGeometry.js'; @@ -614,7 +614,7 @@ _ol_View_.prototype.calculateExtent = function(opt_size) { var rotation = /** @type {!number} */ (this.getRotation()); _ol_asserts_.assert(rotation !== undefined, 3); // The view rotation is not defined - return _ol_extent_.getForViewAndSize(center, resolution, rotation, size); + return getForViewAndSize(center, resolution, rotation, size); }; @@ -722,8 +722,8 @@ _ol_View_.prototype.getResolutions = function() { */ _ol_View_.prototype.getResolutionForExtent = function(extent, opt_size) { var size = opt_size || this.getSizeFromViewport_(); - var xResolution = _ol_extent_.getWidth(extent) / size[0]; - var yResolution = _ol_extent_.getHeight(extent) / size[1]; + var xResolution = getWidth(extent) / size[0]; + var yResolution = getHeight(extent) / size[1]; return Math.max(xResolution, yResolution); }; @@ -882,13 +882,13 @@ _ol_View_.prototype.fit = function(geometryOrExtent, opt_options) { if (!(geometryOrExtent instanceof _ol_geom_SimpleGeometry_)) { _ol_asserts_.assert(Array.isArray(geometryOrExtent), 24); // Invalid extent or geometry provided as `geometry` - _ol_asserts_.assert(!_ol_extent_.isEmpty(geometryOrExtent), + _ol_asserts_.assert(!isEmpty(geometryOrExtent), 25); // Cannot fit empty extent provided as `geometry` geometry = _ol_geom_Polygon_.fromExtent(geometryOrExtent); } else if (geometryOrExtent.getType() === _ol_geom_GeometryType_.CIRCLE) { geometryOrExtent = geometryOrExtent.getExtent(); geometry = _ol_geom_Polygon_.fromExtent(geometryOrExtent); - geometry.rotate(this.getRotation(), _ol_extent_.getCenter(geometryOrExtent)); + geometry.rotate(this.getRotation(), getCenter(geometryOrExtent)); } else { geometry = geometryOrExtent; } @@ -1135,7 +1135,7 @@ _ol_View_.createResolutionConstraint_ = function(options) { // use an extent that can fit the whole world if need be 360 * _ol_proj_.METERS_PER_UNIT[_ol_proj_Units_.DEGREES] / projection.getMetersPerUnit() : - Math.max(_ol_extent_.getWidth(extent), _ol_extent_.getHeight(extent)); + Math.max(getWidth(extent), getHeight(extent)); var defaultMaxResolution = size / DEFAULT_TILE_SIZE / Math.pow( defaultZoomFactor, DEFAULT_MIN_ZOOM); diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index b3c0104fee..56077bbb79 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -17,7 +17,7 @@ import _ol_css_ from '../css.js'; import _ol_dom_ from '../dom.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight, scaleFromCenter} from '../extent.js'; /** @@ -341,9 +341,9 @@ _ol_control_OverviewMap_.prototype.validateExtent_ = function() { var ovextent = ovview.calculateExtent(ovmapSize); var topLeftPixel = - ovmap.getPixelFromCoordinate(_ol_extent_.getTopLeft(extent)); + ovmap.getPixelFromCoordinate(getTopLeft(extent)); var bottomRightPixel = - ovmap.getPixelFromCoordinate(_ol_extent_.getBottomRight(extent)); + ovmap.getPixelFromCoordinate(getBottomRight(extent)); var boxWidth = Math.abs(topLeftPixel[0] - bottomRightPixel[0]); var boxHeight = Math.abs(topLeftPixel[1] - bottomRightPixel[1]); @@ -356,7 +356,7 @@ _ol_control_OverviewMap_.prototype.validateExtent_ = function() { boxWidth > ovmapWidth * MAX_RATIO || boxHeight > ovmapHeight * MAX_RATIO) { this.resetExtent_(); - } else if (!_ol_extent_.containsExtent(ovextent, extent)) { + } else if (!containsExtent(ovextent, extent)) { this.recenter_(); } }; @@ -388,7 +388,7 @@ _ol_control_OverviewMap_.prototype.resetExtent_ = function() { var steps = Math.log( MAX_RATIO / MIN_RATIO) / Math.LN2; var ratio = 1 / (Math.pow(2, steps / 2) * MIN_RATIO); - _ol_extent_.scaleFromCenter(extent, ratio); + scaleFromCenter(extent, ratio); ovview.fit(extent); }; @@ -434,8 +434,8 @@ _ol_control_OverviewMap_.prototype.updateBox_ = function() { var box = this.boxOverlay_.getElement(); var extent = view.calculateExtent(mapSize); var ovresolution = ovview.getResolution(); - var bottomLeft = _ol_extent_.getBottomLeft(extent); - var topRight = _ol_extent_.getTopRight(extent); + var bottomLeft = getBottomLeft(extent); + var topRight = getTopRight(extent); // set position using bottom left coordinates var rotateBottomLeft = this.calculateCoordinateRotate_(rotation, bottomLeft); diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 74f5bc1ec0..32aaaf1753 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import _ol_Feature_ from '../Feature.js'; import _ol_asserts_ from '../asserts.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent} from '../extent.js'; import _ol_format_Feature_ from '../format/Feature.js'; import _ol_format_JSONFeature_ from '../format/JSONFeature.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; @@ -123,7 +123,7 @@ _ol_format_EsriJSON_.convertRings_ = function(rings, layout) { // loop over all outer rings and see if they contain our hole. for (i = outerRings.length - 1; i >= 0; i--) { var outerRing = outerRings[i][0]; - var containsHole = _ol_extent_.containsExtent( + var containsHole = containsExtent( new _ol_geom_LinearRing_(outerRing).getExtent(), new _ol_geom_LinearRing_(hole).getExtent() ); diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index 20144c57ab..190ccb21f4 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -2,7 +2,7 @@ * @module ol/format/GML2 */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdate} from '../extent.js'; import _ol_format_Feature_ from '../format/Feature.js'; import _ol_format_GMLBase_ from '../format/GMLBase.js'; import _ol_format_XSD_ from '../format/XSD.js'; @@ -96,7 +96,7 @@ _ol_format_GML2_.prototype.readBox_ = function(node, objectStack) { /** @type {Array.} */ var flatCoordinates = _ol_xml_.pushParseAndPop([null], this.BOX_PARSERS_, node, objectStack, this); - return _ol_extent_.createOrUpdate(flatCoordinates[1][0], + return createOrUpdate(flatCoordinates[1][0], flatCoordinates[1][1], flatCoordinates[1][3], flatCoordinates[1][4]); }; diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index 77bd97372b..dd6507d981 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdate} from '../extent.js'; import _ol_format_Feature_ from '../format/Feature.js'; import _ol_format_GMLBase_ from '../format/GMLBase.js'; import _ol_format_XSD_ from '../format/XSD.js'; @@ -291,7 +291,7 @@ _ol_format_GML3_.prototype.readEnvelope_ = function(node, objectStack) { /** @type {Array.} */ var flatCoordinates = _ol_xml_.pushParseAndPop([null], this.ENVELOPE_PARSERS_, node, objectStack, this); - return _ol_extent_.createOrUpdate(flatCoordinates[1][0], + return createOrUpdate(flatCoordinates[1][0], flatCoordinates[1][1], flatCoordinates[2][0], flatCoordinates[2][1]); }; diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index f636d9e29d..8e7e5d4143 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -2,7 +2,7 @@ * @module ol/format/WMTSCapabilities */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {boundingExtent} from '../extent.js'; import _ol_format_OWS_ from '../format/OWS.js'; import _ol_format_XLink_ from '../format/XLink.js'; import _ol_format_XML_ from '../format/XML.js'; @@ -186,7 +186,7 @@ _ol_format_WMTSCapabilities_.readWgs84BoundingBox_ = function(node, objectStack) if (coordinates.length != 2) { return undefined; } - return _ol_extent_.boundingExtent(coordinates); + return boundingExtent(coordinates); }; diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index a84bf31a62..ac279fe272 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -2,7 +2,7 @@ * @module ol/geom/Circle */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdate, forEachCorner, intersects} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js'; @@ -98,7 +98,7 @@ _ol_geom_Circle_.prototype.getCenter = function() { _ol_geom_Circle_.prototype.computeExtent = function(extent) { var flatCoordinates = this.flatCoordinates; var radius = flatCoordinates[this.stride] - flatCoordinates[0]; - return _ol_extent_.createOrUpdate( + return createOrUpdate( flatCoordinates[0] - radius, flatCoordinates[1] - radius, flatCoordinates[0] + radius, flatCoordinates[1] + radius, extent); @@ -141,7 +141,7 @@ _ol_geom_Circle_.prototype.getType = function() { */ _ol_geom_Circle_.prototype.intersectsExtent = function(extent) { var circleExtent = this.getExtent(); - if (_ol_extent_.intersects(extent, circleExtent)) { + if (intersects(extent, circleExtent)) { var center = this.getCenter(); if (extent[0] <= center[0] && extent[2] >= center[0]) { @@ -151,7 +151,7 @@ _ol_geom_Circle_.prototype.intersectsExtent = function(extent) { return true; } - return _ol_extent_.forEachCorner(extent, this.intersectsCoordinate, this); + return forEachCorner(extent, this.intersectsCoordinate, this); } return false; diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index 6131bf73cb..4fd9781f01 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_Object_ from '../Object.js'; -import _ol_extent_ from '../extent.js'; +import {createEmpty, getHeight, returnOrUpdate} from '../extent.js'; import _ol_functions_ from '../functions.js'; import _ol_geom_flat_transform_ from '../geom/flat/transform.js'; import _ol_proj_ from '../proj.js'; @@ -32,7 +32,7 @@ var _ol_geom_Geometry_ = function() { * @private * @type {ol.Extent} */ - this.extent_ = _ol_extent_.createEmpty(); + this.extent_ = createEmpty(); /** * @private @@ -143,7 +143,7 @@ _ol_geom_Geometry_.prototype.getExtent = function(opt_extent) { this.extent_ = this.computeExtent(this.extent_); this.extentRevision_ = this.getRevision(); } - return _ol_extent_.returnOrUpdate(this.extent_, opt_extent); + return returnOrUpdate(this.extent_, opt_extent); }; @@ -260,7 +260,7 @@ _ol_geom_Geometry_.prototype.transform = function(source, destination) { function(inCoordinates, outCoordinates, stride) { var pixelExtent = source.getExtent(); var projectedExtent = source.getWorldExtent(); - var scale = _ol_extent_.getHeight(projectedExtent) / _ol_extent_.getHeight(pixelExtent); + var scale = getHeight(projectedExtent) / getHeight(pixelExtent); _ol_transform_.compose(tmpTransform, projectedExtent[0], projectedExtent[3], scale, -scale, 0, diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index e8a76aeacc..d2f54e4bca 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js'; import _ol_geom_Geometry_ from '../geom/Geometry.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_obj_ from '../obj.js'; @@ -98,8 +98,7 @@ _ol_geom_GeometryCollection_.prototype.clone = function() { * @inheritDoc */ _ol_geom_GeometryCollection_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } var geometries = this.geometries_; @@ -131,10 +130,10 @@ _ol_geom_GeometryCollection_.prototype.containsXY = function(x, y) { * @inheritDoc */ _ol_geom_GeometryCollection_.prototype.computeExtent = function(extent) { - _ol_extent_.createOrUpdateEmpty(extent); + createOrUpdateEmpty(extent); var geometries = this.geometries_; for (var i = 0, ii = geometries.length; i < ii; ++i) { - _ol_extent_.extend(extent, geometries[i].getExtent()); + extend(extent, geometries[i].getExtent()); } return extent; }; @@ -254,7 +253,7 @@ _ol_geom_GeometryCollection_.prototype.rotate = function(angle, anchor) { _ol_geom_GeometryCollection_.prototype.scale = function(sx, opt_sy, opt_anchor) { var anchor = opt_anchor; if (!anchor) { - anchor = _ol_extent_.getCenter(this.getExtent()); + anchor = getCenter(this.getExtent()); } var geometries = this.geometries_; for (var i = 0, ii = geometries.length; i < ii; ++i) { diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index f1db362181..1365e3e6ee 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js'; @@ -93,8 +93,7 @@ _ol_geom_LineString_.prototype.clone = function() { * @inheritDoc */ _ol_geom_LineString_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } if (this.maxDeltaRevision_ != this.getRevision()) { diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 6e207912ec..603d7072a3 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -2,7 +2,7 @@ * @module ol/geom/LinearRing */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js'; @@ -63,8 +63,7 @@ _ol_geom_LinearRing_.prototype.clone = function() { * @inheritDoc */ _ol_geom_LinearRing_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } if (this.maxDeltaRevision_ != this.getRevision()) { diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index f29ac628a1..983f59e5f1 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_LineString_ from '../geom/LineString.js'; @@ -89,8 +89,7 @@ _ol_geom_MultiLineString_.prototype.clone = function() { * @inheritDoc */ _ol_geom_MultiLineString_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } if (this.maxDeltaRevision_ != this.getRevision()) { diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index c25f24fd86..10fb40835d 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY, containsXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_Point_ from '../geom/Point.js'; @@ -62,8 +62,7 @@ _ol_geom_MultiPoint_.prototype.clone = function() { * @inheritDoc */ _ol_geom_MultiPoint_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } var flatCoordinates = this.flatCoordinates; @@ -156,7 +155,7 @@ _ol_geom_MultiPoint_.prototype.intersectsExtent = function(extent) { for (i = 0, ii = flatCoordinates.length; i < ii; i += stride) { x = flatCoordinates[i]; y = flatCoordinates[i + 1]; - if (_ol_extent_.containsXY(extent, x, y)) { + if (containsXY(extent, x, y)) { return true; } } diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index c9da109936..a170efa8a3 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_MultiPoint_ from '../geom/MultiPoint.js'; @@ -134,8 +134,7 @@ _ol_geom_MultiPolygon_.prototype.clone = function() { * @inheritDoc */ _ol_geom_MultiPolygon_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } if (this.maxDeltaRevision_ != this.getRevision()) { diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js index d752a4e055..b04244722e 100644 --- a/src/ol/geom/Point.js +++ b/src/ol/geom/Point.js @@ -2,7 +2,7 @@ * @module ol/geom/Point */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdateFromCoordinate, containsXY} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js'; @@ -76,7 +76,7 @@ _ol_geom_Point_.prototype.getCoordinates = function() { * @inheritDoc */ _ol_geom_Point_.prototype.computeExtent = function(extent) { - return _ol_extent_.createOrUpdateFromCoordinate(this.flatCoordinates, extent); + return createOrUpdateFromCoordinate(this.flatCoordinates, extent); }; @@ -94,8 +94,7 @@ _ol_geom_Point_.prototype.getType = function() { * @api */ _ol_geom_Point_.prototype.intersectsExtent = function(extent) { - return _ol_extent_.containsXY(extent, - this.flatCoordinates[0], this.flatCoordinates[1]); + return containsXY(extent, this.flatCoordinates[0], this.flatCoordinates[1]); }; diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index 85a4093c20..32a6190faf 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {closestSquaredDistanceXY, getCenter} from '../extent.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_LinearRing_ from '../geom/LinearRing.js'; @@ -122,8 +122,7 @@ _ol_geom_Polygon_.prototype.clone = function() { * @inheritDoc */ _ol_geom_Polygon_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { - if (minSquaredDistance < - _ol_extent_.closestSquaredDistanceXY(this.getExtent(), x, y)) { + if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; } if (this.maxDeltaRevision_ != this.getRevision()) { @@ -199,7 +198,7 @@ _ol_geom_Polygon_.prototype.getEnds = function() { */ _ol_geom_Polygon_.prototype.getFlatInteriorPoint = function() { if (this.flatInteriorPointRevision_ != this.getRevision()) { - var flatCenter = _ol_extent_.getCenter(this.getExtent()); + var flatCenter = getCenter(this.getExtent()); this.flatInteriorPoint_ = _ol_geom_flat_interiorpoint_.linearRings( this.getOrientedFlatCoordinates(), 0, this.ends_, this.stride, flatCenter, 0); diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index a40face690..d8a0c6574b 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_functions_ from '../functions.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js'; import _ol_geom_Geometry_ from '../geom/Geometry.js'; import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js'; import _ol_geom_flat_transform_ from '../geom/flat/transform.js'; @@ -91,9 +91,8 @@ _ol_geom_SimpleGeometry_.prototype.containsXY = _ol_functions_.FALSE; * @inheritDoc */ _ol_geom_SimpleGeometry_.prototype.computeExtent = function(extent) { - return _ol_extent_.createOrUpdateFromFlatCoordinates( - this.flatCoordinates, 0, this.flatCoordinates.length, this.stride, - extent); + return createOrUpdateFromFlatCoordinates(this.flatCoordinates, + 0, this.flatCoordinates.length, this.stride, extent); }; @@ -289,7 +288,7 @@ _ol_geom_SimpleGeometry_.prototype.scale = function(sx, opt_sy, opt_anchor) { } var anchor = opt_anchor; if (!anchor) { - anchor = _ol_extent_.getCenter(this.getExtent()); + anchor = getCenter(this.getExtent()); } var flatCoordinates = this.getFlatCoordinates(); if (flatCoordinates) { diff --git a/src/ol/geom/flat/center.js b/src/ol/geom/flat/center.js index 70eb13c7d3..4f909cacee 100644 --- a/src/ol/geom/flat/center.js +++ b/src/ol/geom/flat/center.js @@ -1,7 +1,7 @@ /** * @module ol/geom/flat/center */ -import _ol_extent_ from '../../extent.js'; +import {createEmpty, createOrUpdateFromFlatCoordinates} from '../../extent.js'; var _ol_geom_flat_center_ = {}; @@ -15,11 +15,10 @@ var _ol_geom_flat_center_ = {}; _ol_geom_flat_center_.linearRingss = function(flatCoordinates, offset, endss, stride) { var flatCenters = []; var i, ii; - var extent = _ol_extent_.createEmpty(); + var extent = createEmpty(); for (i = 0, ii = endss.length; i < ii; ++i) { var ends = endss[i]; - extent = _ol_extent_.createOrUpdateFromFlatCoordinates( - flatCoordinates, offset, ends[0], stride); + extent = createOrUpdateFromFlatCoordinates(flatCoordinates, offset, ends[0], stride); flatCenters.push((extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2); offset = ends[ends.length - 1]; } diff --git a/src/ol/geom/flat/contains.js b/src/ol/geom/flat/contains.js index ac468dd094..813fa049b4 100644 --- a/src/ol/geom/flat/contains.js +++ b/src/ol/geom/flat/contains.js @@ -1,7 +1,7 @@ /** * @module ol/geom/flat/contains */ -import _ol_extent_ from '../../extent.js'; +import {forEachCorner} from '../../extent.js'; var _ol_geom_flat_contains_ = {}; @@ -14,7 +14,7 @@ var _ol_geom_flat_contains_ = {}; * @return {boolean} Contains extent. */ _ol_geom_flat_contains_.linearRingContainsExtent = function(flatCoordinates, offset, end, stride, extent) { - var outside = _ol_extent_.forEachCorner(extent, + var outside = forEachCorner(extent, /** * @param {ol.Coordinate} coordinate Coordinate. * @return {boolean} Contains (x, y). diff --git a/src/ol/geom/flat/intersectsextent.js b/src/ol/geom/flat/intersectsextent.js index 31b21eb608..cdc209f6dd 100644 --- a/src/ol/geom/flat/intersectsextent.js +++ b/src/ol/geom/flat/intersectsextent.js @@ -1,7 +1,7 @@ /** * @module ol/geom/flat/intersectsextent */ -import _ol_extent_ from '../../extent.js'; +import {containsExtent, createEmpty, extendFlatCoordinates, intersects, intersectsSegment} from '../../extent.js'; import _ol_geom_flat_contains_ from '../flat/contains.js'; import _ol_geom_flat_segments_ from '../flat/segments.js'; var _ol_geom_flat_intersectsextent_ = {}; @@ -16,12 +16,12 @@ var _ol_geom_flat_intersectsextent_ = {}; * @return {boolean} True if the geometry and the extent intersect. */ _ol_geom_flat_intersectsextent_.lineString = function(flatCoordinates, offset, end, stride, extent) { - var coordinatesExtent = _ol_extent_.extendFlatCoordinates( - _ol_extent_.createEmpty(), flatCoordinates, offset, end, stride); - if (!_ol_extent_.intersects(extent, coordinatesExtent)) { + var coordinatesExtent = extendFlatCoordinates( + createEmpty(), flatCoordinates, offset, end, stride); + if (!intersects(extent, coordinatesExtent)) { return false; } - if (_ol_extent_.containsExtent(extent, coordinatesExtent)) { + if (containsExtent(extent, coordinatesExtent)) { return true; } if (coordinatesExtent[0] >= extent[0] && @@ -40,7 +40,7 @@ _ol_geom_flat_intersectsextent_.lineString = function(flatCoordinates, offset, e * `false` otherwise. */ function(point1, point2) { - return _ol_extent_.intersectsSegment(extent, point1, point2); + return intersectsSegment(extent, point1, point2); }); }; diff --git a/src/ol/interaction/DragZoom.js b/src/ol/interaction/DragZoom.js index 53cdbf94ea..8e2ae0d7b9 100644 --- a/src/ol/interaction/DragZoom.js +++ b/src/ol/interaction/DragZoom.js @@ -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({ diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index a52ae1213c..60acca7c72 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -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; } diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js index 61cf829556..5791212c4f 100644 --- a/src/ol/interaction/Extent.js +++ b/src/ol/interaction/Extent.js @@ -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; diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 63a8c67613..6ca4f61701 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -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); diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js index 15bc348fdf..cb9ec4dbbb 100644 --- a/src/ol/interaction/Snap.js +++ b/src/ol/interaction/Snap.js @@ -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); } } }; diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index 5d880eb1c7..4e859c0a54 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -9,7 +9,7 @@ import _ol_ObjectEventType_ from '../ObjectEventType.js'; import _ol_asserts_ from '../asserts.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {getIntersection} from '../extent.js'; import _ol_layer_Base_ from '../layer/Base.js'; import _ol_obj_ from '../obj.js'; import _ol_source_State_ from '../source/State.js'; @@ -210,8 +210,7 @@ _ol_layer_Group_.prototype.getLayerStatesArray = function(opt_states) { layerState.minResolution, ownLayerState.minResolution); if (ownLayerState.extent !== undefined) { if (layerState.extent !== undefined) { - layerState.extent = _ol_extent_.getIntersection( - layerState.extent, ownLayerState.extent); + layerState.extent = getIntersection(layerState.extent, ownLayerState.extent); } else { layerState.extent = ownLayerState.extent; } diff --git a/src/ol/proj.js b/src/ol/proj.js index dd5a47e98f..71b8d3f9b9 100644 --- a/src/ol/proj.js +++ b/src/ol/proj.js @@ -2,7 +2,7 @@ * @module ol/proj */ import _ol_Sphere_ from './Sphere.js'; -import _ol_extent_ from './extent.js'; +import {applyTransform} from './extent.js'; import _ol_math_ from './math.js'; import _ol_proj_EPSG3857_ from './proj/EPSG3857.js'; import _ol_proj_EPSG4326_ from './proj/EPSG4326.js'; @@ -472,7 +472,7 @@ _ol_proj_.transform = function(coordinate, source, destination) { */ _ol_proj_.transformExtent = function(extent, source, destination) { var transformFn = _ol_proj_.getTransform(source, destination); - return _ol_extent_.applyTransform(extent, transformFn); + return applyTransform(extent, transformFn); }; diff --git a/src/ol/render/Feature.js b/src/ol/render/Feature.js index 6c1432aeb9..3e68f2e344 100644 --- a/src/ol/render/Feature.js +++ b/src/ol/render/Feature.js @@ -3,7 +3,7 @@ */ import {nullFunction} from '../index.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdateFromCoordinate, createOrUpdateFromFlatCoordinates, getCenter, getHeight} from '../extent.js'; import _ol_geom_GeometryType_ from '../geom/GeometryType.js'; import _ol_geom_flat_center_ from '../geom/flat/center.js'; import _ol_geom_flat_interiorpoint_ from '../geom/flat/interiorpoint.js'; @@ -110,8 +110,8 @@ _ol_render_Feature_.prototype.getEndss = function() { _ol_render_Feature_.prototype.getExtent = function() { if (!this.extent_) { this.extent_ = this.type_ === _ol_geom_GeometryType_.POINT ? - _ol_extent_.createOrUpdateFromCoordinate(this.flatCoordinates_) : - _ol_extent_.createOrUpdateFromFlatCoordinates( + createOrUpdateFromCoordinate(this.flatCoordinates_) : + createOrUpdateFromFlatCoordinates( this.flatCoordinates_, 0, this.flatCoordinates_.length, 2); } @@ -124,7 +124,7 @@ _ol_render_Feature_.prototype.getExtent = function() { */ _ol_render_Feature_.prototype.getFlatInteriorPoint = function() { if (!this.flatInteriorPoints_) { - var flatCenter = _ol_extent_.getCenter(this.getExtent()); + var flatCenter = getCenter(this.getExtent()); this.flatInteriorPoints_ = _ol_geom_flat_interiorpoint_.linearRings( this.flatCoordinates_, 0, this.ends_, 2, flatCenter, 0); } @@ -266,7 +266,7 @@ _ol_render_Feature_.prototype.getType = function() { _ol_render_Feature_.prototype.transform = function(source, destination) { var pixelExtent = source.getExtent(); var projectedExtent = source.getWorldExtent(); - var scale = _ol_extent_.getHeight(projectedExtent) / _ol_extent_.getHeight(pixelExtent); + var scale = getHeight(projectedExtent) / getHeight(pixelExtent); var transform = this.tmpTransform_; _ol_transform_.compose(transform, projectedExtent[0], projectedExtent[3], diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js index 597a06b1a2..ea6bff2424 100644 --- a/src/ol/render/canvas/Immediate.js +++ b/src/ol/render/canvas/Immediate.js @@ -8,7 +8,7 @@ import {inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_colorlike_ from '../../colorlike.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_geom_GeometryType_ from '../../geom/GeometryType.js'; import _ol_geom_SimpleGeometry_ from '../../geom/SimpleGeometry.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; @@ -402,7 +402,7 @@ _ol_render_canvas_Immediate_.prototype.drawRings_ = function(flatCoordinates, of * @api */ _ol_render_canvas_Immediate_.prototype.drawCircle = function(geometry) { - if (!_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!intersects(this.extent_, geometry.getExtent())) { return; } if (this.fillState_ || this.strokeState_) { @@ -502,8 +502,7 @@ _ol_render_canvas_Immediate_.prototype.drawGeometry = function(geometry) { */ _ol_render_canvas_Immediate_.prototype.drawFeature = function(feature, style) { var geometry = style.getGeometryFunction()(feature); - if (!geometry || - !_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!geometry || !intersects(this.extent_, geometry.getExtent())) { return; } this.setStyle(style); @@ -573,7 +572,7 @@ _ol_render_canvas_Immediate_.prototype.drawMultiPoint = function(geometry) { * @override */ _ol_render_canvas_Immediate_.prototype.drawLineString = function(geometry) { - if (!_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!intersects(this.extent_, geometry.getExtent())) { return; } if (this.strokeState_) { @@ -602,7 +601,7 @@ _ol_render_canvas_Immediate_.prototype.drawLineString = function(geometry) { */ _ol_render_canvas_Immediate_.prototype.drawMultiLineString = function(geometry) { var geometryExtent = geometry.getExtent(); - if (!_ol_extent_.intersects(this.extent_, geometryExtent)) { + if (!intersects(this.extent_, geometryExtent)) { return; } if (this.strokeState_) { @@ -635,7 +634,7 @@ _ol_render_canvas_Immediate_.prototype.drawMultiLineString = function(geometry) * @override */ _ol_render_canvas_Immediate_.prototype.drawPolygon = function(geometry) { - if (!_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!intersects(this.extent_, geometry.getExtent())) { return; } if (this.strokeState_ || this.fillState_) { @@ -670,7 +669,7 @@ _ol_render_canvas_Immediate_.prototype.drawPolygon = function(geometry) { * @override */ _ol_render_canvas_Immediate_.prototype.drawMultiPolygon = function(geometry) { - if (!_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!intersects(this.extent_, geometry.getExtent())) { return; } if (this.strokeState_ || this.fillState_) { diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index 1617adc010..a83f2c362a 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -4,8 +4,9 @@ import {getUid, inherits, nullFunction} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_colorlike_ from '../../colorlike.js'; -import _ol_extent_ from '../../extent.js'; -import _ol_extent_Relationship_ from '../../extent/Relationship.js'; +import {buffer, clone, coordinateRelationship, createEmpty, createOrUpdate, + createOrUpdateEmpty, extend, extendCoordinate, intersects} from '../../extent.js'; +import Relationship from '../../extent/Relationship.js'; import _ol_geom_GeometryType_ from '../../geom/GeometryType.js'; import _ol_geom_flat_inflate_ from '../../geom/flat/inflate.js'; import _ol_geom_flat_length_ from '../../geom/flat/length.js'; @@ -42,7 +43,7 @@ var _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pixel * @private * @type {ol.Extent} */ - this.tmpExtent_ = _ol_extent_.createEmpty(); + this.tmpExtent_ = createEmpty(); /** * @protected @@ -258,13 +259,13 @@ _ol_render_canvas_Replay_.prototype.replayImage_ = function(context, x, y, image transform = _ol_transform_.compose(localTransform, centerX, centerY, 1, 1, rotation, -centerX, -centerY); - _ol_extent_.createOrUpdateEmpty(box); - _ol_extent_.extendCoordinate(box, _ol_transform_.apply(localTransform, p1)); - _ol_extent_.extendCoordinate(box, _ol_transform_.apply(localTransform, p2)); - _ol_extent_.extendCoordinate(box, _ol_transform_.apply(localTransform, p3)); - _ol_extent_.extendCoordinate(box, _ol_transform_.apply(localTransform, p4)); + createOrUpdateEmpty(box); + extendCoordinate(box, _ol_transform_.apply(localTransform, p1)); + extendCoordinate(box, _ol_transform_.apply(localTransform, p2)); + extendCoordinate(box, _ol_transform_.apply(localTransform, p3)); + extendCoordinate(box, _ol_transform_.apply(localTransform, p4)); } else { - _ol_extent_.createOrUpdate(boxX, boxY, boxX + boxW, boxY + boxH, box); + createOrUpdate(boxX, boxY, boxX + boxW, boxY + boxH, box); } var canvas = context.canvas; var intersects = box[0] <= canvas.width && box[2] >= 0 && box[1] <= canvas.height && box[3] >= 0; @@ -278,7 +279,7 @@ _ol_render_canvas_Replay_.prototype.replayImage_ = function(context, x, y, image if (!intersects && declutterGroup[4] == 1) { return; } - _ol_extent_.extend(declutterGroup, box); + extend(declutterGroup, box); var declutterArgs = intersects ? [context, transform ? transform.slice(0) : null, opacity, image, originX, originY, w, h, x, y, scale] : null; @@ -335,7 +336,7 @@ _ol_render_canvas_Replay_.prototype.appendFlatCoordinates = function(flatCoordin for (i = offset + stride; i < end; i += stride) { nextCoord[0] = flatCoordinates[i]; nextCoord[1] = flatCoordinates[i + 1]; - nextRel = _ol_extent_.coordinateRelationship(extent, nextCoord); + nextRel = coordinateRelationship(extent, nextCoord); if (nextRel !== lastRel) { if (skipped) { this.coordinates[myEnd++] = lastCoord[0]; @@ -344,7 +345,7 @@ _ol_render_canvas_Replay_.prototype.appendFlatCoordinates = function(flatCoordin this.coordinates[myEnd++] = nextCoord[0]; this.coordinates[myEnd++] = nextCoord[1]; skipped = false; - } else if (nextRel === _ol_extent_Relationship_.INTERSECTING) { + } else if (nextRel === Relationship.INTERSECTING) { this.coordinates[myEnd++] = nextCoord[0]; this.coordinates[myEnd++] = nextCoord[1]; skipped = false; @@ -516,7 +517,7 @@ _ol_render_canvas_Replay_.prototype.renderDeclutter_ = function(declutterGroup, } } declutterGroup.length = 5; - _ol_extent_.createOrUpdateEmpty(declutterGroup); + createOrUpdateEmpty(declutterGroup); } } }; @@ -587,7 +588,7 @@ _ol_render_canvas_Replay_.prototype.replay_ = function( skippedFeaturesHash[getUid(feature).toString()]) || !feature.getGeometry()) { i = /** @type {number} */ (instruction[2]); - } else if (opt_hitExtent !== undefined && !_ol_extent_.intersects( + } else if (opt_hitExtent !== undefined && !intersects( opt_hitExtent, feature.getGeometry().getExtent())) { i = /** @type {number} */ (instruction[2]) + 1; } else { @@ -1060,10 +1061,10 @@ _ol_render_canvas_Replay_.prototype.finish = nullFunction; */ _ol_render_canvas_Replay_.prototype.getBufferedMaxExtent = function() { if (!this.bufferedMaxExtent_) { - this.bufferedMaxExtent_ = _ol_extent_.clone(this.maxExtent); + this.bufferedMaxExtent_ = clone(this.maxExtent); if (this.maxLineWidth > 0) { var width = this.resolution * (this.maxLineWidth + 1) / 2; - _ol_extent_.buffer(this.bufferedMaxExtent_, width, this.bufferedMaxExtent_); + buffer(this.bufferedMaxExtent_, width, this.bufferedMaxExtent_); } } return this.bufferedMaxExtent_; diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index 9b44af232e..0f8037a552 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -4,7 +4,7 @@ import {inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_dom_ from '../../dom.js'; -import _ol_extent_ from '../../extent.js'; +import {buffer, createEmpty, extendCoordinate} from '../../extent.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; import _ol_obj_ from '../../obj.js'; import _ol_render_ReplayGroup_ from '../ReplayGroup.js'; @@ -216,7 +216,7 @@ _ol_render_canvas_ReplayGroup_.prototype.addDeclutter = function(group) { declutter = this.declutterGroup_; /** @type {number} */ (declutter[4])++; } else { - declutter = this.declutterGroup_ = _ol_extent_.createEmpty(); + declutter = this.declutterGroup_ = createEmpty(); declutter.push(1); } } @@ -309,9 +309,9 @@ _ol_render_canvas_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function( */ var hitExtent; if (this.renderBuffer_ !== undefined) { - hitExtent = _ol_extent_.createEmpty(); - _ol_extent_.extendCoordinate(hitExtent, coordinate); - _ol_extent_.buffer(hitExtent, resolution * (this.renderBuffer_ + hitTolerance), hitExtent); + hitExtent = createEmpty(); + extendCoordinate(hitExtent, coordinate); + buffer(hitExtent, resolution * (this.renderBuffer_ + hitTolerance), hitExtent); } var mask = _ol_render_canvas_ReplayGroup_.getCircleArray_(hitTolerance); diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index 6a76ecdb03..4a7eabd65e 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -4,7 +4,7 @@ import {getUid, inherits} from '../../index.js'; import _ol_colorlike_ from '../../colorlike.js'; import _ol_dom_ from '../../dom.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_geom_flat_straightchunk_ from '../../geom/flat/straightchunk.js'; import _ol_geom_GeometryType_ from '../../geom/GeometryType.js'; import _ol_has_ from '../../has.js'; @@ -177,7 +177,7 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) { var i, ii; if (textState.placement === _ol_style_TextPlacement_.LINE) { - if (!_ol_extent_.intersects(this.getBufferedMaxExtent(), geometry.getExtent())) { + if (!intersects(this.getBufferedMaxExtent(), geometry.getExtent())) { return; } var ends; diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js index 2d981a7c26..497faf63c3 100644 --- a/src/ol/render/webgl/CircleReplay.js +++ b/src/ol/render/webgl/CircleReplay.js @@ -4,7 +4,7 @@ import {getUid, inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_color_ from '../../color.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_obj_ from '../../obj.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; import _ol_render_webgl_circlereplay_defaultshader_ from '../webgl/circlereplay/defaultshader.js'; @@ -289,7 +289,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawHitDetectionReplayOneByOne = functi if (skippedFeaturesHash[featureUid] === undefined && feature.getGeometry() && - (opt_hitExtent === undefined || _ol_extent_.intersects( + (opt_hitExtent === undefined || intersects( /** @type {Array} */ (opt_hitExtent), feature.getGeometry().getExtent()))) { gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index b04f658555..03251ab0f9 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -2,7 +2,7 @@ * @module ol/render/webgl/Immediate */ import {inherits} from '../../index.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_geom_GeometryType_ from '../../geom/GeometryType.js'; import _ol_render_ReplayType_ from '../ReplayType.js'; import _ol_render_VectorContext_ from '../VectorContext.js'; @@ -173,8 +173,7 @@ _ol_render_webgl_Immediate_.prototype.drawGeometry = function(geometry) { */ _ol_render_webgl_Immediate_.prototype.drawFeature = function(feature, style) { var geometry = style.getGeometryFunction()(feature); - if (!geometry || - !_ol_extent_.intersects(this.extent_, geometry.getExtent())) { + if (!geometry || !intersects(this.extent_, geometry.getExtent())) { return; } this.setStyle(style); diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js index 20862252d8..03ecfaefcc 100644 --- a/src/ol/render/webgl/LineStringReplay.js +++ b/src/ol/render/webgl/LineStringReplay.js @@ -4,7 +4,7 @@ import {getUid, inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_color_ from '../../color.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_geom_flat_orient_ from '../../geom/flat/orient.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; import _ol_geom_flat_topology_ from '../../geom/flat/topology.js'; @@ -593,7 +593,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawHitDetectionReplayOneByOne = fu if (skippedFeaturesHash[featureUid] === undefined && feature.getGeometry() && - (opt_hitExtent === undefined || _ol_extent_.intersects( + (opt_hitExtent === undefined || intersects( /** @type {Array} */ (opt_hitExtent), feature.getGeometry().getExtent()))) { gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js index 8eacc6f8c9..4137cf5778 100644 --- a/src/ol/render/webgl/PolygonReplay.js +++ b/src/ol/render/webgl/PolygonReplay.js @@ -4,7 +4,7 @@ import {getUid, inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; import _ol_color_ from '../../color.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_obj_ from '../../obj.js'; import _ol_geom_flat_contains_ from '../../geom/flat/contains.js'; import _ol_geom_flat_orient_ from '../../geom/flat/orient.js'; @@ -970,7 +970,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawHitDetectionReplayOneByOne = funct if (skippedFeaturesHash[featureUid] === undefined && feature.getGeometry() && - (opt_hitExtent === undefined || _ol_extent_.intersects( + (opt_hitExtent === undefined || intersects( /** @type {Array} */ (opt_hitExtent), feature.getGeometry().getExtent()))) { gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js index d2ac6850d3..4cd71cfce5 100644 --- a/src/ol/render/webgl/Replay.js +++ b/src/ol/render/webgl/Replay.js @@ -2,7 +2,7 @@ * @module ol/render/webgl/Replay */ import {inherits} from '../../index.js'; -import _ol_extent_ from '../../extent.js'; +import {getCenter} from '../../extent.js'; import _ol_render_VectorContext_ from '../VectorContext.js'; import _ol_transform_ from '../../transform.js'; import _ol_vec_Mat4_ from '../../vec/Mat4.js'; @@ -40,7 +40,7 @@ var _ol_render_webgl_Replay_ = function(tolerance, maxExtent) { * @protected * @type {ol.Coordinate} */ - this.origin = _ol_extent_.getCenter(maxExtent); + this.origin = getCenter(maxExtent); /** * @private diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index 162b0aaaed..06dd596bed 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -3,7 +3,7 @@ */ import {inherits} from '../../index.js'; import _ol_array_ from '../../array.js'; -import _ol_extent_ from '../../extent.js'; +import {buffer, createOrUpdateFromCoordinate} from '../../extent.js'; import _ol_obj_ from '../../obj.js'; import _ol_render_replay_ from '../replay.js'; import _ol_render_ReplayGroup_ from '../ReplayGroup.js'; @@ -244,9 +244,7 @@ _ol_render_webgl_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function( if (this.renderBuffer_ !== undefined) { // build an extent around the coordinate, so that only features that // intersect this extent are checked - hitExtent = _ol_extent_.buffer( - _ol_extent_.createOrUpdateFromCoordinate(coordinate), - resolution * this.renderBuffer_); + hitExtent = buffer(createOrUpdateFromCoordinate(coordinate), resolution * this.renderBuffer_); } return this.replayHitDetection_(context, diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index 771bacc766..f64194b432 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -2,7 +2,7 @@ * @module ol/render/webgl/TextureReplay */ import {getUid, inherits} from '../../index.js'; -import _ol_extent_ from '../../extent.js'; +import {intersects} from '../../extent.js'; import _ol_obj_ from '../../obj.js'; import _ol_render_webgl_texturereplay_defaultshader_ from '../webgl/texturereplay/defaultshader.js'; import _ol_render_webgl_texturereplay_defaultshader_Locations_ from '../webgl/texturereplay/defaultshader/Locations.js'; @@ -438,7 +438,7 @@ _ol_render_webgl_TextureReplay_.prototype.drawHitDetectionReplayOneByOne = funct if (skippedFeaturesHash[featureUid] === undefined && feature.getGeometry() && - (opt_hitExtent === undefined || _ol_extent_.intersects( + (opt_hitExtent === undefined || intersects( /** @type {Array} */ (opt_hitExtent), feature.getGeometry().getExtent()))) { gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index 909d796bc4..e566c75ac6 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -5,7 +5,7 @@ import {getUid, inherits, nullFunction} from '../index.js'; import _ol_Disposable_ from '../Disposable.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {getWidth} from '../extent.js'; import _ol_functions_ from '../functions.js'; import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_plugins_ from '../plugins.js'; @@ -128,7 +128,7 @@ _ol_renderer_Map_.prototype.forEachFeatureAtCoordinate = function(coordinate, fr var translatedCoordinate = coordinate; if (projection.canWrapX()) { var projectionExtent = projection.getExtent(); - var worldWidth = _ol_extent_.getWidth(projectionExtent); + var worldWidth = getWidth(projectionExtent); var x = coordinate[0]; if (x < projectionExtent[0] || x > projectionExtent[2]) { var worldsAway = Math.ceil((projectionExtent[0] - x) / worldWidth); diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 3e36728ef4..254bb08f3e 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -7,7 +7,7 @@ import _ol_ImageCanvas_ from '../../ImageCanvas.js'; import _ol_LayerType_ from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_array_ from '../../array.js'; -import _ol_extent_ from '../../extent.js'; +import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js'; import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js'; import _ol_obj_ from '../../obj.js'; import _ol_plugins_ from '../../plugins.js'; @@ -122,12 +122,11 @@ _ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, la var renderedExtent = frameState.extent; if (layerState.extent !== undefined) { - renderedExtent = _ol_extent_.getIntersection( - renderedExtent, layerState.extent); + renderedExtent = getIntersection(renderedExtent, layerState.extent); } if (!hints[_ol_ViewHint_.ANIMATING] && !hints[_ol_ViewHint_.INTERACTING] && - !_ol_extent_.isEmpty(renderedExtent)) { + !isEmpty(renderedExtent)) { var projection = viewState.projection; if (!ENABLE_RASTER_REPROJECTION) { var sourceProjection = imageSource.getProjection(); @@ -140,8 +139,8 @@ _ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, la var context = vectorRenderer.context; var imageFrameState = /** @type {olx.FrameState} */ (_ol_obj_.assign({}, frameState, { size: [ - _ol_extent_.getWidth(renderedExtent) / viewResolution, - _ol_extent_.getHeight(renderedExtent) / viewResolution + getWidth(renderedExtent) / viewResolution, + getHeight(renderedExtent) / viewResolution ], viewState: /** @type {olx.ViewState} */ (_ol_obj_.assign({}, frameState.viewState, { rotation: 0 diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index a9515a56f9..cc4baeaadc 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -4,7 +4,7 @@ import {inherits, nullFunction} from '../../index.js'; import _ol_coordinate_ from '../../coordinate.js'; import _ol_dom_ from '../../dom.js'; -import _ol_extent_ from '../../extent.js'; +import {containsExtent, intersects} from '../../extent.js'; import _ol_renderer_canvas_Layer_ from '../canvas/Layer.js'; import _ol_transform_ from '../../transform.js'; @@ -48,8 +48,8 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.composeFrame = function(frameS // clipped rendering if layer extent is set var extent = layerState.extent; var clipped = extent !== undefined && - !_ol_extent_.containsExtent(extent, frameState.extent) && - _ol_extent_.intersects(extent, frameState.extent); + !containsExtent(extent, frameState.extent) && + intersects(extent, frameState.extent); if (clipped) { this.clip(context, frameState, /** @type {ol.Extent} */ (extent)); } diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js index fdf0321ef2..4526d08f4e 100644 --- a/src/ol/renderer/canvas/Layer.js +++ b/src/ol/renderer/canvas/Layer.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/Layer */ import {inherits} from '../../index.js'; -import _ol_extent_ from '../../extent.js'; +import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js'; import _ol_functions_ from '../../functions.js'; import _ol_render_Event_ from '../../render/Event.js'; import _ol_render_EventType_ from '../../render/EventType.js'; @@ -49,10 +49,10 @@ _ol_renderer_canvas_Layer_.prototype.clip = function(context, frameState, extent var width = frameState.size[0] * pixelRatio; var height = frameState.size[1] * pixelRatio; var rotation = frameState.viewState.rotation; - var topLeft = _ol_extent_.getTopLeft(/** @type {ol.Extent} */ (extent)); - var topRight = _ol_extent_.getTopRight(/** @type {ol.Extent} */ (extent)); - var bottomRight = _ol_extent_.getBottomRight(/** @type {ol.Extent} */ (extent)); - var bottomLeft = _ol_extent_.getBottomLeft(/** @type {ol.Extent} */ (extent)); + var topLeft = getTopLeft(/** @type {ol.Extent} */ (extent)); + var topRight = getTopRight(/** @type {ol.Extent} */ (extent)); + var bottomRight = getBottomRight(/** @type {ol.Extent} */ (extent)); + var bottomLeft = getBottomLeft(/** @type {ol.Extent} */ (extent)); _ol_transform_.apply(frameState.coordinateToPixelTransform, topLeft); _ol_transform_.apply(frameState.coordinateToPixelTransform, topRight); diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 18b86a3476..30f113def4 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -7,7 +7,7 @@ import _ol_TileRange_ from '../../TileRange.js'; import _ol_TileState_ from '../../TileState.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_dom_ from '../../dom.js'; -import _ol_extent_ from '../../extent.js'; +import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js'; import _ol_renderer_Type_ from '../Type.js'; import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js'; import _ol_transform_ from '../../transform.js'; @@ -56,7 +56,7 @@ var _ol_renderer_canvas_TileLayer_ = function(tileLayer) { * @protected * @type {ol.Extent} */ - this.tmpExtent = _ol_extent_.createEmpty(); + this.tmpExtent = createEmpty(); /** * @private @@ -138,9 +138,9 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay var extent = frameState.extent; if (layerState.extent !== undefined) { - extent = _ol_extent_.getIntersection(extent, layerState.extent); + extent = getIntersection(extent, layerState.extent); } - if (_ol_extent_.isEmpty(extent)) { + if (isEmpty(extent)) { // Return false to prevent the rendering of the layer. return false; } @@ -212,7 +212,7 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay var animatingOrInteracting = hints[_ol_ViewHint_.ANIMATING] || hints[_ol_ViewHint_.INTERACTING]; if (!(this.renderedResolution && Date.now() - frameState.time > 16 && animatingOrInteracting) && ( newTiles || - !(this.renderedExtent_ && _ol_extent_.containsExtent(this.renderedExtent_, extent)) || + !(this.renderedExtent_ && containsExtent(this.renderedExtent_, extent)) || this.renderedRevision != sourceRevision || oversampling != this.oversampling_ || !animatingOrInteracting && renderedResolution != this.renderedResolution @@ -229,7 +229,7 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay canvas.width = width; canvas.height = height; } else { - if (this.renderedExtent_ && !_ol_extent_.equals(imageExtent, this.renderedExtent_)) { + if (this.renderedExtent_ && !equals(imageExtent, this.renderedExtent_)) { context.clearRect(0, 0, width, height); } oversampling = this.oversampling_; diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 928ea09283..3c195d4f91 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -8,7 +8,7 @@ import _ol_dom_ from '../../dom.js'; import _ol_events_ from '../../events.js'; import _ol_events_EventType_ from '../../events/EventType.js'; import _ol_ext_rbush_ from 'rbush'; -import _ol_extent_ from '../../extent.js'; +import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js'; import _ol_render_EventType_ from '../../render/EventType.js'; import _ol_render_canvas_ from '../../render/canvas.js'; import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js'; @@ -55,7 +55,7 @@ var _ol_renderer_canvas_VectorLayer_ = function(vectorLayer) { * @private * @type {ol.Extent} */ - this.renderedExtent_ = _ol_extent_.createEmpty(); + this.renderedExtent_ = createEmpty(); /** * @private @@ -189,9 +189,9 @@ _ol_renderer_canvas_VectorLayer_.prototype.composeFrame = function(frameState, l width / 2, height / 2); replayGroup.replay(replayContext, transform, rotation, skippedFeatureUids); if (vectorSource.getWrapX() && projection.canWrapX() && - !_ol_extent_.containsExtent(projectionExtent, extent)) { + !containsExtent(projectionExtent, extent)) { var startX = extent[0]; - var worldWidth = _ol_extent_.getWidth(projectionExtent); + var worldWidth = getWidth(projectionExtent); var world = 0; var offsetX; while (startX < projectionExtent[0]) { @@ -328,28 +328,28 @@ _ol_renderer_canvas_VectorLayer_.prototype.prepareFrame = function(frameState, l vectorLayerRenderOrder = _ol_renderer_vector_.defaultOrder; } - var extent = _ol_extent_.buffer(frameStateExtent, + var extent = buffer(frameStateExtent, vectorLayerRenderBuffer * resolution); var projectionExtent = viewState.projection.getExtent(); if (vectorSource.getWrapX() && viewState.projection.canWrapX() && - !_ol_extent_.containsExtent(projectionExtent, frameState.extent)) { + !containsExtent(projectionExtent, frameState.extent)) { // For the replay group, we need an extent that intersects the real world // (-180° to +180°). To support geometries in a coordinate range from -540° // to +540°, we add at least 1 world width on each side of the projection // extent. If the viewport is wider than the world, we need to add half of // the viewport width to make sure we cover the whole viewport. - var worldWidth = _ol_extent_.getWidth(projectionExtent); - var buffer = Math.max(_ol_extent_.getWidth(extent) / 2, worldWidth); - extent[0] = projectionExtent[0] - buffer; - extent[2] = projectionExtent[2] + buffer; + var worldWidth = getWidth(projectionExtent); + var gutter = Math.max(getWidth(extent) / 2, worldWidth); + extent[0] = projectionExtent[0] - gutter; + extent[2] = projectionExtent[2] + gutter; } if (!this.dirty_ && this.renderedResolution_ == resolution && this.renderedRevision_ == vectorLayerRevision && this.renderedRenderOrder_ == vectorLayerRenderOrder && - _ol_extent_.containsExtent(this.renderedExtent_, extent)) { + containsExtent(this.renderedExtent_, extent)) { this.replayGroupChanged = false; return true; } diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 798f06344b..e02e896773 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -8,7 +8,7 @@ import _ol_dom_ from '../../dom.js'; import _ol_events_ from '../../events.js'; import _ol_events_EventType_ from '../../events/EventType.js'; import _ol_ext_rbush_ from 'rbush'; -import _ol_extent_ from '../../extent.js'; +import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, intersects} from '../../extent.js'; import _ol_layer_VectorTileRenderType_ from '../../layer/VectorTileRenderType.js'; import _ol_proj_ from '../../proj.js'; import _ol_proj_Units_ from '../../proj/Units.js'; @@ -180,9 +180,9 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.createReplayGroup_ = function( var sourceTileCoord = sourceTile.tileCoord; var sourceTileExtent = sourceTileGrid.getTileCoordExtent(sourceTileCoord); - var sharedExtent = _ol_extent_.getIntersection(tileExtent, sourceTileExtent); - var bufferedExtent = _ol_extent_.equals(sourceTileExtent, sharedExtent) ? null : - _ol_extent_.buffer(sharedExtent, layer.getRenderBuffer() * resolution); + var sharedExtent = getIntersection(tileExtent, sourceTileExtent); + var bufferedExtent = equals(sourceTileExtent, sharedExtent) ? null : + buffer(sharedExtent, layer.getRenderBuffer() * resolution); var tileProjection = sourceTile.getProjection(); var reproject = false; if (!_ol_proj_.equivalent(projection, tileProjection)) { @@ -234,7 +234,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.createReplayGroup_ = function( } feature.getGeometry().transform(tileProjection, projection); } - if (!bufferedExtent || _ol_extent_.intersects(bufferedExtent, feature.getGeometry().getExtent())) { + if (!bufferedExtent || intersects(bufferedExtent, feature.getGeometry().getExtent())) { renderFeature.call(this, feature); } } @@ -286,8 +286,8 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.forEachFeatureAtCoordinate = func tile = renderedTiles[i]; tileCoord = tile.wrappedTileCoord; tileExtent = tileGrid.getTileCoordExtent(tileCoord, this.tmpExtent); - bufferedExtent = _ol_extent_.buffer(tileExtent, hitTolerance * resolution, bufferedExtent); - if (!_ol_extent_.containsCoordinate(bufferedExtent, coordinate)) { + bufferedExtent = buffer(tileExtent, hitTolerance * resolution, bufferedExtent); + if (!containsCoordinate(bufferedExtent, coordinate)) { continue; } for (var t = 0, tt = tile.tileKeys.length; t < tt; ++t) { @@ -332,7 +332,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.getReplayTransform_ = function(ti var renderResolution = viewState.resolution / pixelRatio; var tileExtent = tileGrid.getTileCoordExtent(tileCoord, this.tmpExtent); var center = viewState.center; - var origin = _ol_extent_.getTopLeft(tileExtent); + var origin = getTopLeft(tileExtent); var size = frameState.size; var offsetX = Math.round(pixelRatio * size[0] / 2); var offsetY = Math.round(pixelRatio * size[1] / 2); diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 9b29331f77..fa6b4bb215 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -6,7 +6,7 @@ import {inherits, nullFunction} from '../../index.js'; import _ol_LayerType_ from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_dom_ from '../../dom.js'; -import _ol_extent_ from '../../extent.js'; +import {getIntersection, isEmpty} from '../../extent.js'; import _ol_functions_ from '../../functions.js'; import _ol_renderer_Type_ from '../Type.js'; import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js'; @@ -137,11 +137,10 @@ _ol_renderer_webgl_ImageLayer_.prototype.prepareFrame = function(frameState, lay var renderedExtent = frameState.extent; if (layerState.extent !== undefined) { - renderedExtent = _ol_extent_.getIntersection( - renderedExtent, layerState.extent); + renderedExtent = getIntersection(renderedExtent, layerState.extent); } if (!hints[_ol_ViewHint_.ANIMATING] && !hints[_ol_ViewHint_.INTERACTING] && - !_ol_extent_.isEmpty(renderedExtent)) { + !isEmpty(renderedExtent)) { var projection = viewState.projection; if (!ENABLE_RASTER_REPROJECTION) { var sourceProjection = imageSource.getProjection(); diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index f317b34356..ce898fc958 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -9,7 +9,7 @@ import _ol_LayerType_ from '../../LayerType.js'; import _ol_TileRange_ from '../../TileRange.js'; import _ol_TileState_ from '../../TileState.js'; import _ol_array_ from '../../array.js'; -import _ol_extent_ from '../../extent.js'; +import {createEmpty, intersects} from '../../extent.js'; import _ol_math_ from '../../math.js'; import _ol_renderer_Type_ from '../Type.js'; import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js'; @@ -246,7 +246,7 @@ _ol_renderer_webgl_TileLayer_.prototype.prepareFrame = function(frameState, laye var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError(); var allTilesLoaded = true; - var tmpExtent = _ol_extent_.createEmpty(); + var tmpExtent = createEmpty(); var tmpTileRange = new _ol_TileRange_(0, 0, 0, 0); var childTileRange, drawable, fullyLoaded, tile, tileState; var x, y, tileExtent; @@ -257,7 +257,7 @@ _ol_renderer_webgl_TileLayer_.prototype.prepareFrame = function(frameState, laye if (layerState.extent !== undefined) { // ignore tiles outside layer extent tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent); - if (!_ol_extent_.intersects(tileExtent, layerState.extent)) { + if (!intersects(tileExtent, layerState.extent)) { continue; } } diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index 2ba2c96913..4486e7cfb5 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -4,7 +4,7 @@ import {getUid, inherits} from '../../index.js'; import _ol_LayerType_ from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; -import _ol_extent_ from '../../extent.js'; +import {buffer, containsExtent, createEmpty} from '../../extent.js'; import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js'; import _ol_renderer_Type_ from '../Type.js'; import _ol_renderer_vector_ from '../vector.js'; @@ -44,7 +44,7 @@ var _ol_renderer_webgl_VectorLayer_ = function(mapRenderer, vectorLayer) { * @private * @type {ol.Extent} */ - this.renderedExtent_ = _ol_extent_.createEmpty(); + this.renderedExtent_ = createEmpty(); /** * @private @@ -241,14 +241,14 @@ _ol_renderer_webgl_VectorLayer_.prototype.prepareFrame = function(frameState, la vectorLayerRenderOrder = _ol_renderer_vector_.defaultOrder; } - var extent = _ol_extent_.buffer(frameStateExtent, + var extent = buffer(frameStateExtent, vectorLayerRenderBuffer * resolution); if (!this.dirty_ && this.renderedResolution_ == resolution && this.renderedRevision_ == vectorLayerRevision && this.renderedRenderOrder_ == vectorLayerRenderOrder && - _ol_extent_.containsExtent(this.renderedExtent_, extent)) { + containsExtent(this.renderedExtent_, extent)) { return true; } diff --git a/src/ol/reproj.js b/src/ol/reproj.js index 7eb6ff653e..734f1aaa0b 100644 --- a/src/ol/reproj.js +++ b/src/ol/reproj.js @@ -2,7 +2,7 @@ * @module ol/reproj */ import _ol_dom_ from './dom.js'; -import _ol_extent_ from './extent.js'; +import {containsCoordinate, createEmpty, extend, getHeight, getTopLeft, getWidth} from './extent.js'; import _ol_math_ from './math.js'; import _ol_proj_ from './proj.js'; var _ol_reproj_ = {}; @@ -43,7 +43,7 @@ _ol_reproj_.calculateSourceResolution = function(sourceProj, targetProj, // in order to achieve optimal results. var sourceExtent = sourceProj.getExtent(); - if (!sourceExtent || _ol_extent_.containsCoordinate(sourceExtent, sourceCenter)) { + if (!sourceExtent || containsCoordinate(sourceExtent, sourceCenter)) { var compensationFactor = _ol_proj_.getPointResolution(sourceProj, sourceResolution, sourceCenter) / sourceResolution; @@ -105,13 +105,13 @@ _ol_reproj_.render = function(width, height, pixelRatio, context.scale(pixelRatio, pixelRatio); - var sourceDataExtent = _ol_extent_.createEmpty(); + var sourceDataExtent = createEmpty(); sources.forEach(function(src, i, arr) { - _ol_extent_.extend(sourceDataExtent, src.extent); + extend(sourceDataExtent, src.extent); }); - var canvasWidthInUnits = _ol_extent_.getWidth(sourceDataExtent); - var canvasHeightInUnits = _ol_extent_.getHeight(sourceDataExtent); + var canvasWidthInUnits = getWidth(sourceDataExtent); + var canvasHeightInUnits = getHeight(sourceDataExtent); var stitchContext = _ol_dom_.createCanvasContext2D( Math.round(pixelRatio * canvasWidthInUnits / sourceResolution), Math.round(pixelRatio * canvasHeightInUnits / sourceResolution)); @@ -121,8 +121,8 @@ _ol_reproj_.render = function(width, height, pixelRatio, sources.forEach(function(src, i, arr) { var xPos = src.extent[0] - sourceDataExtent[0]; var yPos = -(src.extent[3] - sourceDataExtent[3]); - var srcWidth = _ol_extent_.getWidth(src.extent); - var srcHeight = _ol_extent_.getHeight(src.extent); + var srcWidth = getWidth(src.extent); + var srcHeight = getHeight(src.extent); stitchContext.drawImage( src.image, @@ -132,7 +132,7 @@ _ol_reproj_.render = function(width, height, pixelRatio, srcWidth * stitchScale, srcHeight * stitchScale); }); - var targetTopLeft = _ol_extent_.getTopLeft(targetExtent); + var targetTopLeft = getTopLeft(targetExtent); triangulation.getTriangles().forEach(function(triangle, i, arr) { /* Calculate affine transform (src -> dst) diff --git a/src/ol/reproj/Image.js b/src/ol/reproj/Image.js index ec94824ce9..59763d6a08 100644 --- a/src/ol/reproj/Image.js +++ b/src/ol/reproj/Image.js @@ -7,7 +7,7 @@ import _ol_ImageBase_ from '../ImageBase.js'; import _ol_ImageState_ from '../ImageState.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {getCenter, getIntersection, getHeight, getWidth} from '../extent.js'; import _ol_reproj_ from '../reproj.js'; import _ol_reproj_Triangulation_ from '../reproj/Triangulation.js'; @@ -43,9 +43,9 @@ var _ol_reproj_Image_ = function(sourceProj, targetProj, var maxTargetExtent = targetProj.getExtent(); var limitedTargetExtent = maxTargetExtent ? - _ol_extent_.getIntersection(targetExtent, maxTargetExtent) : targetExtent; + getIntersection(targetExtent, maxTargetExtent) : targetExtent; - var targetCenter = _ol_extent_.getCenter(limitedTargetExtent); + var targetCenter = getCenter(limitedTargetExtent); var sourceResolution = _ol_reproj_.calculateSourceResolution( sourceProj, targetProj, targetCenter, targetResolution); @@ -145,9 +145,8 @@ _ol_reproj_Image_.prototype.getProjection = function() { _ol_reproj_Image_.prototype.reproject_ = function() { var sourceState = this.sourceImage_.getState(); if (sourceState == _ol_ImageState_.LOADED) { - var width = _ol_extent_.getWidth(this.targetExtent_) / this.targetResolution_; - var height = - _ol_extent_.getHeight(this.targetExtent_) / this.targetResolution_; + var width = getWidth(this.targetExtent_) / this.targetResolution_; + var height = getHeight(this.targetExtent_) / this.targetResolution_; this.canvas_ = _ol_reproj_.render(width, height, this.sourcePixelRatio_, this.sourceImage_.getResolution(), this.maxSourceExtent_, diff --git a/src/ol/reproj/Tile.js b/src/ol/reproj/Tile.js index 10d5ddcdfe..6dee2f1d74 100644 --- a/src/ol/reproj/Tile.js +++ b/src/ol/reproj/Tile.js @@ -7,7 +7,7 @@ import _ol_Tile_ from '../Tile.js'; import _ol_TileState_ from '../TileState.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {getArea, getCenter, getIntersection} from '../extent.js'; import _ol_math_ from '../math.js'; import _ol_reproj_ from '../reproj.js'; import _ol_reproj_Triangulation_ from '../reproj/Triangulation.js'; @@ -103,9 +103,9 @@ var _ol_reproj_Tile_ = function(sourceProj, sourceTileGrid, var maxSourceExtent = this.sourceTileGrid_.getExtent(); var limitedTargetExtent = maxTargetExtent ? - _ol_extent_.getIntersection(targetExtent, maxTargetExtent) : targetExtent; + getIntersection(targetExtent, maxTargetExtent) : targetExtent; - if (_ol_extent_.getArea(limitedTargetExtent) === 0) { + if (getArea(limitedTargetExtent) === 0) { // Tile is completely outside range -> EMPTY // TODO: is it actually correct that the source even creates the tile ? this.state = _ol_TileState_.EMPTY; @@ -117,15 +117,14 @@ var _ol_reproj_Tile_ = function(sourceProj, sourceTileGrid, if (!maxSourceExtent) { maxSourceExtent = sourceProjExtent; } else { - maxSourceExtent = _ol_extent_.getIntersection( - maxSourceExtent, sourceProjExtent); + maxSourceExtent = getIntersection(maxSourceExtent, sourceProjExtent); } } var targetResolution = targetTileGrid.getResolution( this.wrappedTileCoord_[0]); - var targetCenter = _ol_extent_.getCenter(limitedTargetExtent); + var targetCenter = getCenter(limitedTargetExtent); var sourceResolution = _ol_reproj_.calculateSourceResolution( sourceProj, targetProj, targetCenter, targetResolution); @@ -163,11 +162,11 @@ var _ol_reproj_Tile_ = function(sourceProj, sourceTileGrid, sourceExtent[3] = _ol_math_.clamp( sourceExtent[3], maxSourceExtent[1], maxSourceExtent[3]); } else { - sourceExtent = _ol_extent_.getIntersection(sourceExtent, maxSourceExtent); + sourceExtent = getIntersection(sourceExtent, maxSourceExtent); } } - if (!_ol_extent_.getArea(sourceExtent)) { + if (!getArea(sourceExtent)) { this.state = _ol_TileState_.EMPTY; } else { var sourceRange = sourceTileGrid.getTileRangeForExtentAndZ( diff --git a/src/ol/reproj/Triangulation.js b/src/ol/reproj/Triangulation.js index 954153633a..a3807b2913 100644 --- a/src/ol/reproj/Triangulation.js +++ b/src/ol/reproj/Triangulation.js @@ -1,7 +1,8 @@ /** * @module ol/reproj/Triangulation */ -import _ol_extent_ from '../extent.js'; +import {boundingExtent, createEmpty, extendCoordinate, getBottomLeft, getBottomRight, + getTopLeft, getTopRight, getWidth, intersects} from '../extent.js'; import _ol_math_ from '../math.js'; import _ol_proj_ from '../proj.js'; @@ -104,27 +105,26 @@ var _ol_reproj_Triangulation_ = function(sourceProj, targetProj, targetExtent, this.canWrapXInSource_ = this.sourceProj_.canWrapX() && !!maxSourceExtent && !!this.sourceProj_.getExtent() && - (_ol_extent_.getWidth(maxSourceExtent) == - _ol_extent_.getWidth(this.sourceProj_.getExtent())); + (getWidth(maxSourceExtent) == getWidth(this.sourceProj_.getExtent())); /** * @type {?number} * @private */ this.sourceWorldWidth_ = this.sourceProj_.getExtent() ? - _ol_extent_.getWidth(this.sourceProj_.getExtent()) : null; + getWidth(this.sourceProj_.getExtent()) : null; /** * @type {?number} * @private */ this.targetWorldWidth_ = this.targetProj_.getExtent() ? - _ol_extent_.getWidth(this.targetProj_.getExtent()) : null; + getWidth(this.targetProj_.getExtent()) : null; - var destinationTopLeft = _ol_extent_.getTopLeft(targetExtent); - var destinationTopRight = _ol_extent_.getTopRight(targetExtent); - var destinationBottomRight = _ol_extent_.getBottomRight(targetExtent); - var destinationBottomLeft = _ol_extent_.getBottomLeft(targetExtent); + var destinationTopLeft = getTopLeft(targetExtent); + var destinationTopRight = getTopRight(targetExtent); + var destinationBottomRight = getBottomRight(targetExtent); + var destinationBottomLeft = getBottomLeft(targetExtent); var sourceTopLeft = this.transformInv_(destinationTopLeft); var sourceTopRight = this.transformInv_(destinationTopRight); var sourceBottomRight = this.transformInv_(destinationBottomRight); @@ -217,9 +217,9 @@ _ol_reproj_Triangulation_.prototype.addTriangle_ = function(a, b, c, _ol_reproj_Triangulation_.prototype.addQuad_ = function(a, b, c, d, aSrc, bSrc, cSrc, dSrc, maxSubdivision) { - var sourceQuadExtent = _ol_extent_.boundingExtent([aSrc, bSrc, cSrc, dSrc]); + var sourceQuadExtent = boundingExtent([aSrc, bSrc, cSrc, dSrc]); var sourceCoverageX = this.sourceWorldWidth_ ? - _ol_extent_.getWidth(sourceQuadExtent) / this.sourceWorldWidth_ : null; + getWidth(sourceQuadExtent) / this.sourceWorldWidth_ : null; var sourceWorldWidth = /** @type {number} */ (this.sourceWorldWidth_); // when the quad is wrapped in the source projection @@ -231,9 +231,8 @@ _ol_reproj_Triangulation_.prototype.addQuad_ = function(a, b, c, d, if (maxSubdivision > 0) { if (this.targetProj_.isGlobal() && this.targetWorldWidth_) { - var targetQuadExtent = _ol_extent_.boundingExtent([a, b, c, d]); - var targetCoverageX = - _ol_extent_.getWidth(targetQuadExtent) / this.targetWorldWidth_; + var targetQuadExtent = boundingExtent([a, b, c, d]); + var targetCoverageX = getWidth(targetQuadExtent) / this.targetWorldWidth_; needsSubdivision |= targetCoverageX > MAX_TRIANGLE_WIDTH; } @@ -244,7 +243,7 @@ _ol_reproj_Triangulation_.prototype.addQuad_ = function(a, b, c, d, } if (!needsSubdivision && this.maxSourceExtent_) { - if (!_ol_extent_.intersects(sourceQuadExtent, this.maxSourceExtent_)) { + if (!intersects(sourceQuadExtent, this.maxSourceExtent_)) { // whole quad outside source projection extent -> ignore return; } @@ -328,13 +327,13 @@ _ol_reproj_Triangulation_.prototype.addQuad_ = function(a, b, c, d, * @return {ol.Extent} Calculated extent. */ _ol_reproj_Triangulation_.prototype.calculateSourceExtent = function() { - var extent = _ol_extent_.createEmpty(); + var extent = createEmpty(); this.triangles_.forEach(function(triangle, i, arr) { var src = triangle.source; - _ol_extent_.extendCoordinate(extent, src[0]); - _ol_extent_.extendCoordinate(extent, src[1]); - _ol_extent_.extendCoordinate(extent, src[2]); + extendCoordinate(extent, src[0]); + extendCoordinate(extent, src[1]); + extendCoordinate(extent, src[2]); }); return extent; diff --git a/src/ol/source/BingMaps.js b/src/ol/source/BingMaps.js index 24b31ca878..f3bfdedd78 100644 --- a/src/ol/source/BingMaps.js +++ b/src/ol/source/BingMaps.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_TileUrlFunction_ from '../TileUrlFunction.js'; -import _ol_extent_ from '../extent.js'; +import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import _ol_proj_ from '../proj.js'; import _ol_source_State_ from '../source/State.js'; @@ -185,21 +185,21 @@ _ol_source_BingMaps_.prototype.handleImageryMetadataResponse = function(response var attributions = []; var zoom = frameState.viewState.zoom; resource.imageryProviders.map(function(imageryProvider) { - var intersects = false; + var intersecting = false; var coverageAreas = imageryProvider.coverageAreas; for (var i = 0, ii = coverageAreas.length; i < ii; ++i) { var coverageArea = coverageAreas[i]; if (zoom >= coverageArea.zoomMin && zoom <= coverageArea.zoomMax) { var bbox = coverageArea.bbox; var epsg4326Extent = [bbox[1], bbox[0], bbox[3], bbox[2]]; - var extent = _ol_extent_.applyTransform(epsg4326Extent, transform); - if (_ol_extent_.intersects(extent, frameState.extent)) { - intersects = true; + var extent = applyTransform(epsg4326Extent, transform); + if (intersects(extent, frameState.extent)) { + intersecting = true; break; } } } - if (intersects) { + if (intersecting) { attributions.push(imageryProvider.attribution); } }); diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js index ccbada86d1..6ec0b60485 100644 --- a/src/ol/source/Cluster.js +++ b/src/ol/source/Cluster.js @@ -7,7 +7,7 @@ import _ol_asserts_ from '../asserts.js'; import _ol_Feature_ from '../Feature.js'; import _ol_coordinate_ from '../coordinate.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js'; import _ol_geom_Point_ from '../geom/Point.js'; import _ol_source_Vector_ from '../source/Vector.js'; @@ -140,7 +140,7 @@ _ol_source_Cluster_.prototype.cluster = function() { return; } this.features.length = 0; - var extent = _ol_extent_.createEmpty(); + var extent = createEmpty(); var mapDistance = this.distance * this.resolution; var features = this.source.getFeatures(); @@ -155,8 +155,8 @@ _ol_source_Cluster_.prototype.cluster = function() { var geometry = this.geometryFunction(feature); if (geometry) { var coordinates = geometry.getCoordinates(); - _ol_extent_.createOrUpdateFromCoordinate(coordinates, extent); - _ol_extent_.buffer(extent, mapDistance, extent); + createOrUpdateFromCoordinate(coordinates, extent); + buffer(extent, mapDistance, extent); var neighbors = this.source.getFeaturesInExtent(extent); neighbors = neighbors.filter(function(neighbor) { diff --git a/src/ol/source/Image.js b/src/ol/source/Image.js index db0fb79b6e..7b6504c52e 100644 --- a/src/ol/source/Image.js +++ b/src/ol/source/Image.js @@ -6,7 +6,7 @@ import {inherits} from '../index.js'; import _ol_ImageState_ from '../ImageState.js'; import _ol_array_ from '../array.js'; import _ol_events_Event_ from '../events/Event.js'; -import _ol_extent_ from '../extent.js'; +import {equals} from '../extent.js'; import _ol_proj_ from '../proj.js'; import _ol_reproj_Image_ from '../reproj/Image.js'; import _ol_source_Source_ from '../source/Source.js'; @@ -103,7 +103,7 @@ _ol_source_Image_.prototype.getImage = function(extent, resolution, pixelRatio, _ol_proj_.equivalent( this.reprojectedImage_.getProjection(), projection) && this.reprojectedImage_.getResolution() == resolution && - _ol_extent_.equals(this.reprojectedImage_.getExtent(), extent)) { + equals(this.reprojectedImage_.getExtent(), extent)) { return this.reprojectedImage_; } this.reprojectedImage_.dispose(); diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js index fa3da66292..be6cf4cc36 100644 --- a/src/ol/source/ImageArcGISRest.js +++ b/src/ol/source/ImageArcGISRest.js @@ -6,7 +6,7 @@ import _ol_Image_ from '../Image.js'; import _ol_asserts_ from '../asserts.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, getHeight, getWidth} from '../extent.js'; import _ol_obj_ from '../obj.js'; import _ol_source_Image_ from '../source/Image.js'; import _ol_uri_ from '../uri.js'; @@ -128,7 +128,7 @@ _ol_source_ImageArcGISRest_.prototype.getImageInternal = function(extent, resolu this.renderedRevision_ == this.getRevision() && image.getResolution() == resolution && image.getPixelRatio() == pixelRatio && - _ol_extent_.containsExtent(image.getExtent(), extent)) { + containsExtent(image.getExtent(), extent)) { return image; } @@ -143,8 +143,8 @@ _ol_source_ImageArcGISRest_.prototype.getImageInternal = function(extent, resolu var centerX = (extent[0] + extent[2]) / 2; var centerY = (extent[1] + extent[3]) / 2; if (this.ratio_ != 1) { - var halfWidth = this.ratio_ * _ol_extent_.getWidth(extent) / 2; - var halfHeight = this.ratio_ * _ol_extent_.getHeight(extent) / 2; + var halfWidth = this.ratio_ * getWidth(extent) / 2; + var halfHeight = this.ratio_ * getHeight(extent) / 2; extent[0] = centerX - halfWidth; extent[1] = centerY - halfHeight; extent[2] = centerX + halfWidth; @@ -154,8 +154,8 @@ _ol_source_ImageArcGISRest_.prototype.getImageInternal = function(extent, resolu var imageResolution = resolution / pixelRatio; // Compute an integer width and height. - var width = Math.ceil(_ol_extent_.getWidth(extent) / imageResolution); - var height = Math.ceil(_ol_extent_.getHeight(extent) / imageResolution); + var width = Math.ceil(getWidth(extent) / imageResolution); + var height = Math.ceil(getHeight(extent) / imageResolution); // Modify the extent to match the integer width and height. extent[0] = centerX - imageResolution * width / 2; diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index 1e250b7408..b34332f290 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_ImageCanvas_ from '../ImageCanvas.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, getHeight, getWidth, scaleFromCenter} from '../extent.js'; import _ol_source_Image_ from '../source/Image.js'; /** @@ -66,14 +66,14 @@ _ol_source_ImageCanvas_.prototype.getImageInternal = function(extent, resolution this.renderedRevision_ == this.getRevision() && canvas.getResolution() == resolution && canvas.getPixelRatio() == pixelRatio && - _ol_extent_.containsExtent(canvas.getExtent(), extent)) { + containsExtent(canvas.getExtent(), extent)) { return canvas; } extent = extent.slice(); - _ol_extent_.scaleFromCenter(extent, this.ratio_); - var width = _ol_extent_.getWidth(extent) / resolution; - var height = _ol_extent_.getHeight(extent) / resolution; + scaleFromCenter(extent, this.ratio_); + var width = getWidth(extent) / resolution; + var height = getHeight(extent) / resolution; var size = [width * pixelRatio, height * pixelRatio]; var canvasElement = this.canvasFunction_( diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js index 4d3149c25e..d4e84d5f3e 100644 --- a/src/ol/source/ImageMapGuide.js +++ b/src/ol/source/ImageMapGuide.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import _ol_Image_ from '../Image.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, getCenter, getHeight, getWidth, scaleFromCenter} from '../extent.js'; import _ol_obj_ from '../obj.js'; import _ol_source_Image_ from '../source/Image.js'; import _ol_uri_ from '../uri.js'; @@ -126,16 +126,16 @@ _ol_source_ImageMapGuide_.prototype.getImageInternal = function(extent, resoluti this.renderedRevision_ == this.getRevision() && image.getResolution() == resolution && image.getPixelRatio() == pixelRatio && - _ol_extent_.containsExtent(image.getExtent(), extent)) { + containsExtent(image.getExtent(), extent)) { return image; } if (this.ratio_ != 1) { extent = extent.slice(); - _ol_extent_.scaleFromCenter(extent, this.ratio_); + scaleFromCenter(extent, this.ratio_); } - var width = _ol_extent_.getWidth(extent) / resolution; - var height = _ol_extent_.getHeight(extent) / resolution; + var width = getWidth(extent) / resolution; + var height = getHeight(extent) / resolution; var size = [width * pixelRatio, height * pixelRatio]; if (this.url_ !== undefined) { @@ -174,8 +174,8 @@ _ol_source_ImageMapGuide_.prototype.getImageLoadFunction = function() { * @return {number} The computed map scale. */ _ol_source_ImageMapGuide_.getScale = function(extent, size, metersPerUnit, dpi) { - var mcsW = _ol_extent_.getWidth(extent); - var mcsH = _ol_extent_.getHeight(extent); + var mcsW = getWidth(extent); + var mcsH = getHeight(extent); var devW = size[0]; var devH = size[1]; var mpp = 0.0254 / dpi; @@ -209,7 +209,7 @@ _ol_source_ImageMapGuide_.prototype.updateParams = function(params) { _ol_source_ImageMapGuide_.prototype.getUrl = function(baseUrl, params, extent, size, projection) { var scale = _ol_source_ImageMapGuide_.getScale(extent, size, this.metersPerUnit_, this.displayDpi_); - var center = _ol_extent_.getCenter(extent); + var center = getCenter(extent); var baseParams = { 'OPERATION': this.useOverlay_ ? 'GETDYNAMICMAPOVERLAYIMAGE' : 'GETMAPIMAGE', 'VERSION': '2.0.0', diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js index df89ed0d76..e766d19ce2 100644 --- a/src/ol/source/ImageStatic.js +++ b/src/ol/source/ImageStatic.js @@ -7,7 +7,7 @@ import _ol_ImageState_ from '../ImageState.js'; import _ol_dom_ from '../dom.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {intersects, getHeight, getWidth} from '../extent.js'; import _ol_proj_ from '../proj.js'; import _ol_source_Image_ from '../source/Image.js'; @@ -60,7 +60,7 @@ inherits(_ol_source_ImageStatic_, _ol_source_Image_); * @inheritDoc */ _ol_source_ImageStatic_.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) { - if (_ol_extent_.intersects(extent, this.image_.getExtent())) { + if (intersects(extent, this.image_.getExtent())) { return this.image_; } return null; @@ -82,8 +82,8 @@ _ol_source_ImageStatic_.prototype.handleImageChange = function(evt) { imageWidth = image.width; imageHeight = image.height; } - var resolution = _ol_extent_.getHeight(imageExtent) / imageHeight; - var targetWidth = Math.ceil(_ol_extent_.getWidth(imageExtent) / resolution); + var resolution = getHeight(imageExtent) / imageHeight; + var targetWidth = Math.ceil(getWidth(imageExtent) / resolution); if (targetWidth != imageWidth) { var context = _ol_dom_.createCanvasContext2D(targetWidth, imageHeight); var canvas = context.canvas; diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js index 98fa89fab9..4d907e3154 100644 --- a/src/ol/source/ImageWMS.js +++ b/src/ol/source/ImageWMS.js @@ -8,7 +8,7 @@ import _ol_Image_ from '../Image.js'; import _ol_asserts_ from '../asserts.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, getCenter, getForViewAndSize, getHeight, getWidth} from '../extent.js'; import _ol_obj_ from '../obj.js'; import _ol_proj_ from '../proj.js'; import _ol_reproj_ from '../reproj.js'; @@ -146,8 +146,7 @@ _ol_source_ImageWMS_.prototype.getGetFeatureInfoUrl = function(coordinate, resol coordinate = _ol_proj_.transform(coordinate, projectionObj, sourceProjectionObj); } - var extent = _ol_extent_.getForViewAndSize( - coordinate, resolution, 0, + var extent = getForViewAndSize(coordinate, resolution, 0, _ol_source_ImageWMS_.GETFEATUREINFO_IMAGE_SIZE_); var baseParams = { @@ -199,14 +198,14 @@ _ol_source_ImageWMS_.prototype.getImageInternal = function(extent, resolution, p var imageResolution = resolution / pixelRatio; - var center = _ol_extent_.getCenter(extent); - var viewWidth = Math.ceil(_ol_extent_.getWidth(extent) / imageResolution); - var viewHeight = Math.ceil(_ol_extent_.getHeight(extent) / imageResolution); - var viewExtent = _ol_extent_.getForViewAndSize(center, imageResolution, 0, + var center = getCenter(extent); + var viewWidth = Math.ceil(getWidth(extent) / imageResolution); + var viewHeight = Math.ceil(getHeight(extent) / imageResolution); + var viewExtent = getForViewAndSize(center, imageResolution, 0, [viewWidth, viewHeight]); - var requestWidth = Math.ceil(this.ratio_ * _ol_extent_.getWidth(extent) / imageResolution); - var requestHeight = Math.ceil(this.ratio_ * _ol_extent_.getHeight(extent) / imageResolution); - var requestExtent = _ol_extent_.getForViewAndSize(center, imageResolution, 0, + var requestWidth = Math.ceil(this.ratio_ * getWidth(extent) / imageResolution); + var requestHeight = Math.ceil(this.ratio_ * getHeight(extent) / imageResolution); + var requestExtent = getForViewAndSize(center, imageResolution, 0, [requestWidth, requestHeight]); var image = this.image_; @@ -214,7 +213,7 @@ _ol_source_ImageWMS_.prototype.getImageInternal = function(extent, resolution, p this.renderedRevision_ == this.getRevision() && image.getResolution() == resolution && image.getPixelRatio() == pixelRatio && - _ol_extent_.containsExtent(image.getExtent(), viewExtent)) { + containsExtent(image.getExtent(), viewExtent)) { return image; } @@ -227,8 +226,8 @@ _ol_source_ImageWMS_.prototype.getImageInternal = function(extent, resolution, p }; _ol_obj_.assign(params, this.params_); - this.imageSize_[0] = Math.round(_ol_extent_.getWidth(requestExtent) / imageResolution); - this.imageSize_[1] = Math.round(_ol_extent_.getHeight(requestExtent) / imageResolution); + this.imageSize_[0] = Math.round(getWidth(requestExtent) / imageResolution); + this.imageSize_[1] = Math.round(getHeight(requestExtent) / imageResolution); var url = this.getRequestUrl_(requestExtent, this.imageSize_, pixelRatio, projection, params); diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index 6b90825728..85851571eb 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -9,7 +9,7 @@ import _ol_events_ from '../events.js'; import _ol_events_Event_ from '../events/Event.js'; import _ol_events_EventType_ from '../events/EventType.js'; import {Processor as _ol_ext_pixelworks_Processor_} from 'pixelworks'; -import _ol_extent_ from '../extent.js'; +import {equals, getCenter, getHeight, getWidth} from '../extent.js'; import _ol_layer_Image_ from '../layer/Image.js'; import _ol_layer_Tile_ from '../layer/Tile.js'; import _ol_obj_ from '../obj.js'; @@ -175,12 +175,12 @@ _ol_source_Raster_.prototype.updateFrameState_ = function(extent, resolution, pr frameState.viewState = /** @type {olx.ViewState} */ ( _ol_obj_.assign({}, frameState.viewState)); - var center = _ol_extent_.getCenter(extent); + var center = getCenter(extent); frameState.extent = extent.slice(); frameState.focus = center; - frameState.size[0] = Math.round(_ol_extent_.getWidth(extent) / resolution); - frameState.size[1] = Math.round(_ol_extent_.getHeight(extent) / resolution); + frameState.size[0] = Math.round(getWidth(extent) / resolution); + frameState.size[1] = Math.round(getHeight(extent) / resolution); frameState.time = Date.now(); frameState.animate = false; @@ -226,7 +226,7 @@ _ol_source_Raster_.prototype.getImage = function(extent, resolution, pixelRatio, if (this.renderedImageCanvas_) { var renderedResolution = this.renderedImageCanvas_.getResolution(); var renderedExtent = this.renderedImageCanvas_.getExtent(); - if (resolution !== renderedResolution || !_ol_extent_.equals(extent, renderedExtent)) { + if (resolution !== renderedResolution || !equals(extent, renderedExtent)) { this.renderedImageCanvas_ = null; } } @@ -288,7 +288,7 @@ _ol_source_Raster_.prototype.onWorkerComplete_ = function(frameState, err, outpu var extent = frameState.extent; var resolution = frameState.viewState.resolution; if (resolution !== this.requestedFrameState_.viewState.resolution || - !_ol_extent_.equals(extent, this.requestedFrameState_.extent)) { + !equals(extent, this.requestedFrameState_.extent)) { return; } @@ -296,8 +296,8 @@ _ol_source_Raster_.prototype.onWorkerComplete_ = function(frameState, err, outpu if (this.renderedImageCanvas_) { context = this.renderedImageCanvas_.getImage().getContext('2d'); } else { - var width = Math.round(_ol_extent_.getWidth(extent) / resolution); - var height = Math.round(_ol_extent_.getHeight(extent) / resolution); + var width = Math.round(getWidth(extent) / resolution); + var height = Math.round(getHeight(extent) / resolution); context = _ol_dom_.createCanvasContext2D(width, height); this.renderedImageCanvas_ = new _ol_ImageCanvas_(extent, resolution, 1, context.canvas); } diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js index e594038efd..98e740bf06 100644 --- a/src/ol/source/TileArcGISRest.js +++ b/src/ol/source/TileArcGISRest.js @@ -2,7 +2,7 @@ * @module ol/source/TileArcGISRest */ import {inherits} from '../index.js'; -import _ol_extent_ from '../extent.js'; +import {createEmpty} from '../extent.js'; import _ol_math_ from '../math.js'; import _ol_obj_ from '../obj.js'; import _ol_size_ from '../size.js'; @@ -53,7 +53,7 @@ var _ol_source_TileArcGISRest_ = function(opt_options) { * @private * @type {ol.Extent} */ - this.tmpExtent_ = _ol_extent_.createEmpty(); + this.tmpExtent_ = createEmpty(); this.setKey(this.getKeyForParams_()); }; diff --git a/src/ol/source/TileJSON.js b/src/ol/source/TileJSON.js index 23728876ae..e3d089c248 100644 --- a/src/ol/source/TileJSON.js +++ b/src/ol/source/TileJSON.js @@ -10,7 +10,7 @@ import {inherits} from '../index.js'; import _ol_TileUrlFunction_ from '../TileUrlFunction.js'; import _ol_asserts_ from '../asserts.js'; -import _ol_extent_ from '../extent.js'; +import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import _ol_proj_ from '../proj.js'; import _ol_source_State_ from '../source/State.js'; @@ -121,7 +121,7 @@ _ol_source_TileJSON_.prototype.handleTileJSONResponse = function(tileJSON) { if (tileJSON.bounds !== undefined) { var transform = _ol_proj_.getTransformFromProjections( epsg4326Projection, sourceProjection); - extent = _ol_extent_.applyTransform(tileJSON.bounds, transform); + extent = applyTransform(tileJSON.bounds, transform); } var minZoom = tileJSON.minzoom || 0; @@ -141,7 +141,7 @@ _ol_source_TileJSON_.prototype.handleTileJSONResponse = function(tileJSON) { extent : epsg4326Projection.getExtent(); this.setAttributions(function(frameState) { - if (_ol_extent_.intersects(attributionExtent, frameState.extent)) { + if (intersects(attributionExtent, frameState.extent)) { return [tileJSON.attribution]; } return null; diff --git a/src/ol/source/TileUTFGrid.js b/src/ol/source/TileUTFGrid.js index c4a06bcd3a..60dfe8ed2f 100644 --- a/src/ol/source/TileUTFGrid.js +++ b/src/ol/source/TileUTFGrid.js @@ -8,7 +8,7 @@ import _ol_TileUrlFunction_ from '../TileUrlFunction.js'; import _ol_asserts_ from '../asserts.js'; import _ol_events_ from '../events.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import _ol_proj_ from '../proj.js'; import _ol_source_State_ from '../source/State.js'; @@ -173,7 +173,7 @@ _ol_source_TileUTFGrid_.prototype.handleTileJSONResponse = function(tileJSON) { if (tileJSON.bounds !== undefined) { var transform = _ol_proj_.getTransformFromProjections( epsg4326Projection, sourceProjection); - extent = _ol_extent_.applyTransform(tileJSON.bounds, transform); + extent = applyTransform(tileJSON.bounds, transform); } var minZoom = tileJSON.minzoom || 0; @@ -201,7 +201,7 @@ _ol_source_TileUTFGrid_.prototype.handleTileJSONResponse = function(tileJSON) { extent : epsg4326Projection.getExtent(); this.setAttributions(function(frameState) { - if (_ol_extent_.intersects(attributionExtent, frameState.extent)) { + if (intersects(attributionExtent, frameState.extent)) { return [tileJSON.attribution]; } return null; diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js index a03a4f718e..28253791be 100644 --- a/src/ol/source/TileWMS.js +++ b/src/ol/source/TileWMS.js @@ -5,7 +5,7 @@ import {DEFAULT_WMS_VERSION} from './common.js'; import {inherits} from '../index.js'; import _ol_asserts_ from '../asserts.js'; -import _ol_extent_ from '../extent.js'; +import {buffer, createEmpty} from '../extent.js'; import _ol_obj_ from '../obj.js'; import _ol_math_ from '../math.js'; import _ol_proj_ from '../proj.js'; @@ -85,7 +85,7 @@ var _ol_source_TileWMS_ = function(opt_options) { * @private * @type {ol.Extent} */ - this.tmpExtent_ = _ol_extent_.createEmpty(); + this.tmpExtent_ = createEmpty(); this.updateV13_(); this.setKey(this.getKeyForParams_()); @@ -132,7 +132,7 @@ _ol_source_TileWMS_.prototype.getGetFeatureInfoUrl = function(coordinate, resolu var gutter = this.gutter_; if (gutter !== 0) { tileSize = _ol_size_.buffer(tileSize, gutter, this.tmpSize); - tileExtent = _ol_extent_.buffer(tileExtent, tileResolution * gutter, tileExtent); + tileExtent = buffer(tileExtent, tileResolution * gutter, tileExtent); } if (sourceProjectionObj && sourceProjectionObj !== projectionObj) { @@ -304,8 +304,7 @@ _ol_source_TileWMS_.prototype.fixedTileUrlFunction = function(tileCoord, pixelRa var gutter = this.gutter_; if (gutter !== 0) { tileSize = _ol_size_.buffer(tileSize, gutter, this.tmpSize); - tileExtent = _ol_extent_.buffer(tileExtent, - tileResolution * gutter, tileExtent); + tileExtent = buffer(tileExtent, tileResolution * gutter, tileExtent); } if (pixelRatio != 1) { diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index 7a7c4eb723..1b91059048 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -11,7 +11,7 @@ import _ol_asserts_ from '../asserts.js'; import _ol_events_ from '../events.js'; import _ol_events_Event_ from '../events/Event.js'; import _ol_events_EventType_ from '../events/EventType.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent, equals} from '../extent.js'; import _ol_featureloader_ from '../featureloader.js'; import _ol_functions_ from '../functions.js'; import _ol_loadingstrategy_ from '../loadingstrategy.js'; @@ -751,7 +751,7 @@ _ol_source_Vector_.prototype.loadFeatures = function( * @return {boolean} Contains. */ function(object) { - return _ol_extent_.containsExtent(object.extent, extentToLoad); + return containsExtent(object.extent, extentToLoad); }); if (!alreadyLoaded) { this.loader_.call(this, extentToLoad, resolution, projection); @@ -770,7 +770,7 @@ _ol_source_Vector_.prototype.removeLoadedExtent = function(extent) { var loadedExtentsRtree = this.loadedExtentsRtree_; var obj; loadedExtentsRtree.forEachInExtent(extent, function(object) { - if (_ol_extent_.equals(object.extent, extent)) { + if (equals(object.extent, extent)) { obj = object; return true; } diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index 0a69897f27..c7387eff23 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import _ol_TileUrlFunction_ from '../TileUrlFunction.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {containsExtent} from '../extent.js'; import _ol_obj_ from '../obj.js'; import _ol_proj_ from '../proj.js'; import _ol_source_TileImage_ from '../source/TileImage.js'; @@ -416,7 +416,7 @@ _ol_source_WMTS_.optionsFromCapabilities = function(wmtsCap, config) { if (projectionExtent) { // If possible, do a sanity check on the extent - it should never be // bigger than the validity extent of the projection of a matrix set. - if (!_ol_extent_.containsExtent(projectionExtent, extent)) { + if (!containsExtent(projectionExtent, extent)) { extent = undefined; } } diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js index 807fa0fd55..12cdbe7ac0 100644 --- a/src/ol/source/Zoomify.js +++ b/src/ol/source/Zoomify.js @@ -8,7 +8,7 @@ import _ol_TileState_ from '../TileState.js'; import _ol_TileUrlFunction_ from '../TileUrlFunction.js'; import _ol_asserts_ from '../asserts.js'; import _ol_dom_ from '../dom.js'; -import _ol_extent_ from '../extent.js'; +import {getTopLeft} from '../extent.js'; import _ol_size_ from '../size.js'; import _ol_source_TileImage_ from '../source/TileImage.js'; import _ol_tilegrid_TileGrid_ from '../tilegrid/TileGrid.js'; @@ -84,7 +84,7 @@ var _ol_source_Zoomify_ = function(opt_options) { var tileGrid = new _ol_tilegrid_TileGrid_({ tileSize: tileSize, extent: extent, - origin: _ol_extent_.getTopLeft(extent), + origin: getTopLeft(extent), resolutions: resolutions }); diff --git a/src/ol/structs/RBush.js b/src/ol/structs/RBush.js index dd92b2d85a..d091f4e9f9 100644 --- a/src/ol/structs/RBush.js +++ b/src/ol/structs/RBush.js @@ -3,7 +3,7 @@ */ import {getUid} from '../index.js'; import _ol_ext_rbush_ from 'rbush'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdate, equals} from '../extent.js'; import _ol_obj_ from '../obj.js'; /** @@ -103,7 +103,7 @@ _ol_structs_RBush_.prototype.remove = function(value) { _ol_structs_RBush_.prototype.update = function(extent, value) { var item = this.items_[getUid(value)]; var bbox = [item.minX, item.minY, item.maxX, item.maxY]; - if (!_ol_extent_.equals(bbox, extent)) { + if (!equals(bbox, extent)) { this.remove(value); this.insert(extent, value); } @@ -213,7 +213,7 @@ _ol_structs_RBush_.prototype.clear = function() { _ol_structs_RBush_.prototype.getExtent = function(opt_extent) { // FIXME add getExtent() to rbush var data = this.rbush_.data; - return _ol_extent_.createOrUpdate(data.minX, data.minY, data.maxX, data.maxY, opt_extent); + return createOrUpdate(data.minX, data.minY, data.maxX, data.maxY, opt_extent); }; diff --git a/src/ol/tilegrid.js b/src/ol/tilegrid.js index 4c9e7ba0e6..77a2382351 100644 --- a/src/ol/tilegrid.js +++ b/src/ol/tilegrid.js @@ -3,8 +3,8 @@ */ import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from './tilegrid/common.js'; import _ol_size_ from './size.js'; -import _ol_extent_ from './extent.js'; -import _ol_extent_Corner_ from './extent/Corner.js'; +import {containsCoordinate, createOrUpdate, getCorner, getHeight, getWidth} from './extent.js'; +import Corner from './extent/Corner.js'; import _ol_obj_ from './obj.js'; import _ol_proj_ from './proj.js'; import _ol_proj_Units_ from './proj/Units.js'; @@ -36,8 +36,8 @@ _ol_tilegrid_.wrapX = function(tileGrid, tileCoord, projection) { var z = tileCoord[0]; var center = tileGrid.getTileCoordCenter(tileCoord); var projectionExtent = _ol_tilegrid_.extentFromProjection(projection); - if (!_ol_extent_.containsCoordinate(projectionExtent, center)) { - var worldWidth = _ol_extent_.getWidth(projectionExtent); + if (!containsCoordinate(projectionExtent, center)) { + var worldWidth = getWidth(projectionExtent); var worldsAway = Math.ceil((projectionExtent[0] - center[0]) / worldWidth); center[0] += worldWidth * worldsAway; return tileGrid.getTileCoordForCoordAndZ(center, z); @@ -58,15 +58,14 @@ _ol_tilegrid_.wrapX = function(tileGrid, tileCoord, projection) { * @return {!ol.tilegrid.TileGrid} TileGrid instance. */ _ol_tilegrid_.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_corner) { - var corner = opt_corner !== undefined ? - opt_corner : _ol_extent_Corner_.TOP_LEFT; + var corner = opt_corner !== undefined ? opt_corner : Corner.TOP_LEFT; var resolutions = _ol_tilegrid_.resolutionsFromExtent( extent, opt_maxZoom, opt_tileSize); return new _ol_tilegrid_TileGrid_({ extent: extent, - origin: _ol_extent_.getCorner(extent, corner), + origin: getCorner(extent, corner), resolutions: resolutions, tileSize: opt_tileSize }); @@ -107,8 +106,8 @@ _ol_tilegrid_.resolutionsFromExtent = function(extent, opt_maxZoom, opt_tileSize var maxZoom = opt_maxZoom !== undefined ? opt_maxZoom : DEFAULT_MAX_ZOOM; - var height = _ol_extent_.getHeight(extent); - var width = _ol_extent_.getWidth(extent); + var height = getHeight(extent); + var width = getWidth(extent); var tileSize = _ol_size_.toSize(opt_tileSize !== undefined ? opt_tileSize : DEFAULT_TILE_SIZE); @@ -153,7 +152,7 @@ _ol_tilegrid_.extentFromProjection = function(projection) { if (!extent) { var half = 180 * _ol_proj_.METERS_PER_UNIT[_ol_proj_Units_.DEGREES] / projection.getMetersPerUnit(); - extent = _ol_extent_.createOrUpdate(-half, -half, half, half); + extent = createOrUpdate(-half, -half, half, half); } return extent; }; diff --git a/src/ol/tilegrid/TileGrid.js b/src/ol/tilegrid/TileGrid.js index edab2d53de..d7284c00aa 100644 --- a/src/ol/tilegrid/TileGrid.js +++ b/src/ol/tilegrid/TileGrid.js @@ -5,7 +5,7 @@ import {DEFAULT_TILE_SIZE} from './common.js'; import _ol_asserts_ from '../asserts.js'; import _ol_TileRange_ from '../TileRange.js'; import _ol_array_ from '../array.js'; -import _ol_extent_ from '../extent.js'; +import {createOrUpdate, getTopLeft} from '../extent.js'; import _ol_math_ from '../math.js'; import _ol_size_ from '../size.js'; import _ol_tilecoord_ from '../tilecoord.js'; @@ -88,7 +88,7 @@ var _ol_tilegrid_TileGrid_ = function(options) { if (extent !== undefined && !this.origin_ && !this.origins_) { - this.origin_ = _ol_extent_.getTopLeft(extent); + this.origin_ = getTopLeft(extent); } _ol_asserts_.assert( @@ -313,7 +313,7 @@ _ol_tilegrid_TileGrid_.prototype.getTileRangeExtent = function(z, tileRange, opt var maxX = origin[0] + (tileRange.maxX + 1) * tileSize[0] * resolution; var minY = origin[1] + tileRange.minY * tileSize[1] * resolution; var maxY = origin[1] + (tileRange.maxY + 1) * tileSize[1] * resolution; - return _ol_extent_.createOrUpdate(minX, minY, maxX, maxY, opt_extent); + return createOrUpdate(minX, minY, maxX, maxY, opt_extent); }; @@ -366,7 +366,7 @@ _ol_tilegrid_TileGrid_.prototype.getTileCoordExtent = function(tileCoord, opt_ex var minY = origin[1] + tileCoord[2] * tileSize[1] * resolution; var maxX = minX + tileSize[0] * resolution; var maxY = minY + tileSize[1] * resolution; - return _ol_extent_.createOrUpdate(minX, minY, maxX, maxY, opt_extent); + return createOrUpdate(minX, minY, maxX, maxY, opt_extent); };