Use named imports from extent

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
+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();
+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;
}
}
+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;
}