From 39d97e37376cea5cad1a4fd67c3a5c29a6fb73f1 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 8 Jul 2015 23:57:24 +0000
Subject: [PATCH] 

---
 admin/admin.db                   | Bin 286720 -> 0 bytes
 ferramentas/storymap/default.php | 44 ++++++++++++++++++++++++++++----------------
 ferramentas/storymap/index.js    |  2 +-
 mashups/osm.php                  |  8 +++++++-
 ogc.php                          | 24 ++++++++++++++++++++----
 temas/_lbiomashp.map             |  4 ++--
 6 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/admin/admin.db b/admin/admin.db
index 0e8c910..8413ba2 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/storymap/default.php b/ferramentas/storymap/default.php
index 5da291f..0df7b50 100755
--- a/ferramentas/storymap/default.php
+++ b/ferramentas/storymap/default.php
@@ -1,5 +1,6 @@
 <?php
-//TODO incluir camadas do i3geo como WMS
+//exemplo: http://localhost/i3geo/ferramentas/storymap/default.php?tema=_lreal&layers=_lbiomashp _llocali
+//temas do i3geo podem ser incluidos em &layers separados por espacos
 	if(empty($_GET["tema"])){
 		echo "&tema nao definido";
 		exit;
@@ -9,6 +10,14 @@
 		echo "&tema nao existe";
 		exit;
 	}
+	//$map_type = "stamen:watercolor";
+	$map_type = "stamen:toner-lite";
+	if($_GET["layers"] != ""){
+		$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
+		$url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].":". $_SERVER['SERVER_PORT'];
+		$url .= str_replace("/ferramentas/storymap/default.php","",$_SERVER["PHP_SELF"]);
+		$map_type = $url."/ogc.php?tema=".strip_tags($_GET["layers"])."&DESLIGACACHE=&Z={z}&X={x}&Y={y}";
+	}
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -63,23 +72,26 @@ html, body {
 	<!-- JavaScript-->
 	<script src="../../pacotes/knightlab/StoryMapJS/compiled/js/storymap.js"></script>
 	<script>
+	//http://localhost/ogc.php?tema=_llocali&DESLIGACACHE=&tms=/_llocali/{z}/{x}/{y}.png
 	VCO.Language = {
-    name: "PortuguÃªs",
-    lang: "pt",
-    messages: {
-        loading: "carregando",
-        wikipedia: "da Wikipedia, a enciclopÃ©dia livre",
-		start: 				"Explore"
-    },
-    buttons: {
-        map_overview:      "vista geral do mapa",
-		overview:          "vista geral",
-        backtostart:       "voltar ao comeÃ§o",
-        collapse_toggle:   "ocultar o mapa",
-        uncollapse_toggle: "mostrar o mapa"
-    }
-};
+	    name: "Portugu&ecirc;s",
+	    lang: "pt",
+	    messages: {
+	        loading: "carregando",
+	        wikipedia: "da Wikipedia, a enciclop&eacute;dia livre",
+			start: "Explore"
+	    },
+	    buttons: {
+	        map_overview:      "vista geral do mapa",
+			overview:          "vista geral",
+	        backtostart:       "voltar ao come&ccedil;o",
+	        collapse_toggle:   "ocultar o mapa",
+	        uncollapse_toggle: "mostrar o mapa"
+	    }
+	};
+
 	var storymap = new VCO.StoryMap('storymap', '../../json.php?tema=<?php echo strip_tags($_GET["tema"]);?>&format=storymap&', {
+		"map_type": "<?php echo $map_type;?>",
 		"show_lines": false
 	});
 	window.onresize = function(event) {
diff --git a/ferramentas/storymap/index.js b/ferramentas/storymap/index.js
index e588ae1..047f4d4 100755
--- a/ferramentas/storymap/index.js
+++ b/ferramentas/storymap/index.js
@@ -180,7 +180,7 @@ i3GEOF.storymap =
 			var b = new YAHOO.widget.Button("i3GEOstobotao1", {
 				onclick : {
 					fn : function() {
-						window.open(i3GEO.configura.locaplic + "/ferramentas/storymap/default.php?tema=" + i3GEOF.storymap.tema);
+						window.open(i3GEO.configura.locaplic + "/ferramentas/storymap/default.php?layers=&tema=" + i3GEOF.storymap.tema);
 					}
 				}
 			});
diff --git a/mashups/osm.php b/mashups/osm.php
index 32c6217..1e4a5ab 100755
--- a/mashups/osm.php
+++ b/mashups/osm.php
@@ -357,7 +357,13 @@ if($temas != ""){
 						}
 						// nesse caso o layer e adicionado como TMS
 						// tms leva os parametros do TMS
-						$objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'",{'.$teffect.' tileOrigin: new OpenLayers.LonLat(-180, -90),opacity:'.$opacidade.',serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png", ferramentas :'.$ferramentas.'})';
+						//$objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'",{'.$teffect.' tileOrigin: new OpenLayers.LonLat(-180, -90),opacity:'.$opacidade.',serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png", ferramentas :'.$ferramentas.'})';
+						$objOpenLayers[] = 'new OpenLayers.Layer.OSM("'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&Z=${z}&X=${x}&Y=${y}",{'.$teffect.' tileOrigin: new OpenLayers.LonLat(-180, -90),opacity:'.$opacidade.',serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png", ferramentas :'.$ferramentas.'})';
+						//layer = new OpenLayers.Layer.OSM(camada.name, urllayer + "&Z=${z}&X=${x}&Y=${y}", {
+						//	isBaseLayer : false
+						//});
+						
+						
 						// cria um clone WMS para efeitos de getfeatureinfo
 						$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,transitionEffect : null,singleTile:true,visibility:false,isBaseLayer:false, ferramentas :'.$ferramentas.'})';
 					}
diff --git a/ogc.php b/ogc.php
index d85f3b6..c8e4a44 100644
--- a/ogc.php
+++ b/ogc.php
@@ -709,14 +709,29 @@ if(isset($_GET["tms"])){
 if(isset($_GET["Z"]) && isset($_GET["X"])){
 	$x = $_GET["X"];
 	$y = $_GET["Y"];
-	$z = $_GET["Z"];
-	$layer0 = $oMap->getlayer(0);
+	$z = $_GET["Z"];
+	
+	if(file_exists($tema)){
+		$layer0 = $oMap->getlayer(0);
+		$layer0->set("status",MS_DEFAULT);
+		$layer0->setProjection("proj=latlong,a=6378137,b=6378137");
+	}
+	else{
+		//pode ter mais de um tema
+		$lista = explode(" ",$tema);
+		foreach($lista as $nomeLayer){
+			$layer0 = $oMap->getlayerbyname($nomeLayer);
+			$layer0->set("status",MS_DEFAULT);
+			$layer0->setProjection("proj=latlong,a=6378137,b=6378137");
+		}
+	}
 	//
 	//numero de pixels que serao considerados para corte da imagem no caso de cache ativo e tema de pontos
 	//
 	if ($layer0->getmetadata("cortepixels") != ""){
 		$cortePixels = $layer0->getmetadata("cortepixels");
 	}
+	
 	if($cache == true){
 		carregaCacheImagem($cachedir,$nomeMapfileTmp,"/googlemaps/$layer0->name/$z/$x/$y");
 	}
@@ -742,9 +757,10 @@ if(isset($_GET["Z"]) && isset($_GET["X"])){
 	$oMap->setsize(256,256);
 	$oMap->setExtent($poPoint1->x,$poPoint1->y,$poPoint2->x,$poPoint2->y);
 
-	$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");
+	
 	//
 	//se o layer foi marcado para corte altera os parametros para ampliar o mapa
 	//antes de gerar a imagem
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index da9ecec..f5ee432 100644
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -11,7 +11,7 @@ MAP
       "CLASSE"	"SIM"
       "permitekmz"	"nao"
       "ITENSDESC"	"Bioma Teste de acentuação"
-      #"TILES"	"NAO"
+      "TILES"	"SIM"
       "ESCALA"	"1000000"
       "METAESTAT_CODIGO_TIPO_REGIAO"	""
       "permitedownload"	"sim"
@@ -31,7 +31,7 @@ MAP
     STATUS OFF
     TEMPLATE "none.htm"
     TILEITEM "location"
-    OPACITY 40
+    OPACITY 100
     TYPE POLYGON
     UNITS METERS
     CLASS
--
libgit2 0.21.2

