From 5855b772fa5eb0ab970ade828866ea2ec14a745c Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 24 Nov 2014 00:20:24 +0000
Subject: [PATCH] Correção na inclusão de diretivas de processamento duplicadas

---
 classesphp/classe_mapa.php |  9 +++++++--
 ms_criamapa.php            | 16 +++++++++++-----
 ogc.php                    | 11 ++++++++---
 temas/_lbiomashp.map       | 30 ++++++++++++++++++------------
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php
index a6e7416..9ab05bf 100644
--- a/classesphp/classe_mapa.php
+++ b/classesphp/classe_mapa.php
@@ -1262,8 +1262,13 @@ class Mapa
 						$nlayer = $nmap->getlayerbyname($n);
 						//evita problemas no modo tile
 						if($this->v > 5){
-							$nlayer->setprocessing("LABEL_NO_CLIP=True");
-							$nlayer->setprocessing("POLYLINE_NO_CLIP=True");
+							$p = $nlayer->getProcessing();
+							if(!in_array("LABEL_NO_CLIP=True",$p)){
+								$nlayer->setprocessing("LABEL_NO_CLIP=True");
+							}
+							if(!in_array("POLYLINE_NO_CLIP=True",$p)){
+								$nlayer->setprocessing("POLYLINE_NO_CLIP=True");
+							}
 						}
 						//para impedir erros na legenda
 						if($nlayer->getmetadata("classe") == ""){
diff --git a/ms_criamapa.php b/ms_criamapa.php
index 601cf3e..ace5cdd 100644
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -136,7 +136,7 @@ filtros - filtros podem ser adicionados incluindo o parametro da seguinte forma:
   Exemplo de filtro
 
   http://localhost/i3geo/ms_criamapa.php?temasa=_lbiomashp&map_layer__lbiomashp_filter=(('[CD_LEGENDA]'='CAATINGA'))&temasa=_lbiomashp
-  
+
   no caso de camadas Postgis basta usar map_layer__lbiomashp_filter=cd_legenda='CAATINGA'
 */
 
@@ -215,9 +215,9 @@ filtros - filtros podem ser adicionados incluindo o parametro da seguinte forma:
   Exemplo de filtro
 
   http://localhost/i3geo/ms_criamapa.php?layers=_lbiomashp&temasa=_lbiomashp&map_layer__lbiomashp_filter=(('[CD_LEGENDA]'='CAATINGA'))
-  
+
   no caso de camadas Postgis basta usar map_layer__lbiomashp_filter=cd_legenda='CAATINGA'
-	
+
 	";
 	exit;
 }
@@ -645,8 +645,14 @@ function adaptaLayers($tmpfname,$versao){
 			$layer->setmetadata("classe","");
 		}
 		if($versao > 5){
-			$layer->setprocessing("LABEL_NO_CLIP=True");
-			$layer->setprocessing("POLYLINE_NO_CLIP=True");
+			$pr = $layer->getProcessing();
+			if(!in_array("LABEL_NO_CLIP=True",$pr)){
+				$layer->setprocessing("LABEL_NO_CLIP=True");
+			}
+			if(!in_array("POLYLINE_NO_CLIP=True",$pr)){
+				$layer->setprocessing("POLYLINE_NO_CLIP=True");
+			}
+
 		}
 		//
 		//verifica se deve aplicar filtro
diff --git a/ogc.php b/ogc.php
index 06594b3..d6de625 100644
--- a/ogc.php
+++ b/ogc.php
@@ -411,9 +411,14 @@ else{
 						}
 						autoClasses($l,$oMap);
 						if($versao > 5){
-							$l->setprocessing("LABEL_NO_CLIP=True");
-							$l->setprocessing("POLYLINE_NO_CLIP=True");
-						}
+							$pr = $l->getProcessing();
+							if(!in_array("LABEL_NO_CLIP=True",$pr)){
+								$l->setprocessing("LABEL_NO_CLIP=True");
+							}
+							if(!in_array("POLYLINE_NO_CLIP=True",$pr)){
+								$l->setprocessing("POLYLINE_NO_CLIP=True");
+							}
+													}
 						//
 						//verifica se existem parametros de substituicao passados via url
 						//
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index 1643bf2..30d2dd2 100644
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -44,49 +44,55 @@ MAP
       NAME "CAATINGA"
       EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
       STYLE
-        COLOR 220 255 198
+        COLOR 183 247 169
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
     CLASS
-      NAME "PAMPA"
-      EXPRESSION ('[CD_LEGENDA]'eq'PAMPA')
+      NAME "PAMPA area > 5"
+      EXPRESSION ('[CD_LEGENDA]'eq'PAMPA area > 5')
       STYLE
-        COLOR 146 184 126
+        COLOR 239 22 152
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
     CLASS
       NAME "CERRADO"
       EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
       STYLE
-        COLOR 49 19 199
+        COLOR 57 32 234
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
     CLASS
       NAME "PANTANAL"
       EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
       STYLE
-        COLOR 252 72 119
+        COLOR 214 107 232
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
     CLASS
-      NAME "AMAZÔNIA"
-      EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
+      NAME "AMAZÔNIA"
+      EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
       STYLE
-        COLOR 31 233 4
+        COLOR 102 177 195
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
     CLASS
-      NAME "MATA ATLÂNTICA"
-      EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
+      NAME "MATA ATLÂNTICA"
+      EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
       STYLE
-        COLOR 141 178 208
+        COLOR 44 215 49
         OUTLINECOLOR 255 255 255
       END # STYLE
+      TITLE ""
     END # CLASS
   END # LAYER
 
--
libgit2 0.21.2