From 75da765234eb49e78be2eeceb3a8ffedfcf95e61 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 18 Mar 2013 20:03:09 +0000
Subject: [PATCH] Inclusão de rotina para limpeza de cache de arquivos mapfile usados por ogc.php

---
 admin/php/editormapfile.php | 17 ++++++++++++++++-
 admin/php/editortexto.php   |  8 ++++++++
 ogc.php                     |  2 +-
 temas/_lbiomashp.map        |  5 +++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index 6efa23e..745ef92 100644
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -2030,8 +2030,14 @@ function alterarEstilo()
 	$nclasses = $layer->numclasses;
 	$classe = $layer->getclass($indiceClasse);
 	$estilo = $classe->getstyle($indiceEstilo);
-	$estilo->set("symbolname",$symbolname);
+	if(!empty($symbolname)){
+		$estilo->set("symbolname",$symbolname);
+	}
+	if(empty($symbolname)){
+		$estilo->set("symbolname"," ");
+	}
 	corE($estilo,$color,"color");
+
 	$estilo->set("size",$size);
 	$estilo->set("minsize",$minsize);
 	$estilo->set("maxsize",$maxsize);
@@ -2052,6 +2058,15 @@ function alterarEstilo()
 
 function removeCabecalho($arq,$symbolset=true)
 {
+	global $dir_tmp;
+	//remove o cache OGC
+	$nomeMapfileTmp = $dir_tmp."/ogc_".md5($arq).".map";
+	$nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
+	$nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
+	chmod($nomeMapfileTmp,0777);
+	unlink($nomeMapfileTmp);
+	//echo $nomeMapfileTmp;exit;
+	//remove o cache OGC
 	$handle = fopen($arq, "r");
 	if ($handle)
 	{
diff --git a/admin/php/editortexto.php b/admin/php/editortexto.php
index b0b3f59..0330061 100644
--- a/admin/php/editortexto.php
+++ b/admin/php/editortexto.php
@@ -43,6 +43,14 @@ body {
 			{
 				echo "Arquivo $mapfile n&atilde;o existe.";exit;
 			}
+			//remove o cache OGC
+			$nomeMapfileTmp = $dir_tmp."/ogc_".md5($mapfile).".map";
+			$nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
+			$nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
+			chmod($nomeMapfileTmp,0777);
+			unlink($nomeMapfileTmp);
+			//echo $nomeMapfileTmp;exit;
+			//
 			if($_POST["tipo"] == "gravar"){
 				$fp = fopen($mapfile,"w");
 				fwrite($fp,$gravarTexto);
diff --git a/ogc.php b/ogc.php
index 27f8e9f..3d351c6 100644
--- a/ogc.php
+++ b/ogc.php
@@ -45,7 +45,7 @@ legenda - (opcional) mostra a legenda no corpo do mapa sim|nao
 perfil - (opcional) perfil utilizado para restringir os temas que ser&atilde;o mostrados
 
 format - (opcional) pode ser utilizado a op&ccedil;&atilde;o &format=application/openlayers para abrir o mashup do OpenLayers com as camadas definida em temas
-
+
 Exemplos:
 
 ogc.php?temas=biomashp&format=application/openlayers&bbox=-54,-14,-50,-10
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index edf81fb..91e981c 100644
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -21,6 +21,7 @@ MAP
     PROCESSING "ITEMS=CD_LEGENDA"
     STATUS OFF
     TEMPLATE "none.htm"
+    TILEITEM "location"
     OPACITY 50
     TYPE POLYGON
     UNITS METERS
@@ -29,7 +30,7 @@ MAP
       EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
       STYLE
         ANGLE 0
-        COLOR 21 44 114
+        COLOR 255 255 0
         OFFSET 0 0
       END # STYLE
     END # CLASS
@@ -56,7 +57,7 @@ MAP
       EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
       STYLE
         ANGLE 0
-        COLOR 242 192 145
+        COLOR 0 192 145
         OFFSET 0 0
       END # STYLE
     END # CLASS
--
libgit2 0.21.2