[Mapbender-commits] r3653 - in branches/2.5/http: classes php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Mar 9 10:15:29 EDT 2009
Author: christoph
Date: 2009-03-09 10:15:28 -0400 (Mon, 09 Mar 2009)
New Revision: 3653
Modified:
branches/2.5/http/classes/class_administration.php
branches/2.5/http/classes/class_wms.php
branches/2.5/http/php/mod_loadwmc_server.php
Log:
load WMC problem with ISO-8859-1
Modified: branches/2.5/http/classes/class_administration.php
===================================================================
--- branches/2.5/http/classes/class_administration.php 2009-03-09 14:08:32 UTC (rev 3652)
+++ branches/2.5/http/classes/class_administration.php 2009-03-09 14:15:28 UTC (rev 3653)
@@ -135,7 +135,8 @@
// set parsing options
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
- xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, CHARSET);
+ // internal encoding of Mapbender is UTF-8!!!
+ xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
// this is the actual parsing process
xml_parse_into_struct($parser, $someXml, $values, $tags);
Modified: branches/2.5/http/classes/class_wms.php
===================================================================
--- branches/2.5/http/classes/class_wms.php 2009-03-09 14:08:32 UTC (rev 3652)
+++ branches/2.5/http/classes/class_wms.php 2009-03-09 14:15:28 UTC (rev 3653)
@@ -107,11 +107,11 @@
$add_wms_string .= ",";
}
$add_wms_string .= "', transparent: 'true'";
- $add_wms_string .= ",format: '".$this->gui_wms_mapformat."'});\n";
+ $add_wms_string .= ",format: '".$this->gui_wms_mapformat."'});";
if($base)
- $add_wms_string .= "wms_".$this->wms_id.".isBaseLayer=true;\n";
- $add_wms_string .= "wms_".$this->wms_id.".setVisibility(".($this->gui_wms_visible=="1"?"true":"false").");\n";
- $add_wms_string .= "ol_map.addLayer(wms_".$this->wms_id.");\n";
+ $add_wms_string .= "wms_".$this->wms_id.".isBaseLayer=true;";
+ $add_wms_string .= "wms_".$this->wms_id.".setVisibility(".($this->gui_wms_visible=="1"?"true":"false").");";
+ $add_wms_string .= "ol_map.addLayer(wms_".$this->wms_id.");";
echo $add_wms_string;
}
@@ -979,7 +979,7 @@
if($parent){
$str .= "parent.";
}
- $str .= "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');\n";
+ $str .= "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');";
}
for($i=0; $i<count($this->objLayer); $i++){
if($parent){
@@ -1005,7 +1005,7 @@
$this->objLayer[$i]->gui_layer_querylayer ."','".
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
- $this->objLayer[$i]->gui_layer_wfs_featuretype ."');\n";
+ $this->objLayer[$i]->gui_layer_wfs_featuretype ."');";
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
if($i==0){
@@ -1017,7 +1017,7 @@
$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','".
- $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');\n";
+ $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');";
}
if($parent){
$str .= "parent.";
@@ -1027,7 +1027,7 @@
$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','".
- $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');\n";
+ $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');";
}
for($j=0; $j<count($this->objLayer[$i]->layer_style);$j++){
if($parent){
@@ -1038,7 +1038,7 @@
"', ".$j.
",".$i.
",'".$this->objLayer[$i]->layer_style[$j]["legendurl"].
- "', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');\n";
+ "', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');";
}
}
return $str;
@@ -1069,13 +1069,13 @@
$this->gui_wms_epsg ."','".
$this->gui_wms_visible ."','".
$this->gui_wms_opacity ."','".
- $this->gui_wms_sldurl ."');\n");
+ $this->gui_wms_sldurl ."');");
for($i=0;$i<count($this->data_format);$i++){
if($parent){
echo "parent.";
}
- echo "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');\n";
+ echo "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');";
}
for($i=0; $i<count($this->objLayer); $i++){
if($this->objLayer[$i]->layer_name == $layer_name|| $this->objLayer[$i]->layer_pos == 0){
@@ -1103,7 +1103,7 @@
$this->objLayer[$i]->gui_layer_querylayer ."','".
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
- $this->objLayer[$i]->gui_layer_wfs_featuretype ."');\n");
+ $this->objLayer[$i]->gui_layer_wfs_featuretype ."');");
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
if($i==0){
if($parent){
@@ -1114,7 +1114,7 @@
$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','".
- $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');\n");
+ $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');");
}
if($parent){
echo "parent.";
@@ -1124,13 +1124,13 @@
$this->objLayer[$i]->layer_epsg[$j]["minx"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["miny"] ."','".
$this->objLayer[$i]->layer_epsg[$j]["maxx"] ."','".
- $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');\n");
+ $this->objLayer[$i]->layer_epsg[$j]["maxy"] ."');");
}
for($j=0; $j<count($this->objLayer[$i]->layer_style);$j++){
if($parent){
echo "parent.";
}
- print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".$this->objLayer[$i]->layer_style[$j]["title"]."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');\n");
+ print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".$this->objLayer[$i]->layer_style[$j]["title"]."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendformat"]."');");
}
}
}
Modified: branches/2.5/http/php/mod_loadwmc_server.php
===================================================================
--- branches/2.5/http/php/mod_loadwmc_server.php 2009-03-09 14:08:32 UTC (rev 3652)
+++ branches/2.5/http/php/mod_loadwmc_server.php 2009-03-09 14:15:28 UTC (rev 3653)
@@ -12,6 +12,9 @@
function sendOutput($out){
global $json;
$output = $json->encode($out);
+ if (CHARSET == "ISO-8859-1") {
+ $output = utf8_decode($output);
+ }
header("Content-Type: text/x-json");
echo $output;
}
More information about the Mapbender_commits
mailing list