Correção na inclusão dos mapas de fundo no mashup que utiliza OL3

Edmar Moretti
1 parent f922fe4f
Showing 2 changed files with 40 additions and 18 deletions Show diff stats
mashups/openlayers3.php
ogc.php
@@ -833,42 +833,63 @@ i3GEO.editorOL.kml = [&lt;?php
 	}
 ?>];
 i3GEO.editorOL.marca = "<?php
-	if(isset($marca)){echo $marca;}
-	else
-	{echo "../pacotes/openlayers/img/marker-gold.png";}
+	if(isset($marca)){
+		echo $marca;
+	}
+	else{
+		echo "../pacotes/openlayers/img/marker-gold.png";
+	}
 ?>";
 i3GEO.editorOL.tiles = "<?php
-	if(isset($tiles)){echo $tiles;}
-	else
-	{echo "true";}
+	if(isset($tiles)){
+		echo $tiles;
+	}
+	else{
+		echo "true";
+	}
 ?>";
 i3GEO.editorOL.incluilayergrafico = "<?php
-	if(isset($incluilayergrafico)){echo $incluilayergrafico;}
-	else
-	{echo "true";}
+	if(isset($incluilayergrafico)){
+		echo $incluilayergrafico;
+	}
+	else{
+		echo "true";
+	}
 ?>";
 i3GEO.editorOL.ativalayerswitcher = "<?php
-	if(isset($ativalayerswitcher)){echo $ativalayerswitcher;}
-	else
-	{echo "false";}
+	if(isset($ativalayerswitcher)){
+		echo $ativalayerswitcher;
+	}
+	else{
+		echo "false";
+	}
 ?>";
 i3GEO.editorOL.ativarodadomouse = "<?php
-	if(isset($ativarodadomouse)){echo $ativarodadomouse;}
-	else
-	{echo "true";}
+	if(isset($ativarodadomouse)){
+		echo $ativarodadomouse;
+	}
+	else{
+		echo "true";
+	}
 ?>";
 i3GEO.editorOL.legendahtml = "<?php
-	if(isset($legendahtml)){echo $legendahtml;}
-	else
-	{echo "true";}
+	if(isset($legendahtml)){
+		echo $legendahtml;
+	}
+	else {
+		echo "true";
+	}
 ?>";
 <?php
 if(isset($fundo) && $fundo != ""){
 	echo "i3GEO.editorOL.fundo = '".implode(",",$fundo)."';";
+} else {
+	echo "i3GEO.editorOL.fundo = '';";
 }
+
 if(isset($controles)){
 	echo "i3GEO.editorOL.controles = [".implode(",",$objControles)."];";
 }
@@ -1163,6 +1163,7 @@ function carregaCacheImagem($cachedir,$map,$tms){
 		$nome = $cachedir.$tms;
 	}
 	$nome = str_replace(".png","",$nome).".png";
+	//TODO verificar esses cabecalhos e comparar com geoserver
 	if(file_exists($nome)){
 		header('Content-Length: '.filesize($nome));
 		header('Content-Type: image/png');