[Mapbender-commits] r8749 - in trunk/mapbender/http: javascripts plugins

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-12-09 04:57:33 -0800 (Mon, 09 Dec 2013)
New Revision: 8749

Modified:
   trunk/mapbender/http/javascripts/mb_downloadFeedClient.js
   trunk/mapbender/http/plugins/mb_downloadFeedClient.php
   trunk/mapbender/http/plugins/mb_downloadFeedServer.php
Log:
Extent INSPIRE ATOM Feed Client to show WFS Capabilities URL in case of hybrid implementation

Modified: trunk/mapbender/http/javascripts/mb_downloadFeedClient.js
===================================================================
--- trunk/mapbender/http/javascripts/mb_downloadFeedClient.js	2013-12-08 20:45:48 UTC (rev 8748)
+++ trunk/mapbender/http/javascripts/mb_downloadFeedClient.js	2013-12-09 12:57:33 UTC (rev 8749)
@@ -146,6 +146,8 @@
 	$('#dataset_select').remove();
 	//delete identifier anchor
 	$('#dataset_identifier_link').remove();
+	//delete capabilities anchor
+	$('#capabilities_link').remove();
 	//delete old entries
 	var datasetSelect =  $(document.createElement('select')).appendTo('#dataset_list');
 	datasetSelect.attr({'id':'dataset_select'});
@@ -157,6 +159,13 @@
 			$('#dataset_title').val(featureCollection.features[i].properties.title);
 			$('#dataset_rights').val(featureCollection.features[i].properties.rights);
 			$('#dataset_abstract').val(featureCollection.features[i].properties.summary);
+			//add capabilities anchor
+			identifierAnchor =  $(document.createElement('a')).appendTo('#capabilities_hybrid');
+			identifierAnchor.attr({'id':'capabilities_link'});
+			identifierAnchor.attr({'href':'../php/mod_iso19139ToHtml.php?url='+encodeURIComponent(featureCollection.features[i].properties.capabilitiesLink)});
+			identifierAnchor.text(featureCollection.features[i].properties.capabilitiesLink);
+			//$('#capabilities_link').val(featureCollection.features[i].properties.capabilitiesLink);
+			
 			//add identifier anchor
 			identifierAnchor =  $(document.createElement('a')).appendTo('#dataset_identifier');
 			identifierAnchor.attr({'id':'dataset_identifier_link'});

Modified: trunk/mapbender/http/plugins/mb_downloadFeedClient.php
===================================================================
--- trunk/mapbender/http/plugins/mb_downloadFeedClient.php	2013-12-08 20:45:48 UTC (rev 8748)
+++ trunk/mapbender/http/plugins/mb_downloadFeedClient.php	2013-12-09 12:57:33 UTC (rev 8749)
@@ -147,6 +147,10 @@
 					<label for="dataset_rights"><?php echo _mb("Rights");?>:</label>
 					<textarea readonly="readonly" name="dataset_rights" id="dataset_rights"></textarea>
 				</p>
+				<p>
+					<!--<label for="resource_identifier"><?php echo _mb("Resource identifier");?>:</label>-->
+					<div id="capabilities_hybrid"><?php echo _mb("Capabilities (WFS-hybrid)");?>:<br></div>
+				</p>
 			<!--</fieldset>-->
 		</div>
 	<!--</fieldset>-->

Modified: trunk/mapbender/http/plugins/mb_downloadFeedServer.php
===================================================================
--- trunk/mapbender/http/plugins/mb_downloadFeedServer.php	2013-12-08 20:45:48 UTC (rev 8748)
+++ trunk/mapbender/http/plugins/mb_downloadFeedServer.php	2013-12-09 12:57:33 UTC (rev 8749)
@@ -103,12 +103,12 @@
 			$feedSummary = $feedXML->xpath('/defaultns:feed/defaultns:subtitle');
 			$date = $feedXML->xpath('/defaultns:feed/defaultns:entry/defaultns:date');
 			$code = $feedXML->xpath('/defaultns:feed/defaultns:entry/inspire_dls:spatial_dataset_identifier_code');
-			
 			$namespace = $feedXML->xpath('/defaultns:feed/defaultns:entry/inspire_dls:spatial_dataset_identifier_namespace');
-			
 			$polygon = $feedXML->xpath('/defaultns:feed/defaultns:entry/georss:polygon');
 			$bbox = $feedXML->xpath('/defaultns:feed/defaultns:entry/georss:box');
 			$metadataLink = $feedXML->xpath('/defaultns:feed/defaultns:entry/defaultns:link[contains(@rel,\'describedby\')]/@href');
+			//for hybrid implementation
+			$capabilitiesLink = $feedXML->xpath('/defaultns:feed/defaultns:link[contains(@rel,\'related\')]/@href');
 			$datasetFeedLink = $feedXML->xpath('/defaultns:feed/defaultns:entry/defaultns:link[contains(@rel,\'alternate\')]/@href');
 			//new feature collection
 			$featureCollection = new FeatureCollection;
@@ -133,6 +133,9 @@
 				$polygonArray = (array)$polygon[$i];
 				$mdLinkArray = (array)$metadataLink[$i];
 				$mdLinkArray = $mdLinkArray["@attributes"];
+				$capLinkArray = (array)$capabilitiesLink[$i];
+				$capLinkArray = $capLinkArray["@attributes"];
+				$e = new mb_exception((string)count($capLinkArray));
 				$dsLinkArray = (array)$datasetFeedLink[$i];
 				$dsLinkArray = $dsLinkArray["@attributes"];
 				$feature->properties["title"] = $titleArray[0];
@@ -143,6 +146,7 @@
 				$feature->properties["code"] = $codeArray[0];
 				$feature->properties["namespace"] = $namespaceArray[0];
 				$feature->properties["metadataLink"] = $mdLinkArray["href"];
+				$feature->properties["capabilitiesLink"] = $capLinkArray["href"];
 				$feature->properties["datasetFeedLink"] = $dsLinkArray["href"];
 				//check if polygon is given			
 				if (isset($polygonArray[0]) && $polygonArray[0] != '') {