[Mapbender-commits] r6941 - in trunk/mapbender/http: img img/osgeo_graphics img/osgeo_graphics/geosilk php

Fri Sep 24 06:16:07 EDT 2010

Author: armin11
Date: 2010-09-24 10:16:07 +0000 (Fri, 24 Sep 2010)
New Revision: 6941

Added:
   trunk/mapbender/http/img/osgeo_graphics/
   trunk/mapbender/http/img/osgeo_graphics/Layer.png
   trunk/mapbender/http/img/osgeo_graphics/Mapset.png
   trunk/mapbender/http/img/osgeo_graphics/check.png
   trunk/mapbender/http/img/osgeo_graphics/geosilk/
   trunk/mapbender/http/img/osgeo_graphics/geosilk/server_map.png
   trunk/mapbender/http/img/osgeo_graphics/geosilk/server_vector.png
   trunk/mapbender/http/img/osgeo_graphics/geosilk/vector.png
   trunk/mapbender/http/img/osgeo_graphics/layer-wfs-add.png
   trunk/mapbender/http/img/osgeo_graphics/layer-wms-add.png
   trunk/mapbender/http/img/osgeo_graphics/map-open.png
   trunk/mapbender/http/img/osgeo_graphics/not_selectable.png
   trunk/mapbender/http/img/osgeo_graphics/raster-info.png
   trunk/mapbender/http/img/osgeo_graphics/select.png
Modified:
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
some graphics from osgeo and extension of new metadata show module

Added: trunk/mapbender/http/img/osgeo_graphics/Layer.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/Layer.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/Mapset.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/Mapset.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/check.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/check.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/geosilk/server_map.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/geosilk/server_map.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/geosilk/server_vector.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/geosilk/server_vector.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/geosilk/vector.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/geosilk/vector.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/layer-wfs-add.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/layer-wfs-add.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/layer-wms-add.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/layer-wms-add.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/map-open.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/map-open.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/not_selectable.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/not_selectable.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/raster-info.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/raster-info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/mapbender/http/img/osgeo_graphics/select.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/osgeo_graphics/select.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================

--- trunk/mapbender/http/php/mod_showMetadata.php	2010-09-24 08:05:33 UTC (rev 6940)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2010-09-24 10:16:07 UTC (rev 6941)
@@ -112,12 +112,14 @@
 $translation['kindOfResource'] = 'Art der Ressource';
 $translation['wms'] = 'Kartendienst';
 $translation['layer'] = 'Kartenebene';
+$translation['contentId'] = 'Resourcenidentifikator';
+$translation['serviceId'] = 'Informationen zum Dienst';
 $translation['preview'] = 'Voransicht';
 $translation['extent'] = 'Ausdehnung';
 $translation['resourceAbstract'] = 'Zusammenfassung';
 $translation['resourceTitle'] = 'Titel';
-$translation['metadataProvider'] = 'Veröffentlichende Stelle';
-$translation['serviceProvider'] = 'Dienstanbieter';
+$translation['metadataProvider'] = 'Inhaltlich verantwortliche Stelle';
+$translation['serviceProvider'] = 'Technisch verantwortliche Stelle';
 $translation['contactPerson'] = 'Ansprechpartner';
 $translation['contactOrganization'] = 'Organisation';
 $translation['contactAddress'] = 'Adresse';
@@ -136,7 +138,7 @@
 $translation['minscale'] = 'Minimaler Maßstab';
 $translation['maxscale'] = 'Maximaler Maßstab';
 $translation['crs'] = 'Koordinatenreferenzsysteme (mit BBOX)';
-$translation['wgs84Bbox'] = 'Ausdehnung in geographischen Koordinaten';
+$translation['wgs84Bbox'] = 'Eckpunkte in geogr. Koordinaten';
 $translation['wgs84BboxGraphic'] = 'Kartenübersicht';
 $translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
 $translation['originalCapabilities'] = 'Original Capabilities';
@@ -145,6 +147,12 @@
 $translation['securedCapabilities'] = 'Secured Capabilities URL';
 $translation['capabilities'] = 'Link zum Capabilities Dokument';
 $translation['inspireMetadataValidation'] = 'Validierung gegen INSPIRE Geoportal';
+
+$translation['statusOK'] = 'Stabil';
+$translation['statusChanged'] = 'Beschreibung hat sich geändert - Aktualisierung nötig';
+$translation['statusProblem'] = 'Problem bei letzter Kontrolle';
+
+
 //Array with infos about the different elements which are shown in the tabs
 
 //Check if an id and a resource was given
@@ -174,7 +182,7 @@
 		$v = array($layerId);
 		$t = array('i');
 		$serviceType = 'wms';
-		
+		$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_map.png' alt='".$translation['wms']." - Bild' title='".$translation['wms']."'> - ".$translation['wms'];
 		break;
 	case "layer":
 		$layerId = $id;
@@ -189,6 +197,7 @@
 		$v = array($layerId);
 		$t = array('i');
 		$serviceType = 'wms';
+		$resourceSymbol = "<img src='../img/osgeo_graphics/Layer.png' alt='".$translation['layer']." - Bild' title='".$translation['layer']."'> - ".$translation['layer'];
 		break;
 	case "wfs":
 		echo 'Not yet implemented!'; 
@@ -225,6 +234,33 @@
 }
 $serviceId = $resourceMetadata['serviceid'];
 
+
+/*switch ($serviceType) {
+	case "wms":
+		#$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_map.png' alt='".."' title='".."'>";
+		die(); 	
+		break;
+	case "wfs":
+		#$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_vector.png' alt='' title=''>";
+		die(); 	
+		break;		
+	case "wmc":
+		$resourceSymbol = "<img src='' alt='' title=''>";
+		die(); 	
+		break;
+	case "kml":
+		die(); 	
+		break;
+	case "georss":
+		die(); 	
+		break;
+}
+
+*/
+
+
+
+
 //$e = new mb_exception("mod_showMetadata: fkey_mb_group_id from wms or wfs table: ".$resourceMetadata['fkey_mb_group_id']);
 if (!isset($resourceMetadata['fkey_mb_group_id']) or isnull($resourceMetadata['fkey_mb_group_id'])){
 	$e = new mb_notice("mod_showMetadata: fkey_mb_group_id not found!");
@@ -404,8 +440,20 @@
 }
 $html .= '<p>';
 $html .= $tableBegin;
-$html .= $t_a.$translation['resourceTitle'].$t_b.displayText($resourceMetadata['contenttitle']).$t_c;
-$html .= $t_a.$translation['kindOfResource'].$t_b.displayText($translation[$resource]).$t_c;
+$html .= $t_a.$translation['resourceTitle'].$t_b."<em>".displayText($resourceMetadata['contenttitle'])."</em>".$t_c;
+
+//decide if a root layer have been found - then the type will be a server
+#$html .= "<br>".$resourceMetadata['contentpos']."<br>";
+#$html .= "<br>".$resource."<br>";
+if ($resource == 'layer' & $resourceMetadata['contentpos'] == 0) {
+	$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_map.png' alt='".$translation['wms']." - Bild' title='".$translation['wms']."'> - ".$translation['wms'];
+}
+$html .= $t_a.$translation['kindOfResource'].$t_b.$resourceSymbol.$t_c;
+
+//identification information:
+$html .= $t_a.$translation['contentId'].$t_b.$resourceMetadata['contentid'].$t_c;
+$html .= $t_a.$translation['serviceId'].$t_b."<a href='".$self."?resource=".$serviceType."&id=".$serviceId."&layout=".$layout."'>".$serviceId."</a>".$t_c;
+
 if (($resource == 'wms' or $resource == 'layer') and isset($resourceMetadata['preview'])) {
 	$html .= $t_a.$translation['preview'].$t_b.$resourceMetadata['preview'];
 	if (isset($resourceMetadata['legend'])) {
@@ -413,6 +461,11 @@
 	}
 	$html .= $t_c;
 }
+
+
+
+
+
 if ($metadataContactGroup['metdatapointofcontactorglogo'] != '') {
 	$html .= $t_a.$translation['contactOrganization'].$t_b."<img src='".$metadataContactGroup['metdatapointofcontactorglogo']."'  height='30'>";
 }
@@ -478,9 +531,9 @@
 
 if ($resource == 'wms' or $resource == 'layer'){
 	if ($resourceMetadata['layer_queryable'] == '1') {
-			$html .= $t_a.$translation['queryable'].$t_b.$translation['queryableTrue'].$t_c;	
+			$html .= $t_a.$translation['queryable'].$t_b."<img src='../img/osgeo_graphics/select.png' title='".$translation['queryableTrue']."' alt='".$translation['queryableTrue']."'>".$t_c;	
 	} else {
-			$html .= $t_a.$translation['queryable'].$t_b.$translation['queryableFalse'].$t_c;
+		$html .= $t_a.$translation['queryable'].$t_b."<img src='../img/osgeo_graphics/not_selectable.png' title='".$translation['queryableFalse']."' alt='".$translation['queryableFalse']."'>".$t_c;	
 	}
 }
 $epsgString = '';
@@ -505,7 +558,7 @@
 $html .= $tableEnd;
 $html .= $tableBegin;
 //Scales
-if (isset($resourceMetadata['contentminscale']) or isset($resourceMetadata['contentmaxscale'])){
+if ((isset($resourceMetadata['contentminscale']) & $resourceMetadata['contentminscale'] != '0') or (isset($resourceMetadata['contentmaxscale']) & $resourceMetadata['contentmaxscale'] != '0')){
 	$html .= '<h4>'.$translation['restrictedScale'].'</h4>';
 	if (isset($resourceMetadata['contentminscale']) & $resourceMetadata['contentminscale'] != '0' ) {
 		$html .= $t_a.$translation['maxscale'].$t_b. "1 : ".$resourceMetadata['contentminscale'].$t_c;	
@@ -595,13 +648,13 @@
 $html .= $tableBegin;
 switch ($serviceQuality['last_status']) {
 	case '1':
-		$html .= $t_a.$translation['status'].$t_b.'Stable'.$t_c;
+		$html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/go.bmp' height='24px' width='24px' alt='".$translation['statusOK']."' title='".$translation['statusOK']."'>".$t_c;
 		break;
 	case '0':
-		$html .= $t_a.$translation['status'].$t_b.'Not up to date'.$t_c;
+		$html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/wait.bmp' height='24px' width='24px'  alt='".$translation['statusChanged']."' title='".$translation['statusChanged']."'>".$t_c;
 		break;
 	case '-1':
-		$html .= $t_a.$translation['status'].$t_b.'Service has Problems'.$t_c;
+		$html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/stop.bmp' height='24px' width='24px'  alt='".$translation['statusProblem']."' title='".$translation['statusChanged']."'>".$t_c;
 		break;
 }
 if (isset($serviceQuality['availability'])) {

