From 9a0b32e349b25e1b4befda81a6bb3657687be521 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 30 Jan 2013 03:13:12 +0000
Subject: [PATCH] Correção na seleção

---
 classesjs/classe_interface.js  | 10 +++++-----
 classesphp/mapa_googlemaps.php | 15 +++++++++++----
 classesphp/mapa_openlayers.php | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js
index a01b694..a4be984 100644
--- a/classesjs/classe_interface.js
+++ b/classesjs/classe_interface.js
@@ -1565,16 +1565,16 @@ i3GEO.Interface = {
 				if(!indice){
 					//nao utilize !== aqui
 					if(camada.status != 0){
-						i3GEO.Interface.googlemaps.insereLayer(camada.name,0);
+						i3GEO.Interface.googlemaps.insereLayer(camada.name,0,camada.cache);
 					}
 				}
 			}
 		},
-		criaImageMap: function(nomeLayer){
+		criaImageMap: function(nomeLayer,cache){
 			var i3GEOTileO = "",s;
 			s = "i3GEOTileO = new google.maps.ImageMapType({ "+
 					"getTileUrl: function(coord, zoom) {" +
-					"	var url = '" + i3GEO.configura.locaplic +"/classesphp/mapa_googlemaps.php?g_sid=" + i3GEO.configura.sid +
+					"	var url = '" + i3GEO.configura.locaplic +"/classesphp/mapa_googlemaps.php?g_sid=" + i3GEO.configura.sid + "&cache=" + cache +
 					"&Z=' + zoom + '&X=' + coord.x + '&Y=' + coord.y + '&layer=" + nomeLayer + i3GEO.Interface.googlemaps.PARAMETROSLAYER +'&r='+Math.random()+"';" +
 					"	return url+'&nd='+i3GEO.Interface.googlemaps.posfixo; " +
 					"}, "+
@@ -1585,8 +1585,8 @@ i3GEO.Interface = {
 			eval(s);
 			return i3GEOTileO;
 		},
-		insereLayer: function(nomeLayer,indice){
-			var i = i3GEO.Interface.googlemaps.criaImageMap(nomeLayer);
+		insereLayer: function(nomeLayer,indice,cache){
+			var i = i3GEO.Interface.googlemaps.criaImageMap(nomeLayer,cache);
 			i3GeoMap.overlayMapTypes.insertAt(indice, i);
 		},
 		registraEventos: function(){
diff --git a/classesphp/mapa_googlemaps.php b/classesphp/mapa_googlemaps.php
index e7e43a3..8000d4a 100644
--- a/classesphp/mapa_googlemaps.php
+++ b/classesphp/mapa_googlemaps.php
@@ -95,6 +95,14 @@ $cachedir = $_SESSION["cachedir"];
 $x = $_GET["X"];
 $y = $_GET["Y"];
 $z = $_GET["Z"];
+
+$qyfile = dirname($map_fileX)."/".$_GET["layer"].".php";
+$qy = file_exists($qyfile);
+
+if($qy == false && $_GET["cache"] == "sim" && $_GET["DESLIGACACHE"] != "sim"){
+	carregaCacheImagem($_SESSION["cachedir"],$_SESSION["map_file"],$_GET["tms"]);
+}
+
 $n = pow(2,$z);
 $lon1 = $x / $n * 360.0 - 180.0;
 $lat2 = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n))));
@@ -119,8 +127,7 @@ $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]);
 
 $mapa = ms_newMapObj($map_fileX);
 $ret = $mapa->extent;
-$qyfile = dirname($map_fileX)."/".$_GET["layer"].".php";
-$qy = file_exists($qyfile);
+
 $cache = false;
 if(!isset($_GET["telaR"])){
 	//no caso de projecoes remotas, o mapfile nao´e alterado
@@ -216,8 +223,8 @@ else{
 		foreach ($shp as $indx)
 		{$mapa->querybyindex($indxlayer,-1,$indx,MS_TRUE);}
 		$qm = $mapa->querymap;
-		$qm->set("width",$map_size[0]);
-		$qm->set("height",$map_size[1]);
+		$qm->set("width",255);
+		$qm->set("height",255);
 		$img = $mapa->drawQuery();
 	}
 	else{
diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php
index e176353..9ad9917 100644
--- a/classesphp/mapa_openlayers.php
+++ b/classesphp/mapa_openlayers.php
@@ -81,12 +81,19 @@ if(isset($_GET["tms"])){
 	$lat2 = ($y+1) / $n * 180.0 - 90.0;
 	$_GET["BBOX"] = $lon1." ".$lat1." ".$lon2." ".$lat2;
 }
-if($_GET["cache"] == "sim" && $_GET["DESLIGACACHE"] != "sim"){
+$map_fileX = $_SESSION["map_file"];
+//
+//resolve o problema da sele&ccedil;&atilde;o na vers&atilde;o nova do mapserver
+//
+$qyfile = dirname($map_fileX)."/".$_GET["layer"].".php";
+$qy = file_exists($qyfile);
+
+if($qy == false && $_GET["cache"] == "sim" && $_GET["DESLIGACACHE"] != "sim"){
 	carregaCacheImagem($_SESSION["cachedir"],$_SESSION["map_file"],$_GET["tms"]);
 }
 //
 //map_fileX e para o caso register_globals = On no PHP.INI
-$map_fileX = $_SESSION["map_file"];
+
 if(isset($_GET["tipolayer"]) && $_GET["tipolayer"] == "fundo"){
 	$map_fileX = str_replace(".map","fundo.map",$map_fileX);
 }
@@ -98,11 +105,7 @@ if(isset($_GET["BBOX"])){
 }
 $_GET["TIPOIMAGEM"] = trim($_GET["TIPOIMAGEM"]);
 $mapa = ms_newMapObj($map_fileX);
-//
-//resolve o problema da sele&ccedil;&atilde;o na vers&atilde;o nova do mapserver
-//
-$qyfile = dirname($map_fileX)."/".$_GET["layer"].".php";
-$qy = file_exists($qyfile);
+
 //
 //processa os layers do mapfile
 //
--
libgit2 0.21.2