From 5a681e41224ea73dc784364f49966bb15fa9c9b2 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 27 Mar 2013 03:37:07 +0000
Subject: [PATCH] Inclusão de rotina para geração e recuperação de imagens em cache em ogc.php e mashup openlayers

---
 admin/admin.db                     | Bin 197632 -> 0 bytes
 classesphp/mapa_openlayers.php     |  22 ----------------------
 mashups/openlayers.js              |  39 +++++++++++++++++++++++++++++++++------
 mashups/openlayers.php             |  29 ++++++++++++++++++++---------
 mashups/openlayers_compacto.js     |  37 ++++++++++++++++++++++++++++++++-----
 mashups/openlayers_compacto.js.php |  37 ++++++++++++++++++++++++++++++++-----
 ogc.php                            | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 7 files changed, 208 insertions(+), 101 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 252840f..6d2e460 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php
index 1e7d30d..b38b2b9 100644
--- a/classesphp/mapa_openlayers.php
+++ b/classesphp/mapa_openlayers.php
@@ -334,28 +334,6 @@ function carregaCacheImagem($cachedir,$map,$tms){
 		exit;
 	}
 }
-function XcarregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
-	if($layer == "copyright" || $layer == "")
-	{$bbox = "";}
-	if($layer == "")
-	{$layer = "fundo";}
-	$nome = $w.$h.$bbox.".png";
-	if($cachedir == "")
-	{$nome = dirname(dirname($map))."/cache/".$layer."/".$nome;}
-	else
-	{$nome = $cachedir."/".$layer."/".$nome;}
-	if(file_exists($nome)){
-		header('Content-Length: '.filesize($nome));
-		header('Content-Type: image/png');
-		header('Cache-Control: max-age=3600, must-revalidate');
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT');
-		header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200);
-		$etag = md5_file($nome);
-		header('Etag: '.$etag);
-		fpassthru(fopen($nome, 'rb'));
-		exit;
-	}
-}
 function nomeRand($n=10)
 {
 	$nomes = "";
diff --git a/mashups/openlayers.js b/mashups/openlayers.js
index 7062805..5137018 100755
--- a/mashups/openlayers.js
+++ b/mashups/openlayers.js
@@ -204,7 +204,7 @@ i3GEO.editorOL = {
 		{i3GEO.editorOL.ativaLayerSwitcher();}
 		if(i3GEO.editorOL.ativarodadomouse === false)
 		{i3GEO.editorOL.desativaRodaDoMouse();}
-		
+
 		if(i3GEO.editorOL.numzoom !== ""){
 			i3GEO.editorOL.mapa.setOptions({
 				numZoomLevels: i3GEO.editorOL.numzoom
@@ -277,6 +277,17 @@ i3GEO.editorOL = {
 		}
 		return ins;
 	},
+	layersClonados: function(paramsLayers){
+		var layers = i3GEO.editorOL.mapa.layers,
+			nlayers = layers.length,
+			ins = [],i;
+		for(i=0;i<nlayers;i++){
+			if(layers[i].params.CLONETMS === paramsLayers){
+				return(layers[i]);
+			}
+		}
+		return false;
+	},
 	coordenadas: function(){
 		//
 		//substitui o controle que mostra as coordenadas
@@ -702,7 +713,7 @@ i3GEO.editorOL = {
 			button = new OpenLayers.Control.Button({
 				displayClass: "editorOLzoomtot",
 				trigger: function(){i3GEO.editorOL.mapa.zoomToMaxExtent();},
-				title: "ajusta extens&atilde;o",
+				title: "ajusta extensao",
 				type: OpenLayers.Control.TYPE_BUTTON
 			});
 			controles.push(button);
@@ -725,7 +736,7 @@ i3GEO.editorOL = {
 					handlerOptions: {layerOptions: {styleMap: styleMap}},
 					persist: true,
 					displayClass: "editorOLdistancia",
-					title: "dist&acirc;ncia",
+					title: "distancia",
 					type: OpenLayers.Control.TYPE_TOOL
 				}
 			);
@@ -746,7 +757,7 @@ i3GEO.editorOL = {
 					handlerOptions: {layerOptions: {styleMap: styleMap}},
 					persist: true,
 					displayClass: "editorOLarea",
-					title: "&aacute;rea",
+					title: "area",
 					type: OpenLayers.Control.TYPE_TOOL
 				}
 			);
@@ -771,6 +782,14 @@ i3GEO.editorOL = {
 				displayClass: "editorOLidentifica",
 				eventListeners: {
 					getfeatureinfo: function(event) {
+						var ativo = [i3GEO.editorOL.layerAtivo()];
+						//se for TMS tem de pegar o clone wms
+						if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+							temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+							if(temp != ""){
+								temp.setVisibility(false);
+							}
+						}
 						var lonlat = i3GEO.editorOL.mapa.getLonLatFromPixel(event.xy),
 							lonlattexto = "<hr>",
 							formata;
@@ -815,7 +834,15 @@ i3GEO.editorOL = {
 						));
 					},
 					beforegetfeatureinfo: function(event){
-						var ativo = [i3GEO.editorOL.layerAtivo()];
+						var temp,ativo = [i3GEO.editorOL.layerAtivo()];
+						//se for TMS tem de pegar o clone wms
+						if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+							temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+							if(temp != ""){
+								temp.setVisibility(true);
+								ativo = [temp];
+							}
+						}
 						event.object.layers = ativo;
 						botaoIdentifica.layers = ativo;
 						botaoIdentifica.url = ativo[0].url;
@@ -895,7 +922,7 @@ i3GEO.editorOL = {
 				OpenLayers.Handler.Polygon,
 				{
 					displayClass: "editorOLpoligono",
-					title: "digitalizar pol&iacute;gono",
+					title: "digitalizar poligono",
 					type: OpenLayers.Control.TYPE_TOOL,
 					//handlerOptions: {holeModifier: "altKey"},
 					callbacks:{
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 8cbf76d..bb93990 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -140,7 +140,6 @@ if(isset($fundo) && $fundo != ""){
 	$fundo = str_replace(","," ",$fundo);
 	$fundo = explode(" ",$fundo);
 }
-
 //
 //define quais os layers que compor&atilde;o o mapa
 //
@@ -189,7 +188,8 @@ if($temas != ""){
 					$layers = array();
 					$maptemp = @ms_newMapObj($nomeMap);
 					if($maptemp){
-						for($i=0;$i<($maptemp->numlayers);++$i)	{
+						$nlayers = $maptemp->numlayers;
+						for($i=0;$i<($nlayers);++$i)	{
 							$layern = $maptemp->getLayer($i);
 							$layers[] = $layern->name;
 						}
@@ -204,7 +204,17 @@ if($temas != ""){
 						$visivel = "false";
 						if(in_array($tema,$visiveis))
 						{$visivel = "true";}
-						$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+						if($nlayers == 1 && strtoupper($layern->getmetadata("cache")) == "SIM"){
+							//nesse caso o layer e adicionado como TMS
+							//tms leva os parametros do TMS
+							$objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "../ogc.php?tema='.$tema.'",{tileOrigin: new OpenLayers.LonLat(-180, -90),serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png"})';
+							//cria um clone WMS para efeitos de getfeatureinfo
+							$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,singleTile:true,visibility:false,isBaseLayer:false})';
+						}
+						else{
+							$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+						}
+						//var_dump($objOpenLayers);exit;
 					}
 				}
 				else
@@ -313,18 +323,19 @@ Par&acirc;metros:
 <script type="text/javascript" src="../pacotes/yui290/build/dragdrop/dragdrop-min.js"></script>
 <script type="text/javascript" src="../pacotes/yui290/build/container/container-min.js"></script>
 <script type="text/javascript" src="../classesjs/compactados/classe_calculo_compacto.js"></script>
+<script type="text/javascript" src="../classesjs/compactados/classe_util_compacto.js"></script>
 <script type="text/javascript" src="../pacotes/openlayers/OpenLayers211.js"></script>
 <script type="text/javascript" src="openlayers.js"></script>
-
+<link rel="stylesheet" href="theme/default/style.css" type="text/css" />
+<link rel="stylesheet" href="openlayers.css" type="text/css" />
 -->
+
+
 <script type="text/javascript" src="openlayers_compacto.js.php"></script>
 <script type="text/javascript" src="../classesjs/compactados/classe_util_compacto.js"></script>
 <link rel="stylesheet" href="openlayers_compacto.css" type="text/css" />
 
-<!--
-<link rel="stylesheet" href="theme/default/style.css" type="text/css" />
-<link rel="stylesheet" href="openlayers.css" type="text/css" />
--->
+
 <style>
 .yui-skin-sam .container-minimiza {
 	background:transparent url(../pacotes/yui290/build/assets/skins/sam/sprite.png) no-repeat scroll 0 -450px;
@@ -433,7 +444,7 @@ i3GEO.editorOL.mapa = new OpenLayers.Map(
 	'i3geoMapa',
 	{
 		controls:[],
-		resolutions:[0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.000021457672119140625]
+		resolutions: [0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.000021457672119140625,0.000010728836059570312,0.000005364418029785156,0.000002682209014892578]
 	}
 );
 i3GEO.editorOL.inicia();
diff --git a/mashups/openlayers_compacto.js b/mashups/openlayers_compacto.js
index 7985f72..67f61ab 100644
--- a/mashups/openlayers_compacto.js
+++ b/mashups/openlayers_compacto.js
@@ -3290,6 +3290,17 @@ ins.push(layers[i]);
 }
 return ins;
 },
+layersClonados: function(paramsLayers){
+var layers = i3GEO.editorOL.mapa.layers,
+nlayers = layers.length,
+ins = [],i;
+for(i=0;i<nlayers;i++){
+if(layers[i].params.CLONETMS === paramsLayers){
+return(layers[i]);
+}
+}
+return false;
+},
 coordenadas: function(){
 //
 //substitui o controle que mostra as coordenadas
@@ -3710,7 +3721,7 @@ if(botoes.zoomtot===true){
 button = new OpenLayers.Control.Button({
 displayClass: "editorOLzoomtot",
 trigger: function(){i3GEO.editorOL.mapa.zoomToMaxExtent();},
-title: "ajusta extens&atilde;o",
+title: "ajusta extensao",
 type: OpenLayers.Control.TYPE_BUTTON
 });
 controles.push(button);
@@ -3733,7 +3744,7 @@ OpenLayers.Handler.Path,
 handlerOptions: {layerOptions: {styleMap: styleMap}},
 persist: true,
 displayClass: "editorOLdistancia",
-title: "dist&acirc;ncia",
+title: "distancia",
 type: OpenLayers.Control.TYPE_TOOL
 }
 );
@@ -3754,7 +3765,7 @@ OpenLayers.Handler.Polygon,
 handlerOptions: {layerOptions: {styleMap: styleMap}},
 persist: true,
 displayClass: "editorOLarea",
-title: "&aacute;rea",
+title: "area",
 type: OpenLayers.Control.TYPE_TOOL
 }
 );
@@ -3779,6 +3790,14 @@ type: OpenLayers.Control.TYPE_TOOL,
 displayClass: "editorOLidentifica",
 eventListeners: {
 getfeatureinfo: function(event) {
+var ativo = [i3GEO.editorOL.layerAtivo()];
+//se for TMS tem de pegar o clone wms
+if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+if(temp != ""){
+temp.setVisibility(false);
+}
+}
 var lonlat = i3GEO.editorOL.mapa.getLonLatFromPixel(event.xy),
 lonlattexto = "<hr>",
 formata;
@@ -3823,7 +3842,15 @@ true
 ));
 },
 beforegetfeatureinfo: function(event){
-var ativo = [i3GEO.editorOL.layerAtivo()];
+var temp,ativo = [i3GEO.editorOL.layerAtivo()];
+//se for TMS tem de pegar o clone wms
+if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+if(temp != ""){
+temp.setVisibility(true);
+ativo = [temp];
+}
+}
 event.object.layers = ativo;
 botaoIdentifica.layers = ativo;
 botaoIdentifica.url = ativo[0].url;
@@ -3903,7 +3930,7 @@ i3GEO.editorOL.layergrafico,
 OpenLayers.Handler.Polygon,
 {
 displayClass: "editorOLpoligono",
-title: "digitalizar pol&iacute;gono",
+title: "digitalizar poligono",
 type: OpenLayers.Control.TYPE_TOOL,
 //handlerOptions: {holeModifier: "altKey"},
 callbacks:{
diff --git a/mashups/openlayers_compacto.js.php b/mashups/openlayers_compacto.js.php
index 4670074..390871a 100644
--- a/mashups/openlayers_compacto.js.php
+++ b/mashups/openlayers_compacto.js.php
@@ -3290,6 +3290,17 @@ ins.push(layers[i]);
 }
 return ins;
 },
+layersClonados: function(paramsLayers){
+var layers = i3GEO.editorOL.mapa.layers,
+nlayers = layers.length,
+ins = [],i;
+for(i=0;i<nlayers;i++){
+if(layers[i].params.CLONETMS === paramsLayers){
+return(layers[i]);
+}
+}
+return false;
+},
 coordenadas: function(){
 //
 //substitui o controle que mostra as coordenadas
@@ -3710,7 +3721,7 @@ if(botoes.zoomtot===true){
 button = new OpenLayers.Control.Button({
 displayClass: "editorOLzoomtot",
 trigger: function(){i3GEO.editorOL.mapa.zoomToMaxExtent();},
-title: "ajusta extens&atilde;o",
+title: "ajusta extensao",
 type: OpenLayers.Control.TYPE_BUTTON
 });
 controles.push(button);
@@ -3733,7 +3744,7 @@ OpenLayers.Handler.Path,
 handlerOptions: {layerOptions: {styleMap: styleMap}},
 persist: true,
 displayClass: "editorOLdistancia",
-title: "dist&acirc;ncia",
+title: "distancia",
 type: OpenLayers.Control.TYPE_TOOL
 }
 );
@@ -3754,7 +3765,7 @@ OpenLayers.Handler.Polygon,
 handlerOptions: {layerOptions: {styleMap: styleMap}},
 persist: true,
 displayClass: "editorOLarea",
-title: "&aacute;rea",
+title: "area",
 type: OpenLayers.Control.TYPE_TOOL
 }
 );
@@ -3779,6 +3790,14 @@ type: OpenLayers.Control.TYPE_TOOL,
 displayClass: "editorOLidentifica",
 eventListeners: {
 getfeatureinfo: function(event) {
+var ativo = [i3GEO.editorOL.layerAtivo()];
+//se for TMS tem de pegar o clone wms
+if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+if(temp != ""){
+temp.setVisibility(false);
+}
+}
 var lonlat = i3GEO.editorOL.mapa.getLonLatFromPixel(event.xy),
 lonlattexto = "<hr>",
 formata;
@@ -3823,7 +3842,15 @@ true
 ));
 },
 beforegetfeatureinfo: function(event){
-var ativo = [i3GEO.editorOL.layerAtivo()];
+var temp,ativo = [i3GEO.editorOL.layerAtivo()];
+//se for TMS tem de pegar o clone wms
+if(ativo[0].CLASS_NAME == "OpenLayers.Layer.TMS"){
+temp = i3GEO.editorOL.layersClonados(ativo[0].layername);
+if(temp != ""){
+temp.setVisibility(true);
+ativo = [temp];
+}
+}
 event.object.layers = ativo;
 botaoIdentifica.layers = ativo;
 botaoIdentifica.url = ativo[0].url;
@@ -3903,7 +3930,7 @@ i3GEO.editorOL.layergrafico,
 OpenLayers.Handler.Polygon,
 {
 displayClass: "editorOLpoligono",
-title: "digitalizar pol&iacute;gono",
+title: "digitalizar poligono",
 type: OpenLayers.Control.TYPE_TOOL,
 //handlerOptions: {holeModifier: "altKey"},
 callbacks:{
diff --git a/ogc.php b/ogc.php
index d00f1e6..99acaa2 100644
--- a/ogc.php
+++ b/ogc.php
@@ -120,7 +120,7 @@ include(dirname(__FILE__)."/classesphp/funcoes_gerais.php");
 error_reporting(0);
 $versao = versao();
 $versao = $versao["principal"];
-$req = ms_newowsrequestobj();
+$req = ms_newowsrequestobj();
 $tipo = "";
 $_GET = array_merge($_GET,$_POST);
 if(isset($_GET["sld"]) || isset($_GET["filter"])){
@@ -135,12 +135,10 @@ foreach ($_GET as $k=>$v){
 		$tipo = "metadados";
 		$cache = false;
 	}
-	if(strtolower($k) == "layers" && empty($_GET["tema"]))
-	{
+	if(strtolower($k) == "layers" && empty($_GET["tema"])){
 		$tema = $v;
 	}
-	if(strtolower($k) == "layer" && empty($_GET["tema"]))
-	{
+	if(strtolower($k) == "layer" && empty($_GET["tema"])){
 		$tema = $v;
 	}
 }
@@ -162,17 +160,6 @@ if(isset($version) && !isset($VERSION)){
 if(!isset($VERSION)){
 	$req->setParameter("VeRsIoN","1.0.0");
 }
-/*
-$n =  $req->numparams;
-for($i=0;$i<$n;$i++){
-	echo $req->getName($i);
-	echo "=";
-	echo $req->getValue($i);
-	echo "<br>";
-}
-exit;
-*/
-
 if (!isset($intervalo)){
 	$intervalo = "0,5000";
 }
@@ -190,7 +177,6 @@ if(!isset($tema)){
 $nomeMapfileTmp = $dir_tmp."/ogc_".md5($tema).".map";
 $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
 $nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
-
 if(file_exists($nomeMapfileTmp) && $tipo == ""){
 	$oMap = ms_newMapobj($nomeMapfileTmp);
 }
@@ -461,21 +447,63 @@ else{
 	$oMap->setFontSet($locaplic."/symbols/".basename($oMap->fontsetfilename));
 	$oMap->save($nomeMapfileTmp);
 }
-if($cache == true){
-
+//
+//verifica se a requisicao e do tipo TMS. Se for, tenta gerar ou usar o cache
+//
+//
+//calcula a extensao geografica com base no x,y,z em requisições TMS
+//quando for do tipo tms $_GET["tms"] contem os parametros do tile
+//essa rotina faz um exit ao final
+//o cache tms so fucniona se houver apenas uma camada no mapa
+//tms e usado basicamente por mashup
+//
+if(isset($_GET["tms"])){
+	$temp = explode("/",$_GET["tms"]);
+	$z = $temp[2];
+	$x = $temp[3];
+	$y = str_replace(".png","",$temp[4]);
+	$n = pow(2,$z+1);
+	$lon1 = $x / $n * 360.0 - 180.0;
+	$lon2 = ($x+1) / $n * 360.0 - 180.0;
+	$n = pow(2,$z);
+	$lat1 = $y / $n * 180.0 - 90.0;
+	$lat2 = ($y+1) / $n * 180.0 - 90.0;
+	//essa funcao termina o processo se a imagem existir
+	//carregaCacheImagem($cachedir,$nomeMapfileTmp,$_GET["tms"]);
+	//se nao existir, salva a imagem
+	//echo $lon1." ".$lat1." ".$lon2." ".$lat2;exit;
+	$oMap->setExtent($lon1,$lat1,$lon2,$lat2);
+	$oMap->setsize(256,256);
+	$oMap->getlayer(0)->set("status",MS_DEFAULT);
+	$img = $oMap->draw();
+	if($img->imagepath == ""){
+		exit;
+	}
+	salvaCacheImagem($cachedir,$nomeMapfileTmp,$_GET["tms"]);
+}
+if(strtolower($req->getValueByName("REQUEST")) == "getlegendgraphic"){
+	$l = $oMap->getlayer(0);
+	if($req->getValueByName("LAYER") == ""){
+		$req->setParameter("LAYER",$l->name);
+	}
+	if($req->getValueByName("FORMAT") == ""){
+		$req->setParameter("FORMAT","image/png");
+	}
+}
+if(strtolower($req->getValueByName("REQUEST")) == "getfeature"){
+	$l = $oMap->getlayer(0);
+	if($req->getValueByName("TYPENAME") == "" || $req->getValueByName("TYPENAME") == "undefined"){
+		$req->setParameter("TYPENAME",$l->name);
+	}
 }
-
 //
 //altera os caminhos das imagens
 //
 if((isset($legenda)) && (strtolower($legenda) == "sim")){
 	$leg = $oMap->legend;
 	$leg->set("status",MS_EMBED);
-	$cache = false;
 }
-
-ms_ioinstallstdouttobuffer();
-
+ms_ioinstallstdouttobuffer();
 $oMap->owsdispatch($req);
 $contenttype = ms_iostripstdoutbuffercontenttype();
 if(strtolower($request) == "getcapabilities"){
@@ -585,37 +613,46 @@ function ogc_imprimeListaDeTemasWfs(){
 	}
 	echo $imprimir."</body></html>";
 }
-//FIXME cache fora do novo padrao de xyz
-function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
-	global $dir_tmp;
-	$nome = $w.$h.$bbox.".png";
-	if($cachedir == "")
-	{
-		$nome = $dir_tmp."/cache/".$layer."/".$nome;
-	}
-	else
-	{$nome = $cachedir."/".$layer."/".$nome;
-	}
-	if(file_exists($nome)){
-		ob_start();
-		// assuming you have image data in $imagedata
-		$img = file_get_contents($nome);
-		$length = strlen($img);
-		$ft = filemtime($nome);
-		if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && (strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]) == $ft)) {
-			// Client's cache IS current, so we just respond '304 Not Modified'.
-			header('Last-Modified: '.gmdate('D, d M Y H:i:s', $ft).' GMT', true, 304);
-		} else {
-			// Image not cached or cache outdated, we respond '200 OK' and output the image.
-			header('Last-Modified: '.gmdate('D, d M Y H:i:s', $ft).' GMT', true, 200);
-		}
-		header('Accept-Ranges: bytes');
-		header('Content-Length: '.$length);
-		header('Content-Type: image/png');
-		print($img);
-		ob_end_flush();
-		exit;
+function carregaCacheImagem($cachedir,$map,$tms){
+	global $dir_tmp;
+	if($cachedir == ""){
+		$nome = $dir_tmp."/cache".$tms;
+	}
+	else{
+		$nome = $cachedir.$tms;
+	}
+	if(file_exists($nome)){
+		header('Content-Length: '.filesize($nome));
+		header('Content-Type: image/png');
+		header('Cache-Control: max-age=3600, must-revalidate');
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT');
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200);
+		$etag = md5_file($nome);
+		header('Etag: '.$etag);
+		fpassthru(fopen($nome, 'rb'));
+		exit;
+	}
+}
+function salvaCacheImagem($cachedir,$map,$tms){
+	global $img,$dir_tmp;
+	if($cachedir == ""){
+		$nome = $dir_tmp."/cache".$tms;
 	}
+	else{
+		$nome = $cachedir.$tms;
+	}
+	@mkdir(dirname($nome),0777,true);
+	chmod(dirname($nome),0777);
+	$img->saveImage($nome);
+	chmod($nome,0777);
+
+	header('Content-Length: '.filesize($nome));
+	header('Content-Type: image/png');
+	header('Cache-Control: max-age=3600, must-revalidate');
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT');
+	header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200);
+	fpassthru(fopen($nome, 'rb'));
+	exit;
 }
 function texto2iso($texto){
 	if (function_exists("mb_convert_encoding")){
--
libgit2 0.21.2