From 0aed05a4134dad30460179674eaf37421c45d0f2 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Sun, 4 Aug 2013 12:55:18 +0200 Subject: [PATCH] Renaming handleWriteOptions to applyWriteOptions --- src/ol/parser/ogc/gml.js | 10 +++++----- src/ol/parser/ogc/gml_v2.js | 2 +- src/ol/parser/ogc/gml_v3.js | 2 +- test/spec/ol/parser/ogc/gml_v2.test.js | 16 ++++++++-------- test/spec/ol/parser/ogc/gml_v3.test.js | 26 +++++++++++++------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/ol/parser/ogc/gml.js b/src/ol/parser/ogc/gml.js index 085fb0a0e7..8976e360f9 100644 --- a/src/ol/parser/ogc/gml.js +++ b/src/ol/parser/ogc/gml.js @@ -627,13 +627,13 @@ ol.parser.ogc.GML.prototype.readFeaturesWithMetadataFromString = /** - * Handle the writeOptions passed into the write function. + * Applies the writeOptions passed into the write function. * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as * GML. * @param {ol.parser.GMLWriteOptions=} opt_options Write options. */ -ol.parser.ogc.GML.prototype.handleWriteOptions = function(obj, opt_options) { - // srsName handling: opt_options takes precedence over obj.metadata +ol.parser.ogc.GML.prototype.applyWriteOptions = function(obj, opt_options) { + // srsName handling: opt_options -> this.writeOptions -> obj.metadata var srsName; if (goog.isDef(opt_options) && goog.isDef(opt_options.srsName)) { srsName = opt_options.srsName; @@ -643,9 +643,9 @@ ol.parser.ogc.GML.prototype.handleWriteOptions = function(obj, opt_options) { } else if (goog.isDef(obj.metadata)) { srsName = obj.metadata.projection; } - goog.asserts.assert(goog.isDef(srsName)); + goog.asserts.assert(goog.isDef(srsName), 'srsName required for writing GML'); this.srsName = goog.isString(srsName) ? srsName : srsName.getCode(); - // axisOrientation handling + // axisOrientation handling: opt_options -> this.writeOptions if (goog.isDef(opt_options) && goog.isDef(opt_options.axisOrientation)) { this.axisOrientation = opt_options.axisOrientation; } else if (goog.isDef(this.writeOptions) && diff --git a/src/ol/parser/ogc/gml_v2.js b/src/ol/parser/ogc/gml_v2.js index e9bb62bb06..708ec8451f 100644 --- a/src/ol/parser/ogc/gml_v2.js +++ b/src/ol/parser/ogc/gml_v2.js @@ -120,7 +120,7 @@ goog.inherits(ol.parser.ogc.GML_v2, ol.parser.ogc.GML); * @return {string} A string representing the GML document. */ ol.parser.ogc.GML_v2.prototype.write = function(obj, opt_options) { - this.handleWriteOptions(obj, opt_options); + this.applyWriteOptions(obj, opt_options); var root = this.writeNode('FeatureCollection', obj.features, 'http://www.opengis.net/wfs'); this.setAttributeNS( diff --git a/src/ol/parser/ogc/gml_v3.js b/src/ol/parser/ogc/gml_v3.js index 416f5e31c4..93839513eb 100644 --- a/src/ol/parser/ogc/gml_v3.js +++ b/src/ol/parser/ogc/gml_v3.js @@ -419,7 +419,7 @@ goog.inherits(ol.parser.ogc.GML_v3, ol.parser.ogc.GML); * @return {string} An string representing the XML document. */ ol.parser.ogc.GML_v3.prototype.write = function(obj, opt_options) { - this.handleWriteOptions(obj, opt_options); + this.applyWriteOptions(obj, opt_options); var root = this.writeNode('featureMembers', obj.features); this.setAttributeNS( root, 'http://www.w3.org/2001/XMLSchema-instance', diff --git a/test/spec/ol/parser/ogc/gml_v2.test.js b/test/spec/ol/parser/ogc/gml_v2.test.js index 3955af80c9..9c7fc69be9 100644 --- a/test/spec/ol/parser/ogc/gml_v2.test.js +++ b/test/spec/ol/parser/ogc/gml_v2.test.js @@ -18,7 +18,7 @@ describe('ol.parser.gml_v2', function() { var url = 'spec/ol/parser/ogc/xml/gml_v2/point-coordinates.xml'; afterLoadXml(url, function(xml) { var obj = parser.read(xml); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var geom = parser.createGeometry_({geometry: obj.geometry}); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; @@ -48,7 +48,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -78,7 +78,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -107,7 +107,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -142,7 +142,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -167,7 +167,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -186,7 +186,7 @@ describe('ol.parser.gml_v2', function() { var p = new ol.parser.ogc.GML_v2({featureNS: 'http://foo'}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -231,7 +231,7 @@ describe('ol.parser.gml_v2', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; diff --git a/test/spec/ol/parser/ogc/gml_v3.test.js b/test/spec/ol/parser/ogc/gml_v3.test.js index 6dec1b94d2..8e72fccfdb 100644 --- a/test/spec/ol/parser/ogc/gml_v3.test.js +++ b/test/spec/ol/parser/ogc/gml_v3.test.js @@ -18,7 +18,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -35,7 +35,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -62,7 +62,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({curve: true}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -90,7 +90,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({multiCurve: false}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -107,7 +107,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -126,7 +126,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({curve: true}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -155,7 +155,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -184,7 +184,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({multiSurface: false}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -211,7 +211,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -229,7 +229,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({surface: true}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj); + p.applyWriteOptions(obj); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName; @@ -246,7 +246,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -262,7 +262,7 @@ describe('ol.parser.gml_v3', function() { afterLoadXml(url, function(xml) { var obj = parser.read(xml); var geom = parser.createGeometry_({geometry: obj.geometry}); - parser.handleWriteOptions(obj); + parser.applyWriteOptions(obj); var node = parser.featureNSWiters_['_geometry'].apply(parser, [geom]).firstChild; delete parser.srsName; @@ -278,7 +278,7 @@ describe('ol.parser.gml_v3', function() { var p = new ol.parser.ogc.GML_v3({surface: true}); var obj = p.read(xml); var geom = p.createGeometry_({geometry: obj.geometry}); - p.handleWriteOptions(obj, {srsName: 'foo'}); + p.applyWriteOptions(obj, {srsName: 'foo'}); var node = p.featureNSWiters_['_geometry'].apply(p, [geom]).firstChild; delete p.srsName;