Download as
Browse Code »

Commit 47a7ba8220e76267da20aee814024f21c21c5caf

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

Complementação das opções do item 'disponibilidade' no editor de mapfiles

Showing 7 changed files with 153 additions and 93 deletions   Show diff stats
.settings/org.eclipse.core.resources.prefs
  Diff comments   View file @47a7ba8
1 eclipse.preferences.version=1 1 eclipse.preferences.version=1
2 encoding//interface/openlayersdebug.htm=UTF-8 2 encoding//interface/openlayersdebug.htm=UTF-8
  3 +encoding//temas/_lbiomashp.map=ISO-8859-1
3 encoding/<project>=ISO-8859-1 4 encoding/<project>=ISO-8859-1
admin/admin.db
View file @47a7ba8
No preview for this file type
admin/js/editormapfile.js
  Diff comments   View file @47a7ba8
@@ -689,7 +689,21 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, @@ -689,7 +689,21 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
689 } 689 }
690 if(tipo == "dispo") 690 if(tipo == "dispo")
691 { 691 {
692 - campos = new Array("download","arquivodownload","arquivokmz"); 692 + //validacao
  693 + if($i("kml_tema") && $i("ogc_tema")){
  694 + if(($i("ogc_tema").value).toLowerCase() == "sim"){
  695 + $i("kml_tema").value = "SIM";
  696 + }
  697 + }
  698 + if($i("kml_tema") && $i("kmz_tema")){
  699 + if(($i("kmz_tema").value).toLowerCase() == "sim"){
  700 + $i("kml_tema").value = "SIM";
  701 + }
  702 + if(($i("kml_tema").value).toLowerCase() == "nao"){
  703 + $i("kmz_tema").value = "NAO";
  704 + }
  705 + }
  706 + campos = new Array("download","arquivodownload","arquivokmz","ogc_tema","kml_tema","kmz_tema","download_tema");
693 par = "&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer; 707 par = "&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
694 prog = "../php/editormapfile.php?funcao=alterarDispo"; 708 prog = "../php/editormapfile.php?funcao=alterarDispo";
695 } 709 }
admin/js/editormapfile_dispo.js
  Diff comments   View file @47a7ba8
@@ -28,6 +28,25 @@ function montaEditorDispo(dados) @@ -28,6 +28,25 @@ function montaEditorDispo(dados)
28 }; 28 };
29 var ins = ""; 29 var ins = "";
30 ins += core_geraLinhas(param); 30 ins += core_geraLinhas(param);
  31 +
  32 + ins += "<p>Permite acesso via WMS/WFS? (n&atilde;o ocasiona restri&ccedil;&atilde;o em temas do tipo gvSIG)<br>";
  33 + ins += "<select id='ogc_tema' >";
  34 + ins += core_combosimnao(dados.ogc_tema);
  35 + ins += "</select></p>";
  36 + ins += "<p>Permite o download na aplica&ccedil;&atilde;o datadownload.htm? (n&atilde;o afeta temas do tipo gvSIG) (n&atilde;o afeta a permiss&atilde;o de download definida no item 'disponibilidade' existente em cada layer)<br>";
  37 + ins += "<select id='download_tema' >";
  38 + ins += core_combosimnao(dados.download_tema);
  39 + ins += "</select></p>";
  40 + ins += "<p>Permite acesso via kml? (n&atilde;o restringe em temas do tipo gvSIG)<br>";
  41 + ins += "<select id='kml_tema' >";
  42 + ins += core_combosimnao(dados.kml_tema);
  43 + ins += "</select></p>";
  44 + ins += "<p>Permite acesso via kmz (kml com dados vetoriais)? (n&atilde;o restringe em temas do tipo gvSIG)<br>";
  45 + ins += "<select id='kmz_tema' >";
  46 + ins += core_combosimnao(dados.kmz_tema);
  47 + ins += "</select></p>";
  48 +
  49 +
31 ins += "<br><br><br>"; 50 ins += "<br><br><br>";
32 $i("editor_bd").innerHTML = ins; 51 $i("editor_bd").innerHTML = ins;
33 if($i("cDownload")){ 52 if($i("cDownload")){
admin/php/editormapfile.php
  Diff comments   View file @47a7ba8
@@ -744,6 +744,7 @@ switch (strtoupper($funcao)) @@ -744,6 +744,7 @@ switch (strtoupper($funcao))
744 break; 744 break;
745 case "ALTERARDISPO": 745 case "ALTERARDISPO":
746 alterarDispo(); 746 alterarDispo();
  747 + alteraTemas();
747 retornaJSON(pegaDispo()); 748 retornaJSON(pegaDispo());
748 exit; 749 exit;
749 break; 750 break;
@@ -1674,6 +1675,10 @@ function pegaDispo() @@ -1674,6 +1675,10 @@ function pegaDispo()
1674 $dados["download"] = $layer->getmetadata("download"); 1675 $dados["download"] = $layer->getmetadata("download");
1675 $dados["arquivodownload"] = $layer->getmetadata("arquivodownload"); 1676 $dados["arquivodownload"] = $layer->getmetadata("arquivodownload");
1676 $dados["arquivokmz"] = $layer->getmetadata("arquivokmz"); 1677 $dados["arquivokmz"] = $layer->getmetadata("arquivokmz");
  1678 + $dados["ogc_tema"] = $layer->getmetadata("permiteogc");
  1679 + $dados["download_tema"] = $layer->getmetadata("permitedownload");
  1680 + $dados["kml_tema"] = $layer->getmetadata("permitekml");
  1681 + $dados["kmz_tema"] = $layer->getmetadata("permitekmz");
1677 $dados["codigoMap"] = $codigoMap; 1682 $dados["codigoMap"] = $codigoMap;
1678 $dados["codigoLayer"] = $codigoLayer; 1683 $dados["codigoLayer"] = $codigoLayer;
1679 return $dados; 1684 return $dados;
@@ -1712,17 +1717,31 @@ function alterarEditavel() @@ -1712,17 +1717,31 @@ function alterarEditavel()
1712 } 1717 }
1713 function alterarDispo() 1718 function alterarDispo()
1714 { 1719 {
1715 - global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$download,$arquivodownload,$arquivokmz; 1720 + global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$download,$arquivodownload,$arquivokmz,$ogc_tema,$kml_tema,$kmz_tema,$download_tema;
1716 $mapfile = $locaplic."/temas/".$codigoMap.".map"; 1721 $mapfile = $locaplic."/temas/".$codigoMap.".map";
1717 $mapa = ms_newMapObj($mapfile); 1722 $mapa = ms_newMapObj($mapfile);
1718 $layer = $mapa->getlayerbyname($codigoLayer); 1723 $layer = $mapa->getlayerbyname($codigoLayer);
1719 $layer->setmetadata("download",$download); 1724 $layer->setmetadata("download",$download);
1720 $layer->setmetadata("arquivodownload",$arquivodownload); 1725 $layer->setmetadata("arquivodownload",$arquivodownload);
1721 $layer->setmetadata("arquivokmz",$arquivokmz); 1726 $layer->setmetadata("arquivokmz",$arquivokmz);
  1727 + $layer->setmetadata("permiteogc",$ogc_tema);
  1728 + $layer->setmetadata("permitekml",$kml_tema);
  1729 + $layer->setmetadata("permitekmz",$kmz_tema);
  1730 + $layer->setmetadata("permitedownload",$download_tema);
1722 $mapa->save($mapfile); 1731 $mapa->save($mapfile);
1723 removeCabecalho($mapfile); 1732 removeCabecalho($mapfile);
1724 return "ok"; 1733 return "ok";
1725 } 1734 }
  1735 +//essa funcao existe tambem em menutemas.php
  1736 +function alteraTemas()
  1737 +{
  1738 + global $esquemaadmin,$codigoLayer,$ogc_tema,$kml_tema,$kmz_tema,$locaplic,$download_tema;
  1739 + include("conexao.php");
  1740 + $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_temas SET download_tema = '$download_tema.', ogc_tema='$ogc_tema',kml_tema='$kml_tema',kmz_tema='$kmz_tema' WHERE codigo_tema = '$codigoLayer'");
  1741 + $dbhw = null;
  1742 + $dbh = null;
  1743 +}
  1744 +
1726 function pegaConexao() 1745 function pegaConexao()
1727 { 1746 {
1728 global $codigoMap,$codigoLayer,$locaplic,$postgis_mapa; 1747 global $codigoMap,$codigoLayer,$locaplic,$postgis_mapa;
admin/php/editortexto.php
  Diff comments   View file @47a7ba8
@@ -152,7 +152,7 @@ body { @@ -152,7 +152,7 @@ body {
152 <div style=float:left; > 152 <div style=float:left; >
153 Estilo: <select onchange="mudaEstilo(this.value)"> 153 Estilo: <select onchange="mudaEstilo(this.value)">
154 <option value=elegant >Elegant</option> 154 <option value=elegant >Elegant</option>
155 - <option value=ambiance >Ambiance</option> 155 + <option value=ambiance >Ambiance</option>
156 <option value=cobalt >Cobalt</option> 156 <option value=cobalt >Cobalt</option>
157 <option value=night >Night</option> 157 <option value=night >Night</option>
158 <option value=neo >Neo</option> 158 <option value=neo >Neo</option>
@@ -173,7 +173,7 @@ Ctrl+a - Seleciona tudo&lt;br&gt; @@ -173,7 +173,7 @@ Ctrl+a - Seleciona tudo&lt;br&gt;
173 Ctrl+d - Apaga a linha<br> 173 Ctrl+d - Apaga a linha<br>
174 Ctrl-z - Desfazer<br> 174 Ctrl-z - Desfazer<br>
175 Ctrl-Up - Sobe<br> 175 Ctrl-Up - Sobe<br>
176 -Alt-left - Início da linha<br> 176 +Alt-left - In&iacute;cio da linha<br>
177 177
178 178
179 </fieldset> 179 </fieldset>
@@ -271,4 +271,4 @@ function testar(){ @@ -271,4 +271,4 @@ function testar(){
271 function abrirI3geo(){ 271 function abrirI3geo(){
272 window.open("../../ms_criamapa.php?layers=<?php echo $_GET["mapfile"]; ?>"); 272 window.open("../../ms_criamapa.php?layers=<?php echo $_GET["mapfile"]; ?>");
273 } 273 }
274 -</script>  
275 \ No newline at end of file 274 \ No newline at end of file
  275 +</script>
temas/_lbiomashp.map
  Diff comments   View file @47a7ba8
1 -MAP  
2 - FONTSET "../symbols/fontes.txt"  
3 - SYMBOLSET "../symbols/simbolosv6.sym"  
4 - LAYER  
5 - CONNECTION ""  
6 - DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"  
7 - METADATA  
8 - "TIP" "CD_LEGENDA"  
9 - "CLASSE" "SIM"  
10 - "permitekmz" "sim"  
11 - "ITENSDESC" "Teste de acentuação"  
12 - "TILES" "SIM"  
13 - "ESCALA" "1000000"  
14 - "permitedownload" "sim"  
15 - "download" "SIM"  
16 - "itembuscarapida" "CD_LEGENDA"  
17 - "ITENS" "CD_LEGENDA"  
18 - "permitekml" "sim"  
19 - "permiteogc" "sim"  
20 - "transitioneffect" "SIM"  
21 - "TEMA" "Biomas shapefile (acentuação)"  
22 - END # METADATA  
23 - NAME "_lbiomashp"  
24 - PROCESSING "ITEMS=CD_LEGENDA"  
25 - PROCESSING "LABEL_NO_CLIP=True"  
26 - PROCESSING "POLYLINE_NO_CLIP=True"  
27 - STATUS OFF  
28 - TEMPLATE "none.htm"  
29 - TILEITEM "location"  
30 - OPACITY 40  
31 - TYPE POLYGON  
32 - UNITS METERS  
33 - CLASS  
34 - NAME "CAATINGA"  
35 - EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')  
36 - STYLE  
37 - COLOR 183 247 169  
38 - OUTLINECOLOR 255 255 255  
39 - END # STYLE  
40 - TITLE ""  
41 - END # CLASS  
42 - CLASS  
43 - NAME "PAMPA area > 5"  
44 - EXPRESSION ('[CD_LEGENDA]'eq'PAMPA area > 5')  
45 - STYLE  
46 - COLOR 239 22 152  
47 - OUTLINECOLOR 255 255 255  
48 - END # STYLE  
49 - TITLE ""  
50 - END # CLASS  
51 - CLASS  
52 - NAME "CERRADO"  
53 - EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')  
54 - STYLE  
55 - COLOR 57 32 234  
56 - OUTLINECOLOR 255 255 255  
57 - END # STYLE  
58 - TITLE ""  
59 - END # CLASS  
60 - CLASS  
61 - NAME "PANTANAL"  
62 - EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')  
63 - STYLE  
64 - COLOR 214 107 232  
65 - OUTLINECOLOR 255 255 255  
66 - END # STYLE  
67 - TITLE ""  
68 - END # CLASS  
69 - CLASS  
70 - NAME "AMAZÔNIA"  
71 - EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')  
72 - STYLE  
73 - COLOR 102 177 195  
74 - OUTLINECOLOR 255 255 255  
75 - END # STYLE  
76 - TITLE ""  
77 - END # CLASS  
78 - CLASS  
79 - NAME "MATA ATLÂNTICA"  
80 - EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')  
81 - STYLE  
82 - COLOR 44 215 49  
83 - OUTLINECOLOR 255 255 255  
84 - END # STYLE  
85 - TITLE ""  
86 - END # CLASS  
87 - END # LAYER  
88 -END # MAP 1 +MAP
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolosv6.sym"
  4 + LAYER
  5 + CONNECTION ""
  6 + DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
  7 + METADATA
  8 + "METAESTAT_ID_MEDIDA_VARIAVEL" ""
  9 + "TIP" "CD_LEGENDA"
  10 + "CLASSE" "SIM"
  11 + "permitekmz" "SIM"
  12 + "ITENSDESC" "Teste de acentuação"
  13 + "ESCALA" "1000000"
  14 + "TILES" "SIM"
  15 + "METAESTAT_CODIGO_TIPO_REGIAO" ""
  16 + "permitedownload" "SIM"
  17 + "metaestat" ""
  18 + "download" "SIM"
  19 + "itembuscarapida" "CD_LEGENDA"
  20 + "ITENS" "CD_LEGENDA"
  21 + "arquivodownload" ""
  22 + "arquivokmz" ""
  23 + "transitioneffect" "SIM"
  24 + "permiteogc" "SIM"
  25 + "permitekml" "SIM"
  26 + "TEMA" "Biomas shapefile (acentuação)"
  27 + END # METADATA
  28 + NAME "_lbiomashp"
  29 + PROCESSING "ITEMS=CD_LEGENDA"
  30 + PROCESSING "LABEL_NO_CLIP=True"
  31 + PROCESSING "POLYLINE_NO_CLIP=True"
  32 + STATUS OFF
  33 + TEMPLATE "none.htm"
  34 + TILEITEM "location"
  35 + OPACITY 40
  36 + TYPE POLYGON
  37 + UNITS METERS
  38 + CLASS
  39 + NAME "CAATINGA"
  40 + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
  41 + STYLE
  42 + COLOR 183 247 169
  43 + OUTLINECOLOR 255 255 255
  44 + END # STYLE
  45 + TITLE ""
  46 + END # CLASS
  47 + CLASS
  48 + NAME "PAMPA area > 5"
  49 + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA area > 5')
  50 + STYLE
  51 + COLOR 239 22 152
  52 + OUTLINECOLOR 255 255 255
  53 + END # STYLE
  54 + TITLE ""
  55 + END # CLASS
  56 + CLASS
  57 + NAME "CERRADO"
  58 + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
  59 + STYLE
  60 + COLOR 57 32 234
  61 + OUTLINECOLOR 255 255 255
  62 + END # STYLE
  63 + TITLE ""
  64 + END # CLASS
  65 + CLASS
  66 + NAME "PANTANAL"
  67 + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
  68 + STYLE
  69 + COLOR 214 107 232
  70 + OUTLINECOLOR 255 255 255
  71 + END # STYLE
  72 + TITLE ""
  73 + END # CLASS
  74 + CLASS
  75 + NAME "AMAZÔNIA"
  76 + EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
  77 + STYLE
  78 + COLOR 102 177 195
  79 + OUTLINECOLOR 255 255 255
  80 + END # STYLE
  81 + TITLE ""
  82 + END # CLASS
  83 + CLASS
  84 + NAME "MATA ATLÂNTICA"
  85 + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
  86 + STYLE
  87 + COLOR 44 215 49
  88 + OUTLINECOLOR 255 255 255
  89 + END # STYLE
  90 + TITLE ""
  91 + END # CLASS
  92 + END # LAYER
  93 +
  94 +END # MAP
  95 +