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

Add named export for transformWithOptions function

Browse Source
This commit is contained in:
Frederic Junod
2017-12-22 15:25:02 +01:00
parent a0b68010b9
commit 3843beafa7
14 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import {containsExtent} from '../extent.js'; import {containsExtent} from '../extent.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js'; import JSONFeature from '../format/JSONFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js'; import GeometryType from '../geom/GeometryType.js';
@@ -84,7 +84,7 @@ EsriJSON.readGeometry_ = function(object, opt_options) {
} }
var geometryReader = EsriJSON.GEOMETRY_READERS_[type]; var geometryReader = EsriJSON.GEOMETRY_READERS_[type];
return ( return (
/** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( /** @type {ol.geom.Geometry} */ transformWithOptions(
geometryReader(object), false, opt_options) geometryReader(object), false, opt_options)
); );
}; };
@@ -563,8 +563,7 @@ EsriJSON.prototype.readProjectionFromObject = function(object) {
EsriJSON.writeGeometry_ = function(geometry, opt_options) { EsriJSON.writeGeometry_ = function(geometry, opt_options) {
var geometryWriter = EsriJSON.GEOMETRY_WRITERS_[geometry.getType()]; var geometryWriter = EsriJSON.GEOMETRY_WRITERS_[geometry.getType()];
return geometryWriter(/** @type {ol.geom.Geometry} */( return geometryWriter(/** @type {ol.geom.Geometry} */(
FeatureFormat.transformWithOptions(geometry, true, opt_options)), transformWithOptions(geometry, true, opt_options)), opt_options);
opt_options);
}; };

8
src/ol/format/Feature.js
View File

@@ -163,6 +163,7 @@ FeatureFormat.prototype.writeFeatures = function(features, opt_options) {};
*/ */
FeatureFormat.prototype.writeGeometry = function(geometry, opt_options) {}; FeatureFormat.prototype.writeGeometry = function(geometry, opt_options) {};
export default FeatureFormat;
/** /**
* @param {ol.geom.Geometry|ol.Extent} geometry Geometry. * @param {ol.geom.Geometry|ol.Extent} geometry Geometry.
@@ -170,10 +171,8 @@ FeatureFormat.prototype.writeGeometry = function(geometry, opt_options) {};
* @param {(olx.format.WriteOptions|olx.format.ReadOptions)=} opt_options * @param {(olx.format.WriteOptions|olx.format.ReadOptions)=} opt_options
* Options. * Options.
* @return {ol.geom.Geometry|ol.Extent} Transformed geometry. * @return {ol.geom.Geometry|ol.Extent} Transformed geometry.
* @protected
*/ */
FeatureFormat.transformWithOptions = function( export function transformWithOptions(geometry, write, opt_options) {
geometry, write, opt_options) {
var featureProjection = opt_options ? var featureProjection = opt_options ?
getProjection(opt_options.featureProjection) : null; getProjection(opt_options.featureProjection) : null;
var dataProjection = opt_options ? var dataProjection = opt_options ?
@@ -218,5 +217,4 @@ FeatureFormat.transformWithOptions = function(
transformed.applyTransform(transform); transformed.applyTransform(transform);
} }
return transformed; return transformed;
}; }
export default FeatureFormat;

5
src/ol/format/GML2.js
View File

@@ -3,7 +3,7 @@
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {createOrUpdate} from '../extent.js'; import {createOrUpdate} from '../extent.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import GMLBase from '../format/GMLBase.js'; import GMLBase from '../format/GMLBase.js';
import XSD from '../format/XSD.js'; import XSD from '../format/XSD.js';
import Geometry from '../geom/Geometry.js'; import Geometry from '../geom/Geometry.js';
@@ -295,8 +295,7 @@ GML2.prototype.writeGeometryElement = function(node, geometry, objectStack) {
value = geometry; value = geometry;
} }
} else { } else {
value = value = transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context);
FeatureFormat.transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context);
} }
_ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ _ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */
(item), GML2.GEOMETRY_SERIALIZERS_, (item), GML2.GEOMETRY_SERIALIZERS_,

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

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {extend} from '../array.js'; import {extend} from '../array.js';
import {createOrUpdate} from '../extent.js'; import {createOrUpdate} from '../extent.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import GMLBase from '../format/GMLBase.js'; import GMLBase from '../format/GMLBase.js';
import XSD from '../format/XSD.js'; import XSD from '../format/XSD.js';
import Geometry from '../geom/Geometry.js'; import Geometry from '../geom/Geometry.js';
@@ -962,8 +962,7 @@ GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) {
value = geometry; value = geometry;
} }
} else { } else {
value = value = transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context);
FeatureFormat.transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context);
} }
_ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ _ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */
(item), GML3.GEOMETRY_SERIALIZERS_, (item), GML3.GEOMETRY_SERIALIZERS_,

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

@@ -7,7 +7,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {extend} from '../array.js'; import {extend} from '../array.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js'; import XMLFeature from '../format/XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
@@ -205,7 +205,7 @@ GMLBase.prototype.readGeometryElement = function(node, objectStack) {
this.GEOMETRY_PARSERS_, node, objectStack, this); this.GEOMETRY_PARSERS_, node, objectStack, this);
if (geometry) { if (geometry) {
return ( return (
/** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions(geometry, false, context) /** @type {ol.geom.Geometry} */ transformWithOptions(geometry, false, context)
); );
} else { } else {
return undefined; return undefined;

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

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import {includes} from '../array.js'; import {includes} from '../array.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js'; import XMLFeature from '../format/XMLFeature.js';
import XSD from '../format/XSD.js'; import XSD from '../format/XSD.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
@@ -541,7 +541,7 @@ function readRte(node, objectStack) {
var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates); var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates);
var geometry = new LineString(null); var geometry = new LineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates); geometry.setFlatCoordinates(layout, flatCoordinates);
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry); var feature = new _ol_Feature_(geometry);
feature.setProperties(values); feature.setProperties(values);
return feature; return feature;
@@ -573,7 +573,7 @@ function readTrk(node, objectStack) {
var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates, ends); var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates, ends);
var geometry = new MultiLineString(null); var geometry = new MultiLineString(null);
geometry.setFlatCoordinates(layout, flatCoordinates, ends); geometry.setFlatCoordinates(layout, flatCoordinates, ends);
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry); var feature = new _ol_Feature_(geometry);
feature.setProperties(values); feature.setProperties(values);
return feature; return feature;
@@ -595,7 +595,7 @@ function readWpt(node, objectStack) {
var coordinates = appendCoordinate([], layoutOptions, node, values); var coordinates = appendCoordinate([], layoutOptions, node, values);
var layout = GPX.applyLayoutOptions_(layoutOptions, coordinates); var layout = GPX.applyLayoutOptions_(layoutOptions, coordinates);
var geometry = new Point(coordinates, layout); var geometry = new Point(coordinates, layout);
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry); var feature = new _ol_Feature_(geometry);
feature.setProperties(values); feature.setProperties(values);
return feature; return feature;
@@ -776,8 +776,7 @@ function writeRte(node, feature, objectStack) {
var context = {node: node, 'properties': properties}; var context = {node: node, 'properties': properties};
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (geometry) { if (geometry) {
geometry = /** @type {ol.geom.LineString} */ geometry = /** @type {ol.geom.LineString} */ (transformWithOptions(geometry, true, options));
(FeatureFormat.transformWithOptions(geometry, true, options));
context['geometryLayout'] = geometry.getLayout(); context['geometryLayout'] = geometry.getLayout();
properties['rtept'] = geometry.getCoordinates(); properties['rtept'] = geometry.getCoordinates();
} }
@@ -803,7 +802,7 @@ function writeTrk(node, feature, objectStack) {
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (geometry) { if (geometry) {
geometry = /** @type {ol.geom.MultiLineString} */ geometry = /** @type {ol.geom.MultiLineString} */
(FeatureFormat.transformWithOptions(geometry, true, options)); (transformWithOptions(geometry, true, options));
properties['trkseg'] = geometry.getLineStrings(); properties['trkseg'] = geometry.getLineStrings();
} }
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
@@ -842,7 +841,7 @@ function writeWpt(node, feature, objectStack) {
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (geometry) { if (geometry) {
geometry = /** @type {ol.geom.Point} */ geometry = /** @type {ol.geom.Point} */
(FeatureFormat.transformWithOptions(geometry, true, options)); (transformWithOptions(geometry, true, options));
context['geometryLayout'] = geometry.getLayout(); context['geometryLayout'] = geometry.getLayout();
writeWptType(node, geometry.getCoordinates(), objectStack); writeWptType(node, geometry.getCoordinates(), objectStack);
} }

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

@@ -7,7 +7,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js'; import JSONFeature from '../format/JSONFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js'; import GeometryCollection from '../geom/GeometryCollection.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
@@ -107,7 +107,7 @@ function readGeometry(object, opt_options) {
} }
var geometryReader = GEOMETRY_READERS[object.type]; var geometryReader = GEOMETRY_READERS[object.type];
return ( return (
/** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( /** @type {ol.geom.Geometry} */ transformWithOptions(
geometryReader(object), false, opt_options) geometryReader(object), false, opt_options)
); );
} }
@@ -193,8 +193,7 @@ function readPolygonGeometry(object) {
function writeGeometry(geometry, opt_options) { function writeGeometry(geometry, opt_options) {
var geometryWriter = GEOMETRY_WRITERS[geometry.getType()]; var geometryWriter = GEOMETRY_WRITERS[geometry.getType()];
return geometryWriter(/** @type {ol.geom.Geometry} */ ( return geometryWriter(/** @type {ol.geom.Geometry} */ (
FeatureFormat.transformWithOptions(geometry, true, opt_options)), transformWithOptions(geometry, true, opt_options)), opt_options);
opt_options);
} }

5
src/ol/format/IGC.js
View File

@@ -3,7 +3,7 @@
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import _ol_format_IGCZ_ from '../format/IGCZ.js'; import _ol_format_IGCZ_ from '../format/IGCZ.js';
import TextFeature from '../format/TextFeature.js'; import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
@@ -161,8 +161,7 @@ IGC.prototype.readFeatureFromText = function(text, opt_options) {
var layout = altitudeMode == _ol_format_IGCZ_.NONE ? var layout = altitudeMode == _ol_format_IGCZ_.NONE ?
GeometryLayout.XYM : GeometryLayout.XYZM; GeometryLayout.XYM : GeometryLayout.XYZM;
lineString.setFlatCoordinates(layout, flatCoordinates); lineString.setFlatCoordinates(layout, flatCoordinates);
var feature = new _ol_Feature_(FeatureFormat.transformWithOptions( var feature = new _ol_Feature_(transformWithOptions(lineString, false, opt_options));
lineString, false, opt_options));
feature.setProperties(properties); feature.setProperties(properties);
return feature; return feature;
}; };

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

@@ -6,7 +6,7 @@ import _ol_Feature_ from '../Feature.js';
import {extend, includes} from '../array.js'; import {extend, includes} from '../array.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import {asArray} from '../color.js'; import {asArray} from '../color.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js'; import XMLFeature from '../format/XMLFeature.js';
import XSD from '../format/XSD.js'; import XSD from '../format/XSD.js';
import GeometryCollection from '../geom/GeometryCollection.js'; import GeometryCollection from '../geom/GeometryCollection.js';
@@ -1709,7 +1709,7 @@ KML.prototype.readPlacemark_ = function(node, objectStack) {
var geometry = object['geometry']; var geometry = object['geometry'];
if (geometry) { if (geometry) {
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
} }
feature.setGeometry(geometry); feature.setGeometry(geometry);
delete object['geometry']; delete object['geometry'];
@@ -2463,8 +2463,7 @@ KML.writePlacemark_ = function(node, feature, objectStack) {
var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]); var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]);
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (geometry) { if (geometry) {
geometry = geometry = transformWithOptions(geometry, true, options);
FeatureFormat.transformWithOptions(geometry, true, options);
} }
_ol_xml_.pushSerializeAndPop(context, KML.PLACEMARK_SERIALIZERS_, _ol_xml_.pushSerializeAndPop(context, KML.PLACEMARK_SERIALIZERS_,
KML.GEOMETRY_NODE_FACTORY_, [geometry], objectStack); KML.GEOMETRY_NODE_FACTORY_, [geometry], objectStack);

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

@@ -6,7 +6,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import PBF from 'pbf'; import PBF from 'pbf';
import FeatureFormat from '../format/Feature.js'; import FeatureFormat, {transformWithOptions} from '../format/Feature.js';
import FormatType from '../format/FormatType.js'; import FormatType from '../format/FormatType.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js'; import GeometryType from '../geom/GeometryType.js';
@@ -322,7 +322,7 @@ MVT.prototype.createFeature_ = function(pbf, rawFeature, opt_options) {
if (this.geometryName_) { if (this.geometryName_) {
feature.setGeometryName(this.geometryName_); feature.setGeometryName(this.geometryName_);
} }
var geometry = FeatureFormat.transformWithOptions(geom, false, this.adaptOptions(opt_options)); var geometry = transformWithOptions(geom, false, this.adaptOptions(opt_options));
feature.setGeometry(geometry); feature.setGeometry(geometry);
feature.setId(id); feature.setId(id);
feature.setProperties(values); feature.setProperties(values);

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

@@ -5,7 +5,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {extend} from '../array.js'; import {extend} from '../array.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js'; import XMLFeature from '../format/XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
@@ -57,7 +57,7 @@ OSMXML.readNode_ = function(node, objectStack) {
}, OSMXML.NODE_PARSERS_, node, objectStack); }, OSMXML.NODE_PARSERS_, node, objectStack);
if (!_ol_obj_.isEmpty(values.tags)) { if (!_ol_obj_.isEmpty(values.tags)) {
var geometry = new Point(coordinates); var geometry = new Point(coordinates);
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry); var feature = new _ol_Feature_(geometry);
feature.setId(id); feature.setId(id);
feature.setProperties(values.tags); feature.setProperties(values.tags);
@@ -192,7 +192,7 @@ OSMXML.prototype.readFeaturesFromNode = function(node, opt_options) {
geometry = new LineString(null); geometry = new LineString(null);
geometry.setFlatCoordinates(GeometryLayout.XY, flatCoordinates); geometry.setFlatCoordinates(GeometryLayout.XY, flatCoordinates);
} }
FeatureFormat.transformWithOptions(geometry, false, options); transformWithOptions(geometry, false, options);
var feature = new _ol_Feature_(geometry); var feature = new _ol_Feature_(geometry);
feature.setId(values.id); feature.setId(values.id);
feature.setProperties(values.tags); feature.setProperties(values.tags);

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

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js'; import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
@@ -332,7 +332,7 @@ Polyline.prototype.readGeometryFromText = function(text, opt_options) {
flatCoordinates, 0, flatCoordinates.length, stride); flatCoordinates, 0, flatCoordinates.length, stride);
return ( return (
/** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( /** @type {ol.geom.Geometry} */ transformWithOptions(
new LineString(coordinates, this.geometryLayout_), false, new LineString(coordinates, this.geometryLayout_), false,
this.adaptOptions(opt_options)) this.adaptOptions(opt_options))
); );
@@ -389,8 +389,7 @@ Polyline.prototype.writeGeometry;
*/ */
Polyline.prototype.writeGeometryText = function(geometry, opt_options) { Polyline.prototype.writeGeometryText = function(geometry, opt_options) {
geometry = /** @type {ol.geom.LineString} */ geometry = /** @type {ol.geom.LineString} */
(FeatureFormat.transformWithOptions( (transformWithOptions(geometry, true, this.adaptOptions(opt_options)));
geometry, true, this.adaptOptions(opt_options)));
var flatCoordinates = geometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var stride = geometry.getStride(); var stride = geometry.getStride();
_ol_geom_flat_flip_.flipXY( _ol_geom_flat_flip_.flipXY(

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

@@ -3,7 +3,7 @@
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js'; import JSONFeature from '../format/JSONFeature.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js'; import MultiLineString from '../geom/MultiLineString.js';
@@ -260,7 +260,7 @@ TopoJSON.readFeatureFromGeometry_ = function(object, arcs,
} }
var feature = new _ol_Feature_(); var feature = new _ol_Feature_();
feature.setGeometry(/** @type {ol.geom.Geometry} */ ( feature.setGeometry(/** @type {ol.geom.Geometry} */ (
FeatureFormat.transformWithOptions(geometry, false, opt_options))); transformWithOptions(geometry, false, opt_options)));
if (object.id !== undefined) { if (object.id !== undefined) {
feature.setId(object.id); feature.setId(object.id);
} }

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

@@ -3,7 +3,7 @@
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import FeatureFormat from '../format/Feature.js'; import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js'; import TextFeature from '../format/TextFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js'; import GeometryCollection from '../geom/GeometryCollection.js';
import GeometryType from '../geom/GeometryType.js'; import GeometryType from '../geom/GeometryType.js';
@@ -331,7 +331,7 @@ WKT.prototype.readGeometryFromText = function(text, opt_options) {
var geometry = this.parse_(text); var geometry = this.parse_(text);
if (geometry) { if (geometry) {
return ( return (
/** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions(geometry, false, opt_options) /** @type {ol.geom.Geometry} */ transformWithOptions(geometry, false, opt_options)
); );
} else { } else {
return null; return null;
@@ -408,7 +408,7 @@ WKT.prototype.writeGeometry;
*/ */
WKT.prototype.writeGeometryText = function(geometry, opt_options) { WKT.prototype.writeGeometryText = function(geometry, opt_options) {
return WKT.encode_(/** @type {ol.geom.Geometry} */ ( return WKT.encode_(/** @type {ol.geom.Geometry} */ (
FeatureFormat.transformWithOptions(geometry, true, opt_options))); transformWithOptions(geometry, true, opt_options)));
}; };