diff --git a/src/ol/parser/ogc/filterparser_v1.js b/src/ol/parser/ogc/filterparser_v1.js index 38bd33d2c4..b141c98279 100644 --- a/src/ol/parser/ogc/filterparser_v1.js +++ b/src/ol/parser/ogc/filterparser_v1.js @@ -182,7 +182,8 @@ ol.parser.ogc.Filter_v1 = function() { var args = [], container = {}; this.readChildNodes(node, container); if (goog.isDef(container.geometry)) { - args.push(new ol.expr.Literal(this.gml_.createGeometry(container))); + args.push(new ol.expr.Literal(this.gmlParser_.createGeometry( + container))); } else { args = [new ol.expr.Literal(container.bounds[0]), new ol.expr.Literal(container.bounds[1]), @@ -584,7 +585,7 @@ ol.parser.ogc.Filter_v1.prototype.aggregateLogical_ = function(filters, * @return {ol.parser.ogc.GML_v2|ol.parser.ogc.GML_v3} */ ol.parser.ogc.Filter_v1.prototype.getGmlParser = function() { - return this.gml_; + return this.gmlParser_; }; @@ -594,23 +595,23 @@ ol.parser.ogc.Filter_v1.prototype.getGmlParser = function() { * @protected */ ol.parser.ogc.Filter_v1.prototype.setGmlParser = function(gml) { - this.gml_ = gml; - for (var uri in this.gml_.readers) { - for (var key in this.gml_.readers[uri]) { + this.gmlParser_ = gml; + for (var uri in this.gmlParser_.readers) { + for (var key in this.gmlParser_.readers[uri]) { if (!goog.isDef(this.readers[uri])) { this.readers[uri] = {}; } - this.readers[uri][key] = goog.bind(this.gml_.readers[uri][key], - this.gml_); + this.readers[uri][key] = goog.bind(this.gmlParser_.readers[uri][key], + this.gmlParser_); } } - for (uri in this.gml_.writers) { - for (key in this.gml_.writers[uri]) { + for (uri in this.gmlParser_.writers) { + for (key in this.gmlParser_.writers[uri]) { if (!goog.isDef(this.writers[uri])) { this.writers[uri] = {}; } - this.writers[uri][key] = goog.bind(this.gml_.writers[uri][key], - this.gml_); + this.writers[uri][key] = goog.bind(this.gmlParser_.writers[uri][key], + this.gmlParser_); } } }; diff --git a/src/ol/parser/ogc/filterparser_v1_0_0.js b/src/ol/parser/ogc/filterparser_v1_0_0.js index 0b14d01eb6..eecebe2504 100644 --- a/src/ol/parser/ogc/filterparser_v1_0_0.js +++ b/src/ol/parser/ogc/filterparser_v1_0_0.js @@ -169,7 +169,7 @@ ol.parser.ogc.Filter_v1_0_0.prototype.writeSpatial_ = function(filter, name) { var child; if (geom !== null) { child = this.writeNode('_geometry', {value: geom}, - this.gml_.featureNS).firstChild; + this.gmlParser_.featureNS).firstChild; } else if (bbox.length === 4) { child = this.writeNode('Box', bbox, 'http://www.opengis.net/gml'); diff --git a/src/ol/parser/ogc/filterparser_v1_1_0.js b/src/ol/parser/ogc/filterparser_v1_1_0.js index 77423733fa..42c8388fdc 100644 --- a/src/ol/parser/ogc/filterparser_v1_1_0.js +++ b/src/ol/parser/ogc/filterparser_v1_1_0.js @@ -225,7 +225,7 @@ ol.parser.ogc.Filter_v1_1_0.prototype.writeSpatial_ = function(filter, name) { var child; if (geom !== null) { child = this.writeNode('_geometry', {value: geom}, - this.gml_.featureNS).firstChild; + this.gmlParser_.featureNS).firstChild; } else if (bbox.length === 4) { child = this.writeNode('Envelope', bbox, 'http://www.opengis.net/gml');