Download as
Browse Code »

Commit a218261ce988bf9da63ba2544f955c202ee07d3e

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

Correção na opção de visualização de serviços wms

Showing 11 changed files with 31 additions and 37 deletions   Show diff stats
admin/admin.db
View file @a218261
No preview for this file type
admin1/black_editor.php
  Diff comments   View file @a218261
... ... @@ -583,7 +583,7 @@ if ($_SESSION ["usuario"] != $_COOKIE ["i3geousuariologin"]) {
583 583 //GM - utiliza o GoogleMaps como motor de controle do mapa
584 584 mapType : "OL",
585 585 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
586   - saveExtension : true,
  586 + saveExtension : false,
587 587 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
588 588 posRenderType : "",
589 589 //Altura e largura do tooltip (balao identifica)
... ...
admin1/cadastros/servicos/templates/templateOpcoesTipo.php
  Diff comments   View file @a218261
... ... @@ -5,6 +5,5 @@
5 5 <option {{WMS-Tile-sel}} value="WMS-Tile">WMS-Tile</option>
6 6 <option {{GEORSS-sel}} value="GEORSS">GEORSS</option>
7 7 <option {{WS-sel}} value="WS">WS</option>
8   - <option {{DOWNLOAD-sel}} value="DOWNLOAD">DOWNLOAD</option>
9 8 <option {{GEOJSON-sel}} value="GEOJSON">GEOJSON</option>
10 9 </script>
11 10 \ No newline at end of file
... ...
admin1/catalogo/mapfile/editavel/index.js
  Diff comments   View file @a218261
... ... @@ -47,8 +47,8 @@ i3GEOadmin.editavel = {
47 47 "onSalvar": "i3GEOadmin.editavel.salvar",
48 48 "editavel": function(){
49 49 var hash = {
50   - "sim": i3GEOadmin.comportamento.dicionario.sim,
51   - "nao": i3GEOadmin.comportamento.dicionario.nao,
  50 + "sim": i3GEOadmin.editavel.dicionario.sim,
  51 + "nao": i3GEOadmin.editavel.dicionario.nao,
52 52 "NAO-sel" : "",
53 53 "SIM-sel": ""
54 54 };
... ...
css/i3geo7.css.php 100644 → 100755
  Diff comments   View file @a218261
ferramentas/etiqueta/index.js
  Diff comments   View file @a218261
... ... @@ -304,7 +304,7 @@ i3GEOF.etiqueta = {
304 304 if (it.name === "itenslink"){
305 305 itenslink.push(it.value);
306 306 }
307   - if (it.name === "itembuscarapida"){
  307 + if (it.name === "itembuscarapida" && it.checked === true){
308 308 itembuscarapida = it.value;
309 309 }
310 310 }
... ...
ferramentas/tabela/relatorio.php
  Diff comments   View file @a218261
... ... @@ -78,7 +78,7 @@ if($itemagruparel != &quot;&quot; &amp;&amp; !in_array($itemagruparel,$itensrel))
78 78 {$itensrel[] = $itemagruparel;}
79 79  
80 80 $mapa = ms_newMapObj($map_file);
81   -substituiConObj($temp,$postgis_mapa);
  81 +substituiConObj($mapa,$postgis_mapa);
82 82 if($ext && $ext != ""){
83 83 $e = explode(" ",$ext);
84 84 $extatual = $mapa->extent;
... ... @@ -150,7 +150,7 @@ $fechou = $layer-&gt;close();
150 150  
151 151 restauraCon($map_file,$postgis_mapa);
152 152  
153   -if(isset($tiporel) && $tiporel == "csv"){
  153 +if(isset($_GET["tiporel"]) && $_GET["tiporel"] == "csv"){
154 154 echo "<pre>";
155 155 echo implode(";",explode(",",$nomesrel));
156 156 if($arearel == "true")
... ...
js/i3geo_tudo_compacto7.js.php 100644 → 100755
  Diff comments   View file @a218261
temas/_lbairros.map
  Diff comments   View file @a218261
... ... @@ -2,31 +2,40 @@ MAP
2 2 FONTSET "/var/www/i3geo/symbols/fontes.txt"
3 3 SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym"
4 4 LAYER
5   - CONNECTION "user=postgres password=postgres dbname=i3geosaude host=localhost port=5432 options='-c client_encoding=LATIN1'"
  5 + CONNECTION "i3geosaude"
6 6 CONNECTIONTYPE POSTGIS
7 7 DATA "the_geom from (select gid, st_setsrid(the_geom,4326) as the_geom,co_bairro,no_bairro,no_distr,no_municip from i3geo_metaestat.bairros/*FW*//*FW*/) as foo using unique co_bairro using srid=4326"
8 8 METADATA
9 9 "TIP" "no_bairro,id"
10 10 "cache" "sim"
  11 + "olopacity" ""
11 12 "CLASSE" "SIM"
12   - "temporizador" ""
  13 + "permitekmz" "SIM"
  14 + "gmopacity" ""
  15 + "gmstatus" ""
13 16 "ITENSDESC" "id,Código bairro,Nome,Distrito,Município"
14   - "iconetema" ""
15   - "EDITAVEL" "SIM"
  17 + "EDITAVEL" "NAO"
  18 + "arquivotemaoriginal" ""
  19 + "olstatus" ""
  20 + "nomeoriginal" ""
16 21 "wkttip" "SIM"
  22 + "permitedownload" "SIM"
  23 + "FILTROORIGINAL" ""
17 24 "permitecomentario" "NAO"
  25 + "DATAORIGINAL" ""
18 26 "escondido" "NAO"
19   - "ESQUEMATABELAEDITAVEL" "i3geo_metaestat"
  27 + "download" "SIM"
20 28 "ITENS" "gid,co_bairro,no_bairro,no_distr,no_municip"
21 29 "CONEXAOORIGINAL" "i3geosaude"
22 30 "transitioneffect" "NAO"
  31 + "permiteogc" "SIM"
  32 + "permitekml" "SIM"
23 33 "TEMA" "_Bairros POSTGIS"
24   - "COLUNAIDUNICO" "gid"
25   - "COLUNAGEOMETRIA" "the_geom"
26   - "aplicaextensao" "NAO"
27   - "TABELAEDITAVEL" "bairros"
  34 + "identifica" "nao"
28 35 END # METADATA
29 36 NAME "_lbairros"
  37 + PROCESSING "LABEL_NO_CLIP=True"
  38 + PROCESSING "POLYLINE_NO_CLIP=True"
30 39 STATUS DEFAULT
31 40 TEMPLATE "none.htm"
32 41 TILEITEM "location"
... ... @@ -37,6 +46,7 @@ MAP
37 46 STYLE
38 47 OUTLINECOLOR 255 100 0
39 48 END # STYLE
  49 + TITLE ""
40 50 END # CLASS
41 51 END # LAYER
42 52  
... ...
temas/_lbiomashp.map
  Diff comments   View file @a218261
1 1 MAP
2   - FONTSET "../symbols/fontes.txt"
3   - SYMBOLSET "../symbols/simbolosv6.sym"
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolosv6.sym"
4 4 LAYER
5 5 CONNECTION ""
6 6 DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
7 7 METADATA
8 8 "TIP" "CD_LEGENDA"
9 9 "cache" "sim"
10   - "olopacity" ""
11 10 "CLASSE" "sim"
12 11 "permitekmz" "SIM"
13   - "gmopacity" ""
14   - "gmstatus" ""
15 12 "ITENSDESC" "Teste de acentuação"
16 13 "TILES" "SIM"
17 14 "ESCALA" "250000"
18 15 "editavel" ""
19   - "arquivotemaoriginal" ""
20 16 "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909"
21   - "olstatus" ""
22   - "nomeoriginal" ""
23 17 "permitedownload" "SIM"
24   - "FILTROORIGINAL" ""
25 18 "permitecomentario" "NAO"
26   - "DATAORIGINAL" ""
27   - "PLUGINI3GEO" ""
28 19 "escondido" "NAO"
29 20 "download" "SIM"
30 21 "esquematabelaeditavel" ""
... ... @@ -105,6 +96,5 @@ MAP
105 96 TITLE ""
106 97 END # CLASS
107 98 END # LAYER
108   -
109 99 END # MAP
110   -
  100 +
... ...
temas/_lcbersgeo.map
  Diff comments   View file @a218261
1 1 MAP
2   - FONTSET "../symbols/fontes.txt"
3   - SYMBOLSET "../symbols/simbolos.sym"
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolos.sym"
4 4 LAYER
5 5 DATA "/var/www/geodados/cbersgeo.img"
6 6 METADATA
7   - "METAESTAT_ID_MEDIDA_VARIAVEL" ""
8 7 "cache" "SIM"
9 8 "classe" "NAO"
10 9 "permitekmz" "nao"
11   - "iconetema" ""
12   - "METAESTAT_CODIGO_TIPO_REGIAO" ""
13 10 "extensao" "-47.675168 -12.4736 -44.082638 -10.817411"
14 11 "permitedownload" "sim"
15   - "metaestat" ""
16 12 "DOWNLOAD" "sim"
17 13 "permiteogc" "sim"
18 14 "permitekml" "sim"
... ... @@ -31,6 +27,5 @@ MAP
31 27 END # STYLE
32 28 END # CLASS
33 29 END # LAYER
34   -
35 30 END # MAP
36   -
  31 +
... ...