[Mapbender-commits] r3654 - in branches/2.5/http: classes
javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Mar 9 10:41:40 EDT 2009
Author: christoph
Date: 2009-03-09 10:41:40 -0400 (Mon, 09 Mar 2009)
New Revision: 3654
Modified:
branches/2.5/http/classes/class_map.php
branches/2.5/http/classes/class_wmc.php
branches/2.5/http/javascripts/mod_loadwmc.php
branches/2.5/http/php/mod_savewmc_server.php
Log:
load WMC problem with ISO-8859-1
loadFromSession / SaveInSession
Modified: branches/2.5/http/classes/class_map.php
===================================================================
--- branches/2.5/http/classes/class_map.php 2009-03-09 14:15:28 UTC (rev 3653)
+++ branches/2.5/http/classes/class_map.php 2009-03-09 14:41:40 UTC (rev 3654)
@@ -85,7 +85,6 @@
}
public function addZoomFullExtent ($aMapbenderBbox) {
- $e = new mb_exception("adding new box: " . $aMapbenderBbox);
array_push($this->zoomFullExtentArray, $aMapbenderBbox);
}
Modified: branches/2.5/http/classes/class_wmc.php
===================================================================
--- branches/2.5/http/classes/class_wmc.php 2009-03-09 14:15:28 UTC (rev 3653)
+++ branches/2.5/http/classes/class_wmc.php 2009-03-09 14:41:40 UTC (rev 3654)
@@ -873,7 +873,6 @@
"maxy" => $currentBox->max->y
));
}
- new mb_exception("NEW LAYER EPSG: " . serialize($this->mainMap->getWms(0)->objLayer[0]->layer_epsg));
return true;
}
Modified: branches/2.5/http/javascripts/mod_loadwmc.php
===================================================================
--- branches/2.5/http/javascripts/mod_loadwmc.php 2009-03-09 14:15:28 UTC (rev 3653)
+++ branches/2.5/http/javascripts/mod_loadwmc.php 2009-03-09 14:41:40 UTC (rev 3654)
@@ -33,7 +33,7 @@
}
if (isset($_SESSION['mb_wmc'])) {
- $e = new mb_exception("merging with WMC.");
+ $e = new mb_notice("merging with WMC.");
if ($wmc->createFromXml($_SESSION['mb_wmc'])) {
@@ -75,12 +75,16 @@
<?php
if ($_SESSION["command"] && $_SESSION["command"] == "ADDWMS") {
$e = new mb_notice("merging with WMS in Session...");
- echo createJs(true);
+ $output = createJs(true);
}
else {
$e = new mb_notice("NOT merging with WMS in Session...");
- echo createJs(false);
+ $output = createJs(false);
}
+if (CHARSET == "ISO-8859-1") {
+ $output = utf8_decode($output);
+}
+echo $output;
?>
}
Modified: branches/2.5/http/php/mod_savewmc_server.php
===================================================================
--- branches/2.5/http/php/mod_savewmc_server.php 2009-03-09 14:15:28 UTC (rev 3653)
+++ branches/2.5/http/php/mod_savewmc_server.php 2009-03-09 14:41:40 UTC (rev 3654)
@@ -27,7 +27,7 @@
// get data from POST and SESSION
$mapObject = $json->decode(stripslashes($_POST["mapObject"]));
$userId = $_SESSION["mb_user_id"];
-$saveInSession = $_POST["saveInSession"];
+$saveInSession = intval($_POST["saveInSession"]);
$generalTitle = $_POST["generalTitle"];
$extensionData = $json->decode(stripslashes($_POST["extensionData"]));
More information about the Mapbender_commits
mailing list