From fef1b0981e2f9608cd40ee3e5acd3cb6f2e3a489 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@camptocamp.com>
Date: Thu, 1 Oct 2015 14:13:24 +0200
Subject: [PATCH] Remove goog.string.trim()

Replace with standard ECMAScript 5.1.
---
 src/ol/format/igcformat.js              | 2 +-
 src/ol/format/kmlformat.js              | 7 +++----
 src/ol/format/wmscapabilitiesformat.js  | 3 +--
 src/ol/format/wmtscapabilitiesformat.js | 3 +--
 src/ol/format/xsdformat.js              | 3 +--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/ol/format/igcformat.js b/src/ol/format/igcformat.js
index a03b48375b..446989f87a 100644
--- a/src/ol/format/igcformat.js
+++ b/src/ol/format/igcformat.js
@@ -164,7 +164,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
       } else {
         m = ol.format.IGC.H_RECORD_RE_.exec(line);
         if (m) {
-          properties[m[1]] = goog.string.trim(m[2]);
+          properties[m[1]] = m[2].trim();
           m = ol.format.IGC.HFDTE_RECORD_RE_.exec(line);
         }
       }
diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js
index dbb1d42540..7978721c86 100644
--- a/src/ol/format/kmlformat.js
+++ b/src/ol/format/kmlformat.js
@@ -11,7 +11,6 @@ goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.dom.NodeType');
 goog.require('goog.math');
-goog.require('goog.string');
 goog.require('ol');
 goog.require('ol.Feature');
 goog.require('ol.FeatureStyleFunction');
@@ -392,7 +391,7 @@ ol.format.KML.readFlatCoordinates_ = function(node) {
  * @return {string|undefined} Style URL.
  */
 ol.format.KML.readStyleUrl_ = function(node) {
-  var s = goog.string.trim(ol.xml.getAllTextContent(node, false));
+  var s = ol.xml.getAllTextContent(node, false).trim();
   if (node.baseURI) {
     return goog.Uri.resolve(node.baseURI, s).toString();
   } else {
@@ -410,9 +409,9 @@ ol.format.KML.readStyleUrl_ = function(node) {
 ol.format.KML.readURI_ = function(node) {
   var s = ol.xml.getAllTextContent(node, false);
   if (node.baseURI) {
-    return goog.Uri.resolve(node.baseURI, goog.string.trim(s)).toString();
+    return goog.Uri.resolve(node.baseURI, s.trim()).toString();
   } else {
-    return goog.string.trim(s);
+    return s.trim();
   }
 };
 
diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilitiesformat.js
index 5612b93d13..d5804203a7 100644
--- a/src/ol/format/wmscapabilitiesformat.js
+++ b/src/ol/format/wmscapabilitiesformat.js
@@ -3,7 +3,6 @@ goog.provide('ol.format.WMSCapabilities');
 goog.require('goog.asserts');
 goog.require('goog.dom.NodeType');
 goog.require('goog.object');
-goog.require('goog.string');
 goog.require('ol');
 goog.require('ol.format.XLink');
 goog.require('ol.format.XML');
@@ -69,7 +68,7 @@ ol.format.WMSCapabilities.prototype.readFromNode = function(node) {
   goog.asserts.assert(node.localName == 'WMS_Capabilities' ||
       node.localName == 'WMT_MS_Capabilities',
       'localName should be WMS_Capabilities or WMT_MS_Capabilities');
-  this.version = goog.string.trim(node.getAttribute('version'));
+  this.version = node.getAttribute('version').trim();
   goog.asserts.assertString(this.version, 'this.version should be a string');
   var wmsCapabilityObject = ol.xml.pushParseAndPop({
     'version': this.version
diff --git a/src/ol/format/wmtscapabilitiesformat.js b/src/ol/format/wmtscapabilitiesformat.js
index 628b4810b0..91047cfef4 100644
--- a/src/ol/format/wmtscapabilitiesformat.js
+++ b/src/ol/format/wmtscapabilitiesformat.js
@@ -2,7 +2,6 @@ goog.provide('ol.format.WMTSCapabilities');
 
 goog.require('goog.asserts');
 goog.require('goog.dom.NodeType');
-goog.require('goog.string');
 goog.require('ol.extent');
 goog.require('ol.format.OWS');
 goog.require('ol.format.XLink');
@@ -68,7 +67,7 @@ ol.format.WMTSCapabilities.prototype.readFromNode = function(node) {
       'node.nodeType should be ELEMENT');
   goog.asserts.assert(node.localName == 'Capabilities',
       'localName should be Capabilities');
-  this.version = goog.string.trim(node.getAttribute('version'));
+  this.version = node.getAttribute('version').trim();
   goog.asserts.assertString(this.version, 'this.version should be a string');
   var WMTSCapabilityObject = this.owsParser_.readFromNode(node);
   if (!WMTSCapabilityObject) {
diff --git a/src/ol/format/xsdformat.js b/src/ol/format/xsdformat.js
index 075a625e83..3257e59ac9 100644
--- a/src/ol/format/xsdformat.js
+++ b/src/ol/format/xsdformat.js
@@ -122,8 +122,7 @@ ol.format.XSD.readNonNegativeIntegerString = function(string) {
  * @return {string|undefined} String.
  */
 ol.format.XSD.readString = function(node) {
-  var s = ol.xml.getAllTextContent(node, false);
-  return goog.string.trim(s);
+  return ol.xml.getAllTextContent(node, false).trim();
 };