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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-04-18 04:21:01 -0700 (Thu, 18 Apr 2019)
New Revision: 10110

Modified:
   trunk/mapbender/http/php/mod_GetPublishedData.php
   trunk/mapbender/http/php/mod_exportWmc2Json.php
Log:
Fix for showing digitized objects from session in mobilemap2 client

Modified: trunk/mapbender/http/php/mod_GetPublishedData.php
===================================================================
--- trunk/mapbender/http/php/mod_GetPublishedData.php	2019-04-18 07:23:25 UTC (rev 10109)
+++ trunk/mapbender/http/php/mod_GetPublishedData.php	2019-04-18 11:21:01 UTC (rev 10110)
@@ -14,7 +14,7 @@
 /**
  * publish the choosed data
  */
-
+$admin = new administration();
 //get data from session and request
 $user_id = Mapbender::session()->get("mb_user_id");
 
@@ -51,7 +51,7 @@
 
 //$e = new mb_exception("php/mod_GetPublishedData.php: outputFormat: ".$outputFormat);
 //create a WMC object from a WMC in the database
-
+//$e = new mb_exception("php/mod_GetPublishedData.php: wmc_id: ".$wmc_id);
 if ($wmc_id !== "current") {
 	$xml = wmc::getDocumentWithPublicData($wmc_serial_id);
 	$myWmc = new wmc();
@@ -65,6 +65,7 @@
     	    //$time_start = microtime();
     	    //load it from whereever it has been stored
     	    $wmcDocSession = $admin->getFromStorage($wmc_filename, TMP_WMC_SAVE_STORAGE);
+	    $myWmc = new wmc();
 	    $myWmc->createFromXml($wmcDocSession);
 	} else {
 	    $e = new mb_exception("php/mod_GetPublishedData.php: no wmc found in session!");

Modified: trunk/mapbender/http/php/mod_exportWmc2Json.php
===================================================================
--- trunk/mapbender/http/php/mod_exportWmc2Json.php	2019-04-18 07:23:25 UTC (rev 10109)
+++ trunk/mapbender/http/php/mod_exportWmc2Json.php	2019-04-18 11:21:01 UTC (rev 10110)
@@ -210,10 +210,8 @@
 		//read wmc from session if available and fill the needed fields from wmc object
 		$wmcDocSession = false;
 		//check if wmc filename is in session - TODO only if should be loaded from session not else! (Module loadWMC)
-$e = new mb_exception("user name from session: ".Mapbender::session()->get("mb_user_name"));
 		if(Mapbender::session()->get("mb_wmc")) {
     		    $wmc_filename = Mapbender::session()->get("mb_wmc");
-$e = new mb_exception("filename: ".$wmc_filename);
     		    //$time_start = microtime();
     		    //load it from whereever it has been stored
     		    $wmcDocSession = $admin->getFromStorage($wmc_filename, TMP_WMC_SAVE_STORAGE);
@@ -223,8 +221,8 @@
 	//parse wmc
 	$xmlWmc = simplexml_load_string($wmcDocSession, "SimpleXMLElement", LIBXML_NOBLANKS);
 //$e = new mb_exception($wmcDocSession);
-$test = $xmlWmc->General->BoundingBox[0]['SRS'];
-$e = new mb_exception($test);
+//$test = $xmlWmc->General->BoundingBox[0]['SRS'];
+//$e = new mb_exception($test);
 	//initialize layer
 	$layerCount = 0;
 	//for ($i=0; $i<count($layerArray); $i++) {
@@ -321,10 +319,14 @@
 	$wmcObject->wmc->id = $row['wmc_serial_id'];
 	$wmcObject->wmc->title = $row['wmc_title'];
 	$wmcObject->wmc->timeStamp = $row['wmc_timestamp'];
-	if ($row['wmc_local_data_public'] == '1' && $row['wmc_has_local_data'] == '1') {
-		$wmcObject->wmc->kmloverlay = $overlayPath.$row['wmc_serial_id'];
+	if ($wmcId == "current") {
+		$wmcObject->wmc->kmloverlay = $overlayPath."current";
 	} else {
+		if ($row['wmc_local_data_public'] == '1' && $row['wmc_has_local_data'] == '1') {
+			$wmcObject->wmc->kmloverlay = $overlayPath.$row['wmc_serial_id'];
+		} else {
 		$wmcObject->wmc->kmloverlay = null;
+		}
 	}
 	//transform bbox to requested crs
 	//TODO