[Mapbender-commits] r6967 - in trunk/mapbender: http/classes
http/img/misc http/php tools/wms_extent
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Sep 29 09:57:06 EDT 2010
Author: armin11
Date: 2010-09-29 13:57:06 +0000 (Wed, 29 Sep 2010)
New Revision: 6967
Added:
trunk/mapbender/http/img/misc/kml_icon.gif
Modified:
trunk/mapbender/http/classes/class_metadata_new.php
trunk/mapbender/http/php/mod_getServiceDisclaimer.php
trunk/mapbender/http/php/mod_layerISOMetadata.php
trunk/mapbender/http/php/mod_showMetadata.php
trunk/mapbender/tools/wms_extent/extents.map
Log:
Bugfixing and enhancement (and translations) of metadata module and iso19139 export
Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php 2010-09-29 13:11:49 UTC (rev 6966)
+++ trunk/mapbender/http/classes/class_metadata_new.php 2010-09-29 13:57:06 UTC (rev 6967)
@@ -616,7 +616,7 @@
$this->wmsJSON->wms->srv[$j]->layer[0]->id = (integer)$subLayers[$rootIndex]['layer_id'];
$this->wmsJSON->wms->srv[$j]->layer[0]->title = $subLayers[$rootIndex]['layer_title'];
$this->wmsJSON->wms->srv[$j]->layer[0]->abstract = $subLayers[$rootIndex]['layer_abstract'];
- $this->wmsJSON->wms->srv[$j]->layer[0]->mdLink = "http://".$this->hostName."/mapbender/php/mod_showMetadata.php?resource=layer&layout=tabs&id=".(integer)$subLayers[$rootIndex]['layer_id'];
+ $this->wmsJSON->wms->srv[$j]->layer[0]->mdLink = "http://".$this->hostName."/mapbender/php/mod_showMetadata.php?languageCode=".$this->languageCode."&resource=layer&layout=tabs&id=".(integer)$subLayers[$rootIndex]['layer_id'];
$this->wmsJSON->wms->srv[$j]->layer[0]->previewURL = "http://".$this->hostName."/mapbender/x_geoportal/mod_layerPreview.php?id=".(integer)$subLayers[$rootIndex]['layer_id'];
if ($subLayers[$rootIndex]['layer_name'] == ''){
$this->wmsJSON->wms->srv[$j]->layer[0]->loadable = 0;
@@ -1522,7 +1522,7 @@
$servObject->layer[$countsublayer]->title = $child['layer_title'];
$servObject->layer[$countsublayer]->abstract = $child['layer_abstract'];
$servObject->layer[$countsublayer]->previewURL = "http://".$this->hostName."/mapbender/x_geoportal/mod_layerPreview.php?id=".$child['layer_id'];
- $servObject->layer[$countsublayer]->mdLink = "http://".$this->hostName."/mapbender/php/mod_showMetadata.php?resource=layer&layout=tabs&id=".$child['layer_id'];
+ $servObject->layer[$countsublayer]->mdLink = "http://".$this->hostName."/mapbender/php/mod_showMetadata.php?languageCode=".$this->languageCode."&resource=layer&layout=tabs&id=".$child['layer_id'];
if ($child['layer_name'] == ''){
$servObject->layer[$countsublayer]->loadable = 0;
} else {
Added: trunk/mapbender/http/img/misc/kml_icon.gif
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/img/misc/kml_icon.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/mapbender/http/php/mod_getServiceDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getServiceDisclaimer.php 2010-09-29 13:11:49 UTC (rev 6966)
+++ trunk/mapbender/http/php/mod_getServiceDisclaimer.php 2010-09-29 13:57:06 UTC (rev 6967)
@@ -87,7 +87,6 @@
}
-
$htmlHeader = array();
switch($languageCode){
@@ -105,7 +104,7 @@
$htmlHeader['priceInformation'][1] = ' Cent pro Megapixel</b> ';
$htmlHeader['priceInformation'][2] = ' für abgerufene Bildinformationen angegeben. Das Abrufen eines Kartenbildes in einer Standardauflösung von 600x400 Pixeln kostet dementsprechend <b>';
$htmlHeader['priceInformation'][3] = ' Euro</b>. Angaben zu eventuell möglichen Rabatten erhalten Sie über ';
- $htmlHeader['noInformation'] = 'No informations about use constraints are available!';
+ $htmlHeader['noInformation'] = 'Es sind keine Informationen über Nutzungsbedingungen verfügbar!';
break;
@@ -123,7 +122,7 @@
$htmlHeader['priceInformation'][1] = ' (euro)cent per megapixel</b> ';
$htmlHeader['priceInformation'][2] = ' for retrieved picture data. The retrieving of a typical map with a standardized resolution of 600x400 px will cost <b>';
$htmlHeader['priceInformation'][3] = ' euro</b>. For information about possible discounts please contact ';
- $htmlHeader['noInformation'] = 'Es sind keine Informationen über Nutzungsbedingungen verfügbar!';
+ $htmlHeader['noInformation'] = 'No informations about use constraints are available!';
Modified: trunk/mapbender/http/php/mod_layerISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerISOMetadata.php 2010-09-29 13:11:49 UTC (rev 6966)
+++ trunk/mapbender/http/php/mod_layerISOMetadata.php 2010-09-29 13:57:06 UTC (rev 6967)
@@ -149,6 +149,16 @@
$languagecode->appendChild($languageText);
$language ->appendChild($languagecode);
$language = $MD_Metadata->appendChild($language);
+ //generate Characterset - first it should be utf8 ;-)
+ $characterSet = $iso19139->createElement("gmd:characterSet");
+ $characterSetCode = $iso19139->createElement("gmd:MD_CharacterSetCode");
+ $characterSetCode->setAttribute("codeList", "./resources/codeList.xml#MD_CharacterSetCode");
+ $characterSetCode->setAttribute("codeListValue", "utf8");
+ $characterSet->appendChild($characterSetCode);
+ $characterSet = $MD_Metadata->appendChild($characterSet);
+
+
+
#generate MD_Scope part B 1.3 (if available)
$hierarchyLevel = $iso19139->createElement("gmd:hierarchyLevel");
$scopecode = $iso19139->createElement("gmd:MD_ScopeCode");
@@ -636,7 +646,9 @@
$gmd_transferOptions=$iso19139->createElement("gmd:transferOptions");
$MD_DigitalTransferOptions=$iso19139->createElement("gmd:MD_DigitalTransferOptions");
$gmd_onLine=$iso19139->createElement("gmd:onLine");
+
$CI_OnlineResource=$iso19139->createElement("gmd:CI_OnlineResource");
+
$gmd_linkage=$iso19139->createElement("gmd:linkage");
$gmd_URL=$iso19139->createElement("gmd:URL");
//Check if anonymous user has rights to access this layer - if not ? which resource should be advertised? TODO
@@ -649,6 +661,36 @@
$gmd_URL->appendChild($gmd_URLText);
$gmd_linkage->appendChild($gmd_URL);
$CI_OnlineResource->appendChild($gmd_linkage);
+
+ //append things which geonetwork needs to invoke service/layer or what else? - Here the name of the layer and the protocol seems to be needed?
+ //a problem will occur, if the link to get map is not the same as the link to get caps? So how can we handle this? It seems to very silly!
+ $gmdProtocol = $iso19139->createElement("gmd:protocol");
+ $gmdProtocol_cs = $iso19139->createElement("gco:CharacterString");
+ $gmdProtocolText = $iso19139->createTextNode("OGC:WMS-1.1.1-http-get-map");//for ever 'OGC:WMS-1.1.1-http-get-map'
+
+ $gmdName=$iso19139->createElement("gmd:name");
+ $gmdName_cs=$iso19139->createElement("gco:CharacterString");
+ $gmdNameText=$iso19139->createTextNode($mapbenderMetadata['layer_name']); //Layername?
+
+ $gmdDescription = $iso19139->createElement("gmd:description");
+ $gmdDescription_cs = $iso19139->createElement("gco:CharacterString");
+ $gmdDescriptionText = $iso19139->createTextNode($mapbenderMetadata['layer_abstract']);//Layer Abstract
+
+ $gmdProtocol_cs->appendChild($gmdProtocolText);
+ $gmdProtocol->appendChild($gmdProtocol_cs);
+ $CI_OnlineResource->appendChild($gmdProtocol);
+
+
+
+ $gmdName_cs->appendChild($gmdNameText);
+ $gmdName->appendChild($gmdName_cs);
+ $CI_OnlineResource->appendChild($gmdName);
+
+ $gmdDescription_cs->appendChild($gmdDescriptionText);
+ $gmdDescription->appendChild($gmdDescription_cs);
+ $CI_OnlineResource->appendChild($gmdDescription);
+
+//***********************************************************************************
$gmd_onLine->appendChild($CI_OnlineResource);
$MD_DigitalTransferOptions->appendChild($gmd_onLine);
$gmd_transferOptions->appendChild($MD_DigitalTransferOptions);
Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php 2010-09-29 13:11:49 UTC (rev 6966)
+++ trunk/mapbender/http/php/mod_showMetadata.php 2010-09-29 13:57:06 UTC (rev 6967)
@@ -80,7 +80,7 @@
$testMatch = NULL;
}
$subscribe = intval($_GET["subscribe"]);
-
+/*
//get language parameter out of mapbender session if it is set else set default language to de_DE
if (isset($_SESSION['mb_lang']) and $_SESSION['mb_lang']!='') {
$e = new mb_exception("mod_showMetadata.php: language in session: ".$_SESSION['mb_lang']);
@@ -98,61 +98,170 @@
$langCode = $language;
}
#$langCode="de";
+*/
+$e = new mb_exception("mod_showMetadata.php: language: ".$languageCode);
-$e = new mb_exception("mod_showMetadata.php: language: ".$langCode);
-
//Array with translations:
-$translation['overview'] = 'Übersicht';
-$translation['properties'] = 'Eigenschaften';
-$translation['termsOfUse'] = 'Nutzungsbedingungen';
-$translation['contact'] = 'Kontakt';
-$translation['quality'] = 'Qualität';
-$translation['interfaces'] = 'Schnittstellen';
-$translation['metadata'] = 'Metadaten';
-$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'] = 'Inhaltlich verantwortliche Stelle';
-$translation['serviceProvider'] = 'Technisch verantwortliche Stelle';
-$translation['contactPerson'] = 'Ansprechpartner';
-$translation['contactOrganization'] = 'Organisation';
-$translation['contactAddress'] = 'Adresse';
-$translation['email'] = 'Email';
-$translation['city'] = 'Ort';
-$translation['logo'] = 'Logo';
-$translation['status'] = 'Status';
-$translation['availability'] = 'Verfügbarkeit';
-$translation['statusRed'] = 'Probleme beim letzten Monitoring!';
-$translation['statusGreen'] = 'Letztes Monitoring OK';
-$translation['statusYellow'] = 'Dienstebeschreibung hat sich geändert!';
-$translation['queryableFalse'] = 'Ebene nicht abfragbar';
-$translation['queryableTrue'] = 'Ebene abfragbar';
-$translation['queryable'] = 'Abfragbarkeit';
-$translation['restrictedScale'] = 'Sichtbarkeit';
-$translation['minscale'] = 'Minimaler Maßstab';
-$translation['maxscale'] = 'Maximaler Maßstab';
-$translation['crs'] = 'Koordinatenreferenzsysteme (mit BBOX)';
-$translation['wgs84Bbox'] = 'Eckpunkte in geogr. Koordinaten';
-$translation['wgs84BboxGraphic'] = 'Kartenübersicht';
-$translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
-$translation['originalCapabilities'] = 'Original Capabilities';
-$translation['kml'] = 'KML';
-$translation['inspireMetadata'] = 'INSPIRE Service Metadaten';
-$translation['securedCapabilities'] = 'Secured Capabilities URL';
-$translation['capabilities'] = 'Link zum Capabilities Dokument';
-$translation['inspireMetadataValidation'] = 'Validierung gegen INSPIRE Geoportal';
+switch ($languageCode) {
+ case "de":
+ $translation['overview'] = 'Übersicht';
+ $translation['properties'] = 'Eigenschaften';
+ $translation['termsOfUse'] = 'Nutzungsbedingungen';
+ $translation['contact'] = 'Kontakt';
+ $translation['quality'] = 'Qualität';
+ $translation['interfaces'] = 'Schnittstellen';
+ $translation['metadata'] = 'Metadaten';
+ $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'] = 'Inhaltlich verantwortliche Stelle';
+ $translation['serviceProvider'] = 'Technisch verantwortliche Stelle';
+ $translation['contactPerson'] = 'Ansprechpartner';
+ $translation['contactOrganization'] = 'Organisation';
+ $translation['contactAddress'] = 'Adresse';
+ $translation['email'] = 'Email';
+ $translation['city'] = 'Ort';
+ $translation['logo'] = 'Logo';
+ $translation['status'] = 'Status';
+ $translation['availability'] = 'Verfügbarkeit';
+ $translation['statusRed'] = 'Probleme beim letzten Monitoring!';
+ $translation['statusGreen'] = 'Letztes Monitoring OK';
+ $translation['statusYellow'] = 'Dienstebeschreibung hat sich geändert!';
+ $translation['queryableFalse'] = 'Ebene nicht abfragbar';
+ $translation['queryableTrue'] = 'Ebene abfragbar';
+ $translation['queryable'] = 'Abfragbarkeit';
+ $translation['restrictedScale'] = 'Sichtbarkeit';
+ $translation['minscale'] = 'Minimaler Maßstab';
+ $translation['maxscale'] = 'Maximaler Maßstab';
+ $translation['crs'] = 'Koordinatenreferenzsysteme (mit BBOX)';
+ $translation['wgs84Bbox'] = 'Eckpunkte in geogr. Koordinaten';
+ $translation['wgs84BboxGraphic'] = 'Kartenübersicht';
+ $translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
+ $translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['kml'] = 'KML';
+ $translation['inspireMetadata'] = 'INSPIRE Service Metadaten';
+ $translation['showInspireMetadata'] = 'Metadatendatei';
+ $translation['securedCapabilities'] = 'Secured Capabilities URL';
+ $translation['capabilities'] = 'Link zum Capabilities Dokument';
+ $translation['inspireMetadataValidation'] = 'Validierung gegen INSPIRE Geoportal';
+ $translation['showInspireMetadataValidation'] = 'Validierung starten';
+ $translation['statusOK'] = 'Stabil';
+ $translation['statusChanged'] = 'Beschreibung hat sich geändert - Aktualisierung nötig';
+ $translation['statusProblem'] = 'Problem bei letzter Kontrolle';
+ $translation['contactTelephone'] = 'Telefon';
+ break;
+ case "en":
+ $translation['overview'] = 'Overview';
+ $translation['properties'] = 'Properties';
+ $translation['termsOfUse'] = 'Terms Of Use';
+ $translation['contact'] = 'Kontact';
+ $translation['quality'] = 'Quality';
+ $translation['interfaces'] = 'Interfaces';
+ $translation['metadata'] = 'Metadata';
+ $translation['kindOfResource'] = 'Kind of resource';
+ $translation['wms'] = 'Map Service';
+ $translation['layer'] = 'Map Layer';
+ $translation['contentId'] = 'Resourceidentifier';
+ $translation['serviceId'] = 'Information about the service';
+ $translation['preview'] = 'Preview';
+ $translation['extent'] = 'Extent';
+ $translation['resourceAbstract'] = 'Abstract';
+ $translation['resourceTitle'] = 'Title';
+ $translation['metadataProvider'] = 'Responsible party for content';
+ $translation['serviceProvider'] = 'Responsible party for service';
+ $translation['contactPerson'] = 'Contact person';
+ $translation['contactOrganization'] = 'Organization';
+ $translation['contactAddress'] = 'Address';
+ $translation['email'] = 'Email';
+ $translation['city'] = 'City';
+ $translation['logo'] = 'Logo';
+ $translation['status'] = 'Status';
+ $translation['availability'] = 'Availability';
+ $translation['statusRed'] = 'Problem with last monitoring!';
+ $translation['statusGreen'] = 'Last Monitoring: OK';
+ $translation['statusYellow'] = 'Servicedescription changed!';
+ $translation['queryableFalse'] = 'Layer not queryable';
+ $translation['queryableTrue'] = 'Layer queryable';
+ $translation['queryable'] = 'Query';
+ $translation['restrictedScale'] = 'Visibility';
+ $translation['minscale'] = 'Minimum scale';
+ $translation['maxscale'] = 'Maximum scale';
+ $translation['crs'] = 'Coordinate Reference System';
+ $translation['wgs84Bbox'] = 'Corner in geographic Coordinates';
+ $translation['wgs84BboxGraphic'] = 'Map View';
+ $translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
+ $translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['kml'] = 'KML';
+ $translation['inspireMetadata'] = 'INSPIRE Service Metadata';
+ $translation['securedCapabilities'] = 'Secured Capabilities URL';
+ $translation['capabilities'] = 'Link to OWS capabilities document';
+ $translation['inspireMetadataValidation'] = 'Validate against INSPIRE Geoportal';
+ $translation['statusOK'] = 'stable';
+ $translation['statusChanged'] = 'Description changed - update necessary';
+ $translation['statusProblem'] = 'Problem at last control';
+ $translation['contactTelephone'] = 'Telephon';
+ break;
+ default: #to english
+ $translation['overview'] = 'Overview';
+ $translation['properties'] = 'Properties';
+ $translation['termsOfUse'] = 'Terms Of Use';
+ $translation['contact'] = 'Contact';
+ $translation['quality'] = 'Quality';
+ $translation['interfaces'] = 'Interfaces';
+ $translation['metadata'] = 'Metadata';
+ $translation['kindOfResource'] = 'Kind of resource';
+ $translation['wms'] = 'Map Service';
+ $translation['layer'] = 'Map Layer';
+ $translation['contentId'] = 'Resourceidentifier';
+ $translation['serviceId'] = 'Information about the service';
+ $translation['preview'] = 'Preview';
+ $translation['extent'] = 'Extent';
+ $translation['resourceAbstract'] = 'Abstract';
+ $translation['resourceTitle'] = 'Title';
+ $translation['metadataProvider'] = 'Responsible party for content';
+ $translation['serviceProvider'] = 'Responsible party for service';
+ $translation['contactPerson'] = 'Contact person';
+ $translation['contactOrganization'] = 'Organization';
+ $translation['contactAddress'] = 'Address';
+ $translation['email'] = 'Email';
+ $translation['city'] = 'City';
+ $translation['logo'] = 'Logo';
+ $translation['status'] = 'Status';
+ $translation['availability'] = 'Availability';
+ $translation['statusRed'] = 'Problem with last monitoring!';
+ $translation['statusGreen'] = 'Last Monitoring: OK';
+ $translation['statusYellow'] = 'Servicedescription changed!';
+ $translation['queryableFalse'] = 'Layer not queryable';
+ $translation['queryableTrue'] = 'Layer queryable';
+ $translation['queryable'] = 'Query';
+ $translation['restrictedScale'] = 'Visibility';
+ $translation['minscale'] = 'Minimum scale';
+ $translation['maxscale'] = 'Maximum scale';
+ $translation['crs'] = 'Coordinate Reference System';
+ $translation['wgs84Bbox'] = 'Corner in geographic Coordinates';
+ $translation['wgs84BboxGraphic'] = 'Map View';
+ $translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
+ $translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['kml'] = 'KML';
+ $translation['inspireMetadata'] = 'INSPIRE Service Metadata';
+ $translation['securedCapabilities'] = 'Secured Capabilities URL';
+ $translation['capabilities'] = 'Link to OWS capabilities document';
+ $translation['inspireMetadataValidation'] = 'Validate against INSPIRE Geoportal';
+ $translation['statusOK'] = 'stable';
+ $translation['statusChanged'] = 'Description changed - update necessary';
+ $translation['statusProblem'] = 'Problem at last control';
+ $translation['contactTelephone'] = 'Telephon';
-$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
@@ -337,16 +446,16 @@
//Array with structure of metadata
//e.g. tabs and their content
-$html = '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$langCode.'">';
+$html = '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$languageCode.'">';
$html .= '<body>';
$metadataStr .= '<head>' .
'<title>'.$translation['metadata'].'</title>' .
- '<meta name="description" content="'.$translation['metadata'].'" xml:lang="'.$langCode.'" />'.
- '<meta name="keywords" content="'.$translation['metadata'].'" xml:lang="'.$langCode.'" />' .
+ '<meta name="description" content="'.$translation['metadata'].'" xml:lang="'.$languageCode.'" />'.
+ '<meta name="keywords" content="'.$translation['metadata'].'" xml:lang="'.$languageCode.'" />' .
'<meta http-equiv="cache-control" content="no-cache">'.
'<meta http-equiv="pragma" content="no-cache">'.
'<meta http-equiv="expires" content="0">'.
- '<meta http-equiv="content-language" content="'.$langCode.'" />'.
+ '<meta http-equiv="content-language" content="'.$languageCode.'" />'.
'<meta http-equiv="content-style-type" content="text/css" />'.
'<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">' .
'</head>';
@@ -492,17 +601,13 @@
//show abo function to registred and authorized users
//if ($is_subscribed && !$is_public) {
if ($is_subscribed) {
- $aboStr = "<tr><th>Abo</th><td><img src = '../img/mail_delete.png'>" .
- "<a href = '../php/mod_showMetadata.php?id=" .
- $layerId . "&resource=layer&user_id=" . $currentUser->id . "&subscribe=0'>" .
- _mb("Monitoring Abo löschen") . "</a></td></tr>"; //TODO check wherefor user_id should be given as parameter?
+ $aboStr = "<tr><th>Abo</th><td><a href = '../php/mod_showMetadata.php?id=" .
+ $layerId . "&resource=layer&user_id=" . $currentUser->id . "&subscribe=0'><img style='border: none;' src = '../img/mail_delete.png' title='"._mb("Monitoring Abo löschen")."'></a></td></tr>"; //TODO check wherefor user_id should be given as parameter?
}
//else if (!$is_subscribed && !$is_public) {
else if (!$is_subscribed) {
- $aboStr = "<tr><th>Abo</th><td><img src = '../img/mail_send.png'>" .
- "<a href = '../php/mod_showMetadata.php?id=" . $layerId .
- "&resource=layer&user_id=" . $currentUser->id . "&subscribe=1'>" .
- _mb("Monitoring abonnieren") . "</a></td></tr>";
+ $aboStr = "<tr><th>Abo</th><td><a href = '../php/mod_showMetadata.php?id=" . $layerId .
+ "&resource=layer&user_id=" . $currentUser->id . "&subscribe=1'><img style='border: none;' src = '../img/mail_send.png' title='"._mb("Monitoring abonnieren")."'></a></td></tr>";
}
}
$html .= $aboStr;
@@ -605,6 +710,7 @@
$html .= $t_a.$translation['contactPerson'].$t_b.displayText($resourceMetadata['contactperson']).$t_c;
$html .= $t_a.$translation['contactAddress'].$t_b.displayText($resourceMetadata['address']).$t_c;
$html .= $t_a.$translation['contactCity'].$t_b.displayText($resourceMetadata['postcode'].' '.$resourceMetadata['city']).$t_c;
+$html .= $t_a.$translation['contactTelephone'].$t_b.displayText($resourceMetadata['contactvoicetelephone']).$t_c;
$html .= $t_a.$translation['email'].$t_b.displayText($resourceMetadata['contactelectronicmailaddress']).$t_c;
$html .= $tableEnd;
@@ -626,7 +732,7 @@
$html .= '<div>';
}
$html .= '<p>';
-$tou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?type=".$serviceType."&id=".$serviceId."&languageCode=".$langCode."&asTable=true");
+$tou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?type=".$serviceType."&id=".$serviceId."&languageCode=".$languageCode."&asTable=true");
$html .= $tou;
$html .= '</p>';
$html .= '</div>';
@@ -687,15 +793,17 @@
$html .= $tableBegin;
$html .= $t_a.$translation['mapbenderCapabilities'].$t_b."<a href = '../php/wms.php?layer_id=".$layerId."&PHPSESSID=".session_id()."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
$html .= $t_a.$translation['originalCapabilities'].$t_b."<a href = '".$resourceMetadata['wms_getcapabilities']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
-$html .= $t_a.$translation['inspireMetadata'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=". $layerId."' target=_blank ><img src='../img/inspire_tr_36.png' title='".$translation['inspireMetadata']."' style='width:34px;height:34px' alt='' /></a>"."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layerId."&validate=true' target=_blank title='".$translation['inspireMetadataValidation']."'>".$translation['inspireMetadataValidation']."</a>";
+$html .= $t_a.$translation['inspireMetadata'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=". $layerId."' target=_blank ><img style='border: none;' src='../img/inspire_tr_36.png' title='".$translation['inspireMetadata']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
+$html .= $t_a.$translation['inspireMetadataValidation'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layerId."&validate=true' target=_blank title='".$translation['inspireMetadataValidation']."'>".$translation['showInspireMetadataValidation']."</a>".$t_c;
+
//if service is secured and http_auth is adjusted show secured url
if ($resourceSecured) {
$securedLink = HTTP_AUTH_PROXY."/".$layerId."?REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";
$html .= $t_a.$translation['securedCapabilities'].$t_b."<a href = '".$securedLink."' target=_blank>".$translation['capabilities']."</a>".$t_c;
}
//kml
-$html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'>".$translation['kml']."-Datei</a>".$t_c;
+$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 .= $tableEnd;
$html .= '</p>';
@@ -746,7 +854,7 @@
if ($new_miny < -90) $rlp_4326_box[1] = -90; else $rlp_4326_box[1] = $new_miny;
if ($new_maxy > 90) $rlp_4326_box[3] = 90; else $rlp_4326_box[3] = $new_maxy;
}
- $getMapUrl = EXTENTSERVICEURL."VERSION=1.1.1&REQUEST=GetMap&SERVICE=WMS&LAYERS=background,extent&STYLES=&SRS=EPSG:4326&BBOX=".$rlp_4326_box[0].",".$rlp_4326_box[1].",".$rlp_4326_box[2].",".$rlp_4326_box[3]."&WIDTH=120&HEIGHT=120&FORMAT=image/png&BGCOLOR=0xffffff&TRANSPARENT=TRUE&EXCEPTIONS=application/vnd.ogc.se_inimage&minx=".$layer_4326_box[0]."&miny=".$layer_4326_box[1]."&maxx=".$layer_4326_box[2]."&maxy=".$layer_4326_box[3];
+ $getMapUrl = EXTENTSERVICEURL."VERSION=1.1.1&REQUEST=GetMap&SERVICE=WMS&LAYERS=".EXTENTSERVICELAYER."&STYLES=&SRS=EPSG:4326&BBOX=".$rlp_4326_box[0].",".$rlp_4326_box[1].",".$rlp_4326_box[2].",".$rlp_4326_box[3]."&WIDTH=120&HEIGHT=120&FORMAT=image/png&BGCOLOR=0xffffff&TRANSPARENT=TRUE&EXCEPTIONS=application/vnd.ogc.se_inimage&minx=".$layer_4326_box[0]."&miny=".$layer_4326_box[1]."&maxx=".$layer_4326_box[2]."&maxy=".$layer_4326_box[3];
return $getMapUrl;
}
?>
Modified: trunk/mapbender/tools/wms_extent/extents.map
===================================================================
--- trunk/mapbender/tools/wms_extent/extents.map 2010-09-29 13:11:49 UTC (rev 6966)
+++ trunk/mapbender/tools/wms_extent/extents.map 2010-09-29 13:57:06 UTC (rev 6967)
@@ -10,6 +10,7 @@
END
EXTENT 2475000 5425000 2724000 5658000
WEB
+ IMAGEPATH "/tmp/"
METADATA
WMS_TITLE "Layer Extent"
WMS_ABSTRACT "Geoportal Rheinland Pfalz, Layer Extent"
@@ -59,13 +60,29 @@
SIZE 8
END
END
+#--------------------------------------------------- use this to have a global map background
+#please set the right tmp path above
+LAYER
+ NAME "demis"
+ TYPE RASTER
+ CONNECTION "http://www2.demis.nl/wms/wms.asp?wms=WorldMap&"
+ CONNECTIONTYPE WMS
+ METADATA
+ "wms_srs" "EPSG:4326"
+ "wms_name" "Bathymetry,Countries,Topography,Hillshading,Coastlines,Waterbodies,Rivers,Streams,Railroads,Highways,Roads,Borders,Cities,Settlements,Airports"
+ "wms_connectiontimeout" "2"
+ "wms_server_version" "1.1.1"
+ "wms_format" "image/png"
+ END
+END
+
#---------------------------------------------------
LAYER
- NAME "background" #some service for the background information
+ NAME "background"
STATUS ON
TYPE LINE
CONNECTIONTYPE postgis
- CONNECTION "dbname=<postgisdatabase> user=<username> port=5432 host=<ip>"
+ CONNECTION "dbname=geoportal_latin user=postgres port=5432 host=10.7.101.135"
DATA "the_geom from (select gid , the_geom from gis.landes) as foo using unique gid using SRID=31466"
METADATA
WMS_TITLE "Rheinland-Pfalz"
@@ -98,7 +115,7 @@
STATUS ON
TYPE POLYGON
CONNECTIONTYPE postgis
- CONNECTION "dbname=<postgisdatabase> user=<databaseuser> port=5432 host=<ip>"
+ CONNECTION "dbname=geoportal user=postgres port=5432 host=geoportal-db1.gdi.rlp"
DATA "the_geom from (select GeomFromText('POLYGON((%minx% %miny%,%minx% %maxy%,%maxx% %maxy%,%maxx% %miny%, %minx% %miny%))',4326) as the_geom,area2d(transform(GeomFromText('POLYGON((%minx% %miny%,%minx% %maxy%,%maxx% %maxy%,%maxx% %miny%, %minx% %miny%))',4326),31466)) as area, 1 as oid ) as foo USING UNIQUE oid USING SRID=4326"
METADATA
WMS_TITLE "RLP Geo-Services"
@@ -132,7 +149,7 @@
LABELMAXSCALE 5000000000
LABELMINSCALE 0
CONNECTIONTYPE postgis
- CONNECTION "dbname=<postgisdatabase> user=<databaseuser> port=5432 host=<ip>"
+ CONNECTION "dbname=geoportal user=postgres port=5432 host=10.7.101.135"
DATA "the_geom from (select centroid(GeomFromText('POLYGON((%minx% %miny%,%minx% %maxy%,%maxx% %maxy%,%maxx% %miny%, %minx% %miny%))',4326)) as the_geom,area2d(transform(GeomFromText('POLYGON((%minx% %miny%,%minx% %maxy%,%maxx% %maxy%,%maxx% %miny%, %minx% %miny%))',4326),31466)) as area, 1 as oid ) as foo USING UNIQUE oid USING SRID=4326"
LABELCACHE ON
METADATA
More information about the Mapbender_commits
mailing list