From 979ddfd6567907ec4cf1661ab1c64d13ec3f2ac1 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sun, 17 Oct 2010 21:07:59 +0000
Subject: [PATCH] Correção da ferramenta de identificação em layers com tileindex. Inclusão de um tema com teleindex para testes. Inclusão do ícone aquarela para escolha gráfica de cores na ferramenta de impressão

---
 classesjs/classe_navega.js            |  1 -
 classesphp/classe_atributos.php       |  3 +--
 ferramentas/identifica/index.js.php   |  2 ++
 ferramentas/imprimir/propriedades.htm | 47 ++++++++++++++++++++++++++++++++++++-----------
 menutemas/admin.db                    | Bin 66560 -> 0 bytes
 temas/cbersi.map                      | 43 +++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 temas/cbersi.map

diff --git a/classesjs/classe_navega.js b/classesjs/classe_navega.js
index 22028d6..cb9bd0b 100644
--- a/classesjs/classe_navega.js
+++ b/classesjs/classe_navega.js
@@ -1424,7 +1424,6 @@ i3GEO.navega = {
 				}
 				catch(e){
 					i3GEO.eventos.NAVEGAMAPA.remove("atualizagoogle()");
-					if(typeof(console) !== 'undefined'){console.error(e);}
 				}
 			};
 			if(i3GEO.eventos.NAVEGAMAPA.toString().search("atualizagoogle()") < 0)
diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php
index da052a5..521a44d 100644
--- a/classesphp/classe_atributos.php
+++ b/classesphp/classe_atributos.php
@@ -710,7 +710,6 @@ $listaDeTemas - (opcional) Lista com os códigos dos temas que serão identificado
 		{$temas = $this->mapa->getalllayernames();}
 		foreach ($temas as $tem)
 		{
-			
 			$vermultilayer = new vermultilayer();
 			$vermultilayer->verifica($this->arquivo,$tem);
 			if ($vermultilayer->resultado == 1) // o tema e multi layer
@@ -750,7 +749,7 @@ $listaDeTemas - (opcional) Lista com os códigos dos temas que serão identificado
 				$gr = $layerteste->group;
 				if ((!(($mclasse == "NAO") && ($mtema == "NAO"))) || ($gr != ""))
 				{
-					if (($layerteste->data != "") && ($layerteste->connectiontype != MS_WMS))
+					if (($layerteste->data != "") && ($layerteste->connectiontype != MS_WMS) || ($layerteste->tileindex != ""))
 					{$listatemas[] = $t;}
 				}
 			}
diff --git a/ferramentas/identifica/index.js.php b/ferramentas/identifica/index.js.php
index 523c6e5..b619898 100644
--- a/ferramentas/identifica/index.js.php
+++ b/ferramentas/identifica/index.js.php
@@ -480,6 +480,8 @@ i3GEOF.identifica = {
 	*/
 	mostraDadosTema: function(retorno){
 		var res="",div0,ntemas,i,resultados,nres,cor,j,itens,nitens,k;
+		if(retorno == "")
+		{$i("i3GEOidentificaocorrencia").innerHTML="Nada encontrado";}
 		if (retorno.data !== undefined)
 		{
 			retorno = retorno.data;
diff --git a/ferramentas/imprimir/propriedades.htm b/ferramentas/imprimir/propriedades.htm
index 9f78707..210d323 100644
--- a/ferramentas/imprimir/propriedades.htm
+++ b/ferramentas/imprimir/propriedades.htm
@@ -54,12 +54,16 @@ body {
 				<tr>
 					<td>Cor do texto</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.cor()" /></td></td>
-					<td><input type=text class=digitar size=15 value="0,0,0" id=tituloCor /></td>
+					<td><input type=text class=digitar size=15 value="0,0,0" id=tituloCor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloCor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Cor do fundo</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.fundo()" /></td></td>
-					<td><input type=text class=digitar size=15 value="255,255,255" id=tituloFundo /></td>
+					<td><input type=text class=digitar size=15 value="255,255,255" id=tituloFundo />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloFundo','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Margem</td>
@@ -74,7 +78,9 @@ body {
 				<tr>
 					<td>Cor da borda</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.bordacor()" /></td></td>
-					<td><input type=text class=digitar size=10 value="0,0,0" id=tituloBordacor /></td>
+					<td><input type=text class=digitar size=10 value="0,0,0" id=tituloBordacor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloBordacor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Estilo da borda</td>
@@ -109,12 +115,16 @@ body {
 				<tr>
 					<td>Cor do texto</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.cor()" /></td></td>
-					<td><input type=text class=digitar size=15 value="0,0,0" id=legendaCor /></td>
+					<td><input type=text class=digitar size=15 value="0,0,0" id=legendaCor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaCor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Cor do fundo</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.fundo()" /></td></td>
-					<td><input type=text class=digitar size=15 value="255,255,255" id=legendaFundo /></td>
+					<td><input type=text class=digitar size=15 value="255,255,255" id=legendaFundo />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaFundo','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Margem</td>
@@ -129,7 +139,9 @@ body {
 				<tr>
 					<td>Cor da borda</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.bordacor()" /></td></td>
-					<td><input type=text class=digitar size=10 value="0,0,0" id=legendaBordacor /></td>
+					<td><input type=text class=digitar size=10 value="0,0,0" id=legendaBordacor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaBordacor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Estilo da borda</td>
@@ -169,12 +181,16 @@ body {
 				<tr>
 					<td>Cor do texto</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.cor()" /></td></td>
-					<td><input type=text class=digitar size=15 value="0,0,0" id=escalanumericaCor /></td>
+					<td><input type=text class=digitar size=15 value="0,0,0" id=escalanumericaCor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericacor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Cor do fundo</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.fundo()" /></td></td>
-					<td><input type=text class=digitar size=15 value="255,255,255" id=escalanumericaFundo /></td>
+					<td><input type=text class=digitar size=15 value="255,255,255" id=escalanumericaFundo />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericaFundo','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Margem</td>
@@ -189,7 +205,9 @@ body {
 				<tr>
 					<td>Cor da borda</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.bordacor()" /></td></td>
-					<td><input type=text class=digitar size=10 value="0,0,0" id=escalanumericaBordacor /></td>
+					<td><input type=text class=digitar size=10 value="0,0,0" id=escalanumericaBordacor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericaBordacor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Estilo da borda</td>
@@ -224,7 +242,9 @@ body {
 				<tr>
 					<td>Cor do fundo</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objmapa.fundo()" /></td></td>
-					<td><input type=text class=digitar size=15 value="255,255,255" id=mapaFundo /></td>
+					<td><input type=text class=digitar size=15 value="255,255,255" id=mapaFundo />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','mapaFundo','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Margem</td>
@@ -239,7 +259,9 @@ body {
 				<tr>
 					<td>Cor da borda</td>
 					<td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objmapa.bordacor()" /></td></td>
-					<td><input type=text class=digitar size=10 value="0,0,0" id=mapaBordacor /></td>
+					<td><input type=text class=digitar size=10 value="0,0,0" id=mapaBordacor />
+					<img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','mapaBordacor','rgb')" />
+					</td>
 				</tr>
 				<tr>
 					<td>Estilo da borda</td>
@@ -257,6 +279,9 @@ body {
 		<div id=guia6obj style="display:none;text-align:left;position:relative;top:5px;left:0px">
 		</div>
 	</div>
+<script type="text/javascript" src="../../classesjs/i3geo.js"> </script>
+<script>i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";</script>
 <script language="JavaScript" type="text/javascript" src="propriedades.js"></script>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/menutemas/admin.db b/menutemas/admin.db
index 2b15c66..9cb6d8a 100644
Binary files a/menutemas/admin.db and b/menutemas/admin.db differ
diff --git a/temas/cbersi.map b/temas/cbersi.map
new file mode 100644
index 0000000..e9bb008
--- /dev/null
+++ b/temas/cbersi.map
@@ -0,0 +1,43 @@
+SYMBOLSET ../symbols/simbolos.sym
+FONTSET   "../symbols/fontes.txt"
+
+LAYER
+  NAME cbersi
+  TYPE RASTER
+  TILEINDEX "c://ms4w/Apache/htdocs/geodados/indicecbers.shp"
+  TILEITEM "location"
+	TEMPLATE "none.htm"
+  STATUS off
+	MAXSCALE 2500000
+  METADATA
+  	TEMA "Imagens CBERS2"
+  	CLASSE "SIM"
+    TEXTO "NAO"
+		TABELA "NAO"
+		BUSCA "NAO"
+  END
+	TOLERANCE 0.001
+	OFFSITE 0 0 0
+		
+END  # LAYER
+LAYER
+  NAME cbersii
+  TYPE polygon
+  DATA "c://ms4w/Apache/htdocs/geodados/indicecbers.shp"
+  STATUS off
+	TEMPLATE "none.htm"
+  METADATA
+		TEMA "Índice imagens CBERS2"
+		TITULO "Índice imagens CBERS2"
+  	CLASSE "NAO"
+    TEXTO "NAO"
+		BUSCA "SIM"
+  END
+     CLASS
+		    NAME ' '
+        COLOR -1 -1 -1
+        OUTLINECOLOR 50 50 50
+     END  # CLASS
+END  # LAYER
+
+END
--
libgit2 0.21.2