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
+2 -2
View File
@@ -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()
);
+2 -2
View File
@@ -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.<number>} */
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]);
};
+2 -2
View File
@@ -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.<number>} */
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]);
};
+2 -2
View File
@@ -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);
};