From 4e6b48dd862e0caf06f04382cefcb5a865c26009 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 23 Nov 2011 13:26:24 +0000
Subject: [PATCH] Inclusão de rotina para remover elementos depreciados em MAPFILEs

---
 admin/html/incluimap.html           | 28 +++++++++++++++++++++++++++-
 admin/php/incluiMAP.php             | 49 +++++++++++++++++++++++++++++++------------------
 temas/acidmap.map                   | 10 +++++-----
 temas/atlas_biomas.map              | 10 +++++-----
 temas/autolegenda_exemplo.map       |  6 +++---
 temas/bing.map                      |  2 ++
 temas/biomashp.map                  | 10 +++++-----
 temas/biomashpwms.map               | 10 +++++-----
 temas/cbers.map                     |  2 ++
 temas/cbersgeo.map                  |  4 +++-
 temas/cbersi.map                    |  6 +++---
 temas/cinzapalete.map               |  4 +++-
 temas/estadosl.map                  |  2 ++
 temas/geojs_ogr1.map                |  2 ++
 temas/geopr_ana_federais.map        |  6 +++---
 temas/geopr_aneel_termeletricas.map | 10 +++++-----
 temas/geopr_sipam_vege.map          |  6 +++---
 temas/kml.map                       | 66 ++++++++++++++++++++++++++++++++++--------------------------------
 temas/locali.map                    | 10 +++++-----
 temas/municipios.map                | 10 +++++-----
 temas/munpop.map                    | 18 ++++++++----------
 temas/osm.map                       | 71 ++++++++++++++++++++++++++++++++++++-----------------------------------
 temas/p2r2uf1.map                   |  5 ++---
 temas/postgis.map                   | 10 +++++-----
 temas/povoado.map                   | 14 +++++++-------
 temas/teste.map                     |  3 ++-
 temas/teste5.map                    | 40 +++++++++++++++++++++-------------------
 temas/testegml.map                  | 69 +++++++++++++++++++++++++++++++++++----------------------------------
 temas/testept.map                   | 10 +++++-----
 temas/testepttemplatekml.map        |  6 +++---
 temas/testesubsstring.map           |  6 +++---
 temas/testeutf8postgis.map          |  5 ++---
 temas/testeutm.map                  |  6 +++---
 temas/vegetacao.map                 |  6 +++---
 34 files changed, 288 insertions(+), 234 deletions(-)

diff --git a/admin/html/incluimap.html b/admin/html/incluimap.html
index 73ae465..8fdef83 100644
--- a/admin/html/incluimap.html
+++ b/admin/html/incluimap.html
@@ -14,7 +14,33 @@ você pode editá-los individulamente ou rodar o programa i3geo/admin/php/incluiMA
 <p>
 Antes de fazer isso, faça um backup do seu diretório i3geo/temas
 <p>
-<a href="../php/incluiMAP.php" >Executar o ajuste dos mapfiles</a>
+<a href="../php/incluiMAP.php" >Ajuste dos mapfiles - inclusão da palavra "MAP" no início dos arquivos; substituição de vários elementos depreciados</a>
+<p>
+Lista de substituições:
+<pre>
+	$search = array(
+		"transparency ",
+		"LABELANGLEITEM ",
+		"LABELMAXSCALE ",
+		"LABELMINSCALE ",
+		"LABELMINSCALE ",
+		"LABELSIZEITEM ",
+		"MAXSCALE ",
+		"MINSCALE ",
+		"SYMBOLSCALE "
+	);
+	$replace = array(
+		"OPACITY ",
+		"#LABELANGLEITEM ",
+		"LABELMAXSCALEDENOM ",
+		"LABELMINSCALEDENOM ",
+		"LABELMINSCALEDENOM ",
+		"#LABELSIZEITEM ",
+		"MAXSCALEDENOM ",
+		"MINSCALEDENOM ",
+		"SYMBOLSCALEDENOM "
+	);
+
 <script>
 /*
 Title: Ajuste de mapfiles
diff --git a/admin/php/incluiMAP.php b/admin/php/incluiMAP.php
index 1eed763..29b6e64 100644
--- a/admin/php/incluiMAP.php
+++ b/admin/php/incluiMAP.php
@@ -67,29 +67,42 @@ foreach($arquivos as $arquivo)
 		$buffer = fgets($abre);
 		$buffer = str_replace(PHP_EOL,"",rtrim($buffer));
 		if(trim($buffer) != "MAP" && $buffer != "")
-		{
-			$maparray[] = $buffer;
-		}
+		{$maparray[] = $buffer;}
 		else
 		{$mapExiste = true;}
 	}
 	fclose($abre);
-	//echo "<pre>";
-	//var_dump($maparray);
-	//exit;
-	if($mapExiste == true){
-		echo "MAP já existe em ".$arquivo."<br>";
-	}
-	else{
-		$abre = fopen($arq, "wt");
-		foreach($maparray as $linha)
-		{
-			fwrite ($abre,$linha);
-			fwrite ($abre,"\n");
-		}
-		$fecha = fclose ($abre);
-		echo $arquivo."<br>";
+	$search = array(
+		"transparency ",
+		"LABELANGLEITEM ",
+		"LABELMAXSCALE ",
+		"LABELMINSCALE ",
+		"LABELMINSCALE ",
+		"LABELSIZEITEM ",
+		"MAXSCALE ",
+		"MINSCALE ",
+		"SYMBOLSCALE "
+	);
+	$replace = array(
+		"OPACITY ",
+		"#LABELANGLEITEM ",
+		"LABELMAXSCALEDENOM ",
+		"LABELMINSCALEDENOM ",
+		"LABELMINSCALEDENOM ",
+		"#LABELSIZEITEM ",
+		"MAXSCALEDENOM ",
+		"MINSCALEDENOM ",
+		"SYMBOLSCALEDENOM "
+	);
+	str_ireplace($search,$replace,$maparray);
+	$abre = fopen($arq, "wt");
+	foreach($maparray as $linha)
+	{
+		fwrite ($abre,$linha);
+		fwrite ($abre,"\n");
 	}
+	$fecha = fclose ($abre);
+	echo $arquivo."<br>";
 }
 
 ?>
\ No newline at end of file
diff --git a/temas/acidmap.map b/temas/acidmap.map
index e18a8c0..cc38e29 100644
--- a/temas/acidmap.map
+++ b/temas/acidmap.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
-  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
+  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
   LAYER
     CONNECTION "http://localhost:8080/geoserver/wms?VALUE_COLUMN=VALOR&SERVICE=AMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&FORMAT=image/png&EXCEPTIONS=application/vnd.ogc.se_inimage&TILED=true&TRANSPARENT=FALSE&VALUE_COLUMN=value&SIMPLIFY_METHOD=1&SIMPLIFY_SIZE=400&INTERVALS[]=10,20,45,70,100&INTERVALS_COLORS[]=0xffffff00,0xffb2,0xff00b2,0xffff00b2,0xff0000b2&RENDERER_TYPE=2&INTERPOLATION_STRATEGY=2&RADIUS=32"
     CONNECTIONTYPE WMS
@@ -31,6 +33,4 @@ MAP
     TYPE RASTER
     UNITS METERS
   END
-
 END
-
diff --git a/temas/atlas_biomas.map b/temas/atlas_biomas.map
index 6c363ce..5cc8786 100644
--- a/temas/atlas_biomas.map
+++ b/temas/atlas_biomas.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION "http://mapas.mma.gov.br/i3geo/ogc.php?tema=bioma"
     CONNECTIONTYPE WMS
@@ -33,6 +35,4 @@ MAP
       NAME "testevvvvv"
     END
   END
-
 END
-
diff --git a/temas/autolegenda_exemplo.map b/temas/autolegenda_exemplo.map
index 35e3f86..2f2fe00 100644
--- a/temas/autolegenda_exemplo.map
+++ b/temas/autolegenda_exemplo.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
   LAYER
@@ -44,6 +46,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/bing.map b/temas/bing.map
index 6ee44a0..50629cd 100644
--- a/temas/bing.map
+++ b/temas/bing.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
   LAYER
diff --git a/temas/biomashp.map b/temas/biomashp.map
index 4b47160..5ce771c 100644
--- a/temas/biomashp.map
+++ b/temas/biomashp.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "c:\ms4w\apache\htdocs\i3geo\symbols\fontes.txt"
-  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo\symbols\simbolos.sym"
+MAP
+
+
+  FONTSET "c:\ms4w\apache\htdocs\i3geo\symbols\fontes.txt"
+  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo\symbols\simbolos.sym"
   LAYER
     CONNECTION ""
     DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp"
@@ -107,6 +109,4 @@ MAP
       TITLE ""
     END
   END
-
 END
-
diff --git a/temas/biomashpwms.map b/temas/biomashpwms.map
index 65a7d73..4a58a91 100644
--- a/temas/biomashpwms.map
+++ b/temas/biomashpwms.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
-  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
+  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
   LAYER
     CLASSITEM "ID"
     CONNECTION "http://localhost/i3geo/ogc.php?tema=biomashp"
@@ -80,6 +82,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/cbers.map b/temas/cbers.map
index 7311b93..8b0f0a7 100644
--- a/temas/cbers.map
+++ b/temas/cbers.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
diff --git a/temas/cbersgeo.map b/temas/cbersgeo.map
index 3f91813..5cfdf8e 100644
--- a/temas/cbersgeo.map
+++ b/temas/cbersgeo.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
@@ -24,4 +26,4 @@ LAYER
       END
     END
   END
-END
\ No newline at end of file
+END
diff --git a/temas/cbersi.map b/temas/cbersi.map
index e9bb008..8e13f05 100644
--- a/temas/cbersi.map
+++ b/temas/cbersi.map
@@ -1,6 +1,8 @@
+MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
-
 LAYER
   NAME cbersi
   TYPE RASTER
@@ -18,7 +20,6 @@ LAYER
   END
 	TOLERANCE 0.001
 	OFFSITE 0 0 0
-		
 END  # LAYER
 LAYER
   NAME cbersii
@@ -39,5 +40,4 @@ LAYER
         OUTLINECOLOR 50 50 50
      END  # CLASS
 END  # LAYER
-
 END
diff --git a/temas/cinzapalete.map b/temas/cinzapalete.map
index 714514d..a33d570 100644
--- a/temas/cinzapalete.map
+++ b/temas/cinzapalete.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
@@ -16,4 +18,4 @@ LAYER
     TYPE RASTER
     UNITS METERS
   END
-END
\ No newline at end of file
+END
diff --git a/temas/estadosl.map b/temas/estadosl.map
index ef4dac4..477d1af 100644
--- a/temas/estadosl.map
+++ b/temas/estadosl.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolosv6.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
diff --git a/temas/geojs_ogr1.map b/temas/geojs_ogr1.map
index 00658ba..7ab27f7 100644
--- a/temas/geojs_ogr1.map
+++ b/temas/geojs_ogr1.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
diff --git a/temas/geopr_ana_federais.map b/temas/geopr_ana_federais.map
index 00a6329..35043af 100644
--- a/temas/geopr_ana_federais.map
+++ b/temas/geopr_ana_federais.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   LAYER
     CONNECTION "http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map"
     CONNECTIONTYPE WMS
@@ -72,6 +74,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/geopr_aneel_termeletricas.map b/temas/geopr_aneel_termeletricas.map
index eea9389..d828121 100644
--- a/temas/geopr_aneel_termeletricas.map
+++ b/temas/geopr_aneel_termeletricas.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION "http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?"
     CONNECTIONTYPE WMS
@@ -36,6 +38,4 @@ MAP
       NAME " "
     END
   END
-
 END
-
diff --git a/temas/geopr_sipam_vege.map b/temas/geopr_sipam_vege.map
index bc467ed..ba5a1bc 100644
--- a/temas/geopr_sipam_vege.map
+++ b/temas/geopr_sipam_vege.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   LAYER
     CONNECTION "http://www2.sipam.gov.br:80/geoserver/wms?SERVICE=WMS"
     CONNECTIONTYPE WMS
@@ -34,6 +36,4 @@ MAP
       NAME " "
     END
   END
-
 END
-
diff --git a/temas/kml.map b/temas/kml.map
index 191ffc1..e06cb7f 100644
--- a/temas/kml.map
+++ b/temas/kml.map
@@ -1,32 +1,34 @@
-MAP
-  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
-  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
-  LAYER
-    CONNECTION "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\teste.kml"
-    CONNECTIONTYPE OGR
-    DATA "Trovit"
-    METADATA
-      "CLASSE"	"SIM"
-      "TEXTO"	"NAO"
-      "TEMALOCAL"	"SIM"
-      "DOWNLOAD"	"SIM"
-      "TEMA"	"teste"
-    END
-    NAME "kml"
-    STATUS DEFAULT
-    TEMPLATE "none.htm"
-    TYPE POINT
-    UNITS METERS
-    CLASS
-      NAME ""
-      STYLE
-        ANGLE 360
-        COLOR 200 50 0
-        OUTLINECOLOR 0 0 0
-        SIZE 6
-        SYMBOL "ponto"
-        WIDTH 1
-      END
-    END
-  END
-  END
\ No newline at end of file
+MAP
+
+
+  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
+  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
+  LAYER
+    CONNECTION "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\teste.kml"
+    CONNECTIONTYPE OGR
+    DATA "Trovit"
+    METADATA
+      "CLASSE"	"SIM"
+      "TEXTO"	"NAO"
+      "TEMALOCAL"	"SIM"
+      "DOWNLOAD"	"SIM"
+      "TEMA"	"teste"
+    END
+    NAME "kml"
+    STATUS DEFAULT
+    TEMPLATE "none.htm"
+    TYPE POINT
+    UNITS METERS
+    CLASS
+      NAME ""
+      STYLE
+        ANGLE 360
+        COLOR 200 50 0
+        OUTLINECOLOR 0 0 0
+        SIZE 6
+        SYMBOL "ponto"
+        WIDTH 1
+      END
+    END
+  END
+  END
diff --git a/temas/locali.map b/temas/locali.map
index 9954936..244a7f0 100644
--- a/temas/locali.map
+++ b/temas/locali.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
-  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt"
+  SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym"
   LAYER
     CONNECTION ""
     DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\locali"
@@ -75,6 +77,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/municipios.map b/temas/municipios.map
index 2455340..1a9456c 100644
--- a/temas/municipios.map
+++ b/temas/municipios.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION ""
     DATA "c:\ms4w\apache\htdocs - SFB\i3geo\geodados\municipios.shp"
@@ -49,6 +51,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/munpop.map b/temas/munpop.map
index 531b481..d1f8135 100644
--- a/temas/munpop.map
+++ b/temas/munpop.map
@@ -1,13 +1,13 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
-	CONNECTION "user=postgres dbname=dbspo host=localhost port=5432 password=postgres"
-    CONNECTIONTYPE POSTGIS
-    DATA "the_geom from (SELECT * from public.tb_ibge) as foo using unique gid using srid=23030"
- 
+	CONNECTION "user=postgres dbname=dbspo host=localhost port=5432 password=postgres"
+    CONNECTIONTYPE POSTGIS
+    DATA "the_geom from (SELECT * from public.tb_ibge) as foo using unique gid using srid=23030"
     METADATA
-
       "ltempoitemimagem"	""
       "CLASSE"	"SIM"
       "ltempoitemdescricao"	""
@@ -51,6 +51,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/osm.map b/temas/osm.map
index 69cb27d..18f3a8e 100644
--- a/temas/osm.map
+++ b/temas/osm.map
@@ -1,35 +1,36 @@
-MAP
-FONTSET "../symbols/fontes.txt"
-SYMBOLSET "../symbols/simbolos.sym"
-
- LAYER
-      NAME osm
-      TYPE RASTER
-      METADATA
-         "wms_title"           "Open Street Map"
-         "wms_group_title"     "Roads & Highways"
-         "wms_format"          "image/png"
-         "wms_srs"             "EPSG:4326"
-         "wms_name"            "osm"
-         "wms_server_version"  "1.1.1"
-         "wms_transparent"     "true"
-      "CLASSE"	"SIM"
-      "palletestep"	""
-      "permitekmz"	"nao"
-      "description_template"	""
-      "palletefile"	""
-      "permitedownload"	"nao"
-      "download"	"NAO"
-      "permiteogc"	"nao"
-      "permitekml"	"nao"
-      "TEMA"	"Open Street Map - Rodovias"
-      END
-      STATUS OFF
-      CONNECTIONTYPE WMS
-      CONNECTION "http://full.wms.geofabrik.de/std/demo_key?"
-	  #"http://data1.vizure.net/server/services/request.php?jname=/wms"
-      PROJECTION
-         "init=epsg:4326"
-      END
-   END
-END
+MAP
+
+
+FONTSET "../symbols/fontes.txt"
+SYMBOLSET "../symbols/simbolos.sym"
+ LAYER
+      NAME osm
+      TYPE RASTER
+      METADATA
+         "wms_title"           "Open Street Map"
+         "wms_group_title"     "Roads & Highways"
+         "wms_format"          "image/png"
+         "wms_srs"             "EPSG:4326"
+         "wms_name"            "osm"
+         "wms_server_version"  "1.1.1"
+         "wms_transparent"     "true"
+      "CLASSE"	"SIM"
+      "palletestep"	""
+      "permitekmz"	"nao"
+      "description_template"	""
+      "palletefile"	""
+      "permitedownload"	"nao"
+      "download"	"NAO"
+      "permiteogc"	"nao"
+      "permitekml"	"nao"
+      "TEMA"	"Open Street Map - Rodovias"
+      END
+      STATUS OFF
+      CONNECTIONTYPE WMS
+      CONNECTION "http://full.wms.geofabrik.de/std/demo_key?"
+	  #"http://data1.vizure.net/server/services/request.php?jname=/wms"
+      PROJECTION
+         "init=epsg:4326"
+      END
+   END
+END
diff --git a/temas/p2r2uf1.map b/temas/p2r2uf1.map
index 5197029..cdeba49 100644
--- a/temas/p2r2uf1.map
+++ b/temas/p2r2uf1.map
@@ -1,7 +1,8 @@
 MAP
+
+
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
-
   LAYER
     CONNECTION "user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'"
     CONNECTIONTYPE POSTGIS
@@ -58,7 +59,5 @@ MAP
         SYMBOL 0
       END
     END
-
   END
 END
-
diff --git a/temas/postgis.map b/temas/postgis.map
index 5960166..f5514d0 100644
--- a/temas/postgis.map
+++ b/temas/postgis.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION "user=postgres dbname=dbspo host=localhost port=5432 password=postgres"
     CONNECTIONTYPE POSTGIS
@@ -61,6 +63,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/povoado.map b/temas/povoado.map
index fe25875..26815ee 100644
--- a/temas/povoado.map
+++ b/temas/povoado.map
@@ -1,11 +1,13 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION ""
     DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\sc22\povoado.shp"
     METADATA
-      "temporizador" "5"
+      "temporizador" "5"
 	  "cache"	""
       "ltempoitemimagem"	""
       "CLASSE"	"SIM"
@@ -24,7 +26,7 @@ MAP
       "ltempoitemicone"	""
       "permitecomentario"	"NAO"
       "download"	"SIM"
-      "arquivodownload"	""
+      "arquivodownload"	""
 	  "arquivokmz" "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\povoado.kmz"
       "permitekml"	"sim"
       "permiteogc"	""
@@ -48,6 +50,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/teste.map b/temas/teste.map
index ac2438f..ffdd9e1 100644
--- a/temas/teste.map
+++ b/temas/teste.map
@@ -1,4 +1,6 @@
 MAP
+
+
 SYMBOLSET ../symbols/simbolos.sym
 FONTSET   "../symbols/fontes.txt"
 LAYER
@@ -16,7 +18,6 @@ LAYER
        SYMBOL 'ponto'
        SIZE 6
      END
-
   END
 END
 END
diff --git a/temas/teste5.map b/temas/teste5.map
index cd8b1c1..077558c 100644
--- a/temas/teste5.map
+++ b/temas/teste5.map
@@ -1,19 +1,21 @@
-MAP
-SYMBOLSET ../symbols/simbolos.sym
-FONTSET   "../symbols/fontes.txt"
-LAYER
-	NAME teste5
-	TYPE line
-	DATA ""
-	METADATA
-		TEMA "teste criando novo mapfile"
-		CLASSE "SIM"
-	END
-    CLASS
-        NAME ""
-        STYLE
-        	COLOR 0 0 0
-        END
-    END
-END
-END
+MAP
+
+
+SYMBOLSET ../symbols/simbolos.sym
+FONTSET   "../symbols/fontes.txt"
+LAYER
+	NAME teste5
+	TYPE line
+	DATA ""
+	METADATA
+		TEMA "teste criando novo mapfile"
+		CLASSE "SIM"
+	END
+    CLASS
+        NAME ""
+        STYLE
+        	COLOR 0 0 0
+        END
+    END
+END
+END
diff --git a/temas/testegml.map b/temas/testegml.map
index a2e6ace..33797ee 100644
--- a/temas/testegml.map
+++ b/temas/testegml.map
@@ -1,24 +1,26 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
-    #CONNECTION "http://mapas.mma.gov.br/i3geo/ogc.php?tema=ucsfi"
-    #CONNECTIONTYPE WMS
-	CONNECTIONTYPE OGR
-	CONNECTION "c:/ms4w/apache/htdocs/i3geo/aplicmap/dados/ucsfi.gml"	
-    METADATA
-      #"wms_srs"	"EPSG:4291"
-      #"wms_exceptions_format"	"application/vnd.ogc.se_xml"
-      #"wms_force_separate_request"	"1"
-      #"legendawms"	"http://mapas.mma.gov.br/i3geo/ogc.php?tema=ucsfi&service=wms&request=getlegendgraphic&version=1.1.0&service=wms&layer=ucsfi&format=image/png"
-      #"formatosinfo"	"text/plain,application/vnd.ogc.gml"
-      #"wms_name"	"ucsfi"
-      #"wms_format"	"image/png"
-      #"wms_formatlist"	"image/png,image/gif,image/png; mode=24bit,image/jpeg,image/vnd.wap.wbmp,image/tiff,image/svg xml"
-      #"wms_connectiontimeout"	"30"
-      #"wms_server_version"	"1.1.0"
-      #"wms_style"	"default"
-      #"wms_crs"	"EPSG:4291"
+    #CONNECTION "http://mapas.mma.gov.br/i3geo/ogc.php?tema=ucsfi"
+    #CONNECTIONTYPE WMS
+	CONNECTIONTYPE OGR
+	CONNECTION "c:/ms4w/apache/htdocs/i3geo/aplicmap/dados/ucsfi.gml"
+    METADATA
+      #"wms_srs"	"EPSG:4291"
+      #"wms_exceptions_format"	"application/vnd.ogc.se_xml"
+      #"wms_force_separate_request"	"1"
+      #"legendawms"	"http://mapas.mma.gov.br/i3geo/ogc.php?tema=ucsfi&service=wms&request=getlegendgraphic&version=1.1.0&service=wms&layer=ucsfi&format=image/png"
+      #"formatosinfo"	"text/plain,application/vnd.ogc.gml"
+      #"wms_name"	"ucsfi"
+      #"wms_format"	"image/png"
+      #"wms_formatlist"	"image/png,image/gif,image/png; mode=24bit,image/jpeg,image/vnd.wap.wbmp,image/tiff,image/svg xml"
+      #"wms_connectiontimeout"	"30"
+      #"wms_server_version"	"1.1.0"
+      #"wms_style"	"default"
+      #"wms_crs"	"EPSG:4291"
 	  "tema"	"Unidades de conservação federais de proteção integral"
       "CLASSE"	"SIM"
       "permitekmz"	"nao"
@@ -26,24 +28,23 @@ MAP
       "download"	"nao"
       "permiteogc"	"nao"
       "permitekml"	"sim"
-      "aplicaextensao"	"NAO"
+      "aplicaextensao"	"NAO"
 	  "cache" "sim"
     END
     NAME "ucsfederais"
-    STATUS OFF
+    STATUS OFF
 	OPACITY 70
     #TYPE RASTER
-    #UNITS METERS
-	#OFFSITE 255 255 255
-	TYPE POLYGON
-	CLASS
-	  NAME ""
-      STYLE
-        ANGLE 360
-        COLOR 20 158 10
-        OUTLINECOLOR 17 87 6
-      END
+    #UNITS METERS
+	#OFFSITE 255 255 255
+	TYPE POLYGON
+	CLASS
+	  NAME ""
+      STYLE
+        ANGLE 360
+        COLOR 20 158 10
+        OUTLINECOLOR 17 87 6
+      END
 	  END
-  END
+  END
 END
-
diff --git a/temas/testept.map b/temas/testept.map
index 2881480..9464306 100644
--- a/temas/testept.map
+++ b/temas/testept.map
@@ -1,6 +1,8 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolos.sym"
+MAP
+
+
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
   LAYER
     CONNECTION ""
     DATA "c:\ms4w\Apache\htdocs\geodados\brasil\limitespol\localidades.shp"
@@ -35,6 +37,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/testepttemplatekml.map b/temas/testepttemplatekml.map
index 768af76..22428fb 100644
--- a/temas/testepttemplatekml.map
+++ b/temas/testepttemplatekml.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
   LAYER
@@ -32,6 +34,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/testesubsstring.map b/temas/testesubsstring.map
index b8d0873..0178d91 100644
--- a/temas/testesubsstring.map
+++ b/temas/testesubsstring.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
   LAYER
@@ -41,6 +43,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/testeutf8postgis.map b/temas/testeutf8postgis.map
index 7ccd682..fd322e0 100644
--- a/temas/testeutf8postgis.map
+++ b/temas/testeutf8postgis.map
@@ -1,7 +1,8 @@
 MAP
+
+
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
-
   LAYER
     CONNECTION "teste"
     CONNECTIONTYPE POSTGIS
@@ -30,6 +31,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/testeutm.map b/temas/testeutm.map
index 90d6754..1dbc714 100644
--- a/temas/testeutm.map
+++ b/temas/testeutm.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   LAYER
     CONNECTION ""
     DATA "C:\ms4w\Apache\htdocs\geodados\utm21.shp"
@@ -27,6 +29,4 @@ MAP
       END
     END
   END
-
 END
-
diff --git a/temas/vegetacao.map b/temas/vegetacao.map
index 9c05a38..356bbda 100644
--- a/temas/vegetacao.map
+++ b/temas/vegetacao.map
@@ -1,4 +1,6 @@
-MAP
+MAP
+
+
   LAYER
     DATA "c:\ms4w\apache\htdocs\geodados\brasil\vegetacao\vegetacao.shp"
     METADATA
@@ -139,6 +141,4 @@ MAP
       END
     END
   END
-
 END
-
--
libgit2 0.21.2