[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mapbender-commits
Subject:    [Mapbender-commits] r10092 - in trunk/mapbender/http: extensions/mobilemap2/scripts/netgis php
From:       svn_mapbender () osgeo ! org
Date:       2019-03-27 6:00:12
Message-ID: 20190327060012.29B2D3901D6 () trac ! osgeo ! org
[Download RAW message or body]

Author: armin11
Date: 2019-03-26 23:00:11 -0700 (Tue, 26 Mar 2019)
New Revision: 10092

Modified:
   trunk/mapbender/http/extensions/mobilemap2/scripts/netgis/config.js
   trunk/mapbender/http/php/mod_dataISOMetadata.php
Log:
Fix for license inheritance of dataset metadata

Modified: trunk/mapbender/http/extensions/mobilemap2/scripts/netgis/config.js
===================================================================
--- trunk/mapbender/http/extensions/mobilemap2/scripts/netgis/config.js	2019-03-26 \
                13:38:40 UTC (rev 10091)
+++ trunk/mapbender/http/extensions/mobilemap2/scripts/netgis/config.js	2019-03-27 \
06:00:11 UTC (rev 10092) @@ -52,8 +52,8 @@
 	URL_SEARCH_PROXY:		"./scripts/proxy.php",
 	URL_SEARCH_REQUEST:		"http://www.geoportal.rlp.de/mapbender/geoportal/gaz_geom_mobile.php",
  
-	URL_BACKGROUND_HYBRID:	        \
                "http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/1.0.0/topplusbkg@UTM32",
                
-	//URL_BACKGROUND_HYBRID:	"http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/1.0.0/test@UTM32",
 +	//URL_BACKGROUND_HYBRID:	        \
"http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/1.0.0/topplusbkg@UTM32", \
+	URL_BACKGROUND_HYBRID:	"http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/1.0.0/test@UTM32",
  URL_BACKGROUND_AERIAL:	        "http://geo4.service24.rlp.de/wms/dop_basis.fcgi",
 
 	URL_FEATURE_INFO_PROXY:	"./scripts/proxy.php",

Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php	2019-03-26 13:38:40 UTC (rev \
                10091)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php	2019-03-27 06:00:11 UTC (rev \
10092) @@ -370,7 +370,8 @@
 			$resourceConstraintsNodeList = \
$xpath->query('/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints');
  $arrayResourceConstraintsNodeList = (array)$resourceConstraintsNodeList;
 			//TODO - if this is empty - create a new entry
-			if (!empty($arrayResourceConstraintsNodeList)) {
+			//if (!empty($arrayResourceConstraintsNodeList)) {	
+			if (count($resourceConstraintsNodeList) > 0) {
 				//$e = new mb_exception("list is not empty!");
 				//load xml from constraint generator
 				$licenseDomObject = new DOMDocument();

_______________________________________________
Mapbender_commits mailing list
Mapbender_commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/mapbender_commits


[prev in list] [next in list] [prev in thread] [next in thread]