Rename _ol_format_XMLFeature_ to XMLFeature
This commit is contained in:
@@ -8,7 +8,7 @@ import {inherits} from '../index.js';
|
|||||||
import _ol_array_ from '../array.js';
|
import _ol_array_ from '../array.js';
|
||||||
import _ol_Feature_ from '../Feature.js';
|
import _ol_Feature_ from '../Feature.js';
|
||||||
import FeatureFormat from '../format/Feature.js';
|
import FeatureFormat from '../format/Feature.js';
|
||||||
import _ol_format_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';
|
||||||
import LinearRing from '../geom/LinearRing.js';
|
import LinearRing from '../geom/LinearRing.js';
|
||||||
@@ -75,10 +75,10 @@ var GMLBase = function(opt_options) {
|
|||||||
GMLBase.prototype.readFeaturesInternal)
|
GMLBase.prototype.readFeaturesInternal)
|
||||||
};
|
};
|
||||||
|
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(GMLBase, _ol_format_XMLFeature_);
|
inherits(GMLBase, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
|
|||||||
import _ol_Feature_ from '../Feature.js';
|
import _ol_Feature_ from '../Feature.js';
|
||||||
import _ol_array_ from '../array.js';
|
import _ol_array_ from '../array.js';
|
||||||
import FeatureFormat from '../format/Feature.js';
|
import FeatureFormat from '../format/Feature.js';
|
||||||
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
|
import XMLFeature from '../format/XMLFeature.js';
|
||||||
import _ol_format_XSD_ from '../format/XSD.js';
|
import _ol_format_XSD_ from '../format/XSD.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';
|
||||||
@@ -27,7 +27,7 @@ var GPX = function(opt_options) {
|
|||||||
|
|
||||||
var options = opt_options ? opt_options : {};
|
var options = opt_options ? opt_options : {};
|
||||||
|
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
@@ -41,7 +41,7 @@ var GPX = function(opt_options) {
|
|||||||
this.readExtensions_ = options.readExtensions;
|
this.readExtensions_ = options.readExtensions;
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(GPX, _ol_format_XMLFeature_);
|
inherits(GPX, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import _ol_array_ from '../array.js';
|
|||||||
import _ol_asserts_ from '../asserts.js';
|
import _ol_asserts_ from '../asserts.js';
|
||||||
import _ol_color_ from '../color.js';
|
import _ol_color_ from '../color.js';
|
||||||
import FeatureFormat from '../format/Feature.js';
|
import FeatureFormat from '../format/Feature.js';
|
||||||
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
|
import XMLFeature from '../format/XMLFeature.js';
|
||||||
import _ol_format_XSD_ from '../format/XSD.js';
|
import _ol_format_XSD_ from '../format/XSD.js';
|
||||||
import GeometryCollection from '../geom/GeometryCollection.js';
|
import GeometryCollection from '../geom/GeometryCollection.js';
|
||||||
import GeometryLayout from '../geom/GeometryLayout.js';
|
import GeometryLayout from '../geom/GeometryLayout.js';
|
||||||
@@ -45,7 +45,7 @@ var KML = function(opt_options) {
|
|||||||
|
|
||||||
var options = opt_options ? opt_options : {};
|
var options = opt_options ? opt_options : {};
|
||||||
|
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
|
|
||||||
if (!KML.DEFAULT_STYLE_ARRAY_) {
|
if (!KML.DEFAULT_STYLE_ARRAY_) {
|
||||||
KML.createStyleDefaults_();
|
KML.createStyleDefaults_();
|
||||||
@@ -92,7 +92,7 @@ var KML = function(opt_options) {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(KML, _ol_format_XMLFeature_);
|
inherits(KML, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {inherits} from '../index.js';
|
|||||||
import _ol_array_ from '../array.js';
|
import _ol_array_ from '../array.js';
|
||||||
import _ol_Feature_ from '../Feature.js';
|
import _ol_Feature_ from '../Feature.js';
|
||||||
import FeatureFormat from '../format/Feature.js';
|
import FeatureFormat from '../format/Feature.js';
|
||||||
import _ol_format_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';
|
||||||
import Point from '../geom/Point.js';
|
import Point from '../geom/Point.js';
|
||||||
@@ -25,7 +25,7 @@ import _ol_xml_ from '../xml.js';
|
|||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
var OSMXML = function() {
|
var OSMXML = function() {
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
@@ -33,7 +33,7 @@ var OSMXML = function() {
|
|||||||
this.defaultDataProjection = getProjection('EPSG:4326');
|
this.defaultDataProjection = getProjection('EPSG:4326');
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(OSMXML, _ol_format_XMLFeature_);
|
inherits(OSMXML, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import GML2 from '../format/GML2.js';
|
|||||||
import GML3 from '../format/GML3.js';
|
import GML3 from '../format/GML3.js';
|
||||||
import GMLBase from '../format/GMLBase.js';
|
import GMLBase from '../format/GMLBase.js';
|
||||||
import _ol_format_filter_ from '../format/filter.js';
|
import _ol_format_filter_ from '../format/filter.js';
|
||||||
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
|
import XMLFeature from '../format/XMLFeature.js';
|
||||||
import _ol_format_XSD_ from '../format/XSD.js';
|
import _ol_format_XSD_ from '../format/XSD.js';
|
||||||
import Geometry from '../geom/Geometry.js';
|
import Geometry from '../geom/Geometry.js';
|
||||||
import _ol_obj_ from '../obj.js';
|
import _ol_obj_ from '../obj.js';
|
||||||
@@ -57,10 +57,10 @@ var WFS = function(opt_options) {
|
|||||||
options.schemaLocation :
|
options.schemaLocation :
|
||||||
WFS.SCHEMA_LOCATIONS[WFS.DEFAULT_VERSION];
|
WFS.SCHEMA_LOCATIONS[WFS.DEFAULT_VERSION];
|
||||||
|
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(WFS, _ol_format_XMLFeature_);
|
inherits(WFS, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
import {inherits} from '../index.js';
|
import {inherits} from '../index.js';
|
||||||
import _ol_array_ from '../array.js';
|
import _ol_array_ from '../array.js';
|
||||||
import GML2 from '../format/GML2.js';
|
import GML2 from '../format/GML2.js';
|
||||||
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
|
import XMLFeature from '../format/XMLFeature.js';
|
||||||
import _ol_obj_ from '../obj.js';
|
import _ol_obj_ from '../obj.js';
|
||||||
import _ol_xml_ from '../xml.js';
|
import _ol_xml_ from '../xml.js';
|
||||||
|
|
||||||
@@ -42,10 +42,10 @@ var WMSGetFeatureInfo = function(opt_options) {
|
|||||||
*/
|
*/
|
||||||
this.layers_ = options.layers ? options.layers : null;
|
this.layers_ = options.layers ? options.layers : null;
|
||||||
|
|
||||||
_ol_format_XMLFeature_.call(this);
|
XMLFeature.call(this);
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(WMSGetFeatureInfo, _ol_format_XMLFeature_);
|
inherits(WMSGetFeatureInfo, XMLFeature);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+22
-22
@@ -17,7 +17,7 @@ import _ol_xml_ from '../xml.js';
|
|||||||
* @abstract
|
* @abstract
|
||||||
* @extends {ol.format.Feature}
|
* @extends {ol.format.Feature}
|
||||||
*/
|
*/
|
||||||
var _ol_format_XMLFeature_ = function() {
|
var XMLFeature = function() {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {XMLSerializer}
|
* @type {XMLSerializer}
|
||||||
@@ -28,13 +28,13 @@ var _ol_format_XMLFeature_ = function() {
|
|||||||
FeatureFormat.call(this);
|
FeatureFormat.call(this);
|
||||||
};
|
};
|
||||||
|
|
||||||
inherits(_ol_format_XMLFeature_, FeatureFormat);
|
inherits(XMLFeature, FeatureFormat);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.getType = function() {
|
XMLFeature.prototype.getType = function() {
|
||||||
return _ol_format_FormatType_.XML;
|
return _ol_format_FormatType_.XML;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ _ol_format_XMLFeature_.prototype.getType = function() {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeature = function(source, opt_options) {
|
XMLFeature.prototype.readFeature = function(source, opt_options) {
|
||||||
if (_ol_xml_.isDocument(source)) {
|
if (_ol_xml_.isDocument(source)) {
|
||||||
return this.readFeatureFromDocument(
|
return this.readFeatureFromDocument(
|
||||||
/** @type {Document} */ (source), opt_options);
|
/** @type {Document} */ (source), opt_options);
|
||||||
@@ -62,7 +62,7 @@ _ol_format_XMLFeature_.prototype.readFeature = function(source, opt_options) {
|
|||||||
* @param {olx.format.ReadOptions=} opt_options Options.
|
* @param {olx.format.ReadOptions=} opt_options Options.
|
||||||
* @return {ol.Feature} Feature.
|
* @return {ol.Feature} Feature.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeatureFromDocument = function(
|
XMLFeature.prototype.readFeatureFromDocument = function(
|
||||||
doc, opt_options) {
|
doc, opt_options) {
|
||||||
var features = this.readFeaturesFromDocument(doc, opt_options);
|
var features = this.readFeaturesFromDocument(doc, opt_options);
|
||||||
if (features.length > 0) {
|
if (features.length > 0) {
|
||||||
@@ -78,7 +78,7 @@ _ol_format_XMLFeature_.prototype.readFeatureFromDocument = function(
|
|||||||
* @param {olx.format.ReadOptions=} opt_options Options.
|
* @param {olx.format.ReadOptions=} opt_options Options.
|
||||||
* @return {ol.Feature} Feature.
|
* @return {ol.Feature} Feature.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeatureFromNode = function(node, opt_options) {
|
XMLFeature.prototype.readFeatureFromNode = function(node, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -86,7 +86,7 @@ _ol_format_XMLFeature_.prototype.readFeatureFromNode = function(node, opt_option
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeatures = function(source, opt_options) {
|
XMLFeature.prototype.readFeatures = function(source, opt_options) {
|
||||||
if (_ol_xml_.isDocument(source)) {
|
if (_ol_xml_.isDocument(source)) {
|
||||||
return this.readFeaturesFromDocument(
|
return this.readFeaturesFromDocument(
|
||||||
/** @type {Document} */ (source), opt_options);
|
/** @type {Document} */ (source), opt_options);
|
||||||
@@ -107,7 +107,7 @@ _ol_format_XMLFeature_.prototype.readFeatures = function(source, opt_options) {
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {Array.<ol.Feature>} Features.
|
* @return {Array.<ol.Feature>} Features.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeaturesFromDocument = function(
|
XMLFeature.prototype.readFeaturesFromDocument = function(
|
||||||
doc, opt_options) {
|
doc, opt_options) {
|
||||||
/** @type {Array.<ol.Feature>} */
|
/** @type {Array.<ol.Feature>} */
|
||||||
var features = [];
|
var features = [];
|
||||||
@@ -128,13 +128,13 @@ _ol_format_XMLFeature_.prototype.readFeaturesFromDocument = function(
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {Array.<ol.Feature>} Features.
|
* @return {Array.<ol.Feature>} Features.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readFeaturesFromNode = function(node, opt_options) {};
|
XMLFeature.prototype.readFeaturesFromNode = function(node, opt_options) {};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readGeometry = function(source, opt_options) {
|
XMLFeature.prototype.readGeometry = function(source, opt_options) {
|
||||||
if (_ol_xml_.isDocument(source)) {
|
if (_ol_xml_.isDocument(source)) {
|
||||||
return this.readGeometryFromDocument(
|
return this.readGeometryFromDocument(
|
||||||
/** @type {Document} */ (source), opt_options);
|
/** @type {Document} */ (source), opt_options);
|
||||||
@@ -155,7 +155,7 @@ _ol_format_XMLFeature_.prototype.readGeometry = function(source, opt_options) {
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {ol.geom.Geometry} Geometry.
|
* @return {ol.geom.Geometry} Geometry.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readGeometryFromDocument = function(doc, opt_options) {
|
XMLFeature.prototype.readGeometryFromDocument = function(doc, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -166,7 +166,7 @@ _ol_format_XMLFeature_.prototype.readGeometryFromDocument = function(doc, opt_op
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {ol.geom.Geometry} Geometry.
|
* @return {ol.geom.Geometry} Geometry.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readGeometryFromNode = function(node, opt_options) {
|
XMLFeature.prototype.readGeometryFromNode = function(node, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ _ol_format_XMLFeature_.prototype.readGeometryFromNode = function(node, opt_optio
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readProjection = function(source) {
|
XMLFeature.prototype.readProjection = function(source) {
|
||||||
if (_ol_xml_.isDocument(source)) {
|
if (_ol_xml_.isDocument(source)) {
|
||||||
return this.readProjectionFromDocument(/** @type {Document} */ (source));
|
return this.readProjectionFromDocument(/** @type {Document} */ (source));
|
||||||
} else if (_ol_xml_.isNode(source)) {
|
} else if (_ol_xml_.isNode(source)) {
|
||||||
@@ -193,7 +193,7 @@ _ol_format_XMLFeature_.prototype.readProjection = function(source) {
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {ol.proj.Projection} Projection.
|
* @return {ol.proj.Projection} Projection.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readProjectionFromDocument = function(doc) {
|
XMLFeature.prototype.readProjectionFromDocument = function(doc) {
|
||||||
return this.defaultDataProjection;
|
return this.defaultDataProjection;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -203,7 +203,7 @@ _ol_format_XMLFeature_.prototype.readProjectionFromDocument = function(doc) {
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {ol.proj.Projection} Projection.
|
* @return {ol.proj.Projection} Projection.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.readProjectionFromNode = function(node) {
|
XMLFeature.prototype.readProjectionFromNode = function(node) {
|
||||||
return this.defaultDataProjection;
|
return this.defaultDataProjection;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -211,7 +211,7 @@ _ol_format_XMLFeature_.prototype.readProjectionFromNode = function(node) {
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeFeature = function(feature, opt_options) {
|
XMLFeature.prototype.writeFeature = function(feature, opt_options) {
|
||||||
var node = this.writeFeatureNode(feature, opt_options);
|
var node = this.writeFeatureNode(feature, opt_options);
|
||||||
return this.xmlSerializer_.serializeToString(node);
|
return this.xmlSerializer_.serializeToString(node);
|
||||||
};
|
};
|
||||||
@@ -223,7 +223,7 @@ _ol_format_XMLFeature_.prototype.writeFeature = function(feature, opt_options) {
|
|||||||
* @protected
|
* @protected
|
||||||
* @return {Node} Node.
|
* @return {Node} Node.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeFeatureNode = function(feature, opt_options) {
|
XMLFeature.prototype.writeFeatureNode = function(feature, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -231,7 +231,7 @@ _ol_format_XMLFeature_.prototype.writeFeatureNode = function(feature, opt_option
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeFeatures = function(features, opt_options) {
|
XMLFeature.prototype.writeFeatures = function(features, opt_options) {
|
||||||
var node = this.writeFeaturesNode(features, opt_options);
|
var node = this.writeFeaturesNode(features, opt_options);
|
||||||
return this.xmlSerializer_.serializeToString(node);
|
return this.xmlSerializer_.serializeToString(node);
|
||||||
};
|
};
|
||||||
@@ -242,7 +242,7 @@ _ol_format_XMLFeature_.prototype.writeFeatures = function(features, opt_options)
|
|||||||
* @param {olx.format.WriteOptions=} opt_options Options.
|
* @param {olx.format.WriteOptions=} opt_options Options.
|
||||||
* @return {Node} Node.
|
* @return {Node} Node.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeFeaturesNode = function(features, opt_options) {
|
XMLFeature.prototype.writeFeaturesNode = function(features, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -250,7 +250,7 @@ _ol_format_XMLFeature_.prototype.writeFeaturesNode = function(features, opt_opti
|
|||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeGeometry = function(geometry, opt_options) {
|
XMLFeature.prototype.writeGeometry = function(geometry, opt_options) {
|
||||||
var node = this.writeGeometryNode(geometry, opt_options);
|
var node = this.writeGeometryNode(geometry, opt_options);
|
||||||
return this.xmlSerializer_.serializeToString(node);
|
return this.xmlSerializer_.serializeToString(node);
|
||||||
};
|
};
|
||||||
@@ -261,7 +261,7 @@ _ol_format_XMLFeature_.prototype.writeGeometry = function(geometry, opt_options)
|
|||||||
* @param {olx.format.WriteOptions=} opt_options Options.
|
* @param {olx.format.WriteOptions=} opt_options Options.
|
||||||
* @return {Node} Node.
|
* @return {Node} Node.
|
||||||
*/
|
*/
|
||||||
_ol_format_XMLFeature_.prototype.writeGeometryNode = function(geometry, opt_options) {
|
XMLFeature.prototype.writeGeometryNode = function(geometry, opt_options) {
|
||||||
return null; // not implemented
|
return null; // not implemented
|
||||||
};
|
};
|
||||||
export default _ol_format_XMLFeature_;
|
export default XMLFeature;
|
||||||
|
|||||||
Reference in New Issue
Block a user