Otimização da leitura de imagens em cahce

Edmar Moretti
1 parent 3c735003
Showing 6 changed files with 107 additions and 48 deletions Show diff stats
classesphp/mapa_googlemaps.php
classesphp/mapa_openlayers.php
index.html
interface/openlayers.htm
ogc.php
pacotes/kmlmapserver/classes/layerserver.class.php
@@ -329,7 +329,29 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 	if($cachedir == "")
 	{$nome = dirname(dirname($map))."/cache/googlemaps/".$layer."/".$nome;}
 	else
-	{$nome = $cachedir."/googlemaps/".$layer."/".$nome;}	
+	{$nome = $cachedir."/googlemaps/".$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;
+	}	
+	/*
 	if(file_exists($nome))
 	{
 		if (!function_exists('imagepng'))
@@ -342,14 +364,12 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 		@$img = imagecreatefrompng($nome);
 		if(!$img)
 		{
-			/* Create a blank image */
 			$img  = imagecreatetruecolor($w, $h);
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
 			$bgc = imagecolorallocatealpha($img, 255, 255, 255,127);
 			$tc  = imagecolorallocate($img, 255, 0, 0);
 			imagefilledrectangle($img, 0, 0, $w, $h, $bgc);
-			/* Output an error message */
 			imagestring($img, 3, 5, 5, 'Erro ao ler ' . $nome, $tc);
 		}
 		else
@@ -364,6 +384,7 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 		imagedestroy($img);
 		exit;
 	}
+	*/
 }
 function nomeRand($n=10)
 {
 <?php
-
 /*
 Title: mapa_openlayers.php
@@ -60,33 +59,7 @@ i3geo/classesphp/mapa_openlayers.php
 */
 error_reporting(0);
-clearstatcache();
-$_COOKIE = array();
-if (!function_exists('ms_GetVersion'))
-{
-	$s = PHP_SHLIB_SUFFIX;
-	@dl( 'php_mapscript.'.$s );
-	$ler_extensoes[] = 'php_mapscript';
-}
-//verificação de segurança
-$_SESSION = array();
-session_name("i3GeoPHP");
-if(@$_GET["g_sid"])
-{session_id($_GET["g_sid"]);}
-else
-{ilegal();}
-session_start();
-//var_dump($_SESSION);exit;
-if(@$_SESSION["fingerprint"])
-{
-	$f = explode(",",$_SESSION["fingerprint"]);
-	if (md5('I3GEOSEC' . $_SERVER['HTTP_USER_AGENT'] . session_id()) != $f[0] && !in_array($_GET["telaR"],$f) )
-	{ilegal();}
-}
-else
-{exit;}
-if(!isset($_SESSION["map_file"]))
-{exit;}
+inicializa();
 //
 //map_fileX é necessário caso register_globals = On no PHP.INI
 $map_fileX = $_SESSION["map_file"];
@@ -94,8 +67,7 @@ $postgis_mapa = $_SESSION[&quot;postgis_mapa&quot;];
 $cachedir = $_SESSION["cachedir"];
 if(isset($_GET["tipolayer"]) && $_GET["tipolayer"] == "fundo")
 {$map_fileX = str_replace(".map","fundo.map",$map_fileX);}
-if(isset($_GET["BBOX"]))
-{
+if(isset($_GET["BBOX"])){
 	$_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]);
 	$_GET["map_size"] = $_GET["WIDTH"]." ".$_GET["HEIGHT"];
 }
@@ -335,7 +307,27 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 	{$nome = $cachedir."/".$layer."/".$nome;}
 	if(file_exists($nome))
 	{
-		if (!function_exists('imagepng'))
+		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;
+	}
+	/*
+	if (!function_exists('imagepng'))
 		{
 			$s = PHP_SHLIB_SUFFIX;
 			@dl( 'php_gd2.'.$s );
@@ -345,7 +337,7 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 		@$img = imagecreatefrompng($nome);
 		if(!$img)
 		{
-			/* Create a blank image */
+			// Create a blank image
 			$img  = imagecreatetruecolor($w, $h);
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
@@ -354,7 +346,7 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 			$tc  = imagecolorallocate($img, 255, 0, 0);
 			imagefilledrectangle($img, 0, 0, $w, $h, $bgc);
-			/* Output an error message */
+			// Output an error message
 			imagestring($img, 3, 5, 5, 'Erro ao ler ' . $nome, $tc);
 		}
 		else
@@ -369,6 +361,7 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 		imagedestroy($img);
 		exit;
 	}
+	*/
 }
 function nomeRand($n=10)
 {
@@ -406,6 +399,34 @@ function filtraImg($nomer,$tipoimagem){
 		{imagepng($m->pixelate(),str_replace("\\","/",$nomer));}
 	}
 }
+function inicializa(){
+	clearstatcache();
+	$_COOKIE = array();
+	if (!function_exists('ms_GetVersion')){
+		$s = PHP_SHLIB_SUFFIX;
+		@dl( 'php_mapscript.'.$s );
+		$ler_extensoes[] = 'php_mapscript';
+	}
+	//verificação de segurança
+	$_SESSION = array();
+	session_name("i3GeoPHP");
+	if(@$_GET["g_sid"])
+	{session_id($_GET["g_sid"]);}
+	else
+	{ilegal();}
+	session_start();
+	//var_dump($_SESSION);exit;
+	if(@$_SESSION["fingerprint"])
+	{
+		$f = explode(",",$_SESSION["fingerprint"]);
+		if (md5('I3GEOSEC' . $_SERVER['HTTP_USER_AGENT'] . session_id()) != $f[0] && !in_array($_GET["telaR"],$f) )
+		{ilegal();}
+	}
+	else
+	{exit;}
+	if(!isset($_SESSION["map_file"]))
+	{exit;}
+}
 function ilegal(){
 	$img = imagecreatefrompng("../imagens/ilegal.png");
 	imagealphablending($img, false);
@@ -6,16 +6,9 @@
 <meta name="keywords" content="geoprocessing, GIS, maps, mapserver, dados geograficos, mapa interativo, i3geo, geoprocessamento, mapa, gis, sig, geografia, cartografia, meio ambiente">
 <head>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-
 </head>
 <body>
-<center>
-<br><br>
-<table>
-<tr>
-	<td style="padding:10px;"><center><img alt="i3Geo" src='imagens/logo_inicio.png'></td>
-</tr>
-</table>
+
 </body>
 <script>
 /*
@@ -65,7 +65,7 @@
 <center>
 <table id="i3GEOlogoMarca" style='box-shadow:0 1px 13px gray;border-radius:5px;'>
 	<tr>
-		<td><center><h1 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
+		<td><center><h1 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 	</tr>
 	<tr>
 		<td style="padding:10px;"><center><img alt="" src='../imagens/logo_inicio.png' ></td>
@@ -100,6 +100,7 @@
 		</div>
 	</div>
 </div>
+
 <script src="../classesjs/i3geo.js"></script>
 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
 <!-- estilo necessário para a ferramenta de edição -->
@@ -464,6 +464,28 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=&quot;&quot;){
 	{$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;
+	}	
+	/*
+	if(file_exists($nome))
+	{
 		if (!function_exists('imagepng'))
 		{
 			$s = PHP_SHLIB_SUFFIX;
@@ -474,7 +496,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=&quot;&quot;){
 		@$img = imagecreatefrompng($nome);
 		if(!$img)
 		{
-			/* Create a blank image */
 			$img  = imagecreatetruecolor($w, $h);
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
@@ -483,7 +504,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=&quot;&quot;){
 			$tc  = imagecolorallocate($img, 255, 0, 0);
 			imagefilledrectangle($img, 0, 0, $w, $h, $bgc);
-			/* Output an error message */
 			imagestring($img, 3, 5, 5, 'Erro ao ler ' . $nome, $tc);
 		}
 		else
@@ -498,6 +518,7 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=&quot;&quot;){
 		imagedestroy($img);
 		exit;
 	}
+	*/
 }
 ?>
@@ -758,9 +758,11 @@ class LayerServer {
     function add_style_point(&$new_style, &$style_data){
         if($style_data['icon']){
             $st =& $new_style->addChild('IconStyle');
-            if($style_data['width'] && $style_data['icon_width'] != 32){
+			if($style_data['width'] && $style_data['icon_width'] != 32){
                 $st->addChild('scale', $style_data['icon_width'] / 32);
             }
+			else
+			{$st->addChild('scale', 1);}
             $icon =& $st->addChild('Icon');
             $icon->addChild('href', htmlentities($style_data['icon']));
         }
	@@ -464,6 +464,28 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){		@@ -464,6 +464,28 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
464	{$nome = $cachedir."/".$layer."/".$nome;}	464	{$nome = $cachedir."/".$layer."/".$nome;}
465	if(file_exists($nome))	465	if(file_exists($nome))
466	{	466	{
		467	+ ob_start();
		468	+ // assuming you have image data in $imagedata
		469	+ $img = file_get_contents($nome);
		470	+ $length = strlen($img);
		471	+ $ft = filemtime($nome);
		472	+ if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && (strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]) == $ft)) {
		473	+ // Client's cache IS current, so we just respond '304 Not Modified'.
		474	+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $ft).' GMT', true, 304);
		475	+ } else {
		476	+ // Image not cached or cache outdated, we respond '200 OK' and output the image.
		477	+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $ft).' GMT', true, 200);
		478	+ }
		479	+ header('Accept-Ranges: bytes');
		480	+ header('Content-Length: '.$length);
		481	+ header('Content-Type: image/png');
		482	+ print($img);
		483	+ ob_end_flush();
		484	+ exit;
		485	+ }
		486	+ /*
		487	+ if(file_exists($nome))
		488	+ {
467	if (!function_exists('imagepng'))	489	if (!function_exists('imagepng'))
468	{	490	{
469	$s = PHP_SHLIB_SUFFIX;	491	$s = PHP_SHLIB_SUFFIX;
	@@ -474,7 +496,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){		@@ -474,7 +496,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
474	@$img = imagecreatefrompng($nome);	496	@$img = imagecreatefrompng($nome);
475	if(!$img)	497	if(!$img)
476	{	498	{
477	- /* Create a blank image */
478	$img = imagecreatetruecolor($w, $h);	499	$img = imagecreatetruecolor($w, $h);
479	imagealphablending($img, false);	500	imagealphablending($img, false);
480	imagesavealpha($img, true);	501	imagesavealpha($img, true);
	@@ -483,7 +504,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){		@@ -483,7 +504,6 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
483	$tc = imagecolorallocate($img, 255, 0, 0);	504	$tc = imagecolorallocate($img, 255, 0, 0);
484		505
485	imagefilledrectangle($img, 0, 0, $w, $h, $bgc);	506	imagefilledrectangle($img, 0, 0, $w, $h, $bgc);
486	- /* Output an error message */
487	imagestring($img, 3, 5, 5, 'Erro ao ler ' . $nome, $tc);	507	imagestring($img, 3, 5, 5, 'Erro ao ler ' . $nome, $tc);
488	}	508	}
489	else	509	else
	@@ -498,6 +518,7 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){		@@ -498,6 +518,7 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
498	imagedestroy($img);	518	imagedestroy($img);
499	exit;	519	exit;
500	}	520	}
		521	+ */
501	}	522	}
502		523
503	?>	524	?>