From 0738e22d755ee23c7ae799329fb0cc94d1c27f83 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 4 Apr 2015 00:26:43 +0000
Subject: [PATCH] Correção no serviço OGC - apresentação da legenda

---
 aplicmap/ogcws.map   | 3 ++-
 aplicmap/ogcwsv5.map | 3 ++-
 aplicmap/ogcwsv6.map | 7 ++++---
 ogc.php              | 7 ++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/aplicmap/ogcws.map b/aplicmap/ogcws.map
index ddd7bd2..aa0d741 100644
--- a/aplicmap/ogcws.map
+++ b/aplicmap/ogcws.map
@@ -91,7 +91,8 @@ MAP
 			"ows_city"	"Brasilia"
 			"ows_contactperson"	"Web Master"
 			"ows_addresstype"	"uri"
-			"ows_context_version"	"1.0.0"
+			"ows_context_version"	"1.1.1"
+			"wms_getcapabilities_version"	"1.1.1"
 			"ows_abstract"	"Web services gerados da base de dados do i3Geo. Para chamar um tema especificamente, veja o sistema de ajuda, digitando no navegador web ogc.php?ajuda=, para uma lista compacta de todos os servicos, digite ogc.php?lista=temas"
 			"ows_contactposition"	"Administrador do sitio web"
 			"ows_stateorprovince"	"DF"
diff --git a/aplicmap/ogcwsv5.map b/aplicmap/ogcwsv5.map
index a204021..3c7b517 100644
--- a/aplicmap/ogcwsv5.map
+++ b/aplicmap/ogcwsv5.map
@@ -92,7 +92,8 @@ MAP
 			"ows_city"	"Brasilia"
 			"ows_contactperson"	"Web Master"
 			"ows_addresstype"	"uri"
-			"ows_context_version"	"1.0.0"
+			"ows_context_version"	"1.1.1"
+			"wms_getcapabilities_version"	"1.1.1"
 			"ows_abstract"	"Web services gerados da base de dados do i3Geo. Para chamar um tema especificamente, veja o sistema de ajuda, digitando no navegador web ogc.php?ajuda=, para uma lista compacta de todos os servicos, digite ogc.php?lista=temas"
 			"ows_contactposition"	"Administrador do sitio web"
 			"ows_stateorprovince"	"DF"
diff --git a/aplicmap/ogcwsv6.map b/aplicmap/ogcwsv6.map
index 83a34ae..405fcf7 100644
--- a/aplicmap/ogcwsv6.map
+++ b/aplicmap/ogcwsv6.map
@@ -122,8 +122,8 @@ MAP
 			"ows_city"	"Brasilia"
 			"ows_contactperson"	"Web Master"
 			"ows_addresstype"	"uri"
-			"ows_context_version"	"1.1.0"
-			"wms_getcapabilities_version"	"1.1.0"
+			"ows_context_version"	"1.1.1"
+			"wms_getcapabilities_version"	"1.1.1"
 			"ows_abstract"	"Web services gerados da base de dados do i3Geo. Para chamar um tema especificamente, veja o sistema de ajuda, digitando no navegador web ogc.php?ajuda=, para uma lista compacta de todos os servicos, digite ogc.php?lista=temas"
 			"ows_contactposition"	"Administrador do sitio web"
 			"ows_stateorprovince"	"DF"
@@ -136,7 +136,8 @@ MAP
 			"ows_namespace_uri"	"http://www.omsug.ca/osgis2004"
 			"ows_address"	"http://www.mma.gov.br"
 			"ows_postcode"	""
-		"ows_enable_request" "*"
+			"ows_enable_request" "*"
+			"ows_sld_enabled" "true"
 		END
 		QUERYFORMAT text/html
 		LEGENDFORMAT text/html
diff --git a/ogc.php b/ogc.php
index 4e01e0e..c2e2b60 100644
--- a/ogc.php
+++ b/ogc.php
@@ -232,7 +232,7 @@ if(isset($version) && !isset($VERSION)){
 	$VERSION = $version;
 }
 if(!isset($VERSION)){
-	$req->setParameter("VeRsIoN","1.0.0");
+	$req->setParameter("VeRsIoN","1.1.1");
 }
 if (!isset($intervalo)){
 	$intervalo = "0,5000";
@@ -390,7 +390,8 @@ else{
 						$l->set("template","none.htm");
 						$l->set("dump",MS_TRUE);
 						$l->setmetadata("WMS_INCLUDE_ITEMS","all");
-						$l->setmetadata("WFS_INCLUDE_ITEMS","all");
+						$l->setmetadata("WFS_INCLUDE_ITEMS","all");
+						
 						if(file_exists($locaplic."/temas/miniaturas/".$t.".map.mini.png")){
 							$mini = $proto.$server.dirname($_SERVER['PHP_SELF'])."/temas/miniaturas/".$t.".map.mini.png";
 							$l->setmetadata("wms_attribution_logourl_format","image/png");
@@ -756,7 +757,7 @@ if(strtolower($req->getValueByName("REQUEST")) == "getlegendgraphic"){
 		$req->setParameter("FORMAT","image/png");
 	}
 	$legenda = $oMap->legend;
-	$legenda->set("status",MS_DEFAULT);
+	$legenda->set("status",MS_ON);
 	$l->set("minscaledenom",0);
 	$l->set("maxscaledenom",0);
 	if($req->getValueByName("FORMAT") == "text/html"){
--
libgit2 0.21.2