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

Rename _ol_geom_MultiLineString_ to MultiLineString

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:55:33 -07:00
parent f7b3876c1b
commit 3c78cb7872
26 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/format/EsriJSON.js
View File

@@ -11,7 +11,7 @@ import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import _ol_geom_LinearRing_ from '../geom/LinearRing.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -185,7 +185,7 @@ _ol_format_EsriJSON_.readLineStringGeometry_ = function(object) {
*/
_ol_format_EsriJSON_.readMultiLineStringGeometry_ = function(object) {
var layout = _ol_format_EsriJSON_.getGeometryLayout_(object);
return new _ol_geom_MultiLineString_(object.paths, layout);
return new MultiLineString(object.paths, layout);
};

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

@@ -10,7 +10,7 @@ import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_Geometry_ from '../geom/Geometry.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import _ol_geom_Polygon_ from '../geom/Polygon.js';
import _ol_obj_ from '../obj.js';
@@ -100,7 +100,7 @@ _ol_format_GML3_.prototype.readMultiCurve_ = function(node, objectStack) {
var lineStrings = _ol_xml_.pushParseAndPop([],
this.MULTICURVE_PARSERS_, node, objectStack, this);
if (lineStrings) {
var multiLineString = new _ol_geom_MultiLineString_(null);
var multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
} else {

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

@@ -12,7 +12,7 @@ import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import _ol_geom_LinearRing_ from '../geom/LinearRing.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -298,7 +298,7 @@ _ol_format_GMLBase_.prototype.readMultiLineString = function(node, objectStack)
var lineStrings = _ol_xml_.pushParseAndPop([],
this.MULTILINESTRING_PARSERS_, node, objectStack, this);
if (lineStrings) {
var multiLineString = new _ol_geom_MultiLineString_(null);
var multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
} else {

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

@@ -9,7 +9,7 @@ import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import Point from '../geom/Point.js';
import {get as getProjection} from '../proj.js';
import _ol_xml_ from '../xml.js';
@@ -273,7 +273,7 @@ _ol_format_GPX_.readTrk_ = function(node, objectStack) {
var layoutOptions = /** @type {ol.LayoutOptions} */ (values['layoutOptions']);
delete values['layoutOptions'];
var layout = _ol_format_GPX_.applyLayoutOptions_(layoutOptions, flatCoordinates, ends);
var geometry = new _ol_geom_MultiLineString_(null);
var geometry = new MultiLineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates, ends);
_ol_format_Feature_.transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry);

4
src/ol/format/GeoJSON.js
View File

@@ -11,7 +11,7 @@ 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 LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -129,7 +129,7 @@ _ol_format_GeoJSON_.readLineStringGeometry_ = function(object) {
* @return {ol.geom.MultiLineString} MultiLineString.
*/
_ol_format_GeoJSON_.readMultiLineStringGeometry_ = function(object) {
return new _ol_geom_MultiLineString_(object.coordinates);
return new MultiLineString(object.coordinates);
};

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

@@ -18,7 +18,7 @@ import _ol_geom_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';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -788,7 +788,7 @@ _ol_format_KML_.readGxMultiTrack_ = function(node, objectStack) {
if (!lineStrings) {
return undefined;
}
var multiLineString = new _ol_geom_MultiLineString_(null);
var multiLineString = new MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
};
@@ -940,7 +940,7 @@ _ol_format_KML_.readMultiGeometry_ = function(node, objectStack) {
multiGeometry.setFlatCoordinates(layout, flatCoordinates);
_ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
} else if (type == _ol_geom_GeometryType_.LINE_STRING) {
multiGeometry = new _ol_geom_MultiLineString_(null);
multiGeometry = new MultiLineString(null);
multiGeometry.setLineStrings(geometries);
_ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
} else if (type == _ol_geom_GeometryType_.POLYGON) {

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

@@ -11,7 +11,7 @@ import _ol_format_FormatType_ from '../format/FormatType.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -314,7 +314,7 @@ _ol_format_MVT_.prototype.createFeature_ = function(pbf, rawFeature, opt_options
geometryType === _ol_geom_GeometryType_.LINE_STRING ? new LineString(null) :
geometryType === _ol_geom_GeometryType_.POLYGON ? new _ol_geom_Polygon_(null) :
geometryType === _ol_geom_GeometryType_.MULTI_POINT ? new MultiPoint (null) :
geometryType === _ol_geom_GeometryType_.MULTI_LINE_STRING ? new _ol_geom_MultiLineString_(null) :
geometryType === _ol_geom_GeometryType_.MULTI_LINE_STRING ? new MultiLineString(null) :
null;
}
geom.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, flatCoordinates, ends);

4
src/ol/format/TopoJSON.js
View File

@@ -6,7 +6,7 @@ import _ol_Feature_ from '../Feature.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_JSONFeature_ from '../format/JSONFeature.js';
import LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -158,7 +158,7 @@ _ol_format_TopoJSON_.readMultiLineStringGeometry_ = function(object, arcs) {
for (i = 0, ii = object.arcs.length; i < ii; ++i) {
coordinates[i] = _ol_format_TopoJSON_.concatenateArcs_(object.arcs[i], arcs);
}
return new _ol_geom_MultiLineString_(coordinates);
return new MultiLineString(coordinates);
};

4
src/ol/format/WKT.js
View File

@@ -9,7 +9,7 @@ import _ol_geom_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';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -922,7 +922,7 @@ _ol_format_WKT_.Parser.GeometryConstructor_ = {
'LINESTRING': LineString,
'POLYGON': _ol_geom_Polygon_,
'MULTIPOINT': MultiPoint,
'MULTILINESTRING': _ol_geom_MultiLineString_,
'MULTILINESTRING': MultiLineString,
'MULTIPOLYGON': _ol_geom_MultiPolygon_
};

40
src/ol/geom/MultiLineString.js
View File

@@ -25,7 +25,7 @@ import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js';
* @param {ol.geom.GeometryLayout=} opt_layout Layout.
* @api
*/
var _ol_geom_MultiLineString_ = function(coordinates, opt_layout) {
var MultiLineString = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
@@ -51,7 +51,7 @@ var _ol_geom_MultiLineString_ = function(coordinates, opt_layout) {
};
inherits(_ol_geom_MultiLineString_, _ol_geom_SimpleGeometry_);
inherits(MultiLineString, _ol_geom_SimpleGeometry_);
/**
@@ -59,7 +59,7 @@ inherits(_ol_geom_MultiLineString_, _ol_geom_SimpleGeometry_);
* @param {ol.geom.LineString} lineString LineString.
* @api
*/
_ol_geom_MultiLineString_.prototype.appendLineString = function(lineString) {
MultiLineString.prototype.appendLineString = function(lineString) {
if (!this.flatCoordinates) {
this.flatCoordinates = lineString.getFlatCoordinates().slice();
} else {
@@ -77,8 +77,8 @@ _ol_geom_MultiLineString_.prototype.appendLineString = function(lineString) {
* @override
* @api
*/
_ol_geom_MultiLineString_.prototype.clone = function() {
var multiLineString = new _ol_geom_MultiLineString_(null);
MultiLineString.prototype.clone = function() {
var multiLineString = new MultiLineString(null);
multiLineString.setFlatCoordinates(
this.layout, this.flatCoordinates.slice(), this.ends_.slice());
return multiLineString;
@@ -88,7 +88,7 @@ _ol_geom_MultiLineString_.prototype.clone = function() {
/**
* @inheritDoc
*/
_ol_geom_MultiLineString_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) {
MultiLineString.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) {
if (minSquaredDistance < closestSquaredDistanceXY(this.getExtent(), x, y)) {
return minSquaredDistance;
}
@@ -125,7 +125,7 @@ _ol_geom_MultiLineString_.prototype.closestPointXY = function(x, y, closestPoint
* @return {ol.Coordinate} Coordinate.
* @api
*/
_ol_geom_MultiLineString_.prototype.getCoordinateAtM = function(m, opt_extrapolate, opt_interpolate) {
MultiLineString.prototype.getCoordinateAtM = function(m, opt_extrapolate, opt_interpolate) {
if ((this.layout != _ol_geom_GeometryLayout_.XYM &&
this.layout != _ol_geom_GeometryLayout_.XYZM) ||
this.flatCoordinates.length === 0) {
@@ -144,7 +144,7 @@ _ol_geom_MultiLineString_.prototype.getCoordinateAtM = function(m, opt_extrapola
* @override
* @api
*/
_ol_geom_MultiLineString_.prototype.getCoordinates = function() {
MultiLineString.prototype.getCoordinates = function() {
return _ol_geom_flat_inflate_.coordinatess(
this.flatCoordinates, 0, this.ends_, this.stride);
};
@@ -153,7 +153,7 @@ _ol_geom_MultiLineString_.prototype.getCoordinates = function() {
/**
* @return {Array.<number>} Ends.
*/
_ol_geom_MultiLineString_.prototype.getEnds = function() {
MultiLineString.prototype.getEnds = function() {
return this.ends_;
};
@@ -164,7 +164,7 @@ _ol_geom_MultiLineString_.prototype.getEnds = function() {
* @return {ol.geom.LineString} LineString.
* @api
*/
_ol_geom_MultiLineString_.prototype.getLineString = function(index) {
MultiLineString.prototype.getLineString = function(index) {
if (index < 0 || this.ends_.length <= index) {
return null;
}
@@ -180,7 +180,7 @@ _ol_geom_MultiLineString_.prototype.getLineString = function(index) {
* @return {Array.<ol.geom.LineString>} LineStrings.
* @api
*/
_ol_geom_MultiLineString_.prototype.getLineStrings = function() {
MultiLineString.prototype.getLineStrings = function() {
var flatCoordinates = this.flatCoordinates;
var ends = this.ends_;
var layout = this.layout;
@@ -202,7 +202,7 @@ _ol_geom_MultiLineString_.prototype.getLineStrings = function() {
/**
* @return {Array.<number>} Flat midpoints.
*/
_ol_geom_MultiLineString_.prototype.getFlatMidpoints = function() {
MultiLineString.prototype.getFlatMidpoints = function() {
var midpoints = [];
var flatCoordinates = this.flatCoordinates;
var offset = 0;
@@ -223,13 +223,13 @@ _ol_geom_MultiLineString_.prototype.getFlatMidpoints = function() {
/**
* @inheritDoc
*/
_ol_geom_MultiLineString_.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
MultiLineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
var simplifiedFlatCoordinates = [];
var simplifiedEnds = [];
simplifiedFlatCoordinates.length = _ol_geom_flat_simplify_.douglasPeuckers(
this.flatCoordinates, 0, this.ends_, this.stride, squaredTolerance,
simplifiedFlatCoordinates, 0, simplifiedEnds);
var simplifiedMultiLineString = new _ol_geom_MultiLineString_(null);
var simplifiedMultiLineString = new MultiLineString(null);
simplifiedMultiLineString.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates, simplifiedEnds);
return simplifiedMultiLineString;
@@ -240,7 +240,7 @@ _ol_geom_MultiLineString_.prototype.getSimplifiedGeometryInternal = function(squ
* @inheritDoc
* @api
*/
_ol_geom_MultiLineString_.prototype.getType = function() {
MultiLineString.prototype.getType = function() {
return _ol_geom_GeometryType_.MULTI_LINE_STRING;
};
@@ -249,7 +249,7 @@ _ol_geom_MultiLineString_.prototype.getType = function() {
* @inheritDoc
* @api
*/
_ol_geom_MultiLineString_.prototype.intersectsExtent = function(extent) {
MultiLineString.prototype.intersectsExtent = function(extent) {
return _ol_geom_flat_intersectsextent_.lineStrings(
this.flatCoordinates, 0, this.ends_, this.stride, extent);
};
@@ -262,7 +262,7 @@ _ol_geom_MultiLineString_.prototype.intersectsExtent = function(extent) {
* @override
* @api
*/
_ol_geom_MultiLineString_.prototype.setCoordinates = function(coordinates, opt_layout) {
MultiLineString.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null, this.ends_);
} else {
@@ -283,7 +283,7 @@ _ol_geom_MultiLineString_.prototype.setCoordinates = function(coordinates, opt_l
* @param {Array.<number>} flatCoordinates Flat coordinates.
* @param {Array.<number>} ends Ends.
*/
_ol_geom_MultiLineString_.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) {
MultiLineString.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) {
this.setFlatCoordinatesInternal(layout, flatCoordinates);
this.ends_ = ends;
this.changed();
@@ -293,7 +293,7 @@ _ol_geom_MultiLineString_.prototype.setFlatCoordinates = function(layout, flatCo
/**
* @param {Array.<ol.geom.LineString>} lineStrings LineStrings.
*/
_ol_geom_MultiLineString_.prototype.setLineStrings = function(lineStrings) {
MultiLineString.prototype.setLineStrings = function(lineStrings) {
var layout = this.getLayout();
var flatCoordinates = [];
var ends = [];
@@ -308,4 +308,4 @@ _ol_geom_MultiLineString_.prototype.setLineStrings = function(lineStrings) {
}
this.setFlatCoordinates(layout, flatCoordinates, ends);
};
export default _ol_geom_MultiLineString_;
export default MultiLineString;

4
src/ol/interaction/Draw.js
View File

@@ -14,7 +14,7 @@ import _ol_functions_ from '../functions.js';
import _ol_geom_Circle_ from '../geom/Circle.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import _ol_geom_MultiLineString_ from '../geom/MultiLineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
@@ -674,7 +674,7 @@ _ol_interaction_Draw_.prototype.finishDrawing = function() {
if (this.type_ === _ol_geom_GeometryType_.MULTI_POINT) {
sketchFeature.setGeometry(new MultiPoint([coordinates]));
} else if (this.type_ === _ol_geom_GeometryType_.MULTI_LINE_STRING) {
sketchFeature.setGeometry(new _ol_geom_MultiLineString_([coordinates]));
sketchFeature.setGeometry(new MultiLineString([coordinates]));
} else if (this.type_ === _ol_geom_GeometryType_.MULTI_POLYGON) {
sketchFeature.setGeometry(new _ol_geom_MultiPolygon_([coordinates]));
}