From 9fe5eff8657a62a2ccbef5da10c2a0b56273fd30 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Thu, 23 Jan 2014 10:55:02 +0100
Subject: [PATCH] Use ol.format.XSD.readBoolean in ol.format.KML

---
 src/ol/format/kmlformat.js | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js
index ff17920099..02c75e0a08 100644
--- a/src/ol/format/kmlformat.js
+++ b/src/ol/format/kmlformat.js
@@ -312,22 +312,6 @@ ol.format.KML.makeFeatureStyleFunction_ = function(style) {
 };
 
 
-/**
- * @param {Node} node Node.
- * @private
- * @return {boolean|undefined} Boolean.
- */
-ol.format.KML.readBoolean_ = function(node) {
-  var s = ol.xml.getAllTextContent(node, false);
-  var m = /^\s*(0|1)\s*$/.exec(s);
-  if (m) {
-    return m[1] == '1';
-  } else {
-    return undefined;
-  }
-};
-
-
 /**
  * @param {Node} node Node.
  * @private
@@ -1352,10 +1336,10 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeParsersNS(
       'address': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
       'description': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
       'name': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
-      'open': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_),
+      'open': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean),
       'phoneNumber': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
       'styleUrl': ol.xml.makeObjectPropertySetter(ol.format.KML.readURI_),
-      'visibility': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_)
+      'visibility': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean)
     }, ol.xml.makeParsersNS(
         ol.format.KML.GX_NAMESPACE_URIS_, {
           'MultiTrack': ol.xml.makeObjectPropertySetter(
@@ -1374,8 +1358,8 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeParsersNS(
 ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeParsersNS(
     ol.format.KML.NAMESPACE_URIS_, {
       'color': ol.xml.makeObjectPropertySetter(ol.format.KML.readColor_),
-      'fill': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_),
-      'outline': ol.xml.makeObjectPropertySetter(ol.format.KML.readBoolean_)
+      'fill': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean),
+      'outline': ol.xml.makeObjectPropertySetter(ol.format.XSD.readBoolean)
     });