From cd14296636e92baf5c83db96c85fe0425a3460f9 Mon Sep 17 00:00:00 2001 From: edmarmoretti Date: Tue, 7 Mar 2017 09:19:37 -0300 Subject: [PATCH] Padronização do sistema de administração. --- admin1/catalogo/mapfile/cdados/exec.php | 127 +++++++++++++++++++------------------------------------------------------------------------------------------------------------ admin1/catalogo/mapfile/cdados/funcoes.php | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin1/catalogo/mapfile/comportamento/funcoes.php | 0 admin1/catalogo/mapfile/disponibilidade/funcoes.php | 0 admin1/php/substituiConObj.php | 28 ++++++++++++++++++++++++++++ temas/_lbiomashp.map | 2 +- 6 files changed, 133 insertions(+), 109 deletions(-) create mode 100755 admin1/catalogo/mapfile/cdados/funcoes.php mode change 100644 => 100755 admin1/catalogo/mapfile/comportamento/funcoes.php mode change 100644 => 100755 admin1/catalogo/mapfile/disponibilidade/funcoes.php create mode 100644 admin1/php/substituiConObj.php diff --git a/admin1/catalogo/mapfile/cdados/exec.php b/admin1/catalogo/mapfile/cdados/exec.php index abc4055..68931e8 100755 --- a/admin1/catalogo/mapfile/cdados/exec.php +++ b/admin1/catalogo/mapfile/cdados/exec.php @@ -34,131 +34,42 @@ if (verificaOperacaoSessao ( "admin/html/editormapfile" ) === false) { } include (dirname ( __FILE__ ) . "/../../../../admin/php/conexao.php"); +include ("funcoes.php"); $codigo = $_POST ["codigo"]; +$codigo = str_replace ( " ", "", removeAcentos ( $codigo ) ); +$codigo = str_replace ( ".", "", $codigo ); +$codigo = strip_tags ( $codigo ); +$codigo = htmlspecialchars ( $codigo, ENT_QUOTES ); + $id_tema = ( int ) $_POST ["id_tema"]; $funcao = strtoupper ( $funcao ); switch ($funcao) { case "CALCULAEXTENSAO" : - $codigo = str_replace ( " ", "", removeAcentos ( $codigo ) ); - $codigo = str_replace ( ".", "", $codigo ); - $codigo = strip_tags ( $codigo ); - $codigo = htmlspecialchars ( $codigo, ENT_QUOTES ); - $arq = $locaplic . "/temas/" . $codigo . ".map"; - if ($codigo == "" || ! file_exists ( $arq )) { - header ( "HTTP/1.1 400 arquivo nao existe" ); - exit (); - } - $ret = calculaExtensao($locaplic, $id_tema, $codigo); + $ret = \admin\catalogo\mapfile\cdados\calculaExtensao($locaplic, $id_tema, $codigo); retornaJSON ( array ( - "ret" => $ret + "ret" => $ret ) ); - exit (); break; case "ALTERAR" : - $codigo = str_replace ( " ", "", removeAcentos ( $codigo ) ); - $codigo = str_replace ( ".", "", $codigo ); - $codigo = strip_tags ( $codigo ); - $codigo = htmlspecialchars ( $codigo, ENT_QUOTES ); - $arq = $locaplic . "/temas/" . $codigo . ".map"; - if ($codigo == "" || ! file_exists ( $arq )) { - header ( "HTTP/1.1 400 arquivo nao existe" ); - exit (); - } - $novo = alterar ( $locaplic, $id_tema, $codigo, $_POST["escala"], $_POST["extensao"], $_POST["encoding"]); - if ($novo === false) { + $dados = \admin\catalogo\mapfile\cdados\alterar ( $locaplic, $id_tema, $codigo, $_POST["escala"], $_POST["extensao"], $_POST["encoding"]); + if ($dados === false) { header ( "HTTP/1.1 500 erro ao definir as propriedades" ); - exit (); + } else { + retornaJSON ( array ( + "codigo" => $codigo + ) ); } - retornaJSON ( array ( - "codigo" => $codigo - ) ); - exit (); break; case "LISTA" : - // pega o nome registrado no mapfile - if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) { - header ( "HTTP/1.1 500 erro mapfile nao existe" ); - exit (); - } - $mapa = ms_newMapObj ( $locaplic . "/temas/" . $codigo . ".map" ); - $layer = $mapa->getlayerbyname ( $codigo ); - if ($layer == "") { - header ( "HTTP/1.1 500 erro nao existe LAYER com o nome $codigo" ); - exit (); - } - $dados = array (); - $dados["escala"] = $layer->getmetadata("escala"); - $dados["extensao"] = $layer->getmetadata("extensao"); - $versao = versao(); - $versao = $versao["principal"]; - if($versao >= 7){ - $dados["encoding"] = $layer->encoding; - } - else { - $dados["encoding"] = "notInVersion"; - } - $dados["status"] = $layer->status; + $dados = \admin\catalogo\mapfile\cdados\listar ($locaplic,$codigo); retornaJSON ( array ( - "dados" => $dados + "dados" => $dados ) ); break; -} -cpjson ( $retorno ); -function alterar($locaplic, $id_tema, $codigo, $escala, $extensao, $encoding) { - $arq = $locaplic . "/temas/" . $codigo . ".map"; - if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) { - return false; - } - $mapa = ms_newMapObj ( $arq ); - $layer = @$mapa->getlayerbyname ( $codigo ); - if ($layer == "") { - return false; - } - $layer->setmetadata ( "escala", $escala ); - $layer->setmetadata ( "extensao", str_replace(","," ",$extensao) ); - $versao = versao(); - $versao = $versao["principal"]; - if($versao >= 7){ - $layer->set("encoding",$encoding); - } - try { - $mapa->save ( $arq ); - include (dirname ( __FILE__ ) . "/../../../php/removeCabecalhoMapfile.php"); - removeCabecalhoMapfile ( $arq ); - return true; - } catch (Exception $e) { - return false; - } -} -function calculaExtensao($locaplic, $id_tema, $codigo){ - global $postgis_mapa; - $arq = $locaplic . "/temas/" . $codigo . ".map"; - if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) { - return false; - } - $mapa = ms_newMapObj ( $arq ); - substituiConObj($mapa,$postgis_mapa); - $extatual = $mapa->extent; - $extatual->setextent(-180,-90,180,90); - $layer = @$mapa->getlayerbyname ( $codigo ); - if ($layer == "") { - return false; - } - $original = $layer->getmetadata("extensao"); - $ret = $layer->getextent(); - $ret = $ret->minx." ".$ret->miny." ".$ret->maxx." ".$ret->maxy; - if($ret != " "){ - $layer->setmetadata ( "extensao", $ret); - } - try { - $mapa->save ( $arq ); - include (dirname ( __FILE__ ) . "/../../../php/removeCabecalhoMapfile.php"); - removeCabecalhoMapfile ( $arq ); - return $ret; - } catch (Exception $e) { - return false; - } + default: + header ( "HTTP/1.1 500 erro funcao nao existe" ); + break; } ?> diff --git a/admin1/catalogo/mapfile/cdados/funcoes.php b/admin1/catalogo/mapfile/cdados/funcoes.php new file mode 100755 index 0000000..cff9a91 --- /dev/null +++ b/admin1/catalogo/mapfile/cdados/funcoes.php @@ -0,0 +1,85 @@ +getlayerbyname ( $codigo ); + if ($layer == "") { + header ( "HTTP/1.1 500 erro nao existe LAYER com o nome $codigo" ); + exit (); + } + $dados = array (); + $dados["escala"] = $layer->getmetadata("escala"); + $dados["extensao"] = $layer->getmetadata("extensao"); + $versao = versao(); + $versao = $versao["principal"]; + if($versao >= 7){ + $dados["encoding"] = $layer->encoding; + } + else { + $dados["encoding"] = "notInVersion"; + } + $dados["status"] = $layer->status; + return $dados; +} +function alterar($locaplic, $id_tema, $codigo, $escala, $extensao, $encoding) { + $arq = $locaplic . "/temas/" . $codigo . ".map"; + if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) { + return false; + } + $mapa = ms_newMapObj ( $arq ); + $layer = @$mapa->getlayerbyname ( $codigo ); + if ($layer == "") { + return false; + } + $layer->setmetadata ( "escala", $escala ); + $layer->setmetadata ( "extensao", str_replace(","," ",$extensao) ); + $versao = versao(); + $versao = $versao["principal"]; + if($versao >= 7){ + $layer->set("encoding",$encoding); + } + try { + $mapa->save ( $arq ); + include (dirname ( __FILE__ ) . "/../../../php/removeCabecalhoMapfile.php"); + removeCabecalhoMapfile ( $arq ); + return true; + } catch (Exception $e) { + return false; + } +} +function calculaExtensao($locaplic, $id_tema, $codigo){ + global $postgis_mapa; + $arq = $locaplic . "/temas/" . $codigo . ".map"; + if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) { + return false; + } + $mapa = ms_newMapObj ( $arq ); + include (dirname ( __FILE__ ) . "/../../../php/substituiConObj.php"); + substituiConObj($mapa,$postgis_mapa); + $extatual = $mapa->extent; + $extatual->setextent(-180,-90,180,90); + $layer = @$mapa->getlayerbyname ( $codigo ); + if ($layer == "") { + return false; + } + $original = $layer->getmetadata("extensao"); + $ret = $layer->getextent(); + $ret = $ret->minx." ".$ret->miny." ".$ret->maxx." ".$ret->maxy; + if($ret != " "){ + $layer->setmetadata ( "extensao", $ret); + } + try { + $mapa->save ( $arq ); + include (dirname ( __FILE__ ) . "/../../../php/removeCabecalhoMapfile.php"); + removeCabecalhoMapfile ( $arq ); + return $ret; + } catch (Exception $e) { + return false; + } +} +?> \ No newline at end of file diff --git a/admin1/catalogo/mapfile/comportamento/funcoes.php b/admin1/catalogo/mapfile/comportamento/funcoes.php old mode 100644 new mode 100755 index 4172509..4172509 --- a/admin1/catalogo/mapfile/comportamento/funcoes.php +++ b/admin1/catalogo/mapfile/comportamento/funcoes.php diff --git a/admin1/catalogo/mapfile/disponibilidade/funcoes.php b/admin1/catalogo/mapfile/disponibilidade/funcoes.php old mode 100644 new mode 100755 index f0940c3..f0940c3 --- a/admin1/catalogo/mapfile/disponibilidade/funcoes.php +++ b/admin1/catalogo/mapfile/disponibilidade/funcoes.php diff --git a/admin1/php/substituiConObj.php b/admin1/php/substituiConObj.php new file mode 100644 index 0000000..800f218 --- /dev/null +++ b/admin1/php/substituiConObj.php @@ -0,0 +1,28 @@ +numlayers; + for ($i=0;$i < $numlayers;++$i){ + $layer = $objMap->getlayer($i); + if ($layer->connectiontype == MS_POSTGIS){ + $lcon = $layer->connection; + if (($lcon == " ") || ($lcon == "") || (in_array($lcon,array_keys($postgis_mapa)))) { + // + //o metadata CONEXAOORIGINAL guarda o valor original para posterior substituição + // + if(($lcon == " ") || ($lcon == "")) { + $layer->set("connection",$postgis_mapa); + $layer->setmetadata("CONEXAOORIGINAL",$lcon); + } + else{ + $layer->set("connection",$postgis_mapa[$lcon]); + $layer->setmetadata("CONEXAOORIGINAL",$lcon); + } + } + } + } + } +} +?> \ No newline at end of file diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map index 15907d8..814f720 100755 --- a/temas/_lbiomashp.map +++ b/temas/_lbiomashp.map @@ -12,7 +12,7 @@ MAP "temporizador" "" "ITENSDESC" "Teste de acentuação" "iconetema" "" - "ESCALA" "1000000" + "ESCALA" "250000" "TILES" "SIM" "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909" "permitedownload" "SIM" -- libgit2 0.21.2