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

Use named imports from extent

Browse Source
This commit is contained in:
Andreas Hocevar
2017-12-13 14:05:42 +01:00
parent 7247ccbf38
commit c0c43bca84
77 changed files with 360 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/Map.js
+2 -2
View File
@@ -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);
src/ol/renderer/canvas/ImageLayer.js
+5 -6
View File
@@ -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
src/ol/renderer/canvas/IntermediateCanvas.js
+3 -3
View File
@@ -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));
}
src/ol/renderer/canvas/Layer.js
+5 -5
View File
@@ -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);
src/ol/renderer/canvas/TileLayer.js
+6 -6
View File
@@ -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_;
src/ol/renderer/canvas/VectorLayer.js
+11 -11
View File
@@ -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;
}
src/ol/renderer/canvas/VectorTileLayer.js
+8 -8
View File
@@ -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);
src/ol/renderer/webgl/ImageLayer.js
+3 -4
View File
@@ -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();
src/ol/renderer/webgl/TileLayer.js
+3 -3
View File
@@ -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;
}
}
src/ol/renderer/webgl/VectorLayer.js
+4 -4
View File
@@ -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;
}