Download as
Browse Code »

Commit 979ddfd6567907ec4cf1661ab1c64d13ec3f2ac1

Authored by Edmar Moretti
1 parent 9b82773b
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

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
Showing 6 changed files with 82 additions and 14 deletions   Show diff stats
classesjs/classe_navega.js
  Diff comments   View file @979ddfd
... ... @@ -1424,7 +1424,6 @@ i3GEO.navega = {
1424 1424 }
1425 1425 catch(e){
1426 1426 i3GEO.eventos.NAVEGAMAPA.remove("atualizagoogle()");
1427   - if(typeof(console) !== 'undefined'){console.error(e);}
1428 1427 }
1429 1428 };
1430 1429 if(i3GEO.eventos.NAVEGAMAPA.toString().search("atualizagoogle()") < 0)
... ...
classesphp/classe_atributos.php
  Diff comments   View file @979ddfd
... ... @@ -710,7 +710,6 @@ $listaDeTemas - (opcional) Lista com os códigos dos temas que serão identificado
710 710 {$temas = $this->mapa->getalllayernames();}
711 711 foreach ($temas as $tem)
712 712 {
713   -
714 713 $vermultilayer = new vermultilayer();
715 714 $vermultilayer->verifica($this->arquivo,$tem);
716 715 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
750 749 $gr = $layerteste->group;
751 750 if ((!(($mclasse == "NAO") && ($mtema == "NAO"))) || ($gr != ""))
752 751 {
753   - if (($layerteste->data != "") && ($layerteste->connectiontype != MS_WMS))
  752 + if (($layerteste->data != "") && ($layerteste->connectiontype != MS_WMS) || ($layerteste->tileindex != ""))
754 753 {$listatemas[] = $t;}
755 754 }
756 755 }
... ...
ferramentas/identifica/index.js.php
  Diff comments   View file @979ddfd
... ... @@ -480,6 +480,8 @@ i3GEOF.identifica = {
480 480 */
481 481 mostraDadosTema: function(retorno){
482 482 var res="",div0,ntemas,i,resultados,nres,cor,j,itens,nitens,k;
  483 + if(retorno == "")
  484 + {$i("i3GEOidentificaocorrencia").innerHTML="Nada encontrado";}
483 485 if (retorno.data !== undefined)
484 486 {
485 487 retorno = retorno.data;
... ...
ferramentas/imprimir/propriedades.htm
  Diff comments   View file @979ddfd
... ... @@ -54,12 +54,16 @@ body {
54 54 <tr>
55 55 <td>Cor do texto</td>
56 56 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.cor()" /></td></td>
57   - <td><input type=text class=digitar size=15 value="0,0,0" id=tituloCor /></td>
  57 + <td><input type=text class=digitar size=15 value="0,0,0" id=tituloCor />
  58 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloCor','rgb')" />
  59 + </td>
58 60 </tr>
59 61 <tr>
60 62 <td>Cor do fundo</td>
61 63 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.fundo()" /></td></td>
62   - <td><input type=text class=digitar size=15 value="255,255,255" id=tituloFundo /></td>
  64 + <td><input type=text class=digitar size=15 value="255,255,255" id=tituloFundo />
  65 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloFundo','rgb')" />
  66 + </td>
63 67 </tr>
64 68 <tr>
65 69 <td>Margem</td>
... ... @@ -74,7 +78,9 @@ body {
74 78 <tr>
75 79 <td>Cor da borda</td>
76 80 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objtitulo.bordacor()" /></td></td>
77   - <td><input type=text class=digitar size=10 value="0,0,0" id=tituloBordacor /></td>
  81 + <td><input type=text class=digitar size=10 value="0,0,0" id=tituloBordacor />
  82 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','tituloBordacor','rgb')" />
  83 + </td>
78 84 </tr>
79 85 <tr>
80 86 <td>Estilo da borda</td>
... ... @@ -109,12 +115,16 @@ body {
109 115 <tr>
110 116 <td>Cor do texto</td>
111 117 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.cor()" /></td></td>
112   - <td><input type=text class=digitar size=15 value="0,0,0" id=legendaCor /></td>
  118 + <td><input type=text class=digitar size=15 value="0,0,0" id=legendaCor />
  119 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaCor','rgb')" />
  120 + </td>
113 121 </tr>
114 122 <tr>
115 123 <td>Cor do fundo</td>
116 124 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.fundo()" /></td></td>
117   - <td><input type=text class=digitar size=15 value="255,255,255" id=legendaFundo /></td>
  125 + <td><input type=text class=digitar size=15 value="255,255,255" id=legendaFundo />
  126 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaFundo','rgb')" />
  127 + </td>
118 128 </tr>
119 129 <tr>
120 130 <td>Margem</td>
... ... @@ -129,7 +139,9 @@ body {
129 139 <tr>
130 140 <td>Cor da borda</td>
131 141 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objlegenda.bordacor()" /></td></td>
132   - <td><input type=text class=digitar size=10 value="0,0,0" id=legendaBordacor /></td>
  142 + <td><input type=text class=digitar size=10 value="0,0,0" id=legendaBordacor />
  143 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','legendaBordacor','rgb')" />
  144 + </td>
133 145 </tr>
134 146 <tr>
135 147 <td>Estilo da borda</td>
... ... @@ -169,12 +181,16 @@ body {
169 181 <tr>
170 182 <td>Cor do texto</td>
171 183 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.cor()" /></td></td>
172   - <td><input type=text class=digitar size=15 value="0,0,0" id=escalanumericaCor /></td>
  184 + <td><input type=text class=digitar size=15 value="0,0,0" id=escalanumericaCor />
  185 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericacor','rgb')" />
  186 + </td>
173 187 </tr>
174 188 <tr>
175 189 <td>Cor do fundo</td>
176 190 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.fundo()" /></td></td>
177   - <td><input type=text class=digitar size=15 value="255,255,255" id=escalanumericaFundo /></td>
  191 + <td><input type=text class=digitar size=15 value="255,255,255" id=escalanumericaFundo />
  192 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericaFundo','rgb')" />
  193 + </td>
178 194 </tr>
179 195 <tr>
180 196 <td>Margem</td>
... ... @@ -189,7 +205,9 @@ body {
189 205 <tr>
190 206 <td>Cor da borda</td>
191 207 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objescalanumerica.bordacor()" /></td></td>
192   - <td><input type=text class=digitar size=10 value="0,0,0" id=escalanumericaBordacor /></td>
  208 + <td><input type=text class=digitar size=10 value="0,0,0" id=escalanumericaBordacor />
  209 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','escalanumericaBordacor','rgb')" />
  210 + </td>
193 211 </tr>
194 212 <tr>
195 213 <td>Estilo da borda</td>
... ... @@ -224,7 +242,9 @@ body {
224 242 <tr>
225 243 <td>Cor do fundo</td>
226 244 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objmapa.fundo()" /></td></td>
227   - <td><input type=text class=digitar size=15 value="255,255,255" id=mapaFundo /></td>
  245 + <td><input type=text class=digitar size=15 value="255,255,255" id=mapaFundo />
  246 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','mapaFundo','rgb')" />
  247 + </td>
228 248 </tr>
229 249 <tr>
230 250 <td>Margem</td>
... ... @@ -239,7 +259,9 @@ body {
239 259 <tr>
240 260 <td>Cor da borda</td>
241 261 <td><img src="../../imagens/tic.png" style="cursor:pointer" onclick="javascript:objmapa.bordacor()" /></td></td>
242   - <td><input type=text class=digitar size=10 value="0,0,0" id=mapaBordacor /></td>
  262 + <td><input type=text class=digitar size=10 value="0,0,0" id=mapaBordacor />
  263 + <img alt="aquarela.gif" style=cursor:pointer src='../../imagens/aquarela.gif' onclick="i3GEO.util.abreCor('','mapaBordacor','rgb')" />
  264 + </td>
243 265 </tr>
244 266 <tr>
245 267 <td>Estilo da borda</td>
... ... @@ -257,6 +279,9 @@ body {
257 279 <div id=guia6obj style="display:none;text-align:left;position:relative;top:5px;left:0px">
258 280 </div>
259 281 </div>
  282 +<script type="text/javascript" src="../../classesjs/i3geo.js"> </script>
  283 +<script>i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";</script>
260 284 <script language="JavaScript" type="text/javascript" src="propriedades.js"></script>
  285 +
261 286 </body>
262 287 </html>
263 288 \ No newline at end of file
... ...
menutemas/admin.db
View file @979ddfd
No preview for this file type
temas/cbersi.map 0 → 100644
  Diff comments   View file @979ddfd
... ... @@ -0,0 +1,43 @@
  1 +SYMBOLSET ../symbols/simbolos.sym
  2 +FONTSET "../symbols/fontes.txt"
  3 +
  4 +LAYER
  5 + NAME cbersi
  6 + TYPE RASTER
  7 + TILEINDEX "c://ms4w/Apache/htdocs/geodados/indicecbers.shp"
  8 + TILEITEM "location"
  9 + TEMPLATE "none.htm"
  10 + STATUS off
  11 + MAXSCALE 2500000
  12 + METADATA
  13 + TEMA "Imagens CBERS2"
  14 + CLASSE "SIM"
  15 + TEXTO "NAO"
  16 + TABELA "NAO"
  17 + BUSCA "NAO"
  18 + END
  19 + TOLERANCE 0.001
  20 + OFFSITE 0 0 0
  21 +
  22 +END # LAYER
  23 +LAYER
  24 + NAME cbersii
  25 + TYPE polygon
  26 + DATA "c://ms4w/Apache/htdocs/geodados/indicecbers.shp"
  27 + STATUS off
  28 + TEMPLATE "none.htm"
  29 + METADATA
  30 + TEMA "Índice imagens CBERS2"
  31 + TITULO "Índice imagens CBERS2"
  32 + CLASSE "NAO"
  33 + TEXTO "NAO"
  34 + BUSCA "SIM"
  35 + END
  36 + CLASS
  37 + NAME ' '
  38 + COLOR -1 -1 -1
  39 + OUTLINECOLOR 50 50 50
  40 + END # CLASS
  41 +END # LAYER
  42 +
  43 +END
... ...