diff --git a/LICENSE b/LICENSE index 5e67897..57c43ee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2013 Fabian Schindler +Copyright (c) 2015 EOX IT Services GmbH Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index 09e8064..dcd35cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libcoverage", - "version": "0.1.8", + "version": "0.1.10", "description": "A WCS (Web Coverage Service) client library for JavaScript.", "homepage": "https://github.com/EOX-A/libcoverage.js", "author": { diff --git a/src/eowcs/parse.js b/src/eowcs/parse.js index e4f0ae4..21a4a62 100644 --- a/src/eowcs/parse.js +++ b/src/eowcs/parse.js @@ -35,6 +35,8 @@ function parseEOCoverageSetDescription(node) { ) : []; return { + "numberMatched": node.getAttribute("numberMatched"), + "numberReturned": node.getAttribute("numberReturned"), "coverageDescriptions": cdescs.coverageDescriptions, "datasetSeriesDescriptions": dssdescs.datasetSeriesDescriptions }; @@ -69,7 +71,7 @@ function parseExtendedCapabilities(node) { } function parseExtendedCoverageDescription(node) { - var eoMetadata = xPath(node, "gmlcov:metadata/wcseo:EOMetadata|gmlcov:metadata/gmlcov:Extension/wcseoold:EOMetadata|gmlcov:metadata/wcseoold:EOMetadata"); + var eoMetadata = xPath(node, "gmlcov:metadata/gmlcov:Extension/wcseo:EOMetadata|gmlcov:metadata/wcseo:EOMetadata|gmlcov:metadata/gmlcov:Extension/wcseoold:EOMetadata|gmlcov:metadata/wcseoold:EOMetadata"); if (eoMetadata) { var phenomenonTime = xPath(eoMetadata, "eop:EarthObservation/om:phenomenonTime"); return { @@ -93,4 +95,4 @@ var parseFunctions = { module.exports = { parseFunctions: parseFunctions -} \ No newline at end of file +} diff --git a/src/parse.js b/src/parse.js index 88a7cc9..dfb1414 100644 --- a/src/parse.js +++ b/src/parse.js @@ -9,20 +9,21 @@ var utils = require("./utils"); var parseXml; -if (typeof window.DOMParser != "undefined") { - parseXml = function(xmlStr) { - return ( new window.DOMParser() ).parseFromString(xmlStr, "text/xml"); - }; -} else if (typeof window.ActiveXObject != "undefined" && - new window.ActiveXObject("Microsoft.XMLDOM")) { - parseXml = function(xmlStr) { - var xmlDoc = new window.ActiveXObject("Microsoft.XMLDOM"); - xmlDoc.async = "false"; - xmlDoc.loadXML(xmlStr); - return xmlDoc; - }; +if (typeof window != "undefined" ) { + if (typeof window.DOMParser != "undefined") { + parseXml = function(xmlStr) { + return ( new window.DOMParser() ).parseFromString(xmlStr, "text/xml"); + }; + } else if (typeof window.ActiveXObject != "undefined" && + new window.ActiveXObject("Microsoft.XMLDOM")) { + parseXml = function(xmlStr) { + var xmlDoc = new window.ActiveXObject("Microsoft.XMLDOM"); + xmlDoc.async = "false"; + xmlDoc.loadXML(xmlStr); + return xmlDoc; + }; + } } - /** * @private * @global @@ -116,7 +117,7 @@ function callParseFunctions(tagName, node, options) { } /** - * Parses a (EO-)WCS response to JavaScript objects. + * Parses a (EO-)WCS response to JavaScript objects. * * @param xml the XML string to be parsed * @param options options for parsing