From 05b22552a304a6832a3b8461680dc0eada2b65e1 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 23 Apr 2015 18:16:48 +0000
Subject: [PATCH] ajustes em OGC para não ser necessário definir &tema

---
 admin/admin.db         | Bin 278528 -> 0 bytes
 mashups/openlayers.php |  3 +++
 ogc.htm                | 20 ++++++++++----------
 ogc.php                |  3 +++
 temas/_lbiomashp.map   |  4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 6a44a71..bbde4a6 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 48a063e..adbe566 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -52,6 +52,9 @@ if(!empty($restauramapa)){
 //
 // imprime na tela a ajuda ao usu&aacute;rio
 //
+if(!isset($temas) && isset($layers)){
+	$temas = $layers;
+}
 if(!isset($temas)){
 	ajuda();
 }
diff --git a/ogc.htm b/ogc.htm
index 490b701..a999e8b 100644
--- a/ogc.htm
+++ b/ogc.htm
@@ -82,12 +82,12 @@ function ogc_endereco(botao)
 	ins = "<H1>Endere&ccedil;o do web service:</H1>";
 	var re = new RegExp(".htm", "g");
 	var servico = window.location.href.replace(re,'.php?');
-	var s = "tema="+tema;
+	var s = ""; //"tema="+tema;
 	if(botao.name === "metaestat"){
-		s = "id_medida_variavel="+tema.split("_")[1];
+		s = "id_medida_variavel="+tema.split("_")[1] + "&";
 	}
 	if(botao.name === "mapaCadastrado"){
-		s = "restauramapa="+tema.split("_")[1];
+		s = "restauramapa="+tema.split("_")[1] + "&";
 		tema = "";
 	}
 
@@ -95,13 +95,13 @@ function ogc_endereco(botao)
 	ins += "<p>"+servico;
 	ins += "<p>Bookmark: <span id=bm ></span>";
 	ins  += "<p><iframe src='http://www.facebook.com/plugins/like.php?href="+servico+"&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light&amp;height=21' scrolling='no' frameborder='0' style='border:none; overflow:hidden; width:100px; height:21px;' allowTransparency='true'></iframe>";
-	ins += "<p><a target=blank href='"+servico+"&service=wms&version=1.1.0&request=getcapabilities&layers="+tema+"' />GetCapabilities</a>";
-	ins += "<p><a target=blank href='"+servico+"&SRS=EPSG:4618&WIDTH=500&HEIGHT=500&BBOX=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&FORMAT=image/png&service=wms&version=1.1.0&request=getmap&layers="+tema+"' />testar getmap</a>";
-	ins += "<p><a target=blank href='"+servico+"&format=application/openlayers&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081' />visualizar com openLayers</a>";
-	ins += "<p><a target=blank href='"+servico+"&OUTPUTFORMAT=shape-zip&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download shapefile via WFS</a>";
-	ins += "<p><a target=blank href='"+servico+"&OUTPUTFORMAT=csv&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download CSV via WFS</a>";
-	ins += "<p><a target=blank href='"+servico+"&OUTPUTFORMAT=kmz&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download KMZ</a>";
-	ins += "<p><a target=blank href='"+servico+"&OUTPUTFORMAT=geojson&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />GeoJson</a>";
+	ins += "<p><a target=blank href='"+servico+"service=wms&version=1.1.1&request=getcapabilities&layers="+tema+"' />GetCapabilities</a>";
+	ins += "<p><a target=blank href='"+servico+"SRS=EPSG:4618&WIDTH=500&HEIGHT=500&BBOX=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&FORMAT=image/png&service=wms&version=1.1.0&request=getmap&layers="+tema+"' />testar getmap</a>";
+	ins += "<p><a target=blank href='"+servico+"format=application/openlayers&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&layers="+tema+"' />visualizar com openLayers</a>";
+	ins += "<p><a target=blank href='"+servico+"OUTPUTFORMAT=shape-zip&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download shapefile via WFS</a>";
+	ins += "<p><a target=blank href='"+servico+"OUTPUTFORMAT=csv&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download CSV via WFS</a>";
+	ins += "<p><a target=blank href='"+servico+"OUTPUTFORMAT=kmz&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />download KMZ</a>";
+	ins += "<p><a target=blank href='"+servico+"OUTPUTFORMAT=geojson&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&service=wfs&version=1.1.0&request=getfeature&layers="+tema+"' />GeoJson</a>";
 
 	if(!$i("panellistaarquivos")){
 		YAHOO.namespace("datadownloadLista");
diff --git a/ogc.php b/ogc.php
index 6cd3b5c..a1ef99b 100644
--- a/ogc.php
+++ b/ogc.php
@@ -88,6 +88,9 @@ include(dirname(__FILE__)."/classesphp/funcoes_gerais.php");
 //para o caso da requisicao kml
 if(strtolower($OUTPUTFORMAT) == "kml" || strtolower($OUTPUTFORMAT) == "kmz"){
 	//http://localhost/i3geo/pacotes/kmlmapserver/kmlservice.php?request=kmz&map=_lbiomashp&typename=_lbiomashp
+	if(!isset($tema) && isset($layers)){
+		$tema = $layers;
+	}
 	$urln = "pacotes/kmlmapserver/kmlservice.php?request=kmz&map=".$tema."&typename=".$tema;
 	header("Location:".$urln);
 	exit;
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index fb870ea..168640d 100644
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -7,7 +7,7 @@ MAP
     METADATA
       "TIP"	"CD_LEGENDA"
       "CLASSE"	"SIM"
-      "permitekmz"	"nao"
+      "permitekmz"	"sim"
       "ITENSDESC"	"Teste de acentuação"
       "TILES"	"SIM"
       "ESCALA"	"1000000"
@@ -16,7 +16,7 @@ MAP
       "itembuscarapida"	"CD_LEGENDA"
       "ITENS"	"CD_LEGENDA"
       "permitekml"	"sim"
-      "permiteogc"	"nao"
+      "permiteogc"	"sim"
       "transitioneffect"	"SIM"
       "TEMA"	"Biomas shapefile (acentuação)"
     END # METADATA
--
libgit2 0.21.2