[Mapbender-commits] r9060 - trunk/mapbender/http/classes
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Sep 8 08:34:15 PDT 2014
Author: armin11
Date: 2014-09-08 08:34:14 -0700 (Mon, 08 Sep 2014)
New Revision: 9060
Modified:
trunk/mapbender/http/classes/class_wmcToXml.php
trunk/mapbender/http/classes/class_wms.php
Log:
First changes to allow downloadsymbols in the treeGDE2 module. The links came from dataseturl or INSPIRE download options - not yet ready
Modified: trunk/mapbender/http/classes/class_wmcToXml.php
===================================================================
--- trunk/mapbender/http/classes/class_wmcToXml.php 2014-09-04 10:36:15 UTC (rev 9059)
+++ trunk/mapbender/http/classes/class_wmcToXml.php 2014-09-08 15:34:14 UTC (rev 9060)
@@ -312,20 +312,21 @@
}
// Data URL
- if ($currentLayer->layer_dataurl_href){
+ if ($currentLayer->layer_dataurl[0]->href){
+ $e = new mb_exception("class_wmcToXml: dataurl given: ".$currentLayer->layer_dataurl[0]->href);
$e_layer_data_url = $this->doc->createElement("DataURL");
$e_layer_data_url_or = $this->doc->createElement("OnlineResource");
$e_layer_data_url_or->setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
$e_layer_data_url_or->setAttribute("xlink:type", "simple");
- $e_layer_data_url_or->setAttribute("xlink:href", $currentLayer->layer_dataurl_href);
+ $e_layer_data_url_or->setAttribute("xlink:href", $currentLayer->layer_dataurl[0]->href);
$e_layer_data_url->appendChild($e_layer_data_url_or);
$e_layer->appendChild($e_layer_data_url);
}
// Metadata URL
- if ($currentLayer->layer_metadataurl){
+ if ($currentLayer->layer_metadataurl[0]->href){
$e_layer_metadata_url = $this->doc->createElement("MetadataURL");
// Metadata URL online resource
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2014-09-04 10:36:15 UTC (rev 9059)
+++ trunk/mapbender/http/classes/class_wms.php 2014-09-08 15:34:14 UTC (rev 9060)
@@ -15,7 +15,6 @@
require_once dirname(__FILE__) . "/class_mb_exception.php";
require_once dirname(__FILE__) . "/class_iso19139.php";
require_once dirname(__FILE__) . "/../classes/class_universal_wms_factory.php";
-
class wms {
var $lastURL;
var $wms_id;
@@ -1377,6 +1376,7 @@
$newLayer->layer_title = $currentLayer["title"];
$newLayer->gui_layer_title = $currentLayer["title"];
$newLayer->layer_dataurl[0]->href = $currentLayer["dataurl"];
+ $newLayer->gui_layer_dataurl_href = $currentLayer["dataurl"];
$newLayer->layer_pos = $currentLayer["extension"]["LAYER_POS"];
$newLayer->layer_queryable = $currentLayer["queryable"];
$newLayer->layer_minscale = $currentLayer["extension"]["MINSCALE"];
@@ -1408,6 +1408,7 @@
$newLayer->gui_layer_querylayer = $currentLayer["extension"]["QUERYLAYER"];
$newLayer->gui_layer_minscale = $currentLayer["extension"]["GUI_MINSCALE"];
$newLayer->gui_layer_maxscale = $currentLayer["extension"]["GUI_MAXSCALE"];
+
$newLayer->layer_abstract = $currentLayer["abstract"];
//
@@ -1547,7 +1548,8 @@
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
$this->objLayer[$i]->gui_layer_wfs_featuretype ."','".
- $this->objLayer[$i]->gui_layer_title ."');";
+ $this->objLayer[$i]->gui_layer_title ."','".
+ $this->objLayer[$i]->layer_dataurl[0]->href ."');";
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
$currentEpsg = $this->objLayer[$i]->layer_epsg[$j];
@@ -1669,7 +1671,8 @@
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
$this->objLayer[$i]->gui_layer_wfs_featuretype ."','".
- $this->objLayer[$i]->gui_layer_title ."');");
+ $this->objLayer[$i]->gui_layer_title ."','".
+ $this->objLayer[$i]->layer_dataurl[0]->href ."');");
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
if($i==0){
if($parent){
@@ -3205,7 +3208,6 @@
*
*/
function createObjFromDB($gui_id,$wms_id){
-
$sql = "Select * from gui_wms where fkey_wms_id = $1 AND fkey_gui_id = $2";
$v = array($wms_id,$gui_id);
$t = array('i','s');
@@ -3326,6 +3328,7 @@
//$this->objLayer[$layer_cnt]->layer_dataurl[0]->href =$row2["layer_dataurl"];
//load all dataUrl elements from datalink!
$sql = "SELECT datalink_id, datalink_url, datalink_format FROM datalink INNER JOIN (SELECT * from ows_relation_data WHERE fkey_layer_id = $1) as relation ON datalink.datalink_id = relation.fkey_datalink_id AND datalink.datalink_origin = 'capabilities'";
+ $e = new mb_exception(" layer_id=".$layer_id);
$v = array($layer_id);
$t = array('i');
$res_dataUrl = db_prep_query($sql,$v,$t);
@@ -3334,10 +3337,11 @@
$this->objLayer[$layer_cnt]->layer_dataurl[$count_dataUrl]->href = $row3["datalink_url"];
//$this->objLayer[$layer_cnt]->layer_dataurl[$count_dataUrl]->type = $row3["linktype"];
$this->objLayer[$layer_cnt]->layer_dataurl[$count_dataUrl]->format = $row3["datalink_format"];
-
$count_dataUrl++;
}
-
+ //asign first dataurl to gui_layer_dataurl_href
+
+ $this->objLayer[$layer_cnt]->gui_layer_dataurl_href = $this->objLayer[$layer_cnt]->layer_dataurl[0]->href;
//load all metadataUrl elements from mb_metadata
$sql = "SELECT metadata_id, link, linktype, md_format FROM mb_metadata INNER JOIN (SELECT * from ows_relation_metadata WHERE fkey_layer_id = $1) as relation ON mb_metadata.metadata_id = relation.fkey_metadata_id AND mb_metadata.origin = 'capabilities'";
$v = array($layer_id);
@@ -3550,6 +3554,8 @@
$count_dataUrl++;
}
+ //asign first dataurl to gui_layer_dataurl_href to use it in layertree
+ $this->objLayer[$layer_cnt]->gui_layer_dataurl_href = $this->objLayer[$layer_cnt]->layer_dataurl[0]->href;
$e = new mb_notice("class_wms.php: # of found dataurls in db: ".$count_dataUrl);
//load all metadataUrl elements from mb_metadata
$sql = "SELECT metadata_id, link, linktype, md_format FROM mb_metadata INNER JOIN (SELECT * from ows_relation_metadata WHERE fkey_layer_id = $1) as relation ON mb_metadata.metadata_id = relation.fkey_metadata_id AND mb_metadata.origin = 'capabilities'";
@@ -3559,7 +3565,6 @@
$count_metadataUrl = 0;
while($row4 = db_fetch_array($res_metadataUrl)){
$this->objLayer[$layer_cnt]->layer_metadataurl[$count_metadataUrl]->href = $row4["link"];
- $e = new mb_notice("nogui layer_metadataurl: ".$row4["link"]);
$this->objLayer[$layer_cnt]->layer_metadataurl[$count_metadataUrl]->type = $row4["linktype"];
$this->objLayer[$layer_cnt]->layer_metadataurl[$count_metadataUrl]->format = $row4["md_format"];
@@ -3824,7 +3829,8 @@
var $gui_layer_queryable = 0;
var $gui_layer_querylayer = 0;
var $gui_layer_style = NULL;
-
+ var $gui_layer_dataurl_href;
+
function layer($id,$parent){
$this->layer_id = $id;
$this->layer_parent = $parent;
More information about the Mapbender_commits
mailing list