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

10
src/ol/render/Feature.js
View File

@@ -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],

15
src/ol/render/canvas/Immediate.js
View File

@@ -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_) {

33
src/ol/render/canvas/Replay.js
View File

@@ -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_;

10
src/ol/render/canvas/ReplayGroup.js
View File

@@ -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);

4
src/ol/render/canvas/TextReplay.js
View File

@@ -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;

4
src/ol/render/webgl/CircleReplay.js
View File

@@ -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<number>} */ (opt_hitExtent),
feature.getGeometry().getExtent()))) {
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);

5
src/ol/render/webgl/Immediate.js
View File

@@ -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);

4
src/ol/render/webgl/LineStringReplay.js
View File

@@ -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<number>} */ (opt_hitExtent),
feature.getGeometry().getExtent()))) {
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);

4
src/ol/render/webgl/PolygonReplay.js
View File

@@ -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<number>} */ (opt_hitExtent),
feature.getGeometry().getExtent()))) {
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);

4
src/ol/render/webgl/Replay.js
View File

@@ -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

6
src/ol/render/webgl/ReplayGroup.js
View File

@@ -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,

4
src/ol/render/webgl/TextureReplay.js
View File

@@ -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<number>} */ (opt_hitExtent),
feature.getGeometry().getExtent()))) {
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);