Download as
Browse Code »

Commit 64e370fddaabb98c66a7af2f3f5f9ed4241da3c9

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

Nova opção de minscale e maxscale para toponimia

Showing 4 changed files with 37 additions and 7 deletions   Show diff stats
ferramentas/toponimia/dicionario.js
  Diff comments   View file @64e370f
@@ -124,5 +124,10 @@ i3GEOF.toponimia.dicionario = { @@ -124,5 +124,10 @@ i3GEOF.toponimia.dicionario = {
124 pt : "Remover", 124 pt : "Remover",
125 en : "", 125 en : "",
126 es : "" 126 es : ""
  127 + } ],
  128 + 'minmaxscale' : [ {
  129 + pt : "Denominador das Escalas (mínima - máxima) que restringem a apresentação",
  130 + en : "",
  131 + es : ""
127 } ] 132 } ]
128 }; 133 };
ferramentas/toponimia/exec.php
  Diff comments   View file @64e370f
@@ -22,9 +22,17 @@ Cria um novo tema com a toponímia do tema atual. @@ -22,9 +22,17 @@ Cria um novo tema com a toponímia do tema atual.
22 if(!isset($novotema)) 22 if(!isset($novotema))
23 {$novotema = "sim";} 23 {$novotema = "sim";}
24 $retorno = $m->criaToponimia($item,$position,$partials,$offsetx,$offsety,$minfeaturesize,$mindistance,$force,$shadowcolor,$shadowsizex,$shadowsizey,$outlinecolor,$cor,$sombray,$sombrax,$sombra,$fundo,$angulo,$tamanho,$fonte,$tipo,$wrap,$novotema); 24 $retorno = $m->criaToponimia($item,$position,$partials,$offsetx,$offsety,$minfeaturesize,$mindistance,$force,$shadowcolor,$shadowsizex,$shadowsizey,$outlinecolor,$cor,$sombray,$sombrax,$sombra,$fundo,$angulo,$tamanho,$fonte,$tipo,$wrap,$novotema);
25 -  
26 - if ($tipo != "teste")  
27 - {$m->salva();$_SESSION["contadorsalva"]++;} 25 + if(empty($maxscale)){
  26 + $maxscale = -1;
  27 + }
  28 + if(empty($minscale)){
  29 + $minscale = -1;
  30 + }
  31 + $m->layer->set("labelmaxscaledenom",$maxscale);
  32 + $m->layer->set("labelminscaledenom",$minscale);
  33 + if ($tipo != "teste"){
  34 + $m->salva();$_SESSION["contadorsalva"]++;
  35 + }
28 break; 36 break;
29 case "REMOVETOPONIMIA": 37 case "REMOVETOPONIMIA":
30 include_once(dirname(__FILE__)."/../../classesphp/classe_toponimia.php"); 38 include_once(dirname(__FILE__)."/../../classesphp/classe_toponimia.php");
ferramentas/toponimia/index.js
  Diff comments   View file @64e370f
@@ -119,14 +119,14 @@ i3GEOF.toponimia = { @@ -119,14 +119,14 @@ i3GEOF.toponimia = {
119 //cria a janela flutuante 119 //cria a janela flutuante
120 titulo = "<span class='i3GEOconeFerramenta i3GEOiconeToponimia'></span>" + "<div id='i3GEOFtoponimiaComboCabeca' class='comboTemasCabecalho'> ------</div><span style=margin-left:60px>"+$trad("x56")+"&nbsp;</span><a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=5&idajuda=36' >&nbsp;&nbsp;&nbsp;</a>"; 120 titulo = "<span class='i3GEOconeFerramenta i3GEOiconeToponimia'></span>" + "<div id='i3GEOFtoponimiaComboCabeca' class='comboTemasCabecalho'> ------</div><span style=margin-left:60px>"+$trad("x56")+"&nbsp;</span><a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=5&idajuda=36' >&nbsp;&nbsp;&nbsp;</a>";
121 janela = i3GEO.janela.cria( 121 janela = i3GEO.janela.cria(
122 - "390px",  
123 - "190px", 122 + "410px",
  123 + "260px",
124 "", 124 "",
125 "", 125 "",
126 "", 126 "",
127 titulo, 127 titulo,
128 "i3GEOF.toponimia", 128 "i3GEOF.toponimia",
129 - true, 129 + false,
130 "hd", 130 "hd",
131 "", 131 "",
132 "", 132 "",
@@ -169,6 +169,12 @@ i3GEOF.toponimia = { @@ -169,6 +169,12 @@ i3GEOF.toponimia = {
169 {$i("i3GEOtoponimiafrentes_i").value = "off";} 169 {$i("i3GEOtoponimiafrentes_i").value = "off";}
170 if($i("i3GEOtoponimianovotema").checked) 170 if($i("i3GEOtoponimianovotema").checked)
171 {novotema = "nao";} 171 {novotema = "nao";}
  172 + if($i("i3GEOtoponimiaMinscale").value === ""){
  173 + $i("i3GEOtoponimiaMinscale").value = 0;
  174 + }
  175 + if($i("i3GEOtoponimiaMaxscale").value === ""){
  176 + $i("i3GEOtoponimiaMaxscale").value = 0;
  177 + }
172 par = "&position="+$i("i3GEOtoponimiaposition_i").value + 178 par = "&position="+$i("i3GEOtoponimiaposition_i").value +
173 "&partials="+$i("i3GEOtoponimiapartials_i").value+ 179 "&partials="+$i("i3GEOtoponimiapartials_i").value+
174 "&offsetx="+$i("i3GEOtoponimiaoffsetx_i").value+ 180 "&offsetx="+$i("i3GEOtoponimiaoffsetx_i").value+
@@ -191,6 +197,8 @@ i3GEOF.toponimia = { @@ -191,6 +197,8 @@ i3GEOF.toponimia = {
191 "&item="+$i("i3GEOtoponimiaListaItens").value+ 197 "&item="+$i("i3GEOtoponimiaListaItens").value+
192 "&wrap="+$i("i3GEOtoponimiawrap_i").value+ 198 "&wrap="+$i("i3GEOtoponimiawrap_i").value+
193 "&tema="+i3GEO.temaAtivo+ 199 "&tema="+i3GEO.temaAtivo+
  200 + "&minscale="+parseInt($i("i3GEOtoponimiaMinscale").value,10)+
  201 + "&maxscale="+parseInt($i("i3GEOtoponimiaMaxscale").value,10)+
194 "&novotema="+novotema; 202 "&novotema="+novotema;
195 return par; 203 return par;
196 }, 204 },
ferramentas/toponimia/template_mst.html
  Diff comments   View file @64e370f
@@ -28,7 +28,16 @@ @@ -28,7 +28,16 @@
28 <br> 28 <br>
29 <p class='paragrafo'> 29 <p class='paragrafo'>
30 <input style='cursor: pointer' type='checkbox' checked id='i3GEOtoponimianovotema' /> 30 <input style='cursor: pointer' type='checkbox' checked id='i3GEOtoponimianovotema' />
31 - &nbsp;{{{adicionaToponimia}}} <br> 31 + &nbsp;{{{adicionaToponimia}}}
  32 + <br>
  33 + <p class='paragrafo'>{{{minmaxscale}}}:</p>
  34 + <div class='i3geoForm150 i3geoFormIconeEdita' style='float:left;'>
  35 + <input type='text' value='' id='i3GEOtoponimiaMinscale' />
  36 + </div>
  37 + <div class='i3geoForm150 i3geoFormIconeEdita'>
  38 + <input type='text' value='' id='i3GEOtoponimiaMaxscale' />
  39 + </div>
  40 + <br>
32 <p class='paragrafo'> 41 <p class='paragrafo'>
33 <input id='i3GEOtoponimiabotao1' size='35' type='button' value='{{{criaToponimia}}}' /> 42 <input id='i3GEOtoponimiabotao1' size='35' type='button' value='{{{criaToponimia}}}' />
34 <input id='i3GEOtoponimiabotao2' size='35' type='button' value='{{{removeToponimia}}}' /> 43 <input id='i3GEOtoponimiabotao2' size='35' type='button' value='{{{removeToponimia}}}' />