From de058c7889a00970187fa74529df4f4f8edf9c9e Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 9 Dec 2014 09:15:00 +0100 Subject: [PATCH 1/4] Remove unneeded type cast --- src/ol/format/wfsformat.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index ea9ab4a6b5..be7bda410b 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -27,8 +27,7 @@ goog.require('ol.xml'); * @api stable */ ol.format.WFS = function(opt_options) { - var options = /** @type {olx.format.WFSOptions} */ - (goog.isDef(opt_options) ? opt_options : {}); + var options = goog.isDef(opt_options) ? opt_options : {}; /** * @private From 045109aaaba62d94d98b5650ae0a5f2be97f8a78 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 9 Dec 2014 09:16:41 +0100 Subject: [PATCH 2/4] Uppercase ol.format.WFS.FEATURE_PREFIX const --- src/ol/format/wfsformat.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index be7bda410b..e37f749f38 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -64,7 +64,7 @@ goog.inherits(ol.format.WFS, ol.format.XMLFeature); * @const * @type {string} */ -ol.format.WFS.featurePrefix = 'feature'; +ol.format.WFS.FEATURE_PREFIX = 'feature'; /** @@ -403,7 +403,7 @@ ol.format.WFS.writeDelete_ = function(node, feature, objectStack) { var featureType = goog.object.get(context, 'featureType'); var featurePrefix = goog.object.get(context, 'featurePrefix'); featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : - ol.format.WFS.featurePrefix; + ol.format.WFS.FEATURE_PREFIX; var featureNS = goog.object.get(context, 'featureNS'); node.setAttribute('typeName', featurePrefix + ':' + featureType); ol.xml.setAttributeNS(node, ol.format.WFS.xmlns, 'xmlns:' + featurePrefix, @@ -427,7 +427,7 @@ ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) { var featureType = goog.object.get(context, 'featureType'); var featurePrefix = goog.object.get(context, 'featurePrefix'); featurePrefix = goog.isDef(featurePrefix) ? featurePrefix : - ol.format.WFS.featurePrefix; + ol.format.WFS.FEATURE_PREFIX; var featureNS = goog.object.get(context, 'featureNS'); node.setAttribute('typeName', featurePrefix + ':' + featureType); ol.xml.setAttributeNS(node, ol.format.WFS.xmlns, 'xmlns:' + featurePrefix, From 7922c08fe0a37c04f5668a63465a1e58ebe38fcd Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 9 Dec 2014 09:18:12 +0100 Subject: [PATCH 3/4] Uppercase ol.format.WFS.XMLNS const --- src/ol/format/wfsformat.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index e37f749f38..cf44c73709 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -71,7 +71,7 @@ ol.format.WFS.FEATURE_PREFIX = 'feature'; * @const * @type {string} */ -ol.format.WFS.xmlns = 'http://www.w3.org/2000/xmlns/'; +ol.format.WFS.XMLNS = 'http://www.w3.org/2000/xmlns/'; /** @@ -406,7 +406,7 @@ ol.format.WFS.writeDelete_ = function(node, feature, objectStack) { ol.format.WFS.FEATURE_PREFIX; var featureNS = goog.object.get(context, 'featureNS'); node.setAttribute('typeName', featurePrefix + ':' + featureType); - ol.xml.setAttributeNS(node, ol.format.WFS.xmlns, 'xmlns:' + featurePrefix, + ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); var fid = feature.getId(); if (goog.isDef(fid)) { @@ -430,7 +430,7 @@ ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) { ol.format.WFS.FEATURE_PREFIX; var featureNS = goog.object.get(context, 'featureNS'); node.setAttribute('typeName', featurePrefix + ':' + featureType); - ol.xml.setAttributeNS(node, ol.format.WFS.xmlns, 'xmlns:' + featurePrefix, + ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); var fid = feature.getId(); if (goog.isDef(fid)) { @@ -529,7 +529,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { node.setAttribute('srsName', srsName); } if (goog.isDef(featureNS)) { - ol.xml.setAttributeNS(node, ol.format.WFS.xmlns, 'xmlns:' + featurePrefix, + ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); } var item = goog.object.clone(context); From aaf689bbecb946341f61c119559085fe1794e851 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 9 Dec 2014 09:19:15 +0100 Subject: [PATCH 4/4] Uppercase ol.format.WFS.SCHEMA_LOCATION const --- src/ol/format/wfsformat.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index cf44c73709..f007bed4a7 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -53,7 +53,7 @@ ol.format.WFS = function(opt_options) { * @type {string} */ this.schemaLocation_ = goog.isDef(options.schemaLocation) ? - options.schemaLocation : ol.format.WFS.schemaLocation_; + options.schemaLocation : ol.format.WFS.SCHEMA_LOCATION; goog.base(this); }; @@ -97,9 +97,8 @@ ol.format.WFS.TransactionResponse; /** * @const * @type {string} - * @private */ -ol.format.WFS.schemaLocation_ = 'http://www.opengis.net/wfs ' + +ol.format.WFS.SCHEMA_LOCATION = 'http://www.opengis.net/wfs ' + 'http://schemas.opengis.net/wfs/1.1.0/wfs.xsd';