Renaming handleWriteOptions to applyWriteOptions

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) {
+ol.parser.ogc.GML.prototype.applyWriteOptions = function(obj, opt_options) {
-  // srsName handling: opt_options takes precedence over obj.metadata
+  // 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) &&

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(

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',

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;

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;