ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Date.parse() instead of parsing XSD dates manually

Browse Source
This commit is contained in:
Andreas Hocevar
2016-07-26 16:39:42 +02:00
parent e2d96082f9
commit 1bb572310d
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/format/xsdformat.js
View File

@@ -43,28 +43,8 @@ ol.format.XSD.readBooleanString = function(string) {
*/
ol.format.XSD.readDateTime = function(node) {
var s = ol.xml.getAllTextContent(node, false);
var re =
/^\s*(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(Z|(?:([+\-])(\d{2})(?::(\d{2}))?))\s*$/;
var m = re.exec(s);
if (m) {
var year = parseInt(m[1], 10);
var month = parseInt(m[2], 10) - 1;
var day = parseInt(m[3], 10);
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) / 1000;
if (m[7] != 'Z') {
var sign = m[8] == '-' ? 1 : -1;
dateTime += sign * 60 * 60 * parseInt(m[9], 10);
if (m[10] !== undefined) {
dateTime += sign * 60 * parseInt(m[10], 10);
}
}
return dateTime;
} else {
return undefined;
}
var dateTime = Date.parse(s);
return isNaN(dateTime) ? undefined : dateTime / 1000;
};