From d37a04464676d8280a4d1c38bab71d223447be3a Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 20 Aug 2014 15:03:03 +0000
Subject: [PATCH] 

---
 .project                                                                               |  26 +++++++++++++++++++++-----
 .settings/.jsdtscope                                                                   | 100 +++++-----------------------------------------------------------------------------------------------
 .settings/org.eclipse.wst.jsdt.ui.superType.container                                  |   2 +-
 .settings/org.eclipse.wst.jsdt.ui.superType.name                                       |   2 +-
 ferramentas/heatmap/funcoes.php                                                        |   2 +-
 ferramentas/heatmap/index.js                                                           |  65 ++++++++++++++++++++++++++++++++---------------------------------
 ferramentas/markercluster/.project                                                     |  17 +++++++++++++++++
 ferramentas/markercluster/.settings/.jsdtscope                                         |   4 ++++
 ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container        |   1 +
 ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name             |   1 +
 ferramentas/markercluster/funcoes.php                                                  |   2 +-
 ferramentas/saiku/cartograma.php                                                       |  12 +++++++++++-
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js |  14 ++++++++------
 13 files changed, 104 insertions(+), 144 deletions(-)
 create mode 100755 ferramentas/markercluster/.project
 create mode 100755 ferramentas/markercluster/.settings/.jsdtscope
 create mode 100755 ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100755 ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name

diff --git a/.project b/.project
index 764db75..db8712c 100755
--- a/.project
+++ b/.project
@@ -25,9 +25,16 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.php.core.PHPNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>gvsig</name>
+			<type>2</type>
+			<location>/var/www/i3geo/pacotes/gvsig</location>
+		</link>
+	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1399312895196</id>
+			<id>1406724317282</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -36,7 +43,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1399312895197</id>
+			<id>1406724317287</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -45,7 +52,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1399312895199</id>
+			<id>1406724317292</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -54,7 +61,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1399312895201</id>
+			<id>1406724317296</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -63,7 +70,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1399312895202</id>
+			<id>1406724317299</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -71,5 +78,14 @@
 				<arguments>1.0-name-matches-false-false-*compacto*</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1406724317303</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.css.php</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
index 4b56b4d..fd01699 100755
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="admin/js"/>
-	<classpathentry excluding="compactados/" kind="src" path="classesjs"/>
-	<classpathentry kind="src" path="classesjs/compactados"/>
+	<classpathentry kind="src" path="classesjs"/>
 	<classpathentry kind="src" path="documentacao/javascript"/>
+	<classpathentry excluding="atlas/" kind="src" path="exemplos"/>
 	<classpathentry kind="src" path="exemplos/atlas"/>
 	<classpathentry kind="src" path="ferramentas/3d"/>
 	<classpathentry kind="src" path="ferramentas/agrupaelementos"/>
@@ -52,6 +52,7 @@
 	<classpathentry kind="src" path="ferramentas/graficointerativo"/>
 	<classpathentry kind="src" path="ferramentas/graficointerativo1"/>
 	<classpathentry kind="src" path="ferramentas/graficotema"/>
+	<classpathentry kind="src" path="ferramentas/heatmap"/>
 	<classpathentry kind="src" path="ferramentas/identifica"/>
 	<classpathentry kind="src" path="ferramentas/importarwmc"/>
 	<classpathentry kind="src" path="ferramentas/imprimir"/>
@@ -85,9 +86,9 @@
 	<classpathentry kind="src" path="ferramentas/pontosdistri"/>
 	<classpathentry kind="src" path="ferramentas/preferencias"/>
 	<classpathentry kind="src" path="ferramentas/redessociais"/>
-	<classpathentry excluding="saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/|saiku-server/tomcat/webapps/ROOT/js/saiku/views/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/|saiku-server/tomcat/webapps/ROOT/js/saiku/|saiku-server/tomcat/webapps/ROOT/js/jquery/" kind="src" path="ferramentas/saiku"/>
+	<classpathentry excluding="saiku-server/tomcat/webapps/ROOT/js/jquery/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/|saiku-server/tomcat/webapps/ROOT/js/saiku/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/|saiku-server/tomcat/webapps/ROOT/js/saiku/views/" kind="src" path="ferramentas/saiku"/>
 	<classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery"/>
-	<classpathentry excluding="plugins/i3GeoMap/|views/|plugins/CCC_Chart/" kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku"/>
+	<classpathentry excluding="plugins/i3GeoMap/|plugins/CCC_Chart/|views/" kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku"/>
 	<classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart"/>
 	<classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap"/>
 	<classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views"/>
@@ -110,97 +111,6 @@
 	<classpathentry kind="src" path="ferramentas/wmstime"/>
 	<classpathentry kind="src" path="init"/>
 	<classpathentry kind="src" path="mashups"/>
-	<classpathentry excluding="google/|yui290/build/utilities/|simile/timeline_2.3.0/timeline_js/scripts/l10n/en/|yui290/build/json/|yui290/build/swfdetect/|yui290/build/event-simulate/|yui290/build/datemath/|yui290/build/swfstore/|simile/timeline_2.3.0/timeline_js/scripts/l10n/it/|yui290/build/stylesheet/|ccc2/ccc/|yui290/build/carousel/|yui290/build/history/|proj4js/lib/|yui290/build/logger/|yui290/build/charts/|yui290/build/uploader/|yui290/assets/|openlayers/|yui290/build/dom/|simile/timeline_2.3.0/timeline_js/scripts/l10n/es/|yui290/build/selector/|proj4js/demo/maps/|openflashchart/|proj4js/lib/projCode/|yui290/build/progressbar/|yui290/build/colorpicker/|simile/timeline_2.3.0/timeline_ajax/scripts/|yui290/build/datatable/|yui290/build/event-mouseenter/|simile/timeline_2.3.0/timeline_js/scripts/l10n/vi/|simile/timeline_2.3.0/timeline_js/|cswclient/lib/scripts/|simile/timeline_2.3.0/timeline_js/scripts/l10n/tr/|yui290/build/cookie/|yui290/build/yuiloader/|yui290/build/calendar/|yui290/build/yahoo/|yui290/build/storage/|yui290/build/editor/|proj4js/demo/|jsts/lib/|richdraw/|tme/javascript/|simile/timeline_2.3.0/timeline_js/scripts/l10n/zh/|balloon-tooltips/htdocs/js/|balloon-tooltips/htdocs_depreciado/js/|yui290/build/swf/|yui290/build/autocomplete/|yui290/build/get/|proj4js/docs/NaturalDocs/javascript/|cpaint/|yui290/build/tabview/|yui290/build/treeview/|yui290/build/profilerviewer/|simile/timeline_2.3.0/timeline_js/scripts/l10n/cs/|simile/timeline_2.3.0/timeline_js/scripts/l10n/nl/|yui290/build/imagecropper/|yui290/build/datasource/|simile/timeline_2.3.0/timeline_js/scripts/l10n/fr/|eudock/js/|yui290/build/connection/|yui290/build/animation/|mobileesp/|yui290/build/yuiloader-dom-event/|yui290/build/element/|yui290/build/yuitest/|wicket/|proj4js/lib/defs/|cpaint/JSON/|yui290/build/resize/|simile/timeline_2.3.0/timeline_js/scripts/l10n/se/|yui290/build/container/|yui290/build/slider/|yui290/build/imageloader/|simile/timeline_2.3.0/timeline_ajax/|simile/timeline_2.3.0/timeline_js/scripts/l10n/ru/|simile/timeline_2.3.0/timeline_js/scripts/l10n/de/|yui290/build/event/|yui290/build/button/|yui290/build/layout/|yui290/build/profiler/|yui290/build/element-delegate/|yui290/build/paginator/|simile/timeline_local_example_1.0/local_example/|yui290/build/yahoo-dom-event/|wpcumulus/|yui290/build/dragdrop/|yui290/build/menu/|yui290/build/event-delegate/" kind="src" path="pacotes"/>
-	<classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs_depreciado/js"/>
-	<classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs/js"/>
-	<classpathentry kind="src" path="pacotes/ccc2/ccc"/>
-	<classpathentry excluding="JSON/" kind="src" path="pacotes/cpaint"/>
-	<classpathentry kind="src" path="pacotes/cpaint/JSON"/>
-	<classpathentry kind="src" path="pacotes/cswclient/lib/scripts"/>
-	<classpathentry kind="src" path="pacotes/eudock/js"/>
-	<classpathentry kind="src" path="pacotes/google"/>
-	<classpathentry kind="src" path="pacotes/jsts/lib"/>
-	<classpathentry kind="src" path="pacotes/mobileesp"/>
-	<classpathentry kind="src" path="pacotes/openflashchart"/>
-	<classpathentry kind="src" path="pacotes/openlayers"/>
-	<classpathentry excluding="maps/" kind="src" path="pacotes/proj4js/demo"/>
-	<classpathentry kind="src" path="pacotes/proj4js/demo/maps"/>
-	<classpathentry kind="src" path="pacotes/proj4js/docs/NaturalDocs/javascript"/>
-	<classpathentry excluding="projCode/|defs/" kind="src" path="pacotes/proj4js/lib"/>
-	<classpathentry kind="src" path="pacotes/proj4js/lib/defs"/>
-	<classpathentry kind="src" path="pacotes/proj4js/lib/projCode"/>
-	<classpathentry kind="src" path="pacotes/richdraw"/>
-	<classpathentry excluding="scripts/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax/scripts"/>
-	<classpathentry excluding="scripts/l10n/en/|scripts/l10n/it/|scripts/l10n/es/|scripts/l10n/vi/|scripts/l10n/tr/|scripts/l10n/zh/|scripts/l10n/cs/|scripts/l10n/nl/|scripts/l10n/fr/|scripts/l10n/se/|scripts/l10n/ru/|scripts/l10n/de/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/cs"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/de"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/en"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/es"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/fr"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/it"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/nl"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/ru"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/se"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/tr"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/vi"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/zh"/>
-	<classpathentry kind="src" path="pacotes/simile/timeline_local_example_1.0/local_example"/>
-	<classpathentry kind="src" path="pacotes/tme/javascript"/>
-	<classpathentry kind="src" path="pacotes/wicket"/>
-	<classpathentry kind="src" path="pacotes/wpcumulus"/>
-	<classpathentry kind="src" path="pacotes/yui290/assets"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/animation"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/autocomplete"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/button"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/calendar"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/carousel"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/charts"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/colorpicker"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/connection"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/container"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/cookie"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/datasource"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/datatable"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/datemath"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/dom"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/dragdrop"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/editor"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/element"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/element-delegate"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/event"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/event-delegate"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/event-mouseenter"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/event-simulate"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/get"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/history"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/imagecropper"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/imageloader"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/json"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/layout"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/logger"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/menu"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/paginator"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/profiler"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/profilerviewer"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/progressbar"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/resize"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/selector"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/slider"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/storage"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/stylesheet"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/swf"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/swfdetect"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/swfstore"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/tabview"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/treeview"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/uploader"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/utilities"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/yahoo"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/yahoo-dom-event"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/yuiloader"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/yuiloader-dom-event"/>
-	<classpathentry kind="src" path="pacotes/yui290/build/yuitest"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path=""/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 49c8cd4..3bd5d0a 100755
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +1 @@
-org.eclipse.wst.jsdt.launching.JRE_CONTAINER
\ No newline at end of file
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 11006e2..05bd71b 100755
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +1 @@
-Global
\ No newline at end of file
+Window
\ No newline at end of file
diff --git a/ferramentas/heatmap/funcoes.php b/ferramentas/heatmap/funcoes.php
index 154cf17..3f58ab0 100644
--- a/ferramentas/heatmap/funcoes.php
+++ b/ferramentas/heatmap/funcoes.php
@@ -20,7 +20,7 @@ function heatmapDados($map_file){
 	}
 	else{
 		foreach($registros as $r){
-			$resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r[$coluna].'"}';
+			$resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r["valores"][0]["valor"].'"}';
 		}
 	}
 	if (!connection_aborted()){
diff --git a/ferramentas/heatmap/index.js b/ferramentas/heatmap/index.js
index f92f49e..f4c575c 100644
--- a/ferramentas/heatmap/index.js
+++ b/ferramentas/heatmap/index.js
@@ -1,31 +1,31 @@
 /**
  * Title: heatmap
- * 
+ *
  * Gera um mapa de calor baseado em uma camada existente no mapa.
- * 
+ *
  * Mapas de calor s&atilde;o camadas que utilizam o plugin de camadas heatmap. Veja em classesjs/classe_plugini3geo.js
- * 
+ *
  * A ferramenta altera o mapfile em uso clonando o mapfile escolhido e adicionando os metadados necess&aacute;rios ao uso do heatmap
- * 
+ *
  * Veja:
- * 
+ *
  * <i3GEO.analise.dialogo.heatmap>
- * 
+ *
  * Arquivo:
- * 
+ *
  * i3geo/ferramentas/heatmap/index.js.php
- * 
+ *
  * Licenca:
- * 
+ *
  * GPL2
- * 
+ *
  * i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
- * 
+ *
  * Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
- * 
+ *
  * Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a
  * P&uacute;blica Geral GNU conforme publicada pela Free Software Foundation;
- * 
+ *
  * Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til, por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a
  * garantia impl&iacute;cita de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA. Consulte a Licen&ccedil;a
  * P&uacute;blica Geral do GNU para mais detalhes. Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
@@ -39,7 +39,7 @@ i3GEOF.heatmap =
 	{
 		/**
 		 * Variavel: aguarde
-		 * 
+		 *
 		 * Objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela.
 		 */
 		aguarde : "",
@@ -51,9 +51,9 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: iniciaDicionario
-		 * 
+		 *
 		 * Carrega o dicion&aacute;rio e chama a fun&ccedil;&atilde;o que inicia a ferramenta
-		 * 
+		 *
 		 * O Javascript &eacute; carregado com o id i3GEOF.nomedaferramenta.dicionario_script
 		 */
 		iniciaDicionario : function() {
@@ -68,11 +68,11 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: inicia
-		 * 
+		 *
 		 * Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante
-		 * 
+		 *
 		 * Parametro:
-		 * 
+		 *
 		 * iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta
 		 */
 		inicia : function(iddiv) {
@@ -85,11 +85,11 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: html
-		 * 
+		 *
 		 * Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta
-		 * 
+		 *
 		 * Retorno:
-		 * 
+		 *
 		 * String com o c&oacute;digo html
 		 */
 		html : function() {
@@ -102,7 +102,7 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: iniciaJanelaFlutuante
-		 * 
+		 *
 		 * Cria a janela flutuante para controle da ferramenta.
 		 */
 		iniciaJanelaFlutuante : function() {
@@ -199,7 +199,6 @@ i3GEOF.heatmap =
 				"i3GEOheatmapresultado",
 				true,
 				"i3GEOF.heatmap_rodape");
-			i3GEOF.heatmap.comboItens();
 		},
 		t4 : function() {
 			var ins = "<p class='paragrafo'>" + $trad(6, i3GEOF.heatmap.dicionario);
@@ -220,9 +219,9 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: criaheatmap
-		 * 
+		 *
 		 * Executa a opera&ccedil;&atilde;o de gera&ccedil;&atilde;o do heatmap
-		 * 
+		 *
 		 */
 		criaheatmap : function() {
 			try {
@@ -259,11 +258,11 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: comboTemasSel
-		 * 
+		 *
 		 * Cria um combo com a lista de temas
-		 * 
+		 *
 		 * Veja:
-		 * 
+		 *
 		 * <i3GEO.util.comboTemas>
 		 */
 		comboTemasSel : function() {
@@ -283,13 +282,13 @@ i3GEOF.heatmap =
 		},
 		/**
 		 * Function: comboItens
-		 * 
+		 *
 		 * Cria um combo para escolha de um item do tema
-		 * 
+		 *
 		 * Veja:
-		 * 
+		 *
 		 * <i3GEO.util.comboItens>
-		 * 
+		 *
 		 */
 		comboItens : function() {
 			i3GEO.util
diff --git a/ferramentas/markercluster/.project b/ferramentas/markercluster/.project
new file mode 100755
index 0000000..ceeee04
--- /dev/null
+++ b/ferramentas/markercluster/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ferramentas heatmap</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/ferramentas/markercluster/.settings/.jsdtscope b/ferramentas/markercluster/.settings/.jsdtscope
new file mode 100755
index 0000000..0e4b119
--- /dev/null
+++ b/ferramentas/markercluster/.settings/.jsdtscope
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container b/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100755
index 0000000..49c8cd4
--- /dev/null
+++ b/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER
\ No newline at end of file
diff --git a/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name b/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100755
index 0000000..11006e2
--- /dev/null
+++ b/ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Global
\ No newline at end of file
diff --git a/ferramentas/markercluster/funcoes.php b/ferramentas/markercluster/funcoes.php
index 050e380..1adccf0 100644
--- a/ferramentas/markercluster/funcoes.php
+++ b/ferramentas/markercluster/funcoes.php
@@ -17,7 +17,7 @@ function markerclusterDados($map_file){
 	}
 	else{
 		foreach($registros as $r){
-			$resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r[$coluna].'"}';
+			$resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r["valores"][0]["valor"].'"}';
 		}
 	}
 	if (!connection_aborted()){
diff --git a/ferramentas/saiku/cartograma.php b/ferramentas/saiku/cartograma.php
index 7a6704c..7b07b2c 100644
--- a/ferramentas/saiku/cartograma.php
+++ b/ferramentas/saiku/cartograma.php
@@ -81,6 +81,12 @@ foreach($dados as $dado){
 	}
 	$valores[] = "(".implode(",",$linha).")";
 }
+//
+//o nome da coluna com os dados e acentuado em alguns casos
+//por isso, camadas baseadas em plugins precisam mudar isso
+if($opcoes["tipo"] == "calor" && count($nomesColunas) > 1){
+	$nomesColunas[count($nomesColunas) - 1] = "colunaCalor";
+}
 $sqldados = "
 	select st_setsrid(".$sqlColunaGeo.",".$srid.") as $colunageo, ".implode(",",$colunastabela).",dataset.*
 	from ".$meta["esquemadb"].".".$meta["tabela"]." INNER JOIN
@@ -107,6 +113,9 @@ for($i=0;$i<$nlayers;$i++){
 			$ll->set("status",MS_OFF);
 		}
 	}
+	if($ll->getmetadata("tema") == "Limites"){
+		$ll->set("status",MS_DELETE);
+	}
 }
 
 $layer = ms_newLayerObj($mapa);
@@ -196,8 +205,9 @@ if($opcoes["tipo"] == "coresChapadas"){
 	$m->salva();
 }
 if($opcoes["tipo"] == "calor"){
-	$parametros = '{"plugin":"heatmap","parametros":{"tipoGradiente":"default","opacity":".8","coluna":"","radius":"'.$opcoes["raio"].'","max":"'.$opcoes["max"].'"}}';
+	$parametros = '{"plugin":"heatmap","parametros":{"tipoGradiente":"default","opacity":".8","valorPonto":'.$opcoes["valorPonto"].',"coluna":"'.$nomesColunas[1].'","radius":"'.$opcoes["raio"].'"}}';
 	$layer->setmetadata("PLUGINI3GEO",$parametros);
+	$layer->setmetadata("SAIKU",$opcoes["tipo"]);
 	$mapa->save($map_file);
 }
 header("Location:".$opcoes["locaplic"]."/mashups/openlayers.php?temas=".$map_file."&DESLIGACACHE=sim&botoes=legenda,pan,zoombox,zoomtot,zoomin,zoomout,distancia,area,identifica&controles=navigation,layerswitcher,scaleline,mouseposition,overviewmap,keyboarddefaults&tiles=false&mapext=".$opcoes["mapext"]);
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
index f66ea55..306f985 100644
--- a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
@@ -48,8 +48,8 @@ var i3GeoMap = Backbone.View.extend({
 					//"<ul class='connectable ui-sortable' style=''>"+
 						"<input type=button name=mapaBarras value='Barras' />"+
 						"<input type=button name=mapaPizzas value='Pizzas' />"+
-						"&nbsp;<input type=button name=raiosProporcionais value='Raios proporcionais' />"+
-						"&nbsp;<input type=button name=circulosProporcionais value='C&iacute;rculos proporcionais' />"+
+						"&nbsp;<input type=button name=raiosProporcionais value='Raios' />"+
+						"&nbsp;<input type=button name=circulosProporcionais value='C&iacute;rculos' />"+
 						"&nbsp;<input type=button name=coresChapadas value='Cores' />"+
 						"&nbsp;<input type=button name=calor value='Calor' />"+
 						"&nbsp;<input type=button name=atualizarMapa value='Atualiza' />"+
@@ -327,9 +327,12 @@ var i3GeoMap = Backbone.View.extend({
 	calor: function(s){
 		this.opcoes.size = 10;
 		$.fancybox("Raio de um ponto em pixels:<br><input type=text value='10' size=6 id='calorRaio' /><br>" +
-				"Valor m&aacute;ximo em cada ponto:<br><input type=text value='10' size=6 id='calorMax' /><br>" +
 				"<br>Coluna com os valores:<br>"+
-				"<select id='calorColuna' style='border:1px solid #BBBBBB;'>"+this.opcoesColunas()+"</select>" +
+				"<select id='calorColuna' style='border:1px solid #BBBBBB;'>" +
+				"<option value=''>---</option>" +
+				this.opcoesColunas() +
+				"</select>" +
+				"<br>Ou valor de cada ponto:<br><input type=text value='1' size=6 id='valorPonto' /><br>" +
 				"<br><input type=button value='OK' id='calorOk' />" +
 				"&nbsp; <input type=button value='Cancela' id='calorCancela' />"
 				,
@@ -346,10 +349,9 @@ var i3GeoMap = Backbone.View.extend({
 		);
 		document.getElementById("calorOk").onclick = function(){
 			s.opcoes.tipo = "calor";
-			//s.opcoes.size = document.getElementById("raiosProporcionaisSize").value;
+			s.opcoes.valorPonto = document.getElementById("valorPonto").value;
 			s.opcoes.indicecoluna = [parseInt(document.getElementById("calorColuna").value,10)];
 			s.opcoes.raio = document.getElementById("calorRaio").value;
-			s.opcoes.max = document.getElementById("calorMax").value;
 			s.render();
 			$.fancybox.close();
 		};
--
libgit2 0.21.2