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

Rename _ol_geom_GeometryCollection_ to GeometryCollection

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:59:35 -07:00
parent 87e665d60e
commit 4ea0af87df
11 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/GeoJSON.js
+2 -2
View File
@@ -9,7 +9,7 @@ import _ol_asserts_ from '../asserts.js';
import _ol_Feature_ from '../Feature.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_JSONFeature_ from '../format/JSONFeature.js';
import _ol_geom_GeometryCollection_ from '../geom/GeometryCollection.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
@@ -99,7 +99,7 @@ _ol_format_GeoJSON_.readGeometryCollectionGeometry_ = function(
function(geometry) {
return _ol_format_GeoJSON_.readGeometry_(geometry, opt_options);
});
return new _ol_geom_GeometryCollection_(geometries);
return new GeometryCollection(geometries);
};
src/ol/format/KML.js
+4 -4
View File
@@ -14,7 +14,7 @@ import _ol_color_ from '../color.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_GeometryCollection_ from '../geom/GeometryCollection.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
@@ -911,7 +911,7 @@ _ol_format_KML_.readMultiGeometry_ = function(node, objectStack) {
return null;
}
if (geometries.length === 0) {
return new _ol_geom_GeometryCollection_(geometries);
return new GeometryCollection(geometries);
}
/** @type {ol.geom.Geometry} */
var multiGeometry;
@@ -948,12 +948,12 @@ _ol_format_KML_.readMultiGeometry_ = function(node, objectStack) {
multiGeometry.setPolygons(geometries);
_ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
} else if (type == _ol_geom_GeometryType_.GEOMETRY_COLLECTION) {
multiGeometry = new _ol_geom_GeometryCollection_(geometries);
multiGeometry = new GeometryCollection(geometries);
} else {
_ol_asserts_.assert(false, 37); // Unknown geometry type found
}
} else {
multiGeometry = new _ol_geom_GeometryCollection_(geometries);
multiGeometry = new GeometryCollection(geometries);
}
return /** @type {ol.geom.Geometry} */ (multiGeometry);
};
src/ol/format/WKT.js
+3 -3
View File
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_TextFeature_ from '../format/TextFeature.js';
import _ol_geom_GeometryCollection_ from '../geom/GeometryCollection.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
@@ -386,7 +386,7 @@ _ol_format_WKT_.prototype.writeFeaturesText = function(features, opt_options) {
for (var i = 0, ii = features.length; i < ii; ++i) {
geometries.push(features[i].getGeometry());
}
var collection = new _ol_geom_GeometryCollection_(geometries);
var collection = new GeometryCollection(geometries);
return this.writeGeometryText(collection, opt_options);
};
@@ -671,7 +671,7 @@ _ol_format_WKT_.Parser.prototype.parseGeometry_ = function() {
this.layout_ = this.parseGeometryLayout_();
if (geomType == _ol_geom_GeometryType_.GEOMETRY_COLLECTION.toUpperCase()) {
var geometries = this.parseGeometryCollectionText_();
return new _ol_geom_GeometryCollection_(geometries);
return new GeometryCollection(geometries);
} else {
var parser = _ol_format_WKT_.Parser.GeometryParser_[geomType];
var ctor = _ol_format_WKT_.Parser.GeometryConstructor_[geomType];