Merge pull request #1587 from fredj/misc

Various ol.format.XSD and ol.format.KML cleanups

src/ol/format/igcformat.js

@@ -127,7 +127,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text) {
           }
           flatCoordinates.push(z);
         }
-        var dateTime = Date.UTC(year, month, day, hour, minute, second, 0);
+        var dateTime = Date.UTC(year, month, day, hour, minute, second);
         flatCoordinates.push(dateTime / 1000);
       }
     } else if (line.charAt(0) == 'H') {

src/ol/format/kmlformat.js

@@ -364,22 +364,6 @@ ol.format.KML.readFlatCoordinates_ = function(node) {
 };
 
 
-/**
- * @param {Node} node Node.
- * @private
- * @return {number|undefined}
- */
-ol.format.KML.readNumber_ = function(node) {
-  var s = ol.xml.getAllTextContent(node, false);
-  var m = /^\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)\s*$/i.exec(s);
-  if (m) {
-    return parseFloat(m[1]);
-  } else {
-    return undefined;
-  }
-};
-
-
 /**
  * @param {Node} node Node.
  * @private
@@ -433,8 +417,8 @@ ol.format.KML.readVec2_ = function(node) {
  * @private
  * @return {number|undefined} Scale.
  */
-ol.format.KML.readscale_ = function(node) {
+ol.format.KML.readScale_ = function(node) {
-  var number = ol.format.KML.readNumber_(node);
+  var number = ol.format.XSD.readDecimal(node);
   if (goog.isDef(number)) {
     return Math.sqrt(number);
   } else {
@@ -1129,7 +1113,7 @@ ol.format.KML.whenParser_ = function(node, objectStack) {
     var hour = parseInt(m[4], 10);
     var minute = parseInt(m[5], 10);
     var second = parseInt(m[6], 10);
-    var when = Date.UTC(year, month, day, hour, minute, second, 0);
+    var when = Date.UTC(year, month, day, hour, minute, second);
     if (m[7] != 'Z') {
       var sign = m[8] == '-' ? -1 : 1;
       when += sign * 60 * parseInt(m[9], 10);
@@ -1234,9 +1218,9 @@ ol.format.KML.ICON_PARSERS_ = ol.xml.makeParsersNS(
 ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeParsersNS(
     ol.format.KML.NAMESPACE_URIS_, {
       'Icon': ol.xml.makeObjectPropertySetter(ol.format.KML.readIcon_),
-      'heading': ol.xml.makeObjectPropertySetter(ol.format.KML.readNumber_),
+      'heading': ol.xml.makeObjectPropertySetter(ol.format.XSD.readDecimal),
       'hotSpot': ol.xml.makeObjectPropertySetter(ol.format.KML.readVec2_),
-      'scale': ol.xml.makeObjectPropertySetter(ol.format.KML.readscale_)
+      'scale': ol.xml.makeObjectPropertySetter(ol.format.KML.readScale_)
     });
 
 
@@ -1259,7 +1243,7 @@ ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeParsersNS(
 ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeParsersNS(
     ol.format.KML.NAMESPACE_URIS_, {
       'color': ol.xml.makeObjectPropertySetter(ol.format.KML.readColor_),
-      'width': ol.xml.makeObjectPropertySetter(ol.format.KML.readNumber_)
+      'width': ol.xml.makeObjectPropertySetter(ol.format.XSD.readDecimal)
     });
 
 

src/ol/format/xsdformat.js

@@ -28,7 +28,7 @@ ol.format.XSD.readBoolean = function(node) {
 
 /**
  * @param {Node} node Node.
- * @return {number|undefined} DateTime.
+ * @return {number|undefined} DateTime in seconds.
  */
 ol.format.XSD.readDateTime = function(node) {
   var s = ol.xml.getAllTextContent(node, false);
@@ -42,7 +42,7 @@ ol.format.XSD.readDateTime = function(node) {
     var hour = parseInt(m[4], 10);
     var minute = parseInt(m[5], 10);
     var second = parseInt(m[6], 10);
-    var dateTime = Date.UTC(year, month, day, hour, minute, second, 0) / 1000;
+    var dateTime = Date.UTC(year, month, day, hour, minute, second) / 1000;
     if (m[7] != 'Z') {
       var sign = m[8] == '-' ? -1 : 1;
       dateTime += sign * 60 * parseInt(m[9], 10);
@@ -64,7 +64,7 @@ ol.format.XSD.readDateTime = function(node) {
 ol.format.XSD.readDecimal = function(node) {
   // FIXME check spec
   var s = ol.xml.getAllTextContent(node, false);
-  var m = /^\s*([+\-]?\d+(?:\.\d*)?)\s*$/.exec(s);
+  var m = /^\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)\s*$/i.exec(s);
   if (m) {
     return parseFloat(m[1]);
   } else {
@@ -75,7 +75,7 @@ ol.format.XSD.readDecimal = function(node) {
 
 /**
  * @param {Node} node Node.
- * @return {number|undefined} Decimal.
+ * @return {number|undefined} Non negative integer.
  */
 ol.format.XSD.readNonNegativeInteger = function(node) {
   var s = ol.xml.getAllTextContent(node, false);