From ebe6bbfb8f963624f5f1232c9a024ad38e4ccf56 Mon Sep 17 00:00:00 2001 From: edmarmoretti Date: Sat, 5 Nov 2016 23:44:59 -0200 Subject: [PATCH] Reformulação do layout e programas da página que lista os serviços OGC. Reformulação do editor da árvore do catálogo. Teste do catálogo em Postgres com utf8 e latin1 --- admin/admin.db | Bin 340992 -> 0 bytes admin1/cadastros/identifica/exec.php | 2 +- admin1/cadastros/identifica/index.php | 4 ++-- admin1/cadastros/perfis/exec.php | 2 +- admin1/cadastros/perfis/index.php | 2 +- admin1/cadastros/servicos/exec.php | 6 +++--- admin1/cadastros/servicos/index.php | 2 +- admin1/cadastros/sistemas/exec.php | 2 +- admin1/cadastros/sistemas/funcoes/exec.php | 2 +- admin1/cadastros/sistemas/funcoes/index.php | 2 +- admin1/cadastros/sistemas/index.php | 4 ++-- admin1/cadastros/tags/exec.php | 2 +- admin1/cadastros/tags/index.php | 2 +- admin1/catalogo/atlas/exec.php | 4 ++-- admin1/catalogo/atlas/index.php | 6 +++--- admin1/catalogo/atlas/pranchas/exec.php | 4 ++-- admin1/catalogo/atlas/pranchas/index.php | 4 ++-- admin1/catalogo/atlas/pranchas/temas/index.php | 4 ++-- admin1/catalogo/mapas/exec.php | 8 ++++---- admin1/catalogo/mapas/index.php | 6 +++--- admin1/catalogo/menus/exec.php | 10 +++++----- admin1/catalogo/menus/grupos/index.js | 2 ++ admin1/catalogo/menus/grupos/index.php | 43 ++++++++++++++++++++++--------------------- admin1/catalogo/menus/grupos/listadegrupos/exec.php | 8 ++++---- admin1/catalogo/menus/grupos/listadegrupos/index.js | 2 +- admin1/catalogo/menus/grupos/listadegrupos/index.php | 20 ++++++++++++-------- admin1/catalogo/menus/grupos/subgrupos/index.js | 1 + admin1/catalogo/menus/grupos/subgrupos/index.php | 42 ++++++++++++++++++++++-------------------- admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/exec.php | 8 ++++---- admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.js | 2 +- admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php | 19 +++++++++++-------- admin1/catalogo/menus/grupos/subgrupos/temas/index.js | 19 +++++++++++++++++++ admin1/catalogo/menus/grupos/subgrupos/temas/index.php | 30 +++++++++++++++++++++--------- admin1/catalogo/menus/index.php | 26 +++++++++++++++----------- admin1/head.php | 23 +++++++++++++++++------ admin1/usuarios/cadastro/index.php | 2 +- admin1/usuarios/grupos/index.php | 2 +- admin1/usuarios/operacoes/exec.php | 2 +- admin1/usuarios/operacoes/index.php | 2 +- ferramentas/loginusuario/template_mst_bt.html | 4 ++-- init/head.php | 1 + ogc/dicionario.js | 2 +- ogc/exec.php | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/headjs.php | 25 +++++++++++++++++++++++++ ogc/index.css | 27 +++++++++++++++++++++++++++ ogc/index.js | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ogc/index.php | 298 +++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ogc/menu/exec.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/exec.php | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/index.js | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/index.php | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/subgrupo/exec.php | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/subgrupo/index.js | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/grupo/subgrupo/index.php | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/index.js | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/menu/index.php | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/old/index.js | 338 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/old/index.php | 337 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ogc/templates/modal.php | 12 ++++++++++++ ogc/templates/templatecamadas.php | 22 ++++++++++++++++++++++ ogc/templates/templatelinksdownload.php | 15 +++++++++++++++ ogc/templates/templatelinksogc.php | 11 +++++++++++ ogc/templates/templatelista.php | 14 ++++++++++++++ temas/_lbiomashp.map | 2 +- temas/_lmapadecluster.map | 10 ++++++---- temas/testecluster.map | 10 ++++++---- 66 files changed, 2075 insertions(+), 759 deletions(-) create mode 100755 ogc/exec.php create mode 100644 ogc/headjs.php create mode 100644 ogc/index.css create mode 100755 ogc/menu/exec.php create mode 100755 ogc/menu/grupo/exec.php create mode 100755 ogc/menu/grupo/index.js create mode 100755 ogc/menu/grupo/index.php create mode 100755 ogc/menu/grupo/subgrupo/exec.php create mode 100755 ogc/menu/grupo/subgrupo/index.js create mode 100755 ogc/menu/grupo/subgrupo/index.php create mode 100755 ogc/menu/index.js create mode 100755 ogc/menu/index.php create mode 100755 ogc/old/index.js create mode 100755 ogc/old/index.php create mode 100644 ogc/templates/modal.php create mode 100644 ogc/templates/templatecamadas.php create mode 100644 ogc/templates/templatelinksdownload.php create mode 100644 ogc/templates/templatelinksogc.php create mode 100644 ogc/templates/templatelista.php diff --git a/admin/admin.db b/admin/admin.db index a98433e..ab43ab2 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin1/cadastros/identifica/exec.php b/admin1/cadastros/identifica/exec.php index c40afe4..ec89385 100755 --- a/admin1/cadastros/identifica/exec.php +++ b/admin1/cadastros/identifica/exec.php @@ -130,7 +130,7 @@ function adicionar($publicado_i, $abrir_i, $nome_i, $target_i,$dbhw) { function alterar($id_i, $publicado_i, $abrir_i, $nome_i, $target_i, $dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome_i = utf8_encode($nome_i); + $nome_i = utf8_decode($nome_i); } $dataCol = array( "publicado_i" => $publicado_i, diff --git a/admin1/cadastros/identifica/index.php b/admin1/cadastros/identifica/index.php index 4ecc9f2..bed1679 100755 --- a/admin1/cadastros/identifica/index.php +++ b/admin1/cadastros/identifica/index.php @@ -88,7 +88,7 @@ include "../../head.php";
- {{{opcoesPublicado}}}
@@ -112,7 +112,7 @@ include "../../head.php"; delete_forever - {{{nome_i}}} +  {{{nome_i}}}
diff --git a/admin1/cadastros/perfis/exec.php b/admin1/cadastros/perfis/exec.php index 8c0737e..0140225 100755 --- a/admin1/cadastros/perfis/exec.php +++ b/admin1/cadastros/perfis/exec.php @@ -133,7 +133,7 @@ function alterar($id_perfil, $perfil,$dbhw) { $original = $original[0]["perfil"]; if ($convUTF != true){ - $perfil = utf8_encode($perfil); + $perfil = utf8_decode($perfil); } $dataCol = array( "perfil" => $perfil diff --git a/admin1/cadastros/perfis/index.php b/admin1/cadastros/perfis/index.php index 2c28b7c..2b4de61 100755 --- a/admin1/cadastros/perfis/index.php +++ b/admin1/cadastros/perfis/index.php @@ -87,7 +87,7 @@ include "../../head.php"; delete_forever - {{{perfil}}} +  {{{perfil}}}
diff --git a/admin1/cadastros/servicos/exec.php b/admin1/cadastros/servicos/exec.php index d77b186..6e01faf 100755 --- a/admin1/cadastros/servicos/exec.php +++ b/admin1/cadastros/servicos/exec.php @@ -131,9 +131,9 @@ function adicionar($autor_ws,$desc_ws,$link_ws,$nome_ws,$tipo_ws,$dbhw) { function alterar($id_ws,$autor_ws,$desc_ws,$link_ws,$nome_ws,$tipo_ws,$dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome_ws = utf8_encode($nome_ws); - $desc_ws = utf8_encode($desc_ws); - $autor_ws = utf8_encode($autor_ws); + $nome_ws = utf8_decode($nome_ws); + $desc_ws = utf8_decode($desc_ws); + $autor_ws = utf8_decode($autor_ws); } $dataCol = array( "desc_ws" => $desc_ws, diff --git a/admin1/cadastros/servicos/index.php b/admin1/cadastros/servicos/index.php index 477c89a..14a5852 100755 --- a/admin1/cadastros/servicos/index.php +++ b/admin1/cadastros/servicos/index.php @@ -113,7 +113,7 @@ include "../../head.php"; delete_forever - {{{nome_ws}}} +  {{{nome_ws}}}
diff --git a/admin1/cadastros/sistemas/exec.php b/admin1/cadastros/sistemas/exec.php index a1034bd..fbaa0ce 100755 --- a/admin1/cadastros/sistemas/exec.php +++ b/admin1/cadastros/sistemas/exec.php @@ -140,7 +140,7 @@ function adicionar( $publicado_sistema,$nome_sistema,$perfil_sistema, $dbhw) { function alterar($id_sistema,$publicado_sistema,$nome_sistema,$perfil_sistema, $dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome_sistema = utf8_encode($nome_sistema); + $nome_sistema = utf8_decode($nome_sistema); } $dataCol = array( "publicado_sistema" => $publicado_sistema, diff --git a/admin1/cadastros/sistemas/funcoes/exec.php b/admin1/cadastros/sistemas/funcoes/exec.php index a2960f5..c44bd3a 100755 --- a/admin1/cadastros/sistemas/funcoes/exec.php +++ b/admin1/cadastros/sistemas/funcoes/exec.php @@ -138,7 +138,7 @@ function adicionar( $id_sistema,$nome_funcao,$abrir_funcao,$h_funcao,$w_funcao,$ function alterar($id_funcao,$nome_funcao,$abrir_funcao,$h_funcao,$w_funcao,$perfil_funcao, $dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome_funcao = utf8_encode($nome_funcao); + $nome_funcao = utf8_decode($nome_funcao); } $dataCol = array( "nome_funcao" => $nome_funcao, diff --git a/admin1/cadastros/sistemas/funcoes/index.php b/admin1/cadastros/sistemas/funcoes/index.php index f0c9777..18c879f 100755 --- a/admin1/cadastros/sistemas/funcoes/index.php +++ b/admin1/cadastros/sistemas/funcoes/index.php @@ -118,7 +118,7 @@ $nome_sistema = filter_var($_GET["nome_sistema"], FILTER_SANITIZE_STRING); delete_forever - {{{nome_funcao}}} +  {{{nome_funcao}}}
diff --git a/admin1/cadastros/sistemas/index.php b/admin1/cadastros/sistemas/index.php index e2e722e..07501fc 100755 --- a/admin1/cadastros/sistemas/index.php +++ b/admin1/cadastros/sistemas/index.php @@ -57,7 +57,7 @@ include "../../head.php";
- {{{opcoesPublicado}}}
@@ -100,7 +100,7 @@ include "../../head.php"; delete_forever - {{{nome_sistema}}} +  {{{nome_sistema}}}
diff --git a/admin1/cadastros/tags/exec.php b/admin1/cadastros/tags/exec.php index c36d46c..e336a30 100755 --- a/admin1/cadastros/tags/exec.php +++ b/admin1/cadastros/tags/exec.php @@ -129,7 +129,7 @@ function adicionar($nome, $dbhw) { function alterar($id_tag, $nome,$dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome = utf8_encode($nome); + $nome = utf8_decode($nome); } $dataCol = array( "nome" => $nome diff --git a/admin1/cadastros/tags/index.php b/admin1/cadastros/tags/index.php index 72ec711..dc1a376 100755 --- a/admin1/cadastros/tags/index.php +++ b/admin1/cadastros/tags/index.php @@ -82,7 +82,7 @@ include "../../head.php"; delete_forever - {{{nome}}} +  {{{nome}}}
diff --git a/admin1/catalogo/atlas/exec.php b/admin1/catalogo/atlas/exec.php index 175a387..9bb7acf 100755 --- a/admin1/catalogo/atlas/exec.php +++ b/admin1/catalogo/atlas/exec.php @@ -148,8 +148,8 @@ function adicionar( $titulo_atlas, $publicado_atlas, $ordem_atlas, $basemapfile_ function alterar($id_atlas, $titulo_atlas, $publicado_atlas, $ordem_atlas, $basemapfile_atlas, $desc_atlas, $h_atlas, $w_atlas, $icone_atlas, $link_atlas, $pranchadefault_atlas, $template_atlas, $tipoguias_atlas, $dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $desc_atlas = utf8_encode($desc_atlas); - $titulo_atlas = utf8_encode($titulo_atlas); + $desc_atlas = utf8_decode($desc_atlas); + $titulo_atlas = utf8_decode($titulo_atlas); } $dataCol = array( "publicado_atlas"=>$publicado_atlas, diff --git a/admin1/catalogo/atlas/index.php b/admin1/catalogo/atlas/index.php index d897ad3..adea7d2 100755 --- a/admin1/catalogo/atlas/index.php +++ b/admin1/catalogo/atlas/index.php @@ -85,7 +85,7 @@ include "../../head.php";
- {{{opcoesPublicado}}}
@@ -95,7 +95,7 @@ include "../../head.php";
- +
@@ -182,7 +182,7 @@ include "../../head.php"; delete_forever - {{{titulo_atlas}}} +  {{{titulo_atlas}}}
diff --git a/admin1/catalogo/atlas/pranchas/exec.php b/admin1/catalogo/atlas/pranchas/exec.php index 06d6b9b..8668319 100755 --- a/admin1/catalogo/atlas/pranchas/exec.php +++ b/admin1/catalogo/atlas/pranchas/exec.php @@ -145,8 +145,8 @@ function adicionar( $id_atlas, $titulo_prancha, $ordem_prancha, $desc_prancha, $ function alterar($id_atlas, $id_prancha, $titulo_prancha, $ordem_prancha, $desc_prancha, $h_prancha, $icone_prancha, $link_prancha, $mapext_prancha, $w_prancha, $dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $desc_prancha = utf8_encode($desc_prancha); - $titulo_prancha = utf8_encode($titulo_prancha); + $desc_prancha = utf8_decode($desc_prancha); + $titulo_prancha = utf8_decode($titulo_prancha); } $dataCol = array( "ordem_prancha"=>$ordem_prancha, diff --git a/admin1/catalogo/atlas/pranchas/index.php b/admin1/catalogo/atlas/pranchas/index.php index f26a1d1..818d18a 100755 --- a/admin1/catalogo/atlas/pranchas/index.php +++ b/admin1/catalogo/atlas/pranchas/index.php @@ -89,7 +89,7 @@ $titulo_atlas = filter_var($_GET["titulo_atlas"], FILTER_SANITIZE_STRING);
- +
@@ -151,7 +151,7 @@ $titulo_atlas = filter_var($_GET["titulo_atlas"], FILTER_SANITIZE_STRING); delete_forever - {{{titulo_prancha}}} +  {{{titulo_prancha}}}
diff --git a/admin1/catalogo/atlas/pranchas/temas/index.php b/admin1/catalogo/atlas/pranchas/temas/index.php index d8abdb2..600ca8a 100755 --- a/admin1/catalogo/atlas/pranchas/temas/index.php +++ b/admin1/catalogo/atlas/pranchas/temas/index.php @@ -64,7 +64,7 @@ $id_atlas = filter_var($_GET["id_atlas"], FILTER_SANITIZE_NUMBER_INT);
- +
@@ -97,7 +97,7 @@ $id_atlas = filter_var($_GET["id_atlas"], FILTER_SANITIZE_NUMBER_INT); delete_forever - {{{codigo_tema}}} +  {{{codigo_tema}}}
diff --git a/admin1/catalogo/mapas/exec.php b/admin1/catalogo/mapas/exec.php index 038a3a3..a38864f 100755 --- a/admin1/catalogo/mapas/exec.php +++ b/admin1/catalogo/mapas/exec.php @@ -163,10 +163,10 @@ function adicionar($publicado_mapa, $ordem_mapa, $perfil_mapa, $ligados_mapa, $t // $papeis deve ser um array function alterar($id_mapa, $publicado_mapa, $ordem_mapa, $perfil_mapa, $ligados_mapa, $temas_mapa, $desc_mapa, $ext_mapa, $imagem_mapa, $linkdireto_mapa, $nome_mapa, $outros_mapa, $mapfile, $dbhw) { global $convUTF, $esquemaadmin; - if ($convUTF) { - $nome_mapa = utf8_encode ( $nome_mapa ); - $desc_mapa = utf8_encode ( $desc_mapa ); - $perfil_menu = utf8_encode ( $perfil_mapa ); + if ($convUTF != true) { + $nome_mapa = utf8_decode ( $nome_mapa ); + $desc_mapa = utf8_decode ( $desc_mapa ); + $perfil_menu = utf8_decode ( $perfil_mapa ); } $perfil_mapa = str_replace ( ",", " ", trim ( $perfil_mapa ) ); // verifica a consistencia da lista de perfis diff --git a/admin1/catalogo/mapas/index.php b/admin1/catalogo/mapas/index.php index 24433dd..c9f64c5 100755 --- a/admin1/catalogo/mapas/index.php +++ b/admin1/catalogo/mapas/index.php @@ -79,7 +79,7 @@ include "../../head.php";
- +
@@ -118,7 +118,7 @@ include "../../head.php";
- {{{opcoesPublicado}}}
@@ -171,7 +171,7 @@ include "../../head.php"; delete_forever - {{{nome_mapa}}} +  {{{nome_mapa}}}
diff --git a/admin1/catalogo/menus/exec.php b/admin1/catalogo/menus/exec.php index e903dea..c10692a 100755 --- a/admin1/catalogo/menus/exec.php +++ b/admin1/catalogo/menus/exec.php @@ -148,11 +148,11 @@ function adicionar($publicado_menu, $perfil_menu, $aberto, $desc_menu, $nome_men function alterar($id_menu, $publicado_menu, $perfil_menu, $aberto, $desc_menu, $nome_menu, $es, $en,$dbhw) { global $convUTF, $esquemaadmin; if ($convUTF != true){ - $nome_menu = utf8_encode($nome_menu); - $desc_menu = utf8_encode($desc_menu); - $en = utf8_encode($en); - $es = utf8_encode($es); - $perfil_menu = utf8_encode($perfil_menu); + $nome_menu = utf8_decode($nome_menu); + $desc_menu = utf8_decode($desc_menu); + $en = utf8_decode($en); + $es = utf8_decode($es); + $perfil_menu = utf8_decode($perfil_menu); } $perfil_menu = str_replace(","," ",trim($perfil_menu)); //verifica a consistencia da lista de perfis diff --git a/admin1/catalogo/menus/grupos/index.js b/admin1/catalogo/menus/grupos/index.js index 0cdd2dd..02d7897 100755 --- a/admin1/catalogo/menus/grupos/index.js +++ b/admin1/catalogo/menus/grupos/index.js @@ -122,6 +122,7 @@ i3GEOadmin.grupos = { { "id_raiz": "modal", "escondido": "", + "ordem": 0, "opcoesPerfil": i3GEOadmin.grupos.opcoesPerfil, "excluir": i3GEOadmin.grupos.dicionario.cancelar, "onExcluir": "i3GEOadmin.core.fechaModalGeral",//funcao @@ -323,6 +324,7 @@ i3GEOadmin.grupos = { { "id_n1": "modal", "escondido": "hidden", + "ordem": 0, "excluir": i3GEOadmin.grupos.dicionario.cancelar, "opcoesPerfil": i3GEOadmin.grupos.opcoesPerfil, "onExcluir": "i3GEOadmin.core.fechaModalGeral",//funcao diff --git a/admin1/catalogo/menus/grupos/index.php b/admin1/catalogo/menus/grupos/index.php index 15ed588..81b1577 100755 --- a/admin1/catalogo/menus/grupos/index.php +++ b/admin1/catalogo/menus/grupos/index.php @@ -35,7 +35,7 @@ $nome_menu = filter_var ( $_GET ["nome_menu"], FILTER_SANITIZE_STRING ); class="btn btn-primary btn-fab btn-fab-mini pull-right"> search -

{{{menu}}}:

+

{{{txtDesc}}}
'; + } + else{ + return ""; + } +} +function mostraLinksServico(tema,tipo,disabled){ + $(".modal-body").html('Aguarde'); + var html; + if(disabled != ""){ + $(".modal-body").html = ""; + return; + } + else{ + if(tipo == "meta"){ + tradLinks["tema"] = "metaestat_"+tema; + tradLinks["id_medida_variavel"] = "&id_medida_variavel="+tema; + } + if(tipo == "mapa"){ + tradLinks["tema"] = "mapa_cadastrado_"+tema; + tradLinks["id_medida_variavel"] = "&mapa_cadastrado="+tema; + } + if(tipo == "tema"){ + tradLinks["tema"] = tema; + } + html = Mustache.to_html( + $("#templateLinksOgc").html(), + tradLinks + ); + $(".modal-body").html(html); + } + +} +function mostraLinksDownload(tema,tipo,disabled){ + $(".modal-body").html('Aguarde'); + var html, r, p; + if(disabled != ""){ + return; + } + else{ + r = function(retorno){ + var html,arqs,i,n,ins = ""; + retorno = retorno.data; + //adiciona no hash os dados necessarios + if(tipo == "meta"){ + tradLinks["tema"] = "metaestat_" + tema; + tradLinks["id_medida_variavel"] = "&id_medida_variavel=" + tema; + } + if(tipo == "tema"){ + tradLinks["tema"] = tema; + } + tradLinks["mapfile"] = window.location.protocol + "//" + window.location.host + "/" + retorno.mapfileurl; + tradLinks["sldurl"] = tradLinks["urli3geo"] + "/ferramentas/legenda/exec.php?funcao=TEMA2SLD&tema=" + retorno.tema + "&map_file=" + retorno.mapfile; + + arqs = retorno.arquivos.split(","); + n = arqs.length; + for (i=0; i"+arqs[i]+"

"; + } + tradLinks["shp"] = ins; + + html = Mustache.to_html( + $("#templateLinksDownload").html(), + tradLinks + ); + tradLinks["shp"] = ""; + tradLinks["mapfile"] = ""; + tradLinks["sldurl"] = ""; + + $(".modal-body").html(html); + } + //obtem o shapefile e outros dados + p = "../classesphp/mapa_controle.php?map_file=&funcao=download3&tema="+tema; + //caso a camada venha do sistema de metadados estatisticos e seja uma variavel + if(tipo == "meta"){ + p = "../classesphp/mapa_controle.php?map_file=&funcao=download3&id_medida_variavel="+tema; + } + cpJSON.call(p, "foo", r); + } +} +function listaCompleta(onde){ + var r, p; + r = function(retorno){ + var d, html = "", n, camadas = [], i, t; + d = retorno.data.temas; + n = d.length; + if(n > 0){ + for(i=0; iextent->minx . "," . $map->extent->miny . "," . $map->extent->maxx . "," . $map->extent->maxy; +error_reporting ( 0 ); +include "../init/head.php"; +?> + + + + + + + + + + +
+
+ +
+
+ +
+ + + +
+
+ Aguarde +
+
+
+ + + + + + + + + + + + + + diff --git a/ogc/templates/modal.php b/ogc/templates/modal.php new file mode 100644 index 0000000..e374ead --- /dev/null +++ b/ogc/templates/modal.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/ogc/templates/templatecamadas.php b/ogc/templates/templatecamadas.php new file mode 100644 index 0000000..d238c37 --- /dev/null +++ b/ogc/templates/templatecamadas.php @@ -0,0 +1,22 @@ + diff --git a/ogc/templates/templatelinksdownload.php b/ogc/templates/templatelinksdownload.php new file mode 100644 index 0000000..43e06fc --- /dev/null +++ b/ogc/templates/templatelinksdownload.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/ogc/templates/templatelinksogc.php b/ogc/templates/templatelinksogc.php new file mode 100644 index 0000000..a54b20e --- /dev/null +++ b/ogc/templates/templatelinksogc.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/ogc/templates/templatelista.php b/ogc/templates/templatelista.php new file mode 100644 index 0000000..fb0b337 --- /dev/null +++ b/ogc/templates/templatelista.php @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map index b4699aa..45bd02e 100755 --- a/temas/_lbiomashp.map +++ b/temas/_lbiomashp.map @@ -10,7 +10,7 @@ MAP "CACHE" "sim" "CLASSE" "SIM" "olopacity" "" - "permitekmz" "sim" + "permitekmz" "nao" "gmopacity" "" "gmstatus" "" "ITENSDESC" "Bioma Teste de acentuação" diff --git a/temas/_lmapadecluster.map b/temas/_lmapadecluster.map index f46e54b..521ccaa 100755 --- a/temas/_lmapadecluster.map +++ b/temas/_lmapadecluster.map @@ -12,13 +12,15 @@ MAP "CLASSE" "SIM" "ltempoiteminicio" "" "ltempoitemtip" "" - "permitekmz" "nao" + "permitekmz" "NAO" "METAESTAT_CODIGO_TIPO_REGIAO" "" - "permitedownload" "nao" + "permitedownload" "NAO" "metaestat" "" "PLUGINI3GEO" '{"plugin":"markercluster","parametros":{"tipoEstilos":"default","gridSize":"50"}}' - "permiteogc" "nao" - "permitekml" "nao" + "arquivodownload" "" + "arquivokmz" "" + "permiteogc" "NAO" + "permitekml" "SIM" "TEMA" "Localidades (usar com mapa de cluster)" "cortepixels" "0" END # METADATA diff --git a/temas/testecluster.map b/temas/testecluster.map index 0e31ed0..5652a81 100755 --- a/temas/testecluster.map +++ b/temas/testecluster.map @@ -34,12 +34,14 @@ dbacoes_saude.tb_ubs_det.func_total = 'S' and dbacoes_saude.tb_ubs_det.ano_ubs_d METADATA "METAESTAT_ID_MEDIDA_VARIAVEL" "" "CLASSE" "SIM" - "permitekmz" "nao" + "permitekmz" "NAO" "METAESTAT_CODIGO_TIPO_REGIAO" "" - "permitedownload" "nao" + "permitedownload" "NAO" "metaestat" "" - "permiteogc" "nao" - "permitekml" "nao" + "arquivokmz" "" + "arquivodownload" "" + "permitekml" "SIM" + "permiteogc" "SIM" "TEMA" "Cluster" "IDENTIFICA" "SIM" END # METADATA -- libgit2 0.21.2