From 103aac6c50632b9a61465ffdae8b256a52333b3c Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 1 Feb 2012 01:09:00 +0000 Subject: [PATCH] --- admin/admin.db | Bin 75776 -> 0 bytes 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 | 4 +--- aplicmap/geral1windows.map | 2 +- aplicmap/geral1windowsv5.map | 2 +- aplicmap/geral1windowsv6.map | 2 +- aplicmap/ogcws.map | 2 +- aplicmap/ogcwsv5.map | 2 +- aplicmap/ogcwsv6.map | 2 +- ms_criamapa.php | 14 ++++++-------- ogc.php | 6 +++--- 17 files changed, 23 insertions(+), 27 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index ef0e6bb..c3bee4b 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/aplicmap/geral1.map b/aplicmap/geral1.map index 5054580..70a12b2 100644 --- a/aplicmap/geral1.map +++ b/aplicmap/geral1.map @@ -85,7 +85,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1debian.map b/aplicmap/geral1debian.map index 699ebd7..5d73559 100644 --- a/aplicmap/geral1debian.map +++ b/aplicmap/geral1debian.map @@ -86,7 +86,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1debianv5.map b/aplicmap/geral1debianv5.map index e289804..1b75f86 100644 --- a/aplicmap/geral1debianv5.map +++ b/aplicmap/geral1debianv5.map @@ -86,7 +86,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1debianv6.map b/aplicmap/geral1debianv6.map index 93e446a..5078346 100644 --- a/aplicmap/geral1debianv6.map +++ b/aplicmap/geral1debianv6.map @@ -85,7 +85,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1fedorav5.map b/aplicmap/geral1fedorav5.map index 026d570..0e0316d 100644 --- a/aplicmap/geral1fedorav5.map +++ b/aplicmap/geral1fedorav5.map @@ -86,7 +86,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1fedorav6.map b/aplicmap/geral1fedorav6.map index 2c6af59..9288c98 100644 --- a/aplicmap/geral1fedorav6.map +++ b/aplicmap/geral1fedorav6.map @@ -85,7 +85,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1v5.map b/aplicmap/geral1v5.map index 4a1d08d..83affeb 100644 --- a/aplicmap/geral1v5.map +++ b/aplicmap/geral1v5.map @@ -85,7 +85,7 @@ MAP PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1v6.map b/aplicmap/geral1v6.map index 97758be..f804806 100644 --- a/aplicmap/geral1v6.map +++ b/aplicmap/geral1v6.map @@ -80,10 +80,8 @@ MAP TRANSPARENT TRUE FORMATOPTION "INTERLACE=OFF" END - - PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1windows.map b/aplicmap/geral1windows.map index 193a5ac..405bb35 100644 --- a/aplicmap/geral1windows.map +++ b/aplicmap/geral1windows.map @@ -79,7 +79,7 @@ MAP END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1windowsv5.map b/aplicmap/geral1windowsv5.map index 790cce4..9061299 100644 --- a/aplicmap/geral1windowsv5.map +++ b/aplicmap/geral1windowsv5.map @@ -79,7 +79,7 @@ MAP END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/geral1windowsv6.map b/aplicmap/geral1windowsv6.map index bd54813..3d950ad 100644 --- a/aplicmap/geral1windowsv6.map +++ b/aplicmap/geral1windowsv6.map @@ -80,7 +80,7 @@ MAP END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/ogcws.map b/aplicmap/ogcws.map index ba44303..23d75ff 100644 --- a/aplicmap/ogcws.map +++ b/aplicmap/ogcws.map @@ -23,7 +23,7 @@ MAP END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/ogcwsv5.map b/aplicmap/ogcwsv5.map index 5e6ae84..da7ebaf 100644 --- a/aplicmap/ogcwsv5.map +++ b/aplicmap/ogcwsv5.map @@ -25,7 +25,7 @@ MAP TRANSPARENT TRUE END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/aplicmap/ogcwsv6.map b/aplicmap/ogcwsv6.map index 62b9f97..1e0e8ce 100644 --- a/aplicmap/ogcwsv6.map +++ b/aplicmap/ogcwsv6.map @@ -26,7 +26,7 @@ MAP TRANSPARENT TRUE END PROJECTION - "init=epsg:4291" + "+proj=longlat +ellps=GRS67 +no_defs" END LEGEND IMAGECOLOR 255 255 255 diff --git a/ms_criamapa.php b/ms_criamapa.php index e67c299..7468f68 100644 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -142,6 +142,10 @@ require_once ($caminho."classesphp/carrega_ext.php"); // //quando $funcao existe, é pq o ms_criamapa.php está sendo utilizado como um include em classesphp/mapa_controle.php // +if (!isset($_GET["debug"])) +{error_reporting(0);$debug="nao";} +else +{error_reporting(E_ALL);$debug="sim";} if(!isset($funcao)) {ob_end_clean();} if (!isset($caminho)) @@ -177,12 +181,6 @@ if(!isset($dir_tmp)) {include_once ($caminho."ms_configura.php");} if(isset($tempBaseX) && $tempBaseX != "") {$base = $tempBaseX;} - -if (!isset($debug)) -{error_reporting(0);$debug="nao";} -else -{error_reporting(E_ALL);$debug="sim";} - /* Define o cookie para o idioma da interface */ @@ -677,8 +675,8 @@ function incluiTemasIniciais() // if($existeraster) { - $of = $mapn->outputformat; - $of->set("imagemode",MS_IMAGEMODE_RGB); + //$of = $mapn->outputformat; + //$of->set("imagemode",MS_IMAGEMODE_RGB); } erroCriacao(); } diff --git a/ogc.php b/ogc.php index b833164..e34dda2 100644 --- a/ogc.php +++ b/ogc.php @@ -218,7 +218,7 @@ if ($tipo == "" || $tipo == "metadados") $l = $nmap->getlayerbyname($t); if($cache == true && strtolower($l->getmetadata("cache")) == "sim" && $tipo == "" && count($tema) == 1){ carregaCacheImagem($_GET["BBOX"],$tx,$_GET["WIDTH"],$_GET["HEIGHT"],$cachedir); - } + } $l->setmetadata("ows_title",pegaNome($l)); $l->setmetadata("ows_srs",$listaepsg); //essa linha é necessária pq as vezes no mapfile não tem nenhum layer com o nome igual ao nome do mapfile @@ -236,10 +236,10 @@ if ($tipo == "" || $tipo == "metadados") $l->setmetadata("wms_attribution_logourl_width","50"); $l->setmetadata("wms_attribution_logourl_href",$mini); } - if($l->type == MS_LAYER_RASTER) + if($l->type == MS_LAYER_RASTER && $l->numclasses > 0) { $c = $l->getclass(0); - if ($c->name == "") + if($c->name == "") {$c->name = " ";} } //inclui extensao geografica -- libgit2 0.21.2