From 85c3eb1e67dc76af8258533deb2467e5ba631aac Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 20 Jul 2015 14:06:13 +0000
Subject: [PATCH] Correção no teste rapido para não usar imagem em cache

---
 admin/js/editormapfile.js |  2 +-
 testamapfile.php          | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index 33e430f..8b47481 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -316,7 +316,7 @@ function testarMapfileRapido(codigoMap,extensao)
 		$i("testeRapido"+codigoMap).style.display = "none";
 		return;
 	}
-	$i("testeRapido"+codigoMap).src = "../../testamapfile.php?tipo=grande&map="+codigoMap+".map";
+	$i("testeRapido"+codigoMap).src = "../../testamapfile.php?cache=nao&tipo=grande&map="+codigoMap+".map";
 	$i("testeRapido"+codigoMap).style.display = "block";
 }
 function testarMapfile(codigoMap,extensao)
diff --git a/testamapfile.php b/testamapfile.php
index c8e4354..ae762eb 100644
--- a/testamapfile.php
+++ b/testamapfile.php
@@ -125,7 +125,10 @@ if (isset($map) && $map != "")
 		echo "<hr><br><br><a href='testamapfile.php?map=todos&iniciar=".($iniciar+10)."' >Próximos mapas</a>";
 	}
 	else{
-		verifica($map,$solegenda,$tabela);
+		if(empty($cache)){
+			$cache = "sim";
+		}
+		verifica($map,$solegenda,$tabela,$cache);
 	}
 }
 ?>
@@ -152,15 +155,15 @@ if (isset($map) && $map != "")
 </html>
 
 <?php
-function verifica($map,$solegenda,$tabela){
+function verifica($map,$solegenda,$tabela,$cache="sim"){
 	global $tipo,$locaplic,$postgis_mapa,$versao,$base,$dir_tmp,$tempo;
 	$mapUrl = $map;
-	if ($tipo == "mini" && file_exists('temas/miniaturas/'.$map.".mini.png")){
+	if ($tipo == "mini" && file_exists('temas/miniaturas/'.$map.".mini.png") && $cache == "sim"){
 		Header("Content-type: image/png");
 		ImagePng(ImageCreateFromPNG('temas/miniaturas/'.$map.".mini.png"));
 		exit;
 	}
-	if ($tipo == "grande" && file_exists('temas/miniaturas/'.$map.".grande.png")){
+	if ($tipo == "grande" && file_exists('temas/miniaturas/'.$map.".grande.png")  && $cache == "sim"){
 		Header("Content-type: image/png");
 		ImagePng(ImageCreateFromPNG('temas/miniaturas/'.$map.".grande.png"));
 		exit;
@@ -510,4 +513,4 @@ function zoomTema($nomelayer,&$mapa){
 		$extatual->setextent($ret[0],$ret[1],$ret[2],$ret[3]);
 	}
 }
-?>
\ No newline at end of file
+?>
--
libgit2 0.21.2