Download as
Browse Code »

Commit 64824b26b5bd3a706b4041c60f93e7a210039fb4

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

Correção no ajuste de posicionamento das camadas adicionadas ao mapa

Showing 15 changed files with 23 additions and 40 deletions   Show diff stats
admin/admin.db
View file @64824b2
No preview for this file type
aplicmap/3dmap.map
  Diff comments   View file @64824b2
@@ -5,7 +5,7 @@ LAYER @@ -5,7 +5,7 @@ LAYER
5 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/3dmap.map&" 5 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/3dmap.map&"
6 CONNECTIONTYPE WMS 6 CONNECTIONTYPE WMS
7 METADATA 7 METADATA
8 - "wms_srs" "EPSG:4618" 8 + "wms_srs" "EPSG:4291"
9 "wms_exceptions_format" "application/vnd.ogc.se_xml" 9 "wms_exceptions_format" "application/vnd.ogc.se_xml"
10 "wms_name" "srtmcinza" 10 "wms_name" "srtmcinza"
11 "nomeoriginal" "srtmcinza" 11 "nomeoriginal" "srtmcinza"
aplicmap/geral1.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
aplicmap/geral1debian.map
  Diff comments   View file @64824b2
@@ -269,7 +269,7 @@ MAP @@ -269,7 +269,7 @@ MAP
269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" 269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map"
270 CONNECTIONTYPE WMS 270 CONNECTIONTYPE WMS
271 METADATA 271 METADATA
272 - "wms_srs" "EPSG:4618" 272 + "wms_srs" "EPSG:4291"
273 "tipooriginal" "" 273 "tipooriginal" ""
274 "wms_exceptions_format" "application/vnd.ogc.se_xml" 274 "wms_exceptions_format" "application/vnd.ogc.se_xml"
275 "CLASSE" "SIM" 275 "CLASSE" "SIM"
aplicmap/geral1debianv5.map
  Diff comments   View file @64824b2
@@ -269,7 +269,7 @@ MAP @@ -269,7 +269,7 @@ MAP
269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" 269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map"
270 CONNECTIONTYPE WMS 270 CONNECTIONTYPE WMS
271 METADATA 271 METADATA
272 - "wms_srs" "EPSG:4618" 272 + "wms_srs" "EPSG:4291"
273 "tipooriginal" "" 273 "tipooriginal" ""
274 "wms_exceptions_format" "application/vnd.ogc.se_xml" 274 "wms_exceptions_format" "application/vnd.ogc.se_xml"
275 "CLASSE" "SIM" 275 "CLASSE" "SIM"
aplicmap/geral1debianv6.map
  Diff comments   View file @64824b2
@@ -268,7 +268,7 @@ MAP @@ -268,7 +268,7 @@ MAP
268 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map" 268 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/webservices/baseraster.map"
269 CONNECTIONTYPE WMS 269 CONNECTIONTYPE WMS
270 METADATA 270 METADATA
271 - "wms_srs" "EPSG:4618" 271 + "wms_srs" "EPSG:4291"
272 "tipooriginal" "" 272 "tipooriginal" ""
273 "wms_exceptions_format" "application/vnd.ogc.se_xml" 273 "wms_exceptions_format" "application/vnd.ogc.se_xml"
274 "CLASSE" "SIM" 274 "CLASSE" "SIM"
aplicmap/geral1fedorav5.map
  Diff comments   View file @64824b2
@@ -269,7 +269,7 @@ MAP @@ -269,7 +269,7 @@ MAP
269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map" 269 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map"
270 CONNECTIONTYPE WMS 270 CONNECTIONTYPE WMS
271 METADATA 271 METADATA
272 - "wms_srs" "EPSG:4618" 272 + "wms_srs" "EPSG:4291"
273 "tipooriginal" "" 273 "tipooriginal" ""
274 "wms_exceptions_format" "application/vnd.ogc.se_xml" 274 "wms_exceptions_format" "application/vnd.ogc.se_xml"
275 "CLASSE" "SIM" 275 "CLASSE" "SIM"
aplicmap/geral1fedorav6.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/var/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
aplicmap/geral1v5.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
aplicmap/geral1v6.map
  Diff comments   View file @64824b2
@@ -262,7 +262,7 @@ MAP @@ -262,7 +262,7 @@ MAP
262 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 262 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
263 CONNECTIONTYPE WMS 263 CONNECTIONTYPE WMS
264 METADATA 264 METADATA
265 - "wms_srs" "EPSG:4618" 265 + "wms_srs" "EPSG:4291"
266 "tipooriginal" "" 266 "tipooriginal" ""
267 "wms_exceptions_format" "application/vnd.ogc.se_xml" 267 "wms_exceptions_format" "application/vnd.ogc.se_xml"
268 "CLASSE" "SIM" 268 "CLASSE" "SIM"
aplicmap/geral1windows.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
aplicmap/geral1windowsv5.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
aplicmap/geral1windowsv6.map
  Diff comments   View file @64824b2
@@ -267,7 +267,7 @@ MAP @@ -267,7 +267,7 @@ MAP
267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map" 267 CONNECTION "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map"
268 CONNECTIONTYPE WMS 268 CONNECTIONTYPE WMS
269 METADATA 269 METADATA
270 - "wms_srs" "EPSG:4618" 270 + "wms_srs" "EPSG:4291"
271 "tipooriginal" "" 271 "tipooriginal" ""
272 "wms_exceptions_format" "application/vnd.ogc.se_xml" 272 "wms_exceptions_format" "application/vnd.ogc.se_xml"
273 "CLASSE" "SIM" 273 "CLASSE" "SIM"
classesphp/classe_mapa.php
  Diff comments   View file @64824b2
@@ -933,8 +933,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao @@ -933,8 +933,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao
933 function adicionaTema($temas,$locaplic,$random="sim") 933 function adicionaTema($temas,$locaplic,$random="sim")
934 { 934 {
935 //limpa selecao 935 //limpa selecao
936 - if (file_exists($this->qyfile))  
937 - {unlink ($this->qyfile);}  
938 $temas = explode(",",$temas); 936 $temas = explode(",",$temas);
939 $zoomlayer = ""; 937 $zoomlayer = "";
940 foreach ($temas as $nome) 938 foreach ($temas as $nome)
@@ -970,28 +968,14 @@ $random - indica se os nomes dos novos layers serão modificados ou nao @@ -970,28 +968,14 @@ $random - indica se os nomes dos novos layers serão modificados ou nao
970 $random == "sim" ? $nomeunico[$n] = nomeRandomico() : $nomeunico[$n] = $n; 968 $random == "sim" ? $nomeunico[$n] = nomeRandomico() : $nomeunico[$n] = $n;
971 } 969 }
972 //altera os temas para incluir o nome unico 970 //altera os temas para incluir o nome unico
973 - include_once($locaplic."/classesphp/funcoes_gerais.php"); 971 + //include_once($locaplic."/classesphp/funcoes_gerais.php");
974 foreach ($novosnomes as $n) 972 foreach ($novosnomes as $n)
975 { 973 {
976 $nlayer = $nmap->getlayerbyname($n); 974 $nlayer = $nmap->getlayerbyname($n);
977 - if(function_exists("autoClasses"))  
978 //para impedir erros na legenda 975 //para impedir erros na legenda
979 if($nlayer->getmetadata("classe") == "") 976 if($nlayer->getmetadata("classe") == "")
980 {$nlayer->setmetadata("classe","");} 977 {$nlayer->setmetadata("classe","");}
981 autoClasses($nlayer,$this->mapa); 978 autoClasses($nlayer,$this->mapa);
982 - //  
983 - //cria as classes com base em atributos  
984 - //  
985 - //  
986 - //muda para RGB para melhorar o desenho da imagem raster  
987 - //  
988 - /*  
989 - if($nlayer->type == MS_LAYER_RASTER)  
990 - {  
991 - $of = $this->mapa->outputformat;  
992 - $of->set("imagemode",MS_IMAGEMODE_RGB);  
993 - }  
994 - */  
995 $nlayer->set("status",MS_DEFAULT); 979 $nlayer->set("status",MS_DEFAULT);
996 $nlayer->setmetadata("nomeoriginal",$nlayer->name); 980 $nlayer->setmetadata("nomeoriginal",$nlayer->name);
997 $nlayer->set("name",$nomeunico[$n]); 981 $nlayer->set("name",$nomeunico[$n]);
@@ -1022,11 +1006,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao @@ -1022,11 +1006,6 @@ $random - indica se os nomes dos novos layers serão modificados ou nao
1022 } 1006 }
1023 ms_newLayerObj($this->mapa, $nlayer); 1007 ms_newLayerObj($this->mapa, $nlayer);
1024 $l = $this->mapa->getlayerbyname($nlayer->name); 1008 $l = $this->mapa->getlayerbyname($nlayer->name);
1025 - //  
1026 - //verifica se deve ser feito o zoom para o tema  
1027 - //  
1028 - //if(strtolower($l->getmetadata("aplicaextensao")) == "sim")  
1029 - //{$zoomlayer = $nlayer->name;}  
1030 //reposiciona o layer se for o caso 1009 //reposiciona o layer se for o caso
1031 if ($l->group == "") 1010 if ($l->group == "")
1032 { 1011 {
@@ -1043,11 +1022,15 @@ $random - indica se os nomes dos novos layers serão modificados ou nao @@ -1043,11 +1022,15 @@ $random - indica se os nomes dos novos layers serão modificados ou nao
1043 if (($tipo != 2) && ($tipo != 3)) 1022 if (($tipo != 2) && ($tipo != 3))
1044 {$nummove++;} 1023 {$nummove++;}
1045 } 1024 }
1046 - if ($nummove > 2)  
1047 - {  
1048 - for ($i=0;$i<=($nummove - 3);++$i)  
1049 - {$this->mapa->movelayerup($indicel);}  
1050 - } 1025 + //echo $nummove;exit;
  1026 + //if ($nummove > 2)
  1027 + //{
  1028 + for ($i=0;$i<($nummove);++$i)
  1029 + {
  1030 + $indicel = $l->index;
  1031 + $this->mapa->movelayerup($indicel);
  1032 + }
  1033 + //}
1051 } 1034 }
1052 } 1035 }
1053 } 1036 }
temas/biomashp.map
  Diff comments   View file @64824b2
@@ -5,7 +5,7 @@ MAP @@ -5,7 +5,7 @@ MAP
5 CONNECTION "" 5 CONNECTION ""
6 DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp" 6 DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp"
7 FOOTER "teste.htm" 7 FOOTER "teste.htm"
8 - GROUP "biomashp" 8 + #GROUP "biomashp"
9 HEADER "teste.htm" 9 HEADER "teste.htm"
10 METADATA 10 METADATA
11 "ltempoitemimagem" "" 11 "ltempoitemimagem" ""