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/geom/flat/center.js
+3 -4
View File
@@ -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];
}
src/ol/geom/flat/contains.js
+2 -2
View File
@@ -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).
src/ol/geom/flat/intersectsextent.js
+6 -6
View File
@@ -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);
});
};