[Mapbender-commits] r10300 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-10-25 01:42:38 -0700 (Fri, 25 Oct 2019)
New Revision: 10300

Modified:
   trunk/mapbender/http/classes/class_iso19139.php
Log:
Reverse parsing order of iso metadata field for resolution  - now groundResolution before equivalentScale

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2019-10-24 08:34:36 UTC (rev 10299)
+++ trunk/mapbender/http/classes/class_iso19139.php	2019-10-25 08:42:38 UTC (rev 10300)
@@ -503,6 +503,16 @@
 			$equivalentScale = $equivalentScale[0];
 			$groundResolution = $iso19139Xml->xpath('//gmd:MD_Metadata/gmd:identificationInfo/'.$identifikationXPath.'/gmd:spatialResolution/gmd:MD_Resolution/gmd:distance/gco:Distance');
 			$groundResolution = $groundResolution[0];
+			if (isset($groundResolution) && $groundResolution != "") {
+				$this->spatialResValue = $groundResolution;
+				$this->spatialResType = "groundDistance";
+			} else {
+				if (isset($equivalentScale) && $equivalentScale != "") {
+					$this->spatialResValue = $equivalentScale;
+					$this->spatialResType = "scaleDenominator";
+				}
+			}
+			/*
 			if (isset($equivalentScale) && $equivalentScale != "") {
 				$this->spatialResValue = $equivalentScale;
 				$this->spatialResType = "scaleDenominator";
@@ -511,7 +521,7 @@
 					$this->spatialResValue = $groundResolution;
 					$this->spatialResType = "groundDistance";
 				}
-			}
+			}*/
 			//ref_system
 			$this->refSystem = $iso19139Xml->xpath('//gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString');
 			$this->refSystem = $this->refSystem[0];