diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 4079d18990..5be3ad888d 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import _ol_Feature_ from '../Feature.js'; import {assert} from '../asserts.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 GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; @@ -84,7 +84,7 @@ EsriJSON.readGeometry_ = function(object, opt_options) { } var geometryReader = EsriJSON.GEOMETRY_READERS_[type]; return ( - /** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( + /** @type {ol.geom.Geometry} */ transformWithOptions( geometryReader(object), false, opt_options) ); }; @@ -563,8 +563,7 @@ EsriJSON.prototype.readProjectionFromObject = function(object) { EsriJSON.writeGeometry_ = function(geometry, opt_options) { var geometryWriter = EsriJSON.GEOMETRY_WRITERS_[geometry.getType()]; return geometryWriter(/** @type {ol.geom.Geometry} */( - FeatureFormat.transformWithOptions(geometry, true, opt_options)), - opt_options); + transformWithOptions(geometry, true, opt_options)), opt_options); }; diff --git a/src/ol/format/Feature.js b/src/ol/format/Feature.js index 8bdd170b00..e8b6125540 100644 --- a/src/ol/format/Feature.js +++ b/src/ol/format/Feature.js @@ -163,6 +163,7 @@ FeatureFormat.prototype.writeFeatures = function(features, opt_options) {}; */ FeatureFormat.prototype.writeGeometry = function(geometry, opt_options) {}; +export default FeatureFormat; /** * @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 * Options. * @return {ol.geom.Geometry|ol.Extent} Transformed geometry. - * @protected */ -FeatureFormat.transformWithOptions = function( - geometry, write, opt_options) { +export function transformWithOptions(geometry, write, opt_options) { var featureProjection = opt_options ? getProjection(opt_options.featureProjection) : null; var dataProjection = opt_options ? @@ -218,5 +217,4 @@ FeatureFormat.transformWithOptions = function( transformed.applyTransform(transform); } return transformed; -}; -export default FeatureFormat; +} diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index 701b460c40..cbbd867b7c 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.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 XSD from '../format/XSD.js'; import Geometry from '../geom/Geometry.js'; @@ -295,8 +295,7 @@ GML2.prototype.writeGeometryElement = function(node, geometry, objectStack) { value = geometry; } } else { - value = - FeatureFormat.transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context); + value = transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context); } _ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ (item), GML2.GEOMETRY_SERIALIZERS_, diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index 66a7e18c6d..9cf97206fc 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import {extend} from '../array.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 XSD from '../format/XSD.js'; import Geometry from '../geom/Geometry.js'; @@ -962,8 +962,7 @@ GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) { value = geometry; } } else { - value = - FeatureFormat.transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context); + value = transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context); } _ol_xml_.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ (item), GML3.GEOMETRY_SERIALIZERS_, diff --git a/src/ol/format/GMLBase.js b/src/ol/format/GMLBase.js index c29818134a..85437c0868 100644 --- a/src/ol/format/GMLBase.js +++ b/src/ol/format/GMLBase.js @@ -7,7 +7,7 @@ import {inherits} from '../index.js'; import {extend} from '../array.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 GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; @@ -205,7 +205,7 @@ GMLBase.prototype.readGeometryElement = function(node, objectStack) { this.GEOMETRY_PARSERS_, node, objectStack, this); if (geometry) { return ( - /** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions(geometry, false, context) + /** @type {ol.geom.Geometry} */ transformWithOptions(geometry, false, context) ); } else { return undefined; diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index 525279b552..13a419e3b8 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import _ol_Feature_ from '../Feature.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 XSD from '../format/XSD.js'; import GeometryLayout from '../geom/GeometryLayout.js'; @@ -541,7 +541,7 @@ function readRte(node, objectStack) { var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates); var geometry = new LineString(null); geometry.setFlatCoordinates(layout, flatCoordinates); - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); var feature = new _ol_Feature_(geometry); feature.setProperties(values); return feature; @@ -573,7 +573,7 @@ function readTrk(node, objectStack) { var layout = GPX.applyLayoutOptions_(layoutOptions, flatCoordinates, ends); var geometry = new MultiLineString(null); geometry.setFlatCoordinates(layout, flatCoordinates, ends); - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); var feature = new _ol_Feature_(geometry); feature.setProperties(values); return feature; @@ -595,7 +595,7 @@ function readWpt(node, objectStack) { var coordinates = appendCoordinate([], layoutOptions, node, values); var layout = GPX.applyLayoutOptions_(layoutOptions, coordinates); var geometry = new Point(coordinates, layout); - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); var feature = new _ol_Feature_(geometry); feature.setProperties(values); return feature; @@ -776,8 +776,7 @@ function writeRte(node, feature, objectStack) { var context = {node: node, 'properties': properties}; var geometry = feature.getGeometry(); if (geometry) { - geometry = /** @type {ol.geom.LineString} */ - (FeatureFormat.transformWithOptions(geometry, true, options)); + geometry = /** @type {ol.geom.LineString} */ (transformWithOptions(geometry, true, options)); context['geometryLayout'] = geometry.getLayout(); properties['rtept'] = geometry.getCoordinates(); } @@ -803,7 +802,7 @@ function writeTrk(node, feature, objectStack) { var geometry = feature.getGeometry(); if (geometry) { geometry = /** @type {ol.geom.MultiLineString} */ - (FeatureFormat.transformWithOptions(geometry, true, options)); + (transformWithOptions(geometry, true, options)); properties['trkseg'] = geometry.getLineStrings(); } var parentNode = objectStack[objectStack.length - 1].node; @@ -842,7 +841,7 @@ function writeWpt(node, feature, objectStack) { var geometry = feature.getGeometry(); if (geometry) { geometry = /** @type {ol.geom.Point} */ - (FeatureFormat.transformWithOptions(geometry, true, options)); + (transformWithOptions(geometry, true, options)); context['geometryLayout'] = geometry.getLayout(); writeWptType(node, geometry.getCoordinates(), objectStack); } diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index dce793aa7b..c209f82db2 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -7,7 +7,7 @@ import {inherits} from '../index.js'; import {assert} from '../asserts.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 GeometryCollection from '../geom/GeometryCollection.js'; import LineString from '../geom/LineString.js'; @@ -107,7 +107,7 @@ function readGeometry(object, opt_options) { } var geometryReader = GEOMETRY_READERS[object.type]; return ( - /** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( + /** @type {ol.geom.Geometry} */ transformWithOptions( geometryReader(object), false, opt_options) ); } @@ -193,8 +193,7 @@ function readPolygonGeometry(object) { function writeGeometry(geometry, opt_options) { var geometryWriter = GEOMETRY_WRITERS[geometry.getType()]; return geometryWriter(/** @type {ol.geom.Geometry} */ ( - FeatureFormat.transformWithOptions(geometry, true, opt_options)), - opt_options); + transformWithOptions(geometry, true, opt_options)), opt_options); } diff --git a/src/ol/format/IGC.js b/src/ol/format/IGC.js index 5bc8e137ff..98f341b117 100644 --- a/src/ol/format/IGC.js +++ b/src/ol/format/IGC.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.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 TextFeature from '../format/TextFeature.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 ? GeometryLayout.XYM : GeometryLayout.XYZM; lineString.setFlatCoordinates(layout, flatCoordinates); - var feature = new _ol_Feature_(FeatureFormat.transformWithOptions( - lineString, false, opt_options)); + var feature = new _ol_Feature_(transformWithOptions(lineString, false, opt_options)); feature.setProperties(properties); return feature; }; diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index a35c92a8a3..e4f67db9d3 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -6,7 +6,7 @@ import _ol_Feature_ from '../Feature.js'; import {extend, includes} from '../array.js'; import {assert} from '../asserts.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 XSD from '../format/XSD.js'; import GeometryCollection from '../geom/GeometryCollection.js'; @@ -1709,7 +1709,7 @@ KML.prototype.readPlacemark_ = function(node, objectStack) { var geometry = object['geometry']; if (geometry) { - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); } feature.setGeometry(geometry); delete object['geometry']; @@ -2463,8 +2463,7 @@ KML.writePlacemark_ = function(node, feature, objectStack) { var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]); var geometry = feature.getGeometry(); if (geometry) { - geometry = - FeatureFormat.transformWithOptions(geometry, true, options); + geometry = transformWithOptions(geometry, true, options); } _ol_xml_.pushSerializeAndPop(context, KML.PLACEMARK_SERIALIZERS_, KML.GEOMETRY_NODE_FACTORY_, [geometry], objectStack); diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js index ed99490866..62948b96fa 100644 --- a/src/ol/format/MVT.js +++ b/src/ol/format/MVT.js @@ -6,7 +6,7 @@ import {inherits} from '../index.js'; import {assert} from '../asserts.js'; import PBF from 'pbf'; -import FeatureFormat from '../format/Feature.js'; +import FeatureFormat, {transformWithOptions} from '../format/Feature.js'; import FormatType from '../format/FormatType.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; @@ -322,7 +322,7 @@ MVT.prototype.createFeature_ = function(pbf, rawFeature, opt_options) { if (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.setId(id); feature.setProperties(values); diff --git a/src/ol/format/OSMXML.js b/src/ol/format/OSMXML.js index 6a8aa8d88c..cefa439486 100644 --- a/src/ol/format/OSMXML.js +++ b/src/ol/format/OSMXML.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import {extend} from '../array.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 GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; @@ -57,7 +57,7 @@ OSMXML.readNode_ = function(node, objectStack) { }, OSMXML.NODE_PARSERS_, node, objectStack); if (!_ol_obj_.isEmpty(values.tags)) { var geometry = new Point(coordinates); - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); var feature = new _ol_Feature_(geometry); feature.setId(id); feature.setProperties(values.tags); @@ -192,7 +192,7 @@ OSMXML.prototype.readFeaturesFromNode = function(node, opt_options) { geometry = new LineString(null); geometry.setFlatCoordinates(GeometryLayout.XY, flatCoordinates); } - FeatureFormat.transformWithOptions(geometry, false, options); + transformWithOptions(geometry, false, options); var feature = new _ol_Feature_(geometry); feature.setId(values.id); feature.setProperties(values.tags); diff --git a/src/ol/format/Polyline.js b/src/ol/format/Polyline.js index bc04b0b29f..b7f7d51e60 100644 --- a/src/ol/format/Polyline.js +++ b/src/ol/format/Polyline.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import {assert} from '../asserts.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 GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; @@ -332,7 +332,7 @@ Polyline.prototype.readGeometryFromText = function(text, opt_options) { flatCoordinates, 0, flatCoordinates.length, stride); return ( - /** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions( + /** @type {ol.geom.Geometry} */ transformWithOptions( new LineString(coordinates, this.geometryLayout_), false, this.adaptOptions(opt_options)) ); @@ -389,8 +389,7 @@ Polyline.prototype.writeGeometry; */ Polyline.prototype.writeGeometryText = function(geometry, opt_options) { geometry = /** @type {ol.geom.LineString} */ - (FeatureFormat.transformWithOptions( - geometry, true, this.adaptOptions(opt_options))); + (transformWithOptions(geometry, true, this.adaptOptions(opt_options))); var flatCoordinates = geometry.getFlatCoordinates(); var stride = geometry.getStride(); _ol_geom_flat_flip_.flipXY( diff --git a/src/ol/format/TopoJSON.js b/src/ol/format/TopoJSON.js index 6a19c80ed7..373e4107eb 100644 --- a/src/ol/format/TopoJSON.js +++ b/src/ol/format/TopoJSON.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.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 LineString from '../geom/LineString.js'; import MultiLineString from '../geom/MultiLineString.js'; @@ -260,7 +260,7 @@ TopoJSON.readFeatureFromGeometry_ = function(object, arcs, } var feature = new _ol_Feature_(); feature.setGeometry(/** @type {ol.geom.Geometry} */ ( - FeatureFormat.transformWithOptions(geometry, false, opt_options))); + transformWithOptions(geometry, false, opt_options))); if (object.id !== undefined) { feature.setId(object.id); } diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js index 7b49365ac6..fc5a4b3487 100644 --- a/src/ol/format/WKT.js +++ b/src/ol/format/WKT.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.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 GeometryCollection from '../geom/GeometryCollection.js'; import GeometryType from '../geom/GeometryType.js'; @@ -331,7 +331,7 @@ WKT.prototype.readGeometryFromText = function(text, opt_options) { var geometry = this.parse_(text); if (geometry) { return ( - /** @type {ol.geom.Geometry} */ FeatureFormat.transformWithOptions(geometry, false, opt_options) + /** @type {ol.geom.Geometry} */ transformWithOptions(geometry, false, opt_options) ); } else { return null; @@ -408,7 +408,7 @@ WKT.prototype.writeGeometry; */ WKT.prototype.writeGeometryText = function(geometry, opt_options) { return WKT.encode_(/** @type {ol.geom.Geometry} */ ( - FeatureFormat.transformWithOptions(geometry, true, opt_options))); + transformWithOptions(geometry, true, opt_options))); };