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

Rename _ol_format_GMLBase_ to GMLBase

Browse Source
This commit is contained in:
Tim Schaub
2017-12-17 01:51:11 -07:00
parent f8610190bb
commit 30f10b743a
4 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,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 FeatureFormat from '../format/Feature.js';
import _ol_format_GMLBase_ from '../format/GMLBase.js'; import GMLBase from '../format/GMLBase.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';
@@ -25,11 +25,11 @@ var GML2 = function(opt_options) {
var options = /** @type {olx.format.GMLOptions} */ var options = /** @type {olx.format.GMLOptions} */
(opt_options ? opt_options : {}); (opt_options ? opt_options : {});
_ol_format_GMLBase_.call(this, options); GMLBase.call(this, options);
this.FEATURE_COLLECTION_PARSERS[_ol_format_GMLBase_.GMLNS][ this.FEATURE_COLLECTION_PARSERS[GMLBase.GMLNS][
'featureMember'] = 'featureMember'] =
_ol_xml_.makeArrayPusher(_ol_format_GMLBase_.prototype.readFeaturesInternal); _ol_xml_.makeArrayPusher(GMLBase.prototype.readFeaturesInternal);
/** /**
* @inheritDoc * @inheritDoc
@@ -39,7 +39,7 @@ var GML2 = function(opt_options) {
}; };
inherits(GML2, _ol_format_GMLBase_); inherits(GML2, GMLBase);
/** /**
@@ -47,7 +47,7 @@ inherits(GML2, _ol_format_GMLBase_);
* @type {string} * @type {string}
* @private * @private
*/ */
GML2.schemaLocation_ = _ol_format_GMLBase_.GMLNS + GML2.schemaLocation_ = GMLBase.GMLNS +
' http://schemas.opengis.net/gml/2.1.2/feature.xsd'; ' http://schemas.opengis.net/gml/2.1.2/feature.xsd';
@@ -182,18 +182,18 @@ GML2.prototype.BOX_PARSERS_ = {
*/ */
GML2.prototype.GEOMETRY_PARSERS_ = { GML2.prototype.GEOMETRY_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'Point': _ol_xml_.makeReplacer(_ol_format_GMLBase_.prototype.readPoint), 'Point': _ol_xml_.makeReplacer(GMLBase.prototype.readPoint),
'MultiPoint': _ol_xml_.makeReplacer( 'MultiPoint': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiPoint), GMLBase.prototype.readMultiPoint),
'LineString': _ol_xml_.makeReplacer( 'LineString': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readLineString), GMLBase.prototype.readLineString),
'MultiLineString': _ol_xml_.makeReplacer( 'MultiLineString': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiLineString), GMLBase.prototype.readMultiLineString),
'LinearRing': _ol_xml_.makeReplacer( 'LinearRing': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readLinearRing), GMLBase.prototype.readLinearRing),
'Polygon': _ol_xml_.makeReplacer(_ol_format_GMLBase_.prototype.readPolygon), 'Polygon': _ol_xml_.makeReplacer(GMLBase.prototype.readPolygon),
'MultiPolygon': _ol_xml_.makeReplacer( 'MultiPolygon': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiPolygon), GMLBase.prototype.readMultiPolygon),
'Box': _ol_xml_.makeReplacer(GML2.prototype.readBox_) 'Box': _ol_xml_.makeReplacer(GML2.prototype.readBox_)
} }
}; };

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_array_ from '../array.js'; import _ol_array_ from '../array.js';
import {createOrUpdate} from '../extent.js'; import {createOrUpdate} from '../extent.js';
import FeatureFormat from '../format/Feature.js'; import FeatureFormat from '../format/Feature.js';
import _ol_format_GMLBase_ from '../format/GMLBase.js'; import GMLBase from '../format/GMLBase.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 GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
@@ -33,7 +33,7 @@ var GML3 = function(opt_options) {
var options = /** @type {olx.format.GMLOptions} */ var options = /** @type {olx.format.GMLOptions} */
(opt_options ? opt_options : {}); (opt_options ? opt_options : {});
_ol_format_GMLBase_.call(this, options); GMLBase.call(this, options);
/** /**
* @private * @private
@@ -76,7 +76,7 @@ var GML3 = function(opt_options) {
}; };
inherits(GML3, _ol_format_GMLBase_); inherits(GML3, GMLBase);
/** /**
@@ -84,7 +84,7 @@ inherits(GML3, _ol_format_GMLBase_);
* @type {string} * @type {string}
* @private * @private
*/ */
GML3.schemaLocation_ = _ol_format_GMLBase_.GMLNS + GML3.schemaLocation_ = GMLBase.GMLNS +
' http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/' + ' http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/' +
'1.0.0/gmlsf.xsd'; '1.0.0/gmlsf.xsd';
@@ -423,18 +423,18 @@ GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
*/ */
GML3.prototype.GEOMETRY_PARSERS_ = { GML3.prototype.GEOMETRY_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'Point': _ol_xml_.makeReplacer(_ol_format_GMLBase_.prototype.readPoint), 'Point': _ol_xml_.makeReplacer(GMLBase.prototype.readPoint),
'MultiPoint': _ol_xml_.makeReplacer( 'MultiPoint': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiPoint), GMLBase.prototype.readMultiPoint),
'LineString': _ol_xml_.makeReplacer( 'LineString': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readLineString), GMLBase.prototype.readLineString),
'MultiLineString': _ol_xml_.makeReplacer( 'MultiLineString': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiLineString), GMLBase.prototype.readMultiLineString),
'LinearRing': _ol_xml_.makeReplacer( 'LinearRing': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readLinearRing), GMLBase.prototype.readLinearRing),
'Polygon': _ol_xml_.makeReplacer(_ol_format_GMLBase_.prototype.readPolygon), 'Polygon': _ol_xml_.makeReplacer(GMLBase.prototype.readPolygon),
'MultiPolygon': _ol_xml_.makeReplacer( 'MultiPolygon': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readMultiPolygon), GMLBase.prototype.readMultiPolygon),
'Surface': _ol_xml_.makeReplacer(GML3.prototype.readSurface_), 'Surface': _ol_xml_.makeReplacer(GML3.prototype.readSurface_),
'MultiSurface': _ol_xml_.makeReplacer( 'MultiSurface': _ol_xml_.makeReplacer(
GML3.prototype.readMultiSurface_), GML3.prototype.readMultiSurface_),
@@ -484,7 +484,7 @@ GML3.prototype.MULTISURFACE_PARSERS_ = {
GML3.prototype.CURVEMEMBER_PARSERS_ = { GML3.prototype.CURVEMEMBER_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'LineString': _ol_xml_.makeArrayPusher( 'LineString': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.readLineString), GMLBase.prototype.readLineString),
'Curve': _ol_xml_.makeArrayPusher(GML3.prototype.readCurve_) 'Curve': _ol_xml_.makeArrayPusher(GML3.prototype.readCurve_)
} }
}; };
@@ -497,7 +497,7 @@ GML3.prototype.CURVEMEMBER_PARSERS_ = {
*/ */
GML3.prototype.SURFACEMEMBER_PARSERS_ = { GML3.prototype.SURFACEMEMBER_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'Polygon': _ol_xml_.makeArrayPusher(_ol_format_GMLBase_.prototype.readPolygon), 'Polygon': _ol_xml_.makeArrayPusher(GMLBase.prototype.readPolygon),
'Surface': _ol_xml_.makeArrayPusher(GML3.prototype.readSurface_) 'Surface': _ol_xml_.makeArrayPusher(GML3.prototype.readSurface_)
} }
}; };

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

@@ -36,7 +36,7 @@ import _ol_xml_ from '../xml.js';
* Optional configuration object. * Optional configuration object.
* @extends {ol.format.XMLFeature} * @extends {ol.format.XMLFeature}
*/ */
var _ol_format_GMLBase_ = function(opt_options) { var GMLBase = function(opt_options) {
var options = /** @type {olx.format.GMLOptions} */ var options = /** @type {olx.format.GMLOptions} */
(opt_options ? opt_options : {}); (opt_options ? opt_options : {});
@@ -68,24 +68,24 @@ var _ol_format_GMLBase_ = function(opt_options) {
* @type {Object.<string, Object.<string, Object>>} * @type {Object.<string, Object.<string, Object>>}
*/ */
this.FEATURE_COLLECTION_PARSERS = {}; this.FEATURE_COLLECTION_PARSERS = {};
this.FEATURE_COLLECTION_PARSERS[_ol_format_GMLBase_.GMLNS] = { this.FEATURE_COLLECTION_PARSERS[GMLBase.GMLNS] = {
'featureMember': _ol_xml_.makeReplacer( 'featureMember': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readFeaturesInternal), GMLBase.prototype.readFeaturesInternal),
'featureMembers': _ol_xml_.makeReplacer( 'featureMembers': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readFeaturesInternal) GMLBase.prototype.readFeaturesInternal)
}; };
_ol_format_XMLFeature_.call(this); _ol_format_XMLFeature_.call(this);
}; };
inherits(_ol_format_GMLBase_, _ol_format_XMLFeature_); inherits(GMLBase, _ol_format_XMLFeature_);
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
_ol_format_GMLBase_.GMLNS = 'http://www.opengis.net/gml'; GMLBase.GMLNS = 'http://www.opengis.net/gml';
/** /**
@@ -100,7 +100,7 @@ _ol_format_GMLBase_.GMLNS = 'http://www.opengis.net/gml';
* @type {RegExp} * @type {RegExp}
* @private * @private
*/ */
_ol_format_GMLBase_.ONLY_WHITESPACE_RE_ = /^[\s\xa0]*$/; GMLBase.ONLY_WHITESPACE_RE_ = /^[\s\xa0]*$/;
/** /**
@@ -108,7 +108,7 @@ _ol_format_GMLBase_.ONLY_WHITESPACE_RE_ = /^[\s\xa0]*$/;
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {Array.<ol.Feature> | undefined} Features. * @return {Array.<ol.Feature> | undefined} Features.
*/ */
_ol_format_GMLBase_.prototype.readFeaturesInternal = function(node, objectStack) { GMLBase.prototype.readFeaturesInternal = function(node, objectStack) {
var localName = node.localName; var localName = node.localName;
var features = null; var features = null;
if (localName == 'FeatureCollection') { if (localName == 'FeatureCollection') {
@@ -196,7 +196,7 @@ _ol_format_GMLBase_.prototype.readFeaturesInternal = function(node, objectStack)
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.Geometry|undefined} Geometry. * @return {ol.geom.Geometry|undefined} Geometry.
*/ */
_ol_format_GMLBase_.prototype.readGeometryElement = function(node, objectStack) { GMLBase.prototype.readGeometryElement = function(node, objectStack) {
var context = /** @type {Object} */ (objectStack[0]); var context = /** @type {Object} */ (objectStack[0]);
context['srsName'] = node.firstElementChild.getAttribute('srsName'); context['srsName'] = node.firstElementChild.getAttribute('srsName');
context['srsDimension'] = node.firstElementChild.getAttribute('srsDimension'); context['srsDimension'] = node.firstElementChild.getAttribute('srsDimension');
@@ -218,10 +218,10 @@ _ol_format_GMLBase_.prototype.readGeometryElement = function(node, objectStack)
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.Feature} Feature. * @return {ol.Feature} Feature.
*/ */
_ol_format_GMLBase_.prototype.readFeatureElement = function(node, objectStack) { GMLBase.prototype.readFeatureElement = function(node, objectStack) {
var n; var n;
var fid = node.getAttribute('fid') || var fid = node.getAttribute('fid') ||
_ol_xml_.getAttributeNS(node, _ol_format_GMLBase_.GMLNS, 'id'); _ol_xml_.getAttributeNS(node, GMLBase.GMLNS, 'id');
var values = {}, geometryName; var values = {}, geometryName;
for (n = node.firstElementChild; n; n = n.nextElementSibling) { for (n = node.firstElementChild; n; n = n.nextElementSibling) {
var localName = n.localName; var localName = n.localName;
@@ -232,7 +232,7 @@ _ol_format_GMLBase_.prototype.readFeatureElement = function(node, objectStack) {
(n.childNodes.length === 1 && (n.childNodes.length === 1 &&
(n.firstChild.nodeType === 3 || n.firstChild.nodeType === 4))) { (n.firstChild.nodeType === 3 || n.firstChild.nodeType === 4))) {
var value = _ol_xml_.getAllTextContent(n, false); var value = _ol_xml_.getAllTextContent(n, false);
if (_ol_format_GMLBase_.ONLY_WHITESPACE_RE_.test(value)) { if (GMLBase.ONLY_WHITESPACE_RE_.test(value)) {
value = undefined; value = undefined;
} }
values[localName] = value; values[localName] = value;
@@ -260,7 +260,7 @@ _ol_format_GMLBase_.prototype.readFeatureElement = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.Point|undefined} Point. * @return {ol.geom.Point|undefined} Point.
*/ */
_ol_format_GMLBase_.prototype.readPoint = function(node, objectStack) { GMLBase.prototype.readPoint = function(node, objectStack) {
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
if (flatCoordinates) { if (flatCoordinates) {
@@ -276,7 +276,7 @@ _ol_format_GMLBase_.prototype.readPoint = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.MultiPoint|undefined} MultiPoint. * @return {ol.geom.MultiPoint|undefined} MultiPoint.
*/ */
_ol_format_GMLBase_.prototype.readMultiPoint = function(node, objectStack) { GMLBase.prototype.readMultiPoint = function(node, objectStack) {
/** @type {Array.<Array.<number>>} */ /** @type {Array.<Array.<number>>} */
var coordinates = _ol_xml_.pushParseAndPop([], var coordinates = _ol_xml_.pushParseAndPop([],
this.MULTIPOINT_PARSERS_, node, objectStack, this); this.MULTIPOINT_PARSERS_, node, objectStack, this);
@@ -293,7 +293,7 @@ _ol_format_GMLBase_.prototype.readMultiPoint = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.MultiLineString|undefined} MultiLineString. * @return {ol.geom.MultiLineString|undefined} MultiLineString.
*/ */
_ol_format_GMLBase_.prototype.readMultiLineString = function(node, objectStack) { GMLBase.prototype.readMultiLineString = function(node, objectStack) {
/** @type {Array.<ol.geom.LineString>} */ /** @type {Array.<ol.geom.LineString>} */
var lineStrings = _ol_xml_.pushParseAndPop([], var lineStrings = _ol_xml_.pushParseAndPop([],
this.MULTILINESTRING_PARSERS_, node, objectStack, this); this.MULTILINESTRING_PARSERS_, node, objectStack, this);
@@ -312,7 +312,7 @@ _ol_format_GMLBase_.prototype.readMultiLineString = function(node, objectStack)
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.MultiPolygon|undefined} MultiPolygon. * @return {ol.geom.MultiPolygon|undefined} MultiPolygon.
*/ */
_ol_format_GMLBase_.prototype.readMultiPolygon = function(node, objectStack) { GMLBase.prototype.readMultiPolygon = function(node, objectStack) {
/** @type {Array.<ol.geom.Polygon>} */ /** @type {Array.<ol.geom.Polygon>} */
var polygons = _ol_xml_.pushParseAndPop([], var polygons = _ol_xml_.pushParseAndPop([],
this.MULTIPOLYGON_PARSERS_, node, objectStack, this); this.MULTIPOLYGON_PARSERS_, node, objectStack, this);
@@ -331,7 +331,7 @@ _ol_format_GMLBase_.prototype.readMultiPolygon = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.pointMemberParser_ = function(node, objectStack) { GMLBase.prototype.pointMemberParser_ = function(node, objectStack) {
_ol_xml_.parseNode(this.POINTMEMBER_PARSERS_, _ol_xml_.parseNode(this.POINTMEMBER_PARSERS_,
node, objectStack, this); node, objectStack, this);
}; };
@@ -342,7 +342,7 @@ _ol_format_GMLBase_.prototype.pointMemberParser_ = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.lineStringMemberParser_ = function(node, objectStack) { GMLBase.prototype.lineStringMemberParser_ = function(node, objectStack) {
_ol_xml_.parseNode(this.LINESTRINGMEMBER_PARSERS_, _ol_xml_.parseNode(this.LINESTRINGMEMBER_PARSERS_,
node, objectStack, this); node, objectStack, this);
}; };
@@ -353,7 +353,7 @@ _ol_format_GMLBase_.prototype.lineStringMemberParser_ = function(node, objectSta
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.polygonMemberParser_ = function(node, objectStack) { GMLBase.prototype.polygonMemberParser_ = function(node, objectStack) {
_ol_xml_.parseNode(this.POLYGONMEMBER_PARSERS_, node, _ol_xml_.parseNode(this.POLYGONMEMBER_PARSERS_, node,
objectStack, this); objectStack, this);
}; };
@@ -364,7 +364,7 @@ _ol_format_GMLBase_.prototype.polygonMemberParser_ = function(node, objectStack)
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.LineString|undefined} LineString. * @return {ol.geom.LineString|undefined} LineString.
*/ */
_ol_format_GMLBase_.prototype.readLineString = function(node, objectStack) { GMLBase.prototype.readLineString = function(node, objectStack) {
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
if (flatCoordinates) { if (flatCoordinates) {
@@ -383,7 +383,7 @@ _ol_format_GMLBase_.prototype.readLineString = function(node, objectStack) {
* @private * @private
* @return {Array.<number>|undefined} LinearRing flat coordinates. * @return {Array.<number>|undefined} LinearRing flat coordinates.
*/ */
_ol_format_GMLBase_.prototype.readFlatLinearRing_ = function(node, objectStack) { GMLBase.prototype.readFlatLinearRing_ = function(node, objectStack) {
var ring = _ol_xml_.pushParseAndPop(null, var ring = _ol_xml_.pushParseAndPop(null,
this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node,
objectStack, this); objectStack, this);
@@ -400,7 +400,7 @@ _ol_format_GMLBase_.prototype.readFlatLinearRing_ = function(node, objectStack)
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.LinearRing|undefined} LinearRing. * @return {ol.geom.LinearRing|undefined} LinearRing.
*/ */
_ol_format_GMLBase_.prototype.readLinearRing = function(node, objectStack) { GMLBase.prototype.readLinearRing = function(node, objectStack) {
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
if (flatCoordinates) { if (flatCoordinates) {
@@ -418,7 +418,7 @@ _ol_format_GMLBase_.prototype.readLinearRing = function(node, objectStack) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @return {ol.geom.Polygon|undefined} Polygon. * @return {ol.geom.Polygon|undefined} Polygon.
*/ */
_ol_format_GMLBase_.prototype.readPolygon = function(node, objectStack) { GMLBase.prototype.readPolygon = function(node, objectStack) {
/** @type {Array.<Array.<number>>} */ /** @type {Array.<Array.<number>>} */
var flatLinearRings = _ol_xml_.pushParseAndPop([null], var flatLinearRings = _ol_xml_.pushParseAndPop([null],
this.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack, this); this.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack, this);
@@ -446,7 +446,7 @@ _ol_format_GMLBase_.prototype.readPolygon = function(node, objectStack) {
* @private * @private
* @return {Array.<number>} Flat coordinates. * @return {Array.<number>} Flat coordinates.
*/ */
_ol_format_GMLBase_.prototype.readFlatCoordinatesFromNode_ = function(node, objectStack) { GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, objectStack) {
return _ol_xml_.pushParseAndPop(null, return _ol_xml_.pushParseAndPop(null,
this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node,
objectStack, this); objectStack, this);
@@ -458,12 +458,12 @@ _ol_format_GMLBase_.prototype.readFlatCoordinatesFromNode_ = function(node, obje
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.MULTIPOINT_PARSERS_ = { GMLBase.prototype.MULTIPOINT_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'pointMember': _ol_xml_.makeArrayPusher( 'pointMember': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.pointMemberParser_), GMLBase.prototype.pointMemberParser_),
'pointMembers': _ol_xml_.makeArrayPusher( 'pointMembers': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.pointMemberParser_) GMLBase.prototype.pointMemberParser_)
} }
}; };
@@ -473,12 +473,12 @@ _ol_format_GMLBase_.prototype.MULTIPOINT_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.MULTILINESTRING_PARSERS_ = { GMLBase.prototype.MULTILINESTRING_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'lineStringMember': _ol_xml_.makeArrayPusher( 'lineStringMember': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.lineStringMemberParser_), GMLBase.prototype.lineStringMemberParser_),
'lineStringMembers': _ol_xml_.makeArrayPusher( 'lineStringMembers': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.lineStringMemberParser_) GMLBase.prototype.lineStringMemberParser_)
} }
}; };
@@ -488,12 +488,12 @@ _ol_format_GMLBase_.prototype.MULTILINESTRING_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.MULTIPOLYGON_PARSERS_ = { GMLBase.prototype.MULTIPOLYGON_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'polygonMember': _ol_xml_.makeArrayPusher( 'polygonMember': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.polygonMemberParser_), GMLBase.prototype.polygonMemberParser_),
'polygonMembers': _ol_xml_.makeArrayPusher( 'polygonMembers': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.polygonMemberParser_) GMLBase.prototype.polygonMemberParser_)
} }
}; };
@@ -503,10 +503,10 @@ _ol_format_GMLBase_.prototype.MULTIPOLYGON_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.POINTMEMBER_PARSERS_ = { GMLBase.prototype.POINTMEMBER_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'Point': _ol_xml_.makeArrayPusher( 'Point': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.readFlatCoordinatesFromNode_) GMLBase.prototype.readFlatCoordinatesFromNode_)
} }
}; };
@@ -516,10 +516,10 @@ _ol_format_GMLBase_.prototype.POINTMEMBER_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.LINESTRINGMEMBER_PARSERS_ = { GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'LineString': _ol_xml_.makeArrayPusher( 'LineString': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.readLineString) GMLBase.prototype.readLineString)
} }
}; };
@@ -529,10 +529,10 @@ _ol_format_GMLBase_.prototype.LINESTRINGMEMBER_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @private * @private
*/ */
_ol_format_GMLBase_.prototype.POLYGONMEMBER_PARSERS_ = { GMLBase.prototype.POLYGONMEMBER_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'Polygon': _ol_xml_.makeArrayPusher( 'Polygon': _ol_xml_.makeArrayPusher(
_ol_format_GMLBase_.prototype.readPolygon) GMLBase.prototype.readPolygon)
} }
}; };
@@ -542,10 +542,10 @@ _ol_format_GMLBase_.prototype.POLYGONMEMBER_PARSERS_ = {
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.XmlParser>>}
* @protected * @protected
*/ */
_ol_format_GMLBase_.prototype.RING_PARSERS = { GMLBase.prototype.RING_PARSERS = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'LinearRing': _ol_xml_.makeReplacer( 'LinearRing': _ol_xml_.makeReplacer(
_ol_format_GMLBase_.prototype.readFlatLinearRing_) GMLBase.prototype.readFlatLinearRing_)
} }
}; };
@@ -553,7 +553,7 @@ _ol_format_GMLBase_.prototype.RING_PARSERS = {
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_format_GMLBase_.prototype.readGeometryFromNode = function(node, opt_options) { GMLBase.prototype.readGeometryFromNode = function(node, opt_options) {
var geometry = this.readGeometryElement(node, var geometry = this.readGeometryElement(node,
[this.getReadOptions(node, opt_options ? opt_options : {})]); [this.getReadOptions(node, opt_options ? opt_options : {})]);
return geometry ? geometry : null; return geometry ? geometry : null;
@@ -569,13 +569,13 @@ _ol_format_GMLBase_.prototype.readGeometryFromNode = function(node, opt_options)
* @return {Array.<ol.Feature>} Features. * @return {Array.<ol.Feature>} Features.
* @api * @api
*/ */
_ol_format_GMLBase_.prototype.readFeatures; GMLBase.prototype.readFeatures;
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_format_GMLBase_.prototype.readFeaturesFromNode = function(node, opt_options) { GMLBase.prototype.readFeaturesFromNode = function(node, opt_options) {
var options = { var options = {
featureType: this.featureType, featureType: this.featureType,
featureNS: this.featureNS featureNS: this.featureNS
@@ -591,8 +591,8 @@ _ol_format_GMLBase_.prototype.readFeaturesFromNode = function(node, opt_options)
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_format_GMLBase_.prototype.readProjectionFromNode = function(node) { GMLBase.prototype.readProjectionFromNode = function(node) {
return getProjection(this.srsName ? this.srsName : return getProjection(this.srsName ? this.srsName :
node.firstElementChild.getAttribute('srsName')); node.firstElementChild.getAttribute('srsName'));
}; };
export default _ol_format_GMLBase_; export default GMLBase;

18
src/ol/format/WFS.js
View File

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_asserts_ from '../asserts.js'; import _ol_asserts_ from '../asserts.js';
import GML2 from '../format/GML2.js'; import GML2 from '../format/GML2.js';
import GML3 from '../format/GML3.js'; import GML3 from '../format/GML3.js';
import _ol_format_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 _ol_format_XMLFeature_ from '../format/XMLFeature.js';
import _ol_format_XSD_ from '../format/XSD.js'; import _ol_format_XSD_ from '../format/XSD.js';
@@ -156,9 +156,9 @@ _ol_format_WFS_.prototype.readFeaturesFromNode = function(node, opt_options) {
_ol_obj_.assign(context, this.getReadOptions(node, _ol_obj_.assign(context, this.getReadOptions(node,
opt_options ? opt_options : {})); opt_options ? opt_options : {}));
var objectStack = [context]; var objectStack = [context];
this.gmlFormat_.FEATURE_COLLECTION_PARSERS[_ol_format_GMLBase_.GMLNS][ this.gmlFormat_.FEATURE_COLLECTION_PARSERS[GMLBase.GMLNS][
'featureMember'] = 'featureMember'] =
_ol_xml_.makeArrayPusher(_ol_format_GMLBase_.prototype.readFeaturesInternal); _ol_xml_.makeArrayPusher(GMLBase.prototype.readFeaturesInternal);
var features = _ol_xml_.pushParseAndPop([], var features = _ol_xml_.pushParseAndPop([],
this.gmlFormat_.FEATURE_COLLECTION_PARSERS, node, this.gmlFormat_.FEATURE_COLLECTION_PARSERS, node,
objectStack, this.gmlFormat_); objectStack, this.gmlFormat_);
@@ -238,7 +238,7 @@ _ol_format_WFS_.prototype.readFeatureCollectionMetadataFromDocument = function(d
_ol_format_WFS_.FEATURE_COLLECTION_PARSERS_ = { _ol_format_WFS_.FEATURE_COLLECTION_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'boundedBy': _ol_xml_.makeObjectPropertySetter( 'boundedBy': _ol_xml_.makeObjectPropertySetter(
_ol_format_GMLBase_.prototype.readGeometryElement, 'bounds') GMLBase.prototype.readGeometryElement, 'bounds')
} }
}; };
@@ -702,15 +702,15 @@ _ol_format_WFS_.writeDuringFilter_ = function(node, filter, objectStack) {
_ol_format_XSD_.writeStringTextNode(valueReference, filter.propertyName); _ol_format_XSD_.writeStringTextNode(valueReference, filter.propertyName);
node.appendChild(valueReference); node.appendChild(valueReference);
var timePeriod = _ol_xml_.createElementNS(_ol_format_GMLBase_.GMLNS, 'TimePeriod'); var timePeriod = _ol_xml_.createElementNS(GMLBase.GMLNS, 'TimePeriod');
node.appendChild(timePeriod); node.appendChild(timePeriod);
var begin = _ol_xml_.createElementNS(_ol_format_GMLBase_.GMLNS, 'begin'); var begin = _ol_xml_.createElementNS(GMLBase.GMLNS, 'begin');
timePeriod.appendChild(begin); timePeriod.appendChild(begin);
_ol_format_WFS_.writeTimeInstant_(begin, filter.begin); _ol_format_WFS_.writeTimeInstant_(begin, filter.begin);
var end = _ol_xml_.createElementNS(_ol_format_GMLBase_.GMLNS, 'end'); var end = _ol_xml_.createElementNS(GMLBase.GMLNS, 'end');
timePeriod.appendChild(end); timePeriod.appendChild(end);
_ol_format_WFS_.writeTimeInstant_(end, filter.end); _ol_format_WFS_.writeTimeInstant_(end, filter.end);
}; };
@@ -855,10 +855,10 @@ _ol_format_WFS_.writeOgcLiteral_ = function(node, value) {
* @private * @private
*/ */
_ol_format_WFS_.writeTimeInstant_ = function(node, time) { _ol_format_WFS_.writeTimeInstant_ = function(node, time) {
var timeInstant = _ol_xml_.createElementNS(_ol_format_GMLBase_.GMLNS, 'TimeInstant'); var timeInstant = _ol_xml_.createElementNS(GMLBase.GMLNS, 'TimeInstant');
node.appendChild(timeInstant); node.appendChild(timeInstant);
var timePosition = _ol_xml_.createElementNS(_ol_format_GMLBase_.GMLNS, 'timePosition'); var timePosition = _ol_xml_.createElementNS(GMLBase.GMLNS, 'timePosition');
timeInstant.appendChild(timePosition); timeInstant.appendChild(timePosition);
_ol_format_XSD_.writeStringTextNode(timePosition, time); _ol_format_XSD_.writeStringTextNode(timePosition, time);
}; };