Merge pull request #57 from neogeo-technologies/develop

Amélioration du renseignement automatique des champs metadata et metadata-csw #48
mviewer · Mar 6, 2020 · 759975c · 759975c
2 parents e946756 + 990d6af
commit 759975c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/ogc.js b/lib/ogc.js
@@ -231,6 +231,8 @@ var ogc = (function () {
             var layer = {};
             var previousParentLayerId = parentLayerId;
             var previousParentExtTitle = parentExtTitle;
+            var metadataUrlItemHtml;
+            var metadataUrlItemXml;
 
             layer.abstract = $(l).find('Abstract').text();
             layer.wms = _getWmsUrlFromGetCapabilitiesUrl(
@@ -245,8 +247,14 @@ var ogc = (function () {
                 layer.extTitle = layer.title;
             }
             layer.attribution = $(l).find("Attribution Title").text();
-            layer.metadata = $(l).find('MetadataURL[type="TC211"]>OnlineResource').attr("xlink\:href");
-            layer['metadata-csw'] = $(l).find('MetadataURL[type="ISO19115\:2003"]>OnlineResource').attr("xlink\:href");
+
+            // Get url of human readable metadata document
+            metadataUrlItemHtml = $(l).find("MetadataURL Format").filter(function () { return $(this).html() == "text/html"; }).parent().first();
+            layer['metadata'] = metadataUrlItemHtml.find('OnlineResource').attr("xlink\:href");
+
+            // Get url of raw metadata document
+            metadataUrlItemXml = $(l).find("MetadataURL Format").filter(function () { return $.inArray($(this).html(), [ "text/xml", "text/plain" ]) > -1; }).parent().first();
+            layer['metadata-csw'] = metadataUrlItemXml.find('OnlineResource').attr("xlink\:href");
 
             // Filter layers with regard to the provided keyword
             if (keyword) {