[Mapbender-commits] r9829 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-12-08 00:38:00 -0800 (Fri, 08 Dec 2017)
New Revision: 9829

Modified:
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
More rdfa

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2017-12-07 15:53:18 UTC (rev 9828)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2017-12-08 08:38:00 UTC (rev 9829)
@@ -863,7 +863,6 @@
 
 //identification information:
 $html .= $t_a.$translation['contentId'].$t_b.$resourceMetadata['contentid'].$t_c;
-
 if (isset($resourceMetadata['contentname']) && ($resourceMetadata['contentname'] != '')) {
 	$html .= $t_a.$translation['contentName'].$t_b.$resourceMetadata['contentname'].$t_c;
 }
@@ -875,7 +874,7 @@
 if (($resource == 'wms' or $resource == 'layer' or $resource == 'wmc' ) and isset($resourceMetadata['preview'])) {
 	$html .= $t_a.$translation['preview'].$t_b.$resourceMetadata['preview'];
 	//add dynamic preview in rdfa
-	$html .= '<span hidden="hidden" property="exampleOfWork" href="'.$mapbenderBaseUrl.$_SERVER['PHP_SELF'].'/../../geoportal/mod_showPreview.php?resource=layer&id='.$resourceMetadata['contentid'].'"></span>';
+	$html .= '<span hidden="hidden" property="exampleOfWork" typeof="CreativeWork"><span hidden="hidden" property="thumbnailUrl">'.$mapbenderBaseUrl.$_SERVER['PHP_SELF'].'/../../geoportal/mod_showPreview.php?resource=layer&id='.$resourceMetadata['contentid'].'</span></span>';
 	if (isset($resourceMetadata['legend'])) {
 		$html .= $resourceMetadata['legend'];
 	}
@@ -933,7 +932,8 @@
 		$showMapUrl = $mapbenderBaseUrl.WRAPPER_PATH."?LAYER[zoom]=1&LAYER[id]=".$resourceMetadata['contentid']."&LAYER[visible]=0&LAYER[querylayer]=0";
 	}
 	//add hidden element for show map url
-	$html .= $t_a.$t_b.'<span property="url">'.$showMapUrl.'</span>'.$t_c;
+	$html .= $t_a.$t_b.'<span hidden="hidden" property="url">'.$showMapUrl.'</span>'.$t_c;
+	$html .= $t_a.$t_b.'<span hidden="hidden" property="identifier">'.$mapbenderBaseUrl.$resource.'/'.$resourceMetadata['contentid'].'</span>'.$t_c;
 	//$html .= $t_a.$translation['addLayerToMap'].$t_b."<a href='".$showMapUrl."' target='_blank'><img src='../img/osgeo_graphics/layer-wms-add.png'></a>".$t_c;
 	$html .= $t_a."<button onclick='window.open(\"".$showMapUrl."\", 
   \"windowname1\", 
@@ -958,6 +958,8 @@
    return false;><img src='../img/osgeo_graphics/layer-wms-add.png'>".$translation['showMap']."</button>".$t_b."".$t_c;
 	
 }
+//add dynamic preview in rdfa
+$html .= $t_a.$t_b.'<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>'.$t_c;
 //new for share and discuss metadata by twitter
 if (TWITTER_METADATA) {
 	if ($resource == 'wfs' or $resource == 'wms') {
@@ -1067,8 +1069,6 @@
 	$html .= $t_a.$translation['wgs84Bbox'].$t_b.$wgs84Bbox.$t_c;
 	if (defined('EXTENTSERVICEURL')) {
 		$html .= $t_a.$translation['wgs84BboxGraphic'].$t_b."<img src='".$getMapUrl."'>".$t_c;
-		//add dynamic preview in rdfa
-		$html .= '<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>';
 	} else {
 		$html .= $t_a.$translation['wgs84BboxGraphic'].$t_b.$translation['graphicUnavailable'].$t_c;
 	}
@@ -1393,7 +1393,7 @@
 	$html .= "<img  src='../img/inspire_tr_36.png'>";
 	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".       $layerId."' target=_blank >".$translation['showDocument']."</a><br/><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layerId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
 	$html .= $t_c;
-	$html .= $t_a2."<img style='border: none;width:34px;height:34px' src='../img/rdf_w3c_icon.48.gif' title='".$translation['inspireMetadata']." - RDF/XML (BETA)"."' style='width:34px;height:34px' alt='' />";
+	$html .= $t_a2."<img style='border: none;width:34px;height:34px' src='../img/rdf_w3c_icon.48.gif' title='".$translation['inspireMetadata']." - RDF/XML (BETA)"."' alt='' />";
 
 	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_layerISOMetadata.php?SERVICE=WMS&CN=false&outputFormat=rdf&Id=". $layerId."' target=_blank >".$translation['showDocument']."</a><br /><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../mod_layerISOMetadata.php?SERVICE=WMS&CN=false&outputFormat=rdf&Id=".$layerId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
         $html .= $t_c;
@@ -1409,7 +1409,7 @@
 	}
 
 	//kml
-	$html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'><img style='border: none;' src='../img/misc/kml_icon.gif' title='".$translation['kml']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
+	$html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'><img style='border: none;width:34px;height:34px' src='../img/misc/kml_icon.gif' title='".$translation['kml']."' alt='' /></a>".$t_c;
 }
 
 if ($resource == 'wfs' or $resource == 'featuretype' or $resource == 'wfs-conf') {