From 64824b26b5bd3a706b4041c60f93e7a210039fb4 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 8 Feb 2012 00:57:08 +0000 Subject: [PATCH] Correção no ajuste de posicionamento das camadas adicionadas ao mapa --- admin/admin.db | Bin 75776 -> 0 bytes aplicmap/3dmap.map | 2 +- aplicmap/geral1.map | 2 +- aplicmap/geral1debian.map | 2 +- aplicmap/geral1debianv5.map | 2 +- aplicmap/geral1debianv6.map | 2 +- aplicmap/geral1fedorav5.map | 2 +- aplicmap/geral1fedorav6.map | 2 +- aplicmap/geral1v5.map | 2 +- aplicmap/geral1v6.map | 2 +- aplicmap/geral1windows.map | 2 +- aplicmap/geral1windowsv5.map | 2 +- aplicmap/geral1windowsv6.map | 2 +- classesphp/classe_mapa.php | 37 ++++++++++--------------------------- temas/biomashp.map | 2 +- 15 files changed, 23 insertions(+), 40 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index 2224cc8..14951be 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/aplicmap/3dmap.map b/aplicmap/3dmap.map index 3972d98..1cdf1cf 100644 --- a/aplicmap/3dmap.map +++ b/aplicmap/3dmap.map @@ -5,7 +5,7 @@ LAYER CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/3dmap.map&" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "wms_exceptions_format" "application/vnd.ogc.se_xml" "wms_name" "srtmcinza" "nomeoriginal" "srtmcinza" diff --git a/aplicmap/geral1.map b/aplicmap/geral1.map index 72bce66..70a12b2 100644 --- a/aplicmap/geral1.map +++ b/aplicmap/geral1.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1debian.map b/aplicmap/geral1debian.map index 1ddb3d4..5d73559 100644 --- a/aplicmap/geral1debian.map +++ b/aplicmap/geral1debian.map @@ -269,7 +269,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1debianv5.map b/aplicmap/geral1debianv5.map index 9b26ab1..1b75f86 100644 --- a/aplicmap/geral1debianv5.map +++ b/aplicmap/geral1debianv5.map @@ -269,7 +269,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1debianv6.map b/aplicmap/geral1debianv6.map index 773ec75..5078346 100644 --- a/aplicmap/geral1debianv6.map +++ b/aplicmap/geral1debianv6.map @@ -268,7 +268,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1fedorav5.map b/aplicmap/geral1fedorav5.map index fcd15c0..0e0316d 100644 --- a/aplicmap/geral1fedorav5.map +++ b/aplicmap/geral1fedorav5.map @@ -269,7 +269,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1fedorav6.map b/aplicmap/geral1fedorav6.map index 02e5c41..9288c98 100644 --- a/aplicmap/geral1fedorav6.map +++ b/aplicmap/geral1fedorav6.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1v5.map b/aplicmap/geral1v5.map index 68b630b..83affeb 100644 --- a/aplicmap/geral1v5.map +++ b/aplicmap/geral1v5.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1v6.map b/aplicmap/geral1v6.map index 3f77f7c..f804806 100644 --- a/aplicmap/geral1v6.map +++ b/aplicmap/geral1v6.map @@ -262,7 +262,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1windows.map b/aplicmap/geral1windows.map index edf9fca..405bb35 100644 --- a/aplicmap/geral1windows.map +++ b/aplicmap/geral1windows.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1windowsv5.map b/aplicmap/geral1windowsv5.map index edeaaae..9061299 100644 --- a/aplicmap/geral1windowsv5.map +++ b/aplicmap/geral1windowsv5.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/aplicmap/geral1windowsv6.map b/aplicmap/geral1windowsv6.map index ecebade..3d950ad 100644 --- a/aplicmap/geral1windowsv6.map +++ b/aplicmap/geral1windowsv6.map @@ -267,7 +267,7 @@ MAP CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" CONNECTIONTYPE WMS METADATA - "wms_srs" "EPSG:4618" + "wms_srs" "EPSG:4291" "tipooriginal" "" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php index 7273728..e2792c0 100644 --- a/classesphp/classe_mapa.php +++ b/classesphp/classe_mapa.php @@ -933,8 +933,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao function adicionaTema($temas,$locaplic,$random="sim") { //limpa selecao - if (file_exists($this->qyfile)) - {unlink ($this->qyfile);} $temas = explode(",",$temas); $zoomlayer = ""; foreach ($temas as $nome) @@ -970,28 +968,14 @@ $random - indica se os nomes dos novos layers serão modificados ou nao $random == "sim" ? $nomeunico[$n] = nomeRandomico() : $nomeunico[$n] = $n; } //altera os temas para incluir o nome unico - include_once($locaplic."/classesphp/funcoes_gerais.php"); + //include_once($locaplic."/classesphp/funcoes_gerais.php"); foreach ($novosnomes as $n) { $nlayer = $nmap->getlayerbyname($n); - if(function_exists("autoClasses")) //para impedir erros na legenda if($nlayer->getmetadata("classe") == "") {$nlayer->setmetadata("classe","");} autoClasses($nlayer,$this->mapa); - // - //cria as classes com base em atributos - // - // - //muda para RGB para melhorar o desenho da imagem raster - // - /* - if($nlayer->type == MS_LAYER_RASTER) - { - $of = $this->mapa->outputformat; - $of->set("imagemode",MS_IMAGEMODE_RGB); - } - */ $nlayer->set("status",MS_DEFAULT); $nlayer->setmetadata("nomeoriginal",$nlayer->name); $nlayer->set("name",$nomeunico[$n]); @@ -1022,11 +1006,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao } ms_newLayerObj($this->mapa, $nlayer); $l = $this->mapa->getlayerbyname($nlayer->name); - // - //verifica se deve ser feito o zoom para o tema - // - //if(strtolower($l->getmetadata("aplicaextensao")) == "sim") - //{$zoomlayer = $nlayer->name;} //reposiciona o layer se for o caso if ($l->group == "") { @@ -1043,11 +1022,15 @@ $random - indica se os nomes dos novos layers serão modificados ou nao if (($tipo != 2) && ($tipo != 3)) {$nummove++;} } - if ($nummove > 2) - { - for ($i=0;$i<=($nummove - 3);++$i) - {$this->mapa->movelayerup($indicel);} - } + //echo $nummove;exit; + //if ($nummove > 2) + //{ + for ($i=0;$i<($nummove);++$i) + { + $indicel = $l->index; + $this->mapa->movelayerup($indicel); + } + //} } } } diff --git a/temas/biomashp.map b/temas/biomashp.map index 7d3cc43..03075d6 100644 --- a/temas/biomashp.map +++ b/temas/biomashp.map @@ -5,7 +5,7 @@ MAP CONNECTION "" DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp" FOOTER "teste.htm" - GROUP "biomashp" + #GROUP "biomashp" HEADER "teste.htm" METADATA "ltempoitemimagem" "" -- libgit2 0.21.2