[Mapbender-commits] r9065 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-09-10 04:02:55 -0700 (Wed, 10 Sep 2014)
New Revision: 9065

Modified:
   trunk/mapbender/http/javascripts/initWmcObj.php
   trunk/mapbender/http/javascripts/wms.js
Log:
handle metadataurl and dataurl between wmc and wms

Modified: trunk/mapbender/http/javascripts/initWmcObj.php
===================================================================
--- trunk/mapbender/http/javascripts/initWmcObj.php	2014-09-10 11:01:48 UTC (rev 9064)
+++ trunk/mapbender/http/javascripts/initWmcObj.php	2014-09-10 11:02:55 UTC (rev 9065)
@@ -110,7 +110,6 @@
 //
 // Load WMC from session or application
 $e = new mb_notice("javascript/initWmcObj.php: start!");
-//
 $wmc = new wmc();
 $app = Mapbender::session()->get("mb_user_gui"); //if gui was set!
 //$wmcDocSession = Mapbender::session()->get("mb_wmc");
@@ -398,6 +397,7 @@
 $wmcGetApi = new wmc();
 //new Object with merged layers and other features
 $wmcGetApi->createFromXml($xml);
+		
 //
 // CONSTRAINTS
 //
@@ -575,6 +575,7 @@
 ) {
 	//put them into the session to pull them later on
 	Mapbender::session()->set("wmcConstraints", $resultObj);
+
 //*******************************************************
 	//Alternate approach: create map object from xml:
 	//$e = new mb_notice("initWmcObj.php: build alternate js!");

Modified: trunk/mapbender/http/javascripts/wms.js
===================================================================
--- trunk/mapbender/http/javascripts/wms.js	2014-09-10 11:01:48 UTC (rev 9064)
+++ trunk/mapbender/http/javascripts/wms.js	2014-09-10 11:02:55 UTC (rev 9065)
@@ -763,7 +763,7 @@
 	layer_uid,
 	layer_name,
 	layer_title,
-	layer_dataurl_href,
+	layer_dataurl,
 	layer_pos,
 	layer_queryable,
 	layer_minscale,
@@ -787,7 +787,7 @@
 		layer_uid,
 		layer_name,
 		layer_title,
-		layer_dataurl_href,
+		layer_dataurl,
 		layer_pos,
 		layer_queryable,
 		layer_minscale,
@@ -826,7 +826,7 @@
 	wms_layer_uid,
 	layer_name,
 	layer_title,
-	layer_dataurl_href,
+	layer_dataurl,
 	layer_pos,
 	layer_queryable,
 	layer_minscale,
@@ -851,7 +851,7 @@
 	this.layer_title = layer_title;
 	this.gui_layer_title = gui_layer_title || layer_title;
 	this.layer_currentTitle = this.gui_layer_title;
-	this.layer_dataurl_href = layer_dataurl_href;
+	this.layer_dataurl = layer_dataurl;
 	this.layer_pos = layer_pos;
 	this.layer_queryable = layer_queryable;
 	this.layer_minscale = layer_minscale;