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

Accept linestrings and flat coordinates in MultiLineString constructor

Browse Source
This commit is contained in:
ahocevar
2018-07-07 17:01:39 +02:00
parent 3871f7785a
commit a09b6c91c9
8 changed files with 44 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/format/GML3.js
View File

@@ -103,8 +103,7 @@ GML3.prototype.readMultiCurve_ = function(node, objectStack) {
const lineStrings = pushParseAndPop([],
this.MULTICURVE_PARSERS_, node, objectStack, this);
if (lineStrings) {
const multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
const multiLineString = new MultiLineString(lineStrings);
return multiLineString;
} else {
return undefined;

6
src/ol/format/GMLBase.js
View File

@@ -323,11 +323,7 @@ GMLBase.prototype.readMultiLineString = function(node, objectStack) {
const lineStrings = pushParseAndPop([],
this.MULTILINESTRING_PARSERS_, node, objectStack, this);
if (lineStrings) {
const multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
} else {
return undefined;
return new MultiLineString(lineStrings);
}
};

3
src/ol/format/GPX.js
View File

@@ -584,8 +584,7 @@ function readTrk(node, objectStack) {
const layoutOptions = /** @type {module:ol/format/GPX~LayoutOptions} */ (values['layoutOptions']);
delete values['layoutOptions'];
const layout = applyLayoutOptions(layoutOptions, flatCoordinates, ends);
const geometry = new MultiLineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates, ends);
const geometry = new MultiLineString(flatCoordinates, layout, ends);
transformWithOptions(geometry, false, options);
const feature = new Feature(geometry);
feature.setProperties(values);

7
src/ol/format/KML.js
View File

@@ -904,9 +904,7 @@ function readGxMultiTrack(node, objectStack) {
if (!lineStrings) {
return undefined;
}
const multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
return new MultiLineString(lineStrings);
}
@@ -1107,8 +1105,7 @@ function readMultiGeometry(node, objectStack) {
multiGeometry = new MultiPoint(flatCoordinates, layout);
setCommonGeometryProperties(multiGeometry, geometries);
} else if (type == GeometryType.LINE_STRING) {
multiGeometry = new MultiLineString(null);
multiGeometry.setLineStrings(geometries);
multiGeometry = new MultiLineString(geometries);
setCommonGeometryProperties(multiGeometry, geometries);
} else if (type == GeometryType.POLYGON) {
multiGeometry = new MultiPolygon(null);

6
src/ol/format/MVT.js
View File

@@ -343,13 +343,9 @@ MVT.prototype.createFeature_ = function(pbf, rawFeature, opt_options) {
geometryType === GeometryType.LINE_STRING ? new LineString(flatCoordinates, GeometryLayout.XY) :
geometryType === GeometryType.POLYGON ? new Polygon(flatCoordinates, GeometryLayout.XY, ends) :
geometryType === GeometryType.MULTI_POINT ? new MultiPoint(flatCoordinates, GeometryLayout.XY) :
geometryType === GeometryType.MULTI_LINE_STRING ? new MultiLineString(null) :
geometryType === GeometryType.MULTI_LINE_STRING ? new MultiLineString(flatCoordinates, GeometryLayout.XY, ends) :
null;
}
if (geometryType !== GeometryType.POLYGON && geometryType !== GeometryType.LINE_STRING &&
geometryType !== GeometryType.MULTI_POINT && geometryType !== GeometryType.POINT) {
geom.setFlatCoordinates(GeometryLayout.XY, flatCoordinates, ends);
}
feature = new this.featureClass_();
if (this.geometryName_) {
feature.setGeometryName(this.geometryName_);