From 33d9513680e9f8a3132d27f78c1b179c7f9ee657 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sat, 6 Aug 2016 22:39:12 -0300 Subject: [PATCH] Correção na geração de mapfiles --- admin/admin.db | Bin 340992 -> 0 bytes classesphp/atlas_controle.php | 2 ++ classesphp/classe_alteraclasse.php | 2 ++ classesphp/classe_analise.php | 2 ++ classesphp/classe_atributos.php | 2 ++ classesphp/classe_escala.php | 5 +++-- classesphp/classe_legenda.php | 5 ++--- classesphp/classe_mapa.php | 36 ++---------------------------------- classesphp/classe_navegacao.php | 3 ++- classesphp/classe_selecao.php | 3 ++- classesphp/classe_shp.php | 5 ++--- classesphp/classe_temas.php | 5 +++-- classesphp/classe_toponimia.php | 5 +++-- classesphp/funcoes_gerais.php | 2 ++ classesphp/mapa_googleearth.php | 9 --------- json.php | 6 +++--- testamapfile.php | 2 ++ 17 files changed, 34 insertions(+), 60 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index e42f2c4..805c06f 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/classesphp/atlas_controle.php b/classesphp/atlas_controle.php index d36cf73..c152af5 100755 --- a/classesphp/atlas_controle.php +++ b/classesphp/atlas_controle.php @@ -221,5 +221,7 @@ function gravaid() } $tmpfname = str_replace(".map","",$tmpfname).".map"; $m->save($tmpfname); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($tmpfname,$postgis_mapa); } ?> \ No newline at end of file diff --git a/classesphp/classe_alteraclasse.php b/classesphp/classe_alteraclasse.php index 4dadec0..f802bf2 100755 --- a/classesphp/classe_alteraclasse.php +++ b/classesphp/classe_alteraclasse.php @@ -103,6 +103,8 @@ class Alteraclasse exit(); } $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* Function: aplicacoresrgb diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php index ca22597..0f0223b 100755 --- a/classesphp/classe_analise.php +++ b/classesphp/classe_analise.php @@ -184,6 +184,8 @@ class Analise exit(); } $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php index a94029c..23de19e 100755 --- a/classesphp/classe_atributos.php +++ b/classesphp/classe_atributos.php @@ -147,6 +147,8 @@ class Atributos $this->mapa->setProjection($this->projO); } $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* diff --git a/classesphp/classe_escala.php b/classesphp/classe_escala.php index e75585e..d457820 100755 --- a/classesphp/classe_escala.php +++ b/classesphp/classe_escala.php @@ -87,8 +87,9 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){exit();} - $this->mapa->save($this->arquivo); + $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* diff --git a/classesphp/classe_legenda.php b/classesphp/classe_legenda.php index c174623..4e668e2 100755 --- a/classesphp/classe_legenda.php +++ b/classesphp/classe_legenda.php @@ -174,11 +174,10 @@ class Legenda */ function salva() { - if (connection_aborted()){ - exit(); - } $this->recalculaSLD(); $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: recalculaSLD diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php index 86cc303..b78c9eb 100755 --- a/classesphp/classe_mapa.php +++ b/classesphp/classe_mapa.php @@ -121,10 +121,9 @@ class Mapa */ function salva() { - if(connection_aborted()){ - exit(); - } $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* Method: listaTemasBuscaRapida @@ -1728,38 +1727,7 @@ class Mapa */ function converteWS($locaplic,$h) { - //$nomews = str_replace(".map","ws.map",$this->arquivo); $nomeurl = "/ogc.php?tema=".$this->arquivo; - /* - $w = $this->mapa->web; - $w->set("template",""); - //adiciona os parametros no nivel do mapa - $this->mapa->setmetadata("wms_title","I3Geo"); - $this->mapa->setmetadata("wms_onlineresource","http://".$h.$nomeurl); - $this->mapa->setmetadata("wms_srs","EPSG:4291"); - $this->mapa->setmetadata("ows_enable_request","*"); - //$this->mapa->setmetadata("wms_getcontext_enabled","1"); - foreach ($this->layers as $layer) - { - $n = pegaNome($layer); - $layer->setmetadata("wms_title",$n); - $layer->setmetadata("wms_name",$n); - $layer->setmetadata("wms_srs","EPSG:4291 EPSG:4326"); - //$layer->setmetadata("wms_getcontext_enabled","1"); - $layer->setmetadata("WMS_INCLUDE_ITEMS","all"); - //$layer->setmetadata("wms_onlineresource","http://".$h.$nomeurl); - $layer->set("status","ON"); - $layer->set("template","none.htm"); - $layer->setmetadata("gml_include_items","all"); - $layer->set("dump",MS_TRUE); - $c = $layer->getclass(0); - if ($c->name == "") - {$c->name = " ";} - } - $eb = $this->mapa->scalebar; - $eb->set("status",MS_OFF); - $this->mapa->save($nomews); - */ return($nomeurl); } /* diff --git a/classesphp/classe_navegacao.php b/classesphp/classe_navegacao.php index 52563a9..86b9dc6 100755 --- a/classesphp/classe_navegacao.php +++ b/classesphp/classe_navegacao.php @@ -78,8 +78,9 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){exit();} $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: gravaImagemCorpo (depreciado) diff --git a/classesphp/classe_selecao.php b/classesphp/classe_selecao.php index 6486f5d..b51c828 100755 --- a/classesphp/classe_selecao.php +++ b/classesphp/classe_selecao.php @@ -136,10 +136,11 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){exit();} if($this->mapa->getmetadata("interface") == "googlemaps") {$this->mapa->setProjection($this->projO);} $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: nSel diff --git a/classesphp/classe_shp.php b/classesphp/classe_shp.php index f996c18..b10d0d9 100755 --- a/classesphp/classe_shp.php +++ b/classesphp/classe_shp.php @@ -127,10 +127,9 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){ - exit(); - } $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: criaSHPvazio diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index 4fe5124..39b129b 100755 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -170,8 +170,9 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){exit();} - $this->mapa->save($this->arquivo); + $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: pegaMetadata diff --git a/classesphp/classe_toponimia.php b/classesphp/classe_toponimia.php index f36cbc6..e8c2a5b 100755 --- a/classesphp/classe_toponimia.php +++ b/classesphp/classe_toponimia.php @@ -112,8 +112,9 @@ Salva o mapfile atual */ function salva() { - if (connection_aborted()){exit();} - $this->mapa->save($this->arquivo); + $this->mapa->save($this->arquivo); + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($this->arquivo,$postgis_mapa); } /* function: criaToponimia diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index 8456f5d..0e250a7 100755 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -310,6 +310,8 @@ $map_file {string} - Arquivo map file. */ function copiaSeguranca($map_file) { + include(dirname(__FILE__)."/../ms_configura.php"); + restauraCon($map_file,$postgis_mapa); if (file_exists($map_file)) { if ($objMapa = @ms_newMapObj($map_file)) diff --git a/classesphp/mapa_googleearth.php b/classesphp/mapa_googleearth.php index 710a83f..d96d390 100755 --- a/classesphp/mapa_googleearth.php +++ b/classesphp/mapa_googleearth.php @@ -272,15 +272,6 @@ function retornaWms($map_fileX,$postgis_mapa){ echo header("Content-type: image/png \n\n"); imagepng($img); } - /* - $n = " "; - foreach(array_keys($_GET) as $s){ - $n .= " key ".$s." and value ".$_GET[$s]; - } - $l = $mapa->getlayerbyname("zee"); - $l->setmetadata("str",$n); - $mapa->save($_GET["map"]); - */ } function nomeRandomico($n=10) diff --git a/json.php b/json.php index 79779a1..2edb89e 100755 --- a/json.php +++ b/json.php @@ -126,7 +126,7 @@ autoClasses($l,$oMap); ms_newLayerObj($oMap, $l); $oMap->save($nomeMapfileTmp); - +restauraCon($nomeMapfileTmp,$postgis_mapa); validaAcessoTemas($nomeMapfileTmp,true); $oMap = ms_newMapobj($nomeMapfileTmp); @@ -312,10 +312,10 @@ function storymap($par){ ); $contents = json_encode($j); - + $contents = json_decode($contents); $contents = json_encode($contents); - + file_put_contents($nomeArq.".json",$contents); //envia diff --git a/testamapfile.php b/testamapfile.php index 5f604a9..e928b80 100755 --- a/testamapfile.php +++ b/testamapfile.php @@ -387,6 +387,7 @@ function verifica($map,$solegenda,$tabela,$cache="sim"){ if(isset($tabela)){ include("classesphp/classe_atributos.php"); $t = new Atributos($destino,$map); + restauraCon($destino,$postgis_mapa); $r = $t->itensTexto(); $colunas = explode(";",$r["itens"]); $ncolunas = count($colunas); @@ -428,6 +429,7 @@ function verifica($map,$solegenda,$tabela,$cache="sim"){ } else{ $mapa = ms_newMapObj($destino); + restauraCon($destino,$postgis_mapa); $objImagem = @$mapa->draw(); //corrige o titulo da legenda $numlayers = $mapa->numlayers; -- libgit2 0.21.2