diff --git a/admin/admin.db b/admin/admin.db index 2211a99..aa404fb 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php index df75ea0..45f6b0a 100644 --- a/classesphp/classe_atributos.php +++ b/classesphp/classe_atributos.php @@ -127,7 +127,7 @@ class Atributos } if($this->mapa->getmetadata("interface") == "googlemaps"){ $this->projO = $this->mapa->getProjection(); - $this->mapa->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $this->mapa->setProjection(pegaProjecaoDefault("proj4")); } } } @@ -2382,7 +2382,7 @@ class Atributos } $conta = $conta + 1; } - + if($wkt == "sim"){ $arraytemp = array( "alias"=>"wkt", diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php index 3b908da..47f31ec 100644 --- a/classesphp/classe_mapa.php +++ b/classesphp/classe_mapa.php @@ -2214,10 +2214,10 @@ class Mapa function converteInterfacePara($interface){ if($interface == "openlayers"){ $prefixo = "ol"; - $this->mapa->setProjection("+proj=longlat +ellps=GRS67 +no_defs"); + $this->mapa->setProjection(pegaProjecaoDefault("proj4")); } - else - {$prefixo = "gm"; + else{ + $prefixo = "gm"; } foreach($this->layers as $l){ $opacidadeM = $l->getmetadata($prefixo."opacity"); diff --git a/classesphp/classe_selecao.php b/classesphp/classe_selecao.php index 14f4ef5..668e6e1 100644 --- a/classesphp/classe_selecao.php +++ b/classesphp/classe_selecao.php @@ -124,7 +124,7 @@ $ext - extensão geográfica do mapa } if($this->mapa->getmetadata("interface") == "googlemaps"){ $this->projO = $this->mapa->getProjection(); - $this->mapa->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $this->mapa->setProjection(pegaProjecaoDefault("proj4")); } } /* diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index 02d091a..48d9bca 100644 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -425,7 +425,7 @@ Calcula a extensão geográfica de um tema e ajusta o mapa para essa if(!$this->layer){return "erro";} if($this->mapa->getmetadata("interface") == "googlemaps"){ $projO = $this->mapa->getProjection(); - $this->mapa->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $this->mapa->setProjection(pegaProjecaoDefault("proj4")); } $prjMapa = ""; $prjTema = ""; @@ -829,7 +829,7 @@ $wkt - boolean indicando se $xy e um WKT $c = $shp->getCentroid(); $c = $c->x; if($c > -181 && $c < 181){ - $pinlayer->setprojection("proj=latlong,a=6378137,b=6378137"); + $pinlayer->setprojection(pegaProjecaoDefault("proj4")); } else{ $pinlayer->setprojection($this->mapa->getProjection()); diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index 288fa3d..9b3147d 100644 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -716,7 +716,7 @@ function retornaReferenciaDinamica($ext="",$w="",$h="") $i = $interface; } if($i == "googlemaps"){ - $objMapa->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $objMapa->setProjection(pegaProjecaoDefault("proj4")); } if($ext && $ext != ""){ $e = explode(" ",$ext); @@ -769,7 +769,7 @@ function retornaReferenciaDinamica($ext="",$w="",$h="") $s = "var refimagem='".$nomer."';var refwidth=".$w.";var refheight=".$h.";var refpath='".$objImagem->imagepath."';var refurl='".$objImagem->imageurl."'"; $mapa = ms_newMapObj($map_file); if($i == "googlemaps"){ - $mapa->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $mapa->setProjection(pegaProjecaoDefault("proj4")); } $ref = $mapa->reference; $r = $ref->extent; @@ -2873,7 +2873,7 @@ Se essa variavel nao existir, retorna o valor default baseado em EPSG:4326 Parametros: -tipo {string} - se for vazio retorna todos os elementos do array. Se nao for vazio, usa $tipo como +tipo {string} - se for vazio retorna todos os elementos do array. Se nao for vazio, usa $tipo como chave para retornar apenas o indice desejado (proj4, epsg, prj) Retorno: diff --git a/ferramentas/buscarapida/gadget.php b/ferramentas/buscarapida/gadget.php index 3fdbc9f..20865ef 100644 --- a/ferramentas/buscarapida/gadget.php +++ b/ferramentas/buscarapida/gadget.php @@ -1,9 +1,13 @@ Parâmetro &locaplic= não foi definido. 'locaplic' indica onde o i3geo está instalado";} +include_once(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); +$projecao = pegaProjecaoDefault("epsg"); +if(!isset($palavra)){ + echo "Parâmetro &palavra= não foi definido. 'palavra' é a palavra que será buscada"; +} +if(!isset($locaplic)){ + echo "
Parâmetro &locaplic= não foi definido. 'locaplic' indica onde o i3geo está instalado"; +} ?> @@ -22,7 +26,7 @@ i3GEObuscaRapida.idresultado var mapaLugar = function(wkt,layer,gid,nm) { var ext = i3GEO.util.wkt2ext(wkt,"polygon"); - var url = "/ms_criamapa.php?srs_wms=epsg:4618&image_wms=image/png&versao_wms=1.1.1" + var url = "/ms_criamapa.php?srs_wms=epsg:&image_wms=image/png&versao_wms=1.1.1" url += "&url_wms=http://mapas.mma.gov.br/webservices/geonameswms.php?gid="+gid+"&"; url += "&layer_wms="+layer+"&style_wms=default" url += "&nome_wms="+nm+" - "+layer diff --git a/ferramentas/congelamapa/openlayers.php b/ferramentas/congelamapa/openlayers.php index 4eb571d..0ae3abb 100644 --- a/ferramentas/congelamapa/openlayers.php +++ b/ferramentas/congelamapa/openlayers.php @@ -17,7 +17,7 @@ $novo_mapfile = $dir."/".nomeRandomico(5).$base; copy($map_file,$novo_mapfile); chmod($novo_mapfile,0777); $mapa = ms_newMapObj($novo_mapfile); -$mapa->setProjection("+proj=longlat +ellps=GRS67 +no_defs"); +$mapa->setProjection(pegaProjecaoDefault("proj4")); $numlayers = $mapa->numlayers; $layers = array(); for($i = 0;$i < $numlayers;++$i){ diff --git a/ferramentas/congelamapa/openlayers3.php b/ferramentas/congelamapa/openlayers3.php index 00b02af..7ac1c73 100644 --- a/ferramentas/congelamapa/openlayers3.php +++ b/ferramentas/congelamapa/openlayers3.php @@ -17,7 +17,7 @@ $novo_mapfile = $dir."/".nomeRandomico(5).$base; copy($map_file,$novo_mapfile); chmod($novo_mapfile,0777); $mapa = ms_newMapObj($novo_mapfile); -$mapa->setProjection("+proj=longlat +ellps=GRS67 +no_defs"); +$mapa->setProjection(pegaProjecaoDefault("proj4")); $numlayers = $mapa->numlayers; $layers = array(); for($i = 0;$i < $numlayers;++$i){ diff --git a/ferramentas/imprimir/a4lpaisagempdf.php b/ferramentas/imprimir/a4lpaisagempdf.php index 2c81d75..6b29606 100644 --- a/ferramentas/imprimir/a4lpaisagempdf.php +++ b/ferramentas/imprimir/a4lpaisagempdf.php @@ -42,9 +42,9 @@ $map->save($temp); substituiCon($temp,$postgis_mapa); $map = ms_newMapObj($temp); -if($map->getmetadata("interface") == "googlemaps") -{ - $map->setProjection("init=epsg:4618,a=6378137,b=6378137"); +if($map->getmetadata("interface") == "googlemaps"){ + $proj4 = pegaProjecaoDefault("proj4"); + $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); diff --git a/ferramentas/imprimir/aggpng.php b/ferramentas/imprimir/aggpng.php index 263553f..4ee1103 100644 --- a/ferramentas/imprimir/aggpng.php +++ b/ferramentas/imprimir/aggpng.php @@ -72,7 +72,8 @@ $of->set("imagemode","RGB"); $map = ms_newMapObj($temp); if($map->getmetadata("interface") == "googlemaps") { - $map->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $proj4 = pegaProjecaoDefault("proj4"); + $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); diff --git a/ferramentas/imprimir/geotif.php b/ferramentas/imprimir/geotif.php index 12fabc6..1f8f4b8 100644 --- a/ferramentas/imprimir/geotif.php +++ b/ferramentas/imprimir/geotif.php @@ -71,7 +71,8 @@ $of->set("imagemode","RGB"); $map = ms_newMapObj($temp); if($map->getmetadata("interface") == "googlemaps") { - $map->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $proj4 = pegaProjecaoDefault("proj4"); + $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); diff --git a/ferramentas/imprimir/jpeg.php b/ferramentas/imprimir/jpeg.php index f57d9bb..ea8b808 100755 --- a/ferramentas/imprimir/jpeg.php +++ b/ferramentas/imprimir/jpeg.php @@ -74,7 +74,8 @@ $of->set("mimetype","image/jpeg"); $of->set("extension","jpg"); if($map->getmetadata("interface") == "googlemaps") { - $map->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $proj4 = pegaProjecaoDefault("proj4"); + $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); diff --git a/ferramentas/imprimir/svg.php b/ferramentas/imprimir/svg.php index 22070de..d1872c0 100644 --- a/ferramentas/imprimir/svg.php +++ b/ferramentas/imprimir/svg.php @@ -69,7 +69,8 @@ substituiCon($temp,$postgis_mapa); $map = ms_newMapObj($temp); if($map->getmetadata("interface") == "googlemaps") { - $map->setProjection("init=epsg:4618,a=6378137,b=6378137"); + $proj4 = pegaProjecaoDefault("proj4"); + $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); diff --git a/ferramentas/parametrossql/ogc.php b/ferramentas/parametrossql/ogc.php index 1804ab8..6697217 100755 --- a/ferramentas/parametrossql/ogc.php +++ b/ferramentas/parametrossql/ogc.php @@ -12,6 +12,8 @@ require_once(dirname(__FILE__)."/../../classesphp/carrega_ext.php"); include(dirname(__FILE__)."/../../ms_configura.php"); include(dirname(__FILE__)."/../../classesphp/pega_variaveis.php"); include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); +$projDefault = pegaProjecaoDefault(); + $temas = $tema; if(isset($_GET["sld"]) || isset($_GET["filter"])){ $cache = false; @@ -40,7 +42,7 @@ if($_GET["SRS"] == "EPSG:900913"){ $req = ms_newowsrequestobj(); $_GET = array_merge($_GET,$_POST); if(!isset($_GET["srs"]) && !isset($_GET["SRS"])){ - $_GET["srs"] = "EPSG:4326"; + $_GET["srs"] = "EPSG:".$projDefault["epsg"]; } foreach ($_GET as $k=>$v){ $req->setParameter(strtoupper($k), $v); @@ -97,7 +99,7 @@ else{ $oMap->setmetadata("ows_enable_request","*"); //parametro mandatario if($oMap->getmetadata("wms_srs") == ""){ - $oMap->setmetadata("wms_srs","EPSG:4326"); + $oMap->setmetadata("wms_srs","EPSG:".$projDefault["epsg"]); } $e = $oMap->extent; @@ -310,7 +312,7 @@ if(isset($_GET["Z"]) && isset($_GET["X"])){ $x--; $y--; - $projInObj = ms_newprojectionobj("proj=latlong,a=6378137,b=6378137"); + $projInObj = ms_newprojectionobj($projDefault["proj4"]); $projOutObj = ms_newprojectionobj("proj=merc,a=6378137,b=6378137,lat_ts=0.0,lon_0=0.0,x_0=0.0,y_0=0,k=1.0,units=m"); $poPoint1 = ms_newpointobj(); @@ -324,7 +326,7 @@ if(isset($_GET["Z"]) && isset($_GET["X"])){ $oMap->getlayer(0)->set("status",MS_DEFAULT); $oMap->setProjection("proj=merc,a=6378137,b=6378137,lat_ts=0.0,lon_0=0.0,x_0=0.0,y_0=0,k=1.0,units=m"); - $layer0->setProjection("proj=latlong,a=6378137,b=6378137"); + $layer0->setProjection($projDefault["proj4"]); // //se o layer foi marcado para corte altera os parametros para ampliar o mapa //antes de gerar a imagem @@ -401,7 +403,7 @@ if(strtolower($req->getValueByName("REQUEST")) == "getfeature"){ $req->setParameter("TYPENAME",$l->name); } if($l->getProjection() == "" ){ - $l->setProjection("proj=latlong,a=6378137,b=6378137"); + $l->setProjection($projDefault["proj4"]); } if(strtolower($req->getValueByName("SRS")) == "epsg:900913"){ $req->setParameter("SRS","EPSG:3857"); diff --git a/ferramentas/telaremota/openlayers1.php b/ferramentas/telaremota/openlayers1.php index 9446333..67c8cce 100644 --- a/ferramentas/telaremota/openlayers1.php +++ b/ferramentas/telaremota/openlayers1.php @@ -119,7 +119,7 @@ function inicia(){ OpenLayers.ImgPath = "../../pacotes/openlayers/img/" OpenLayers.Lang.setCode("pt-BR"); var urlLayer = "../../classesphp/mapa_openlayers.php?DESLIGACACHE=sim&g_sid=&telaR="; - + var remoto = new OpenLayers.Layer.WMS( "Remoto", urlLayer, @@ -168,7 +168,7 @@ function inicia(){ "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map", { layers : "baseraster", - srs : "EPSG:4618", + srs : "EPSG:4326", format : "image/png", isBaseLayer : false }, { diff --git a/ferramentas/wkt2layer/exec.php b/ferramentas/wkt2layer/exec.php index fd9b008..6db49a3 100755 --- a/ferramentas/wkt2layer/exec.php +++ b/ferramentas/wkt2layer/exec.php @@ -45,7 +45,7 @@ Insere elementos no mapa como um layer do tipo feature baseado em wkt $c = $shp->getCentroid(); $c = $c->x; if($c > -181 && $c < 181){ - $l->setprojection("proj=latlong,a=6378137,b=6378137"); + $l->setprojection(pegaProjecaoDefault("proj4")); } else{ $l->setprojection($this->mapa->getProjection()); diff --git a/ogc.htm b/ogc.htm index bcc7da4..ca95368 100644 --- a/ogc.htm +++ b/ogc.htm @@ -199,6 +199,8 @@ A:hover { ins += "

testar getmap"; ins += + "

testar getLegendGraphic"; + ins += "

visualizar com openLayers"; ins += "

download shapefile via WFS"; diff --git a/ogc.php b/ogc.php index 55e5bba..28f0610 100644 --- a/ogc.php +++ b/ogc.php @@ -212,7 +212,7 @@ if(!empty($restauramapa)){ //para operar como o Geoserver, abre o openlayers // if(isset($format) && strtolower($format) == "application/openlayers"){ - $urln = dirname($_SERVER["PHP_SELF"])."/mashups/openlayers.php?layers=".$layers."&mapext=".$bbox."&botoes=pan,zoombox,zoomtot,identifica"; + $urln = dirname($_SERVER["PHP_SELF"])."/mashups/openlayers.php?layers=".$layers."&mapext=".$bbox."&botoes=pan,zoombox,zoomtot,identifica,legenda"; //echo $urln;exit; if(!headers_sent()){ header("Location:".$urln); @@ -752,11 +752,11 @@ if(isset($_GET["Z"]) && isset($_GET["X"])){ $x = $_GET["X"]; $y = $_GET["Y"]; $z = $_GET["Z"]; - + $proj4 = pegaProjecaoDefault("proj4"); if(file_exists($tema)){ $layer0 = $oMap->getlayer(0); $layer0->set("status",MS_DEFAULT); - $layer0->setProjection("proj=latlong,a=6378137,b=6378137"); + $layer0->setProjection($proj4); } else{ //pode ter mais de um tema @@ -764,7 +764,7 @@ if(isset($_GET["Z"]) && isset($_GET["X"])){ foreach($lista as $nomeLayer){ $layer0 = $oMap->getlayerbyname($nomeLayer); $layer0->set("status",MS_DEFAULT); - $layer0->setProjection("proj=latlong,a=6378137,b=6378137"); + $layer0->setProjection($proj4); } } // @@ -880,7 +880,7 @@ if(strtolower($req->getValueByName("REQUEST")) == "getfeature"){ $req->setParameter("TYPENAME",$l->name); } if($l->getProjection() == "" ){ - $l->setProjection("proj=latlong,a=6378137,b=6378137"); + $l->setProjection(pegaProjecaoDefault("proj4")); } if(strtolower($req->getValueByName("SRS")) == "epsg:900913"){ $req->setParameter("SRS","EPSG:3857"); diff --git a/pacotes/kmlmapserver/classes/layerserver.class.php b/pacotes/kmlmapserver/classes/layerserver.class.php index a13e160..05577a7 100644 --- a/pacotes/kmlmapserver/classes/layerserver.class.php +++ b/pacotes/kmlmapserver/classes/layerserver.class.php @@ -157,7 +157,6 @@ class LayerServer { } else { $this->_networklink = false; } - $imageObj = $this->map_object->drawlegend(); $url = $imageObj->saveWebImage(); $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); -- libgit2 0.21.2