From 34df73b72735f5fe48a71754d9a56e59ffd8dbc0 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 3 Oct 2011 21:48:29 +0000
Subject: [PATCH] Compactação dos códigos do mashup

---
 aplicmap/ogcws.map                 |  3 +--
 aplicmap/ogcwsv5.map               | 23 ++++++++++++-----------
 aplicmap/ogcwsv6.map               | 21 +++++++++++----------
 mashups/index.html                 |  1 +
 mashups/openlayers.js.php          |  2 +-
 mashups/openlayers_compacto.js     |  2 +-
 mashups/openlayers_compacto.js.php |  2 +-
 7 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/aplicmap/ogcws.map b/aplicmap/ogcws.map
index ba8602d..c5c4ada 100644
--- a/aplicmap/ogcws.map
+++ b/aplicmap/ogcws.map
@@ -11,8 +11,7 @@ MAP
   #CONFIG MS_NONSQUARE "YES"
   #CONFIG MS_ERRORFILE "/ms4w/tmp/ms_error.txt"
   NAME "i3geoogc"
-
-  DEBUG 5
+  #DEBUG 5
   OUTPUTFORMAT
     NAME "png"
     MIMETYPE "image/png"
diff --git a/aplicmap/ogcwsv5.map b/aplicmap/ogcwsv5.map
index 2047123..b0d841a 100644
--- a/aplicmap/ogcwsv5.map
+++ b/aplicmap/ogcwsv5.map
@@ -12,17 +12,18 @@ MAP
   #CONFIG MS_ERRORFILE "/ms4w/tmp/ms_error.txt"
   NAME "i3geoogc"
   DEBUG OFF
-  #DEBUG 5
-  OUTPUTFORMAT
-    NAME "png"
-    MIMETYPE "image/png"
-    DRIVER "GD/PNG"
-    EXTENSION "png"
-    IMAGEMODE "RGBA"
-    TRANSPARENT TRUE
-    FORMATOPTION "INTERLACE=OFF"
-  END
-
+  #DEBUG 5 
+	OUTPUTFORMAT
+		NAME 'png'
+		MIMETYPE "image/png"
+ 		DRIVER AGG/PNG
+ 		IMAGEMODE RGB
+ 		FORMATOPTION "QUANTIZE_FORCE=ON"
+ 		FORMATOPTION "QUANTIZE_DITHER=OFF"
+ 		FORMATOPTION "QUANTIZE_COLORS=256"
+		FORMATOPTION "INTERLACE=OFF"
+		TRANSPARENT TRUE
+	END
   PROJECTION
     "init=epsg:4291"
   END
diff --git a/aplicmap/ogcwsv6.map b/aplicmap/ogcwsv6.map
index 5c3d97f..8f26853 100644
--- a/aplicmap/ogcwsv6.map
+++ b/aplicmap/ogcwsv6.map
@@ -14,16 +14,17 @@ MAP
   NAME "i3geoogc"
   DEBUG OFF
   #DEBUG 5
-  OUTPUTFORMAT
-    NAME "png"
-    MIMETYPE "image/png"
-    DRIVER "AGG/PNG"
-    EXTENSION "png"
-    IMAGEMODE "RGBA"
-    TRANSPARENT TRUE
-    #FORMATOPTION "INTERLACE=OFF"
-  END
-
+	OUTPUTFORMAT
+		NAME 'png'
+		MIMETYPE "image/png"
+ 		DRIVER AGG/PNG
+ 		IMAGEMODE RGB
+ 		FORMATOPTION "QUANTIZE_FORCE=ON"
+ 		FORMATOPTION "QUANTIZE_DITHER=OFF"
+ 		FORMATOPTION "QUANTIZE_COLORS=256"
+		FORMATOPTION "INTERLACE=OFF"
+		TRANSPARENT TRUE
+	END
   PROJECTION
     "init=epsg:4291"
   END
diff --git a/mashups/index.html b/mashups/index.html
index 02dd2e6..9963f6b 100644
--- a/mashups/index.html
+++ b/mashups/index.html
@@ -25,6 +25,7 @@ body,td
 <p>O <a href='http://openlayers.org' >OpenLayers</a> é uma biblioteca em javascript bastante popular. Possuí uma interface simples mas que pode 
 conter um grande número de funcionalidades.</p>
 <p>Para ver todos os parâmetros: <a href='openlayers.php'>i3geo/mashups/openlayers.php</a></p>
+<p>O gerador de Web Services do i3GEO pode ser utilizado para abrir o mashup. Exemplo: <a href="http://localhost/i3geo/ogc.php?temas=biomashp&format=application/openlayers&bbox=-54,-14,-50,-10" >ogc.php?temas=biomashp&format=application/openlayers&bbox=-54,-14,-50,-10</a></p>
 <p>Exemplo: todas as opções e um tema adicionado <a href='openlayers.php?temas=biomashp&largura=600'>openlayers.php?temas=biomashp&largura=600</a></p>
 <p>Exemplo: zoom para uma região <a href='openlayers.php?temas=biomashp&largura=600&mapext=-68.39967 -12.16172 -62.67402 -5.366808'>openlayers.php?temas=biomashp&largura=600&mapext=-68.39967 -12.16172 -62.67402 -5.366808</a></p>
 <p>Exemplo: Botões principais e barra de zoom maior <a href='openlayers.php?temas=biomashp&largura=600&botoes=pan,zoombox,zoomtot,distancia,area,identifica&numzoomlevels=10'>openlayers.php?temas=biomashp&largura=600&botoes=pan,zoombox,zoomtot,distancia,area,identifica&numzoomlevels=10</a>
diff --git a/mashups/openlayers.js.php b/mashups/openlayers.js.php
index f05f541..8147cfc 100644
--- a/mashups/openlayers.js.php
+++ b/mashups/openlayers.js.php
@@ -197,7 +197,7 @@ i3GEO.editorOL = {
 		i3GEO.editorOL.adicionaMarcas();
 		if(i3GEO.editorOL.maxext !== "")
 		{i3GEO.editorOL.mapa.zoomToMaxExtent();}
-		else
+		if(i3GEO.editorOL.mapext != "")
 		{i3GEO.editorOL.mapa.zoomToExtent(i3GEO.editorOL.mapext);}
 		i3GEO.editorOL.coordenadas();	
 		i3GEO.editorOL.criaJanelaBusca();
diff --git a/mashups/openlayers_compacto.js b/mashups/openlayers_compacto.js
index d19f5ec..aa80811 100644
--- a/mashups/openlayers_compacto.js
+++ b/mashups/openlayers_compacto.js
@@ -2382,7 +2382,7 @@ i3GEO.editorOL = {
 		i3GEO.editorOL.adicionaMarcas();

 		if(i3GEO.editorOL.maxext !== "")

 		{i3GEO.editorOL.mapa.zoomToMaxExtent();}

-		else

+		if(i3GEO.editorOL.mapext != "")

 		{i3GEO.editorOL.mapa.zoomToExtent(i3GEO.editorOL.mapext);}

 		i3GEO.editorOL.coordenadas();	

 		i3GEO.editorOL.criaJanelaBusca();

diff --git a/mashups/openlayers_compacto.js.php b/mashups/openlayers_compacto.js.php
index ad9d0b7..4c74c3f 100644
--- a/mashups/openlayers_compacto.js.php
+++ b/mashups/openlayers_compacto.js.php
@@ -2382,7 +2382,7 @@ i3GEO.editorOL = {
 		i3GEO.editorOL.adicionaMarcas();


 		if(i3GEO.editorOL.maxext !== "")


 		{i3GEO.editorOL.mapa.zoomToMaxExtent();}


-		else


+		if(i3GEO.editorOL.mapext != "")


 		{i3GEO.editorOL.mapa.zoomToExtent(i3GEO.editorOL.mapext);}


 		i3GEO.editorOL.coordenadas();	


 		i3GEO.editorOL.criaJanelaBusca();


--
libgit2 0.21.2