From a972231d2006fc4cffcf2fd12e99e1b06b70fb64 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 22 Jan 2014 02:08:04 +0000
Subject: [PATCH] $1

---
 ferramentas/saiku/cartograma.php                                                        |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 ferramentas/saiku/esquemaxml.php                                                        |  11 +++++++----
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html                           |  26 +++++++-------------------
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js | 705 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/README.md  |  12 ++++++++++++
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/chart.png  | Bin 0 -> 3388 bytes
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/map.png    | Bin 0 -> 1152 bytes
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/mapa.png   | Bin 0 -> 1258 bytes
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js  | 713 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views/QueryToolbar.js       | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mashups/openlayers.js                                                                   |  16 +++++++++-------
 mashups/openlayers.php                                                                  |   7 ++++++-
 mashups/openlayers_compacto.js                                                          |   8 +++++---
 mashups/openlayers_compacto.js.php                                                      |   8 +++++---
 14 files changed, 1766 insertions(+), 47 deletions(-)
 create mode 100755 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js
 create mode 100755 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/README.md
 create mode 100755 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/chart.png
 create mode 100755 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/map.png
 create mode 100644 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/mapa.png
 create mode 100644 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
 create mode 100755 ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views/QueryToolbar.js

diff --git a/ferramentas/saiku/cartograma.php b/ferramentas/saiku/cartograma.php
index 831c643..9c46417 100644
--- a/ferramentas/saiku/cartograma.php
+++ b/ferramentas/saiku/cartograma.php
@@ -22,10 +22,14 @@ $opcoes = (array) json_decode($_POST["opcoes"],true);
 $metadados = (array) json_decode($_POST["metadados"],true);
 $nmetadados = count($metadados);
 //pega o id da regiao (busca pelo posfixo geocod)
-$codigo_tipo_regiao = $metadados[0]["identificador"];
-$codigo_tipo_regiao = explode("].[",$codigo_tipo_regiao);
-$codigo_tipo_regiao = str_replace(array("codigo_tipo_regiao_","[","_geocod"),"",$codigo_tipo_regiao[0]);
-
+$codigo_tipo_regiao = $metadados[0]["colName"];
+$codigo_tipo_regiao = explode("#",$codigo_tipo_regiao);
+$codigo_tipo_regiao = $codigo_tipo_regiao[1];
+/*
+echo "<pre>";
+var_dump($metadados);
+echo $codigo_tipo_regiao;exit;
+*/
 if(empty($codigo_tipo_regiao)){
 	echo "Nao foi possivel determinar o codigo da regiao ou localidade no sistema Metaestat";
 	exit;
@@ -47,7 +51,7 @@ $srid = $meta["srid"];
 $colunastabela = $m->colunasTabela($meta["codigo_estat_conexao"],$meta["esquemadb"],$meta["tabela"],"geometry","!=");
 $tipoLayer = "POLYGON";
 //define a coluna geo correta
-if($opcoes["tipo"] == "raiosProporcionais" || $opcoes["tipo"] == "circulosProporcionais"){
+if($opcoes["tipo"] == "mapaPizzas" || $opcoes["tipo"] == "mapaBarras" || $opcoes["tipo"] == "raiosProporcionais" || $opcoes["tipo"] == "circulosProporcionais"){
 	if($meta["colunacentroide"] != ""){
 		$colunageo = $meta["colunacentroide"];
 		$sqlColunaGeo = $meta["colunacentroide"];
@@ -56,6 +60,9 @@ if($opcoes["tipo"] == "raiosProporcionais" || $opcoes["tipo"] == "circulosPropor
 		$sqlColunaGeo = "st_centroid(".$meta["colunageo"].")";
 	}
 	$tipoLayer = "POINT";
+	if($opcoes["tipo"] == "mapaBarras" || $opcoes["tipo"] == "mapaPizzas"){
+		$tipoLayer = "CHART";
+	}
 }
 //var_dump($metadados);exit;
 //constroi um sql que retorna os dados na forma de uma tabela inline
@@ -115,19 +122,32 @@ $l[] = '		SAIKU "'.$opcoes["tipo"].'"';
 $l[] = '		TIP "'.$meta["colunanomeregiao"].','.implode(',',$nomesColunas).'"';
 $l[] = '		METAESTAT_CODIGO_TIPO_REGIAO "'.$codigo_tipo_regiao.'"';
 $l[] = '	END	';
-$l = implode("",$l);
+
+$l = implode(PHP_EOL,$l);
+
 if($opcoes["tipo"] == "raiosProporcionais"){
-	$l .= implode(" ",raiosProporcionais(1,$nomesColunas[1]));
+	$l .= implode(PHP_EOL,raiosProporcionais(1,$nomesColunas[1]));
 }
 if($opcoes["tipo"] == "circulosProporcionais"){
 	$l .= '	OPACITY 50';
-	$l .= implode(" ",circulosProporcionais(1,$nomesColunas[1]));
+	$l .= implode(PHP_EOL,circulosProporcionais(1,$nomesColunas[1]));
 }
 if($opcoes["tipo"] == "coresChapadas"){
 	$l .= '	OPACITY 50';
-	$l .= implode(" ",coresChapadas(1,$nomesColunas[1]));
+	$l .= implode(PHP_EOL,coresChapadas(1,$nomesColunas[1]));
+}
+if($opcoes["tipo"] == "mapaBarras"){
+	$l .= PHP_EOL.' PROCESSING "CHART_SIZE='.$opcoes["size"].' '.$opcoes["size"].'"';
+	$l .= PHP_EOL.' PROCESSING "CHART_TYPE=bar"';
+	$l .= implode(PHP_EOL,mapaBarras($nomesColunas));
 }
-$l .= 'END';
+if($opcoes["tipo"] == "mapaPizzas"){
+	$l .= PHP_EOL.' PROCESSING "CHART_SIZE='.$opcoes["size"].' '.$opcoes["size"].'"';
+	$l .= PHP_EOL.' PROCESSING "CHART_TYPE=pie"';
+	$l .= implode(PHP_EOL,mapaBarras($nomesColunas));
+}
+$l .= PHP_EOL.'END';
+
 //echo $l;exit;
 $layer->updateFromString($l);
 
@@ -146,6 +166,28 @@ if($opcoes["tipo"] == "coresChapadas"){
 
 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"]);
 
+function mapaBarras($colunas){
+	global $opcoes;
+	//$opcoes["coreshex"] = array_reverse($opcoes["coreshex"]);
+	//$valores = retornaDadosColuna($coluna);
+	//$cortes = quartis($valores,$nomeColuna);
+	//var_dump($opcoes["coreshex"]);exit;
+	$nclasses = count($colunas);
+	$classes = array();
+	for($i=1;$i<$nclasses;$i++){
+		$classes[] = PHP_EOL.'CLASS';
+		$classes[] = '	NAME "'.$colunas[$i].'"';
+		$classes[] = '	STYLE';
+		$cor = $opcoes["outlinecolor"];
+		$classes[] = '		OUTLINECOLOR '.$cor["red"].' '.$cor["green"].' '.$cor["blue"];
+		$classes[] = '		SIZE ['.$colunas[$i].']';
+		$classes[] = '		COLOR '.$opcoes["cores"][$i-1];
+		$classes[] = '	END';
+		$classes[] = 'END	';
+	}
+	return $classes;
+}
+
 function coresChapadas($coluna,$nomeColuna){
 	global $opcoes;
 	$valores = retornaDadosColuna($coluna);
@@ -251,4 +293,21 @@ function retornaDadosColuna($coluna){
 	}
 	return $valores;
 }
+function cHexToDec ($hexStr, $returnAsString = true, $seperator = ' ') {
+		$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
+		$rgbArray = array();
+		if (strlen($hexStr) == 6) { //If a proper hex code, convert using bitwise operation. No overhead... faster
+				$colorVal = hexdec($hexStr);
+				$rgbArray['red'] = 0xFF & ($colorVal >> 0x10);
+				$rgbArray['green'] = 0xFF & ($colorVal >> 0x8);
+				$rgbArray['blue'] = 0xFF & $colorVal;
+		} elseif (strlen($hexStr) == 3) { //if shorthand notation, need some string manipulations
+				$rgbArray['red'] = hexdec(str_repeat(substr($hexStr, 0, 1), 2));
+				$rgbArray['green'] = hexdec(str_repeat(substr($hexStr, 1, 1), 2));
+				$rgbArray['blue'] = hexdec(str_repeat(substr($hexStr, 2, 1), 2));
+		} else {
+				return false; //Invalid hex color code
+		}
+		return $returnAsString ? implode($seperator, $rgbArray) : $rgbArray; // returns the rgb string or the associative array
+}
 ?>
diff --git a/ferramentas/saiku/esquemaxml.php b/ferramentas/saiku/esquemaxml.php
index cd95b1e..fbfcda7 100644
--- a/ferramentas/saiku/esquemaxml.php
+++ b/ferramentas/saiku/esquemaxml.php
@@ -87,8 +87,8 @@ for ($i=0;$i < $c;++$i){
 	}
 }
 if($codigo_tipo_regiao == ""){
-	echo "Nenhum tema com limites ou localidades foi encontrado";
-	exit;
+	//echo "Nenhum tema com limites ou localidades foi encontrado";
+	//exit;
 }
 $regiao = "";
 $item = "";
@@ -158,7 +158,7 @@ foreach($regioes as $regiao){
 				nameColumn='j$i{$r["colunanomeregiao"]}' uniqueMembers='false'/>
 		";
 		$niveis2[] = "
-			<Level name='".converte($r["nome_tipo_regiao"])." - GeoCod'
+			<Level name='".converte($r["nome_tipo_regiao"])." - GeoCod #{$caminho[$i]}'
 				column='j$i{$r['identificador']}'
 				nameColumn='j$i{$r["identificador"]}' uniqueMembers='false'/>
 		";
@@ -169,7 +169,7 @@ foreach($regioes as $regiao){
 			nameColumn='nome' uniqueMembers='true' />
 	";
 	$niveis2[] = "
-		<Level name='".converte($regiao["nome_tipo_regiao"])." - GeoCod'
+		<Level name='".converte($regiao["nome_tipo_regiao"])." - GeoCod #{$regiao["codigo_tipo_regiao"]}'
 			column='codigo'
 			nameColumn='codigo' uniqueMembers='true' />
 	";
@@ -327,6 +327,9 @@ header("Location:".$saikuUrl."/?nomeConexao=".$nomeConexao."&locaplic=".$_GET["l
 
 function converte($texto){
 	$texto = str_replace("&","&amp;",htmlentities($texto));
+	//$texto = htmlentities($texto);
+	//$texto = mb_convert_encoding($texto, 'UTF-8', mb_detect_encoding($texto));
+	//$texto = utf8_encode($texto);
 	return $texto;
 }
 ?>
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html
index 6f2d67c..a5ad4d6 100755
--- a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/index.html
@@ -22,6 +22,7 @@
 
 <!--  jQuery CSS -->
 <link rel="stylesheet" href="css/jquery/jquery-ui.css" type="text/css" media="all" />
+<link rel="stylesheet" href="js/jquery/jquery.colourPicker.css" type="text/css" media="all" />
 
 <link rel="stylesheet" href="js/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="js/jquery/jquery.contextMenu.css" type="text/css" media="screen" />
@@ -56,6 +57,7 @@
 
 
 	<script type="text/javascript" src="js/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+	<script type="text/javascript" src="js/jquery/jquery.colourPicker.js"></script>
 
 
 	<!-- Backbone.js and deps -->
@@ -108,10 +110,6 @@
 
 	<!-- Saiku plugins -->
 
-
-	<!--
-				<script type="text/javascript" src="js/saiku/plugins/Chart/plugin.js" defer></script>
-				-->
 	<script type="text/javascript" src="js/saiku/plugins/Statistics/plugin.js" defer></script>
 	<script type="text/javascript" src="js/saiku/plugins/I18n/plugin.js" defer></script>
 	<script type="text/javascript" src="js/saiku/plugins/BIServer/plugin.js" defer></script>
@@ -125,28 +123,18 @@
 	<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/jquery.tipsy.js"></script>
 	<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/tipsy.js"></script>
 	<link type="text/css" href="js/saiku/plugins/CCC_Chart/tipsy.css" rel="stylesheet" />
-	<!-- FUTURE FILES FOR CHART EDITOR
-						<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/cccProperties.js"></script>
-						<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/cccCharts.js"></script>
-						<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/ChartEditor.js"></script>
-						-->
 	<script type="text/javascript" src="js/saiku/plugins/CCC_Chart/plugin.js"></script>
 
 	<script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
 
-	<!--start js SaikuChartPlus-->
-	<script type="text/javascript" src="js/saiku/plugins/SaikuChartPlus/plugin.js" defer></script>
-	<!--<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">
-		google.load('visualization', '1.0', {'packages':['geochart','geomap']});
-</script>
--->
-	<!--end js SaikuChartPlus-->
+	<!--start js i3GeoMap-->
+	<script type="text/javascript" src="js/saiku/plugins/i3GeoMap/plugin.js" ></script>
+	<!--end js i3GeoMap-->
 
 	<!--  i3GEO obtem o parametro passado pela url e que contem o codigo da conexao que deve ser utilizada -->
 	<script>
-nomeConexao = window.location.search.replace("?","");
-</script>
+		nomeConexao = parametroUrl("nomeConexao");
+	</script>
 	<!-- Templates -->
 	<script type="text/x-jquery-tmpl" id="template-toolbar">
 						<ul>
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js
new file mode 100755
index 0000000..da464da
--- /dev/null
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js
@@ -0,0 +1,705 @@
+/*
+ *   Copyright 2012 OSBI Ltd
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+/**
+ * Renders a chart for each workspace
+ */
+var Chart = Backbone.View.extend({
+
+		events: {
+				'click .keep' : 'keepVisible'
+		},
+
+	cccOptions: {
+				type: "BarChart",
+				stacked: true
+		},
+
+		data: null,
+		hasProcessed: null,
+
+		getChartProperties: function(chartName) {
+				var self = this;
+				var ret = [];
+				_.each(ChartProperties, function(property) {
+						if (property.ChartObject == chartName) {
+								ret.push(property);
+						}
+
+				});
+				return ret;
+
+		},
+
+		initialize: function(args) {
+
+				this.workspace = args.workspace;
+
+				// Create a unique ID for use as the CSS selector
+				this.id = _.uniqueId("chart_");
+				$(this.el).attr({ id: this.id });
+				//$('<div id="nav_' + this.id + '">' + "<input type='submit' class='keep' value='keep only selected' />" + '</div>').appendTo($(this.el));
+				$('<div class="canvas_wrapper" style="display:none;"><div id="canvas_' + this.id + '"></div></div>').appendTo($(this.el));
+
+				this.cccOptions.canvas = 'canvas_' + this.id;
+				this.cccOptions = this.getQuickOptions(this.cccOptions);
+
+				this.data = null;
+
+				// Bind table rendering to query result event
+				_.bindAll(this, "receive_data", "process_data", "show",  "getData", "render_view", "render_chart", "render_chart_delayed", "getQuickOptions","exportChart","block_ui");
+				var self = this;
+				this.workspace.bind('query:run',  function() {
+						if (! $(self.workspace.querytoolbar.el).find('.render_chart').hasClass('on')) {
+								return false;
+						}
+						self.data = {};
+						self.data.resultset = [];
+						self.data.metadata = [];
+						$(self.el).find('.canvas_wrapper').hide();
+						return false;
+				});
+
+				this.workspace.bind('query:fetch', this.block_ui);
+
+				this.workspace.bind('query:result', this.receive_data);
+
+				var pseudoForm = "<div id='nav" + this.id + "' style='display:none' class='nav'><form id='svgChartPseudoForm' target='_blank' method='POST'>" +
+								"<input type='hidden' name='type' class='type'/>" +
+								"<input type='hidden' name='svg' class='svg'/>" +
+								"</form></div>";
+				if (isIE) {
+						pseudoForm = "<div></div>";
+				}
+				this.nav =$(pseudoForm);
+
+				$(this.el).append(this.nav);
+
+				/*
+				// Create navigation
+				var exportoptions = "<div><a class='hide' href='#charteditor' id='acharteditor' /><!--<a class='editor' href='#chart_editor'>Advanced Properties</a>-->Export to: " +
+								"<a class='export' href='#png' class='i18n'>PNG</a>, " +
+								"<a class='export' href='#pdf' class='i18n'>PDF</a>, " +
+								//"<a class='export' href='#tiff' class='i18n'>TIFF</a>, " +
+								"<a class='export' href='#svg' class='i18n'>SVG</a>, " +
+								"<a class='export' href='#jpg' class='i18n'>JPG</a>" +
+								"<form id='svgChartPseudoForm' target='_blank' method='POST'>" +
+								"<input type='hidden' name='type' class='type'/>" +
+								"<input type='hidden' name='svg' class='svg'/>" +
+								"</form>";
+
+				var chartnav = exportoptions + "</div>";
+				if (typeof isIE !== "undefined") {
+						chartnav = "<div></div>";
+				}
+				// Create navigation
+				this.nav = $(chartnav).css({
+								'padding-bottom': '10px'
+						});
+				this.nav.find('a.type').css({
+										color: '#666',
+										'margin-right': '5px',
+										'text-decoration': 'none',
+										'border': '1px solid #ccc',
+										padding: '5px'
+								});
+
+				this.nav.find('a.export').click(this.exportChart);
+
+
+				this.nav.find('a').css({
+										color: '#666',
+										'margin-right': '5px',
+										'text-decoration': 'none',
+										'border': '1px solid #ccc',
+										padding: '5px'
+								});
+				*/
+				/* XXX - enable again later
+				$(this.nav).append('<div style="display:none;"> <div id="charteditor" class="chart_editor"></div></div>');
+
+				this.editor = new ChartEditor({  workspace : this.workspace,
+																				ChartProperties : ChartProperties,
+																				ChartTypes: ChartTypes,
+																				data : this.getData,
+																				getChartProperties : this.getChartProperties});
+
+				$(this.nav).find('.chart_editor').append($(this.editor.el));
+				*/
+
+		},
+
+
+		block_ui: function() {
+				if (! $(this.workspace.querytoolbar.el).find('.render_chart').hasClass('on')) {
+						return;
+				}
+				//Saiku.ui.block("Updating chart data....");
+		},
+
+		exportChart: function(type) {
+				var svgContent = new XMLSerializer().serializeToString($('svg')[0]);
+				var rep = '<svg xmlns="http://www.w3.org/2000/svg" ';
+				if (svgContent.substr(0,rep.length) != rep) {
+						svgContent = svgContent.replace('<svg ', rep);
+				}
+
+				var form = $('#svgChartPseudoForm');
+				form.find('.type').val(type);
+				form.find('.svg').val(svgContent);
+				form.attr('action', Settings.REST_URL + this.workspace.query.url() + escape("/../../export/saiku/chart"));
+				form.submit();
+				return false;
+		},
+
+		render_view: function() {
+			// Append chart to workspace
+				$(this.workspace.el).find('.workspace_results')
+						.prepend($(this.el).hide());
+		},
+
+		getData: function() {
+				return this.data;
+		},
+
+		show: function(event, ui) {
+				/*
+				if ('MODE' in Settings && Settings.MODE == 'table') {
+						$(this.nav).hide();
+				} else {
+						$(this.nav).show();
+				}
+
+				$('a#acharteditor').fancybox(
+																	{
+																	'autoDimensions'    : false,
+																	'autoScale'         : false,
+																	'height'            :  ($("body").height() - 140),
+																	'width'             :  ($("body").width() - 100),
+																	'transitionIn'      : 'none',
+																	'transitionOut'     : 'none',
+																	'type'              : 'inline'
+																	}
+															);
+				*/
+				if (this.cccOptions.width <= 0) {
+						this.cccOptions.width = $(this.workspace.el).find('.workspace_results').width() - 40;
+				}
+				if (this.cccOptions.height <= 0) {
+						this.cccOptions.height = $(this.workspace.el).find('.workspace_results').height() - 40;
+				}
+
+				$(this.el).show();
+
+				var hasRun = this.workspace.query.result.hasRun();
+				if (hasRun) {
+						this.process_data({ data: this.workspace.query.result.lastresult() });
+				}
+
+		},
+
+		chart_editor: function() {
+		$('a#acharteditor').click();
+		return true;
+		},
+
+		export_button: function(event) {
+				var self = this;
+				$target = $(event.target).hasClass('button') ? $(event.target) : $(event.target).parent();
+
+				var self = this;
+				$body = $(document);
+				//$body.off('.contextMenu .contextMenuAutoHide');
+				//$('.context-menu-list').remove();
+				$.contextMenu('destroy', '.export_button');
+				$.contextMenu({
+								selector: '.export_button',
+								trigger: 'left',
+								ignoreRightClick: true,
+								callback: function(key, options) {
+										self.workspace.chart.exportChart(key);
+								},
+								items: {
+										"png": {name: "PNG"},
+										"jpg": {name: "JPEG"},
+										"pdf": {name: "PDF"},
+										"svg": {name: "SVG"}
+								}
+				});
+				$target.contextMenu();
+		},
+
+		button: function(event) {
+				$target = $(event.target).hasClass('button') ? $(event.target) : $(event.target).parent();
+				if ($target.hasClass('chartoption')) {
+						$target.parent().siblings().find('.chartoption.on').removeClass('on');
+						$target.addClass('on');
+						if ($(this.workspace.querytoolbar.el).find('.render_chart').hasClass('on')) {
+								$(this.el).find('.canvas_wrapper').hide();
+						}
+
+
+				}
+				return false;
+		},
+
+		stackedBar: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'stackedBar');
+				var options = {
+						stacked: true,
+						type: "BarChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		bar: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'bar');
+				var options = {
+						type: "BarChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+				/*
+				this.cccOptions.multiChartIndexes = [1];
+				this.cccOptions.dataMeasuresInColumns = true;
+				this.cccOptions.orientation = 'vertical';
+				this.cccOptions.smallTitlePosition = 'left';
+				//this.cccOptions.multiChartColumnsMax = 5;
+				this.cccOptions.smallWidth = 300;
+				this.cccOptions.smallHeight = 100;
+				*/
+		},
+
+		multiplebar: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'multiplebar');
+				var options = {
+						type: "BarChart",
+						multiChartIndexes: [1],
+						dataMeasuresInColumns: true,
+						orientation: "vertical",
+						smallTitlePosition: "top",
+						multiChartMax: 30,
+						multiChartColumnsMax: Math.floor( this.cccOptions.width / 200),
+						smallWidth: 200,
+						smallHeight: 150
+
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		line: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'line');
+				var options = {
+						type: "LineChart"
+				};
+
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		pie: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'pie');
+				var options = {
+						type: "PieChart",
+						multiChartIndexes: [0] // ideally this would be chosen by the user (count, which)
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		heatgrid: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'heatgrid');
+				var options = {
+						type: "HeatGridChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		stackedBar100: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'stackedBar100');
+				var options = {
+						type: "NormalizedBarChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		area: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'area');
+				var options = {
+						type: "StackedAreaChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+		dot: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'dot');
+				var options = {
+						type: "DotChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+		waterfall: function() {
+				this.workspace.query.setProperty('saiku.ui.render.type', 'waterfall');
+				var options = {
+						type: "WaterfallChart"
+				};
+				this.cccOptions = this.getQuickOptions(options);
+				this.render_chart();
+		},
+
+		keepVisible: function(event) {
+
+
+				var chart = this.chart.root;
+				var data = chart.data;
+
+				data
+				.datums(null, {selected: false})
+				.each(function(datum) {
+						datum.setVisible(false);
+				});
+
+				data.clearSelected();
+
+				chart.render(true, true, false);
+
+
+		},
+
+		// Default static style-sheet
+		cccOptionsDefault: {
+				Base: {
+						animate: false,
+						selectable: true,
+						valuesVisible: false,
+						legend:  true,
+						legendPosition: "top",
+						legendAlign: "right",
+						legendSizeMax: "30%",
+						axisSizeMax: "40%",
+						plotFrameVisible : false,
+						orthoAxisMinorTicks : false,
+						colors: ["#1f77b4", "#aec7e8", "#ff7f0e", "#ffbb78", "#2ca02c", "#98df8a", "#d62728", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b", "#c49c94", "#e377c2", "#f7b6d2", "#7f7f7f", "#c7c7c7", "#bcbd22", "#dbdb8d", "#17becf", "#9edae5" ]
+/*
+"#B12623",
+"#ff8585",
+"#009bff",
+"#1f77b4",
+"#ff5900",
+"#ffbb9e",
+"#750000",
+"#cecece",
+"#aec7e8", "#ff7f0e", "#ffbb78", "#2ca02c", "#98df8a", "#d62728", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b", "#c49c94", "#e377c2", "#f7b6d2", "#7f7f7f", "#c7c7c7", "#bcbd22", "#dbdb8d", "#17becf", "#9edae5" ]
+ */
+				},
+
+				HeatGridChart: {
+						orientation: "horizontal",
+						useShapes: true,
+						shape: "circle",
+						nullShape: "cross",
+						colorNormByCategory: false,
+						sizeRole: "value",
+						legend: false,
+						hoverable: true,
+						axisComposite: true,
+						colors: ["red", "yellow", "lightgreen", "darkgreen"],
+						xAxisSize: 130,
+						yAxisSize: 130
+				},
+
+				WaterfallChart: {
+						orientation: "horizontal"
+				},
+
+				PieChart: {
+						multiChartColumnsMax: 3,
+						multiChartMax: 30,
+						smallTitleFont: "bold 14px sans-serif",
+						valuesVisible: true,
+						valuesMask: "{value.percent}",
+						explodedSliceRadius: "10%",
+						extensionPoints: {
+								slice_innerRadiusEx: '40%',
+								slice_offsetRadius: function(scene) {
+											return scene.isSelected() ? '10%' : 0;
+								}
+						},
+						clickable: true
+						//valuesLabelStyle: 'inside'
+				},
+
+				LineChart: {
+						extensionPoints: {
+								area_interpolate: "monotone", // cardinal
+								line_interpolate: "monotone"
+						}
+				},
+
+				StackedAreaChart: {
+						extensionPoints: {
+								area_interpolate: "monotone",
+								line_interpolate: "monotone"
+						}
+				}
+		},
+
+		getQuickOptions: function(baseOptions) {
+				var chartType = (baseOptions && baseOptions.type) || "BarChart";
+				var workspaceResults = $(this.workspace.el).find(".workspace_results");
+				var options = _.extend({
+								type:   chartType,
+								canvas: 'canvas_' + this.id,
+								width:  workspaceResults.width() - 40,
+								height: workspaceResults.height() - 40
+						},
+						this.cccOptionsDefault.Base,
+						this.cccOptionsDefault[chartType], // may be undefined
+						baseOptions);
+
+				if(this.data != null && this.data.resultset.length > 5) {
+						if(options.type === "HeatGridChart") {
+								options.xAxisSize = 150;
+						} else if(options.orientation !== "horizontal") {
+								options.extensionPoints = _.extend(Object.create(options.extensionPoints || {}),
+										{
+												xAxisLabel_textAngle: -Math.PI/2,
+												xAxisLabel_textAlign: "right",
+												xAxisLabel_textBaseline:  "middle"
+										});
+						}
+				}
+
+				return options;
+		},
+
+		render_chart: function() {
+				_.delay(this.render_chart_delayed, 0, this);
+				return false;
+		},
+
+		render_chart_delayed: function() {
+				if (!$(this.workspace.querytoolbar.el).find('.render_chart').hasClass('on') || !this.hasProcessed) {
+						return;
+				}
+				$(this.workspace.toolbar.el).find('.i3GeoMap').removeClass('on');
+/* DEBUGGING
+this.med = new Date().getTime();
+$(this.el).prepend(" | chart render (" + (this.med - this.call_time) + ")" );
+this.call_time = undefined;
+*/
+				var workspaceResults = $(this.workspace.el).find(".workspace_results");
+				var isSmall = (this.data != null && this.data.height < 80 && this.data.width < 80);
+				var isMedium = (this.data != null && this.data.height < 300 && this.data.width < 300);
+				var isBig = (!isSmall && !isMedium);
+				var animate = false;
+				var hoverable =  isSmall;
+
+				var runtimeChartDefinition = _.clone(this.cccOptions);
+				if (isBig) {
+						if (runtimeChartDefinition.hasOwnProperty('extensionPoints') && runtimeChartDefinition.extensionPoints.hasOwnProperty('line_interpolate'))
+								delete runtimeChartDefinition.extensionPoints.line_interpolate;
+						if (runtimeChartDefinition.hasOwnProperty('extensionPoints') && runtimeChartDefinition.extensionPoints.hasOwnProperty('area_interpolate'))
+								delete runtimeChartDefinition.extensionPoints.area_interpolate;
+				}
+				runtimeChartDefinition = _.extend(runtimeChartDefinition, {
+								width:  workspaceResults.width() - 40,
+								height: workspaceResults.height() - 40,
+								hoverable: hoverable,
+								animate: animate
+				});
+
+				/* XXX - enable later
+				var start = new Date().getTime();
+				this.editor.chartDefinition = _.clone(this.cccOptions);
+				this.editor.set_chart("pvc." + this.cccOptions.type);
+				this.editor.render_chart_properties("pvc." + this.cccOptions.type, this.editor.chartDefinition);
+				*/
+
+				this.chart = new pvc[runtimeChartDefinition.type](runtimeChartDefinition);
+/* DEBUGGING
+this.med3 = new Date().getTime();
+$(this.el).prepend(" pvc (" + (this.med3 - this.med) + ")" );
+*/
+
+				this.chart.setData(this.data, {
+						crosstabMode: true,
+						seriesInRows: false
+				});
+
+				try {
+						if (animate) {
+								$(this.el).find('.canvas_wrapper').show();
+						}
+						this.chart.render();
+/* DEBUGGING
+						var med2 = new Date().getTime();
+						$(this.el).prepend(" done (" + (med2 - this.med) + ")" );
+*/
+				} catch (e) {
+						$(this.el).text("Could not render chart");
+				}
+				this.workspace.processing.hide();
+				this.workspace.adjust();
+				if (animate) {
+						return false;
+				}
+				// $('#nav_' + this.id).show();
+				if (isIE || isBig) {
+						$(this.el).find('.canvas_wrapper').show();
+				} else {
+						$(this.el).find('.canvas_wrapper').fadeIn(400);
+				}
+				return false;
+		},
+
+		receive_data: function(args) {
+				if (! $(this.workspace.querytoolbar.el).find('.render_chart').hasClass('on')) {
+						return;
+				}
+				return _.delay(this.process_data, 0, args);
+
+		},
+
+		process_data: function(args) {
+				this.data = {};
+				this.data.resultset = [];
+				this.data.metadata = [];
+				this.data.height = 0;
+				this.data.width = 0;
+
+				if (typeof args == "undefined" || typeof args.data == "undefined" ||
+						($(this.workspace.el).is(':visible') && !$(this.el).is(':visible'))) {
+						return;
+				}
+
+				if (args.data != null && args.data.error != null) {
+						return this.workspace.error(args);
+				}
+				// Check to see if there is data
+				if (args.data == null || (args.data.cellset && args.data.cellset.length === 0)) {
+						return this.workspace.no_results(args);
+				}
+
+				var cellset = args.data.cellset;
+				if (cellset && cellset.length > 0) {
+/* DEBUGGING
+var start = new Date().getTime();
+this.call_time = start;
+$(this.el).prepend(" | chart process");
+*/
+						var lowest_level = 0;
+						var data_start = 0;
+						for (var row = 0; data_start == 0 && row < cellset.length; row++) {
+										this.data.metadata = [];
+										for (var field = 0; field < cellset[row].length; field++) {
+												var firstHeader = [];
+
+												while (cellset[row][field].type == "COLUMN_HEADER" && cellset[row][field].value == "null") {
+														row++;
+												}
+												if (cellset[row][field].type == "ROW_HEADER_HEADER") {
+
+														while(cellset[row][field].type == "ROW_HEADER_HEADER") {
+																firstHeader.push(cellset[row][field].value);
+																field++;
+														}
+
+														this.data.metadata.push({
+																colIndex: 0,
+																colType: "String",
+																colName: firstHeader.join('/')
+														});
+														lowest_level = field - 1;
+												}
+												if (cellset[row][field].type == "COLUMN_HEADER" && cellset[row][field].value != "null") {
+														var lowest_col_header = 0;
+														var colheader = [];
+														while(lowest_col_header <= row) {
+																colheader.push(cellset[lowest_col_header][field].value);
+																lowest_col_header++;
+														}
+														this.data.metadata.push({
+																colIndex: field - lowest_level + 1,
+																colType: "Numeric",
+																colName: colheader.join('/')
+														});
+
+														data_start = row+1;
+												}
+										}
+						}
+						var labelsSet = {};
+						for (var row = data_start; row < cellset.length; row++) {
+						if (cellset[row][0].value !== "") {
+										var record = [];
+										this.data.width = cellset[row].length - lowest_level + 1;
+										var label = "";
+										for (var labelCol = lowest_level; labelCol >= 0; labelCol--) {
+												var lastKnownUpperLevelRow = row;
+												while(cellset[lastKnownUpperLevelRow] && cellset[lastKnownUpperLevelRow][labelCol].value === 'null') {
+														--lastKnownUpperLevelRow;
+												}
+												if(cellset[lastKnownUpperLevelRow]) {
+														if (label == "") {
+																label = cellset[lastKnownUpperLevelRow][labelCol].value;
+														} else {
+																label = cellset[lastKnownUpperLevelRow][labelCol].value + " / " + label;
+														}
+												}
+										}
+										if(label in labelsSet) {
+												labelsSet[label] = labelsSet[label]+1;
+												label = label + ' [' + (labelsSet[label] + 1) + ']';
+										} else {
+												labelsSet[label] = 0;
+										}
+										record.push(label);
+
+										for (var col = lowest_level + 1; col < cellset[row].length; col++) {
+												var cell = cellset[row][col];
+												var value = cell.value || 0;
+												// check if the resultset contains the raw value, if not try to parse the given value
+												var raw = cell.properties.raw;
+												if (raw && raw !== "null") {
+														value = parseFloat(raw);
+												} else if (typeof(cell.value) !== "number" && parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''))) {
+														value = parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''));
+												}
+												record.push(value);
+										}
+										this.data.resultset.push(record);
+								}
+						}
+						//makeSureUniqueLabels(this.data.resultset);
+						this.hasProcessed = true;
+						this.data.height = this.data.resultset.length;
+						this.cccOptions = this.getQuickOptions(this.cccOptions);
+						this.render_chart();
+				} else {
+						$(this.el).find('.canvas_wrapper').text("No results").show();
+						this.workspace.processing.hide();
+						this.workspace.adjust();
+				}
+		}
+});
+
+
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/README.md b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/README.md
new file mode 100755
index 0000000..745ac3b
--- /dev/null
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/README.md
@@ -0,0 +1,12 @@
+Saiku Chart Plus
+
+Welcome to Saiku Chart Plus Project.
+
+What is Saiku Chart Plus? 
+
+It is an open source project that helps Pentaho BI users to create other types of charts and maps based on Saiku Project, Highcharts and Google Maps.
+
+To learn more visit our page http://it4biz.github.com/SaikuChartPlus/
+
+Direct link to download Saiku Chart Plus:
+http://sourceforge.net/projects/saikuchartplus/files/SaikuChartPlus2.4/saikuchartsplus-plugin-2.4-RC1.zip/download
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/chart.png b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/chart.png
new file mode 100755
index 0000000..6a1d24f
Binary files /dev/null and b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/chart.png differ
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/map.png b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/map.png
new file mode 100755
index 0000000..4db25ea
Binary files /dev/null and b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/map.png differ
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/mapa.png b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/mapa.png
new file mode 100644
index 0000000..ca5c47e
Binary files /dev/null and b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/mapa.png differ
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
new file mode 100644
index 0000000..c27c974
--- /dev/null
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
@@ -0,0 +1,713 @@
+/*
+ *   Esse plugin e parte do software livre i3Geo
+ *
+ *   Baseado em ChartPlus IT4biz IT Solutions Ltda
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * changed by edmar.moretti@gmail.com
+ */
+
+var i3GeoMap = Backbone.View.extend({
+	opcoes: {cores:"",size:0,tipo:"",indicecoluna:"",cores:"",coluna:"",locaplic:"",outlinecolor:""},
+	coreshex:  ["#1f77b4", "#aec7e8", "#ff7f0e", "#ffbb78", "#2ca02c", "#98df8a", "#d62728", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b", "#c49c94", "#e377c2", "#f7b6d2", "#7f7f7f", "#c7c7c7", "#bcbd22", "#dbdb8d", "#17becf", "#9edae5" ],
+	initialize: function(args) {
+		this.workspace = args.workspace;
+
+		// Create a unique ID for use as the CSS selector
+		this.id = _.uniqueId("i3GeoMap_");
+		$(this.el).attr({ id: this.id });
+
+		// Bind map rendering to query result event
+		_.bindAll(this, "render", "receive_data", "process_data", "show",
+				"setOptions");
+
+		this.workspace.bind('query:result', this.receive_data);
+
+		// Add chart button
+		this.add_button();
+		this.workspace.toolbar.i3GeoMap = this.show;
+
+		// Listen to adjust event and rerender chart
+		//this.workspace.bind('workspace:adjust', this.render);
+		// Create navigation
+		this.nav = $("" +
+			"<div style='overflow: hidden;padding: 10px 5px;' >"+
+			"<div class='fields_list' style='height:34px;'>"+
+				"<div class='fields_list_header limit'><span class='i18n_translated'>Mapa</span></div>"+
+				"<div class='fields_list_body filter' style='margin:4px 5px 5px 5px'>"+
+					//"<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=coresChapadas value='Cores' />"+
+						"&nbsp;<input type=button name=atualizarMapa value='Atualiza' />"+
+						"&nbsp;<input type=button name=fecharMapa value='Fechar' />"+
+					//"</ul>"+
+				"</div>"+
+			"</div>"+
+			"</div>"+
+			"<div id='message'></div>"+
+			"<form id='formi3GeoMap' method='post' target='iframei3GeoMap' action='"+parametroUrl("locaplic")+"/ferramentas/saiku/cartograma.php' >"+
+			"<input type=hidden name=opcoes id=formi3GeoMapOpcoes value='' />"+
+			"<input type=hidden name=g_sid id=formi3GeoMapg_sid value='"+parametroUrl("g_sid")+"' />"+
+			"<input type=hidden name=dados id=formi3GeoMapdados value='' />"+
+			"<input type=hidden name=metadados id=formi3GeoMapmetadados value='' />"+
+			"</form>" +
+			"<iframe id='iframei3GeoMap' name='iframei3GeoMap' style='width:100%;height:200px;display:block' />"
+				);
+		this.nav.find('input').click(this.setOptions);
+
+		// Append chart to workspace
+		$(this.workspace.el).find('.workspace_results')
+			.prepend($(this.el).hide())
+			.prepend(this.nav.hide());
+	},
+	add_button: function() {
+		var $chart_button =
+				$('<a href="#i3GeoMap" class="i3GeoMap button disabled_toolbar i18n" title="Mapa com i3Geo"></a>')
+				.css({  'background-image': "url('js/saiku/plugins/i3GeoMap/mapa.png')",
+								'background-repeat':'no-repeat',
+								'background-position':'20% 50%'
+						});
+
+		var $chart_li = $('<li class="seperator"></li>').append($chart_button);
+		$(this.workspace.toolbar.el).find("ul").append($chart_li);
+	},
+	fecha: function(){
+		$(this.workspace.toolbar.el).find('.i3GeoMap').removeClass('on');
+		$(this.el).hide();
+		$(this.nav).hide();
+		this.workspace.processing.hide();
+		this.workspace.adjust();
+		$(this.workspace.el).find('.workspace_results table').show();
+		this.workspace.table.render({ data: this.workspace.query.result.lastresult() });
+	},
+	atualizarMapa: function(){
+		document.getElementById('formi3GeoMap').submit();
+	},
+	show: function(event, ui) {
+		//$(this.workspace.el).find('.workspace_results table').toggle();
+		$(this.el).toggle();
+		$(this.nav).toggle();
+		$(event.target).toggleClass('on');
+		$("#message").html("");
+		this.nav.find('input').show();
+		if ($(event.target).hasClass('on')) {
+			this.process_data({ data: this.workspace.query.result.lastresult() });
+			//this.render();
+		}
+	},
+
+	setOptions: function(event) {
+		var type = $(event.target).attr('name');
+		this.opcoes.coluna = "";
+		this.opcoes.indicecoluna = "";
+		this.opcoes.cores = "";
+		this.opcoes.outlinecolor = "";
+		this[type](this);
+		return false;
+	},
+	fecharMapa: function(){
+		var i = document.getElementById("iframei3GeoMap");
+		if(i){
+			i.src = "";
+			i.style.display = "none";
+			i.style.height = "0px";
+		}
+	},
+	mapaPizzas: function(s){
+		this.opcoes.size = 50;
+		this.opcoes.cores = coresHex2Rgb(this.coreshex);
+		$.fancybox("Cor do contorno:  "+this.cores("corContorno")+
+				"Tamanho das pizzas (em pixels):<br><input type=text value='"+this.opcoes.size+"' size=6 id='mapaPizzasSize' />" +
+				"<br><input type=button value='OK' id='mapaPizzasOk' />" +
+				"&nbsp; <input type=button value='Cancela' id='mapaPizzasCancela' />"
+				,
+				{
+					'autoDimensions'    : false,
+					'autoScale'         : false,
+					'height'            :  250,
+					'width'             :  350,
+					'transitionIn'      : 'none',
+					'transitionOut'     : 'none',
+					'showCloseButton'	: false,
+					'modal'				: false
+				}
+		);
+		document.getElementById("mapaPizzasOk").onclick = function(){
+			s.opcoes.tipo = "mapaPizzas";
+			s.opcoes.size = document.getElementById("mapaPizzasSize").value;
+			s.opcoes.indicecoluna = [];
+			var cori = $('input[name="corContorno"]').val();
+			s.opcoes.outlinecolor = hex2rgb(cori);
+			s.render();
+			$.fancybox.close();
+		};
+		document.getElementById("mapaPizzasCancela").onclick = function(){
+			$.fancybox.close();
+			s.fecharMapa();
+		};
+		jQuery('select[name="corContorno"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+	},
+
+	mapaBarras: function(s){
+		this.opcoes.size = 50;
+		this.opcoes.cores = coresHex2Rgb(this.coreshex);
+		$.fancybox("Cor do contorno:  "+this.cores("corContorno")+
+				"Tamanho das barras (em pixels):<br><input type=text value='"+this.opcoes.size+"' size=6 id='mapaBarrasSize' />" +
+				"<br><input type=button value='OK' id='mapaBarrasOk' />" +
+				"&nbsp; <input type=button value='Cancela' id='mapaBarrasCancela' />"
+				,
+				{
+					'autoDimensions'    : false,
+					'autoScale'         : false,
+					'height'            :  250,
+					'width'             :  350,
+					'transitionIn'      : 'none',
+					'transitionOut'     : 'none',
+					'showCloseButton'	: false,
+					'modal'				: false
+				}
+		);
+		document.getElementById("mapaBarrasOk").onclick = function(){
+			s.opcoes.tipo = "mapaBarras";
+			s.opcoes.size = document.getElementById("mapaBarrasSize").value;
+			s.opcoes.indicecoluna = [];
+			var cori = $('input[name="corContorno"]').val();
+			s.opcoes.outlinecolor = hex2rgb(cori);
+			s.render();
+			$.fancybox.close();
+		};
+		document.getElementById("mapaBarrasCancela").onclick = function(){
+			$.fancybox.close();
+			s.fecharMapa();
+		};
+		jQuery('select[name="corContorno"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+	},
+	coresChapadas: function(s){
+		this.opcoes.size = 0;
+		$.fancybox("Cor inicial:  "+this.cores("corInicial")+
+				"Cor final:  "+this.cores("corFinal")+
+				"Coluna com os valores:<br>"+
+				"<select id='coresChapadasColuna' style='border:1px solid #BBBBBB;'>"+this.opcoesColunas()+"</select>" +
+				"<br><input type=button value='OK' id='coresChapadasOk' />" +
+				"&nbsp; <input type=button value='Cancela' id='coresChapadasCancela' />"
+				,
+				{
+					'autoDimensions'    : false,
+					'autoScale'         : false,
+					'height'            :  250,
+					'width'             :  350,
+					'transitionIn'      : 'none',
+					'transitionOut'     : 'none',
+					'showCloseButton'	: false,
+					'modal'				: false
+				}
+		);
+		document.getElementById("coresChapadasOk").onclick = function(){
+			s.opcoes.tipo = "coresChapadas";
+			s.opcoes.size = 0;
+			s.opcoes.indicecoluna = [parseInt(document.getElementById("coresChapadasColuna").value,10)];
+			var cori = $('input[name="corInicial"]').val();
+			var corf = $('input[name="corFinal"]').val();
+			s.opcoes.cores = [hex2rgb(cori),hex2rgb(corf)];
+			s.render();
+			$.fancybox.close();
+		};
+		document.getElementById("coresChapadasCancela").onclick = function(){
+			$.fancybox.close();
+			s.fecharMapa();
+		};
+		jQuery('select[name="corInicial"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+		$('input[name="corInicial"]')[0].value = "ffffc7";
+
+		jQuery('select[name="corFinal"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+		$('input[name="corFinal"]')[0].value = "643403";
+	},
+	raiosProporcionais: function(s){
+		this.opcoes.size = 10;
+		$.fancybox("Escolha uma cor:  "+this.cores()+
+				"Tamanho inicial do c&iacute;rculo (em pixels):<br><input type=text value='"+this.opcoes.size+"' size=6 id='raiosProporcionaisSize' />" +
+				"<br>Coluna com os valores:<br>"+
+				"<select id='raiosProporcionaisColuna' style='border:1px solid #BBBBBB;'>"+this.opcoesColunas()+"</select>" +
+				"<br><input type=button value='OK' id='raiosProporcionaisOk' />" +
+				"&nbsp; <input type=button value='Cancela' id='raiosProporcionaisCancela' />"
+				,
+				{
+					'autoDimensions'    : false,
+					'autoScale'         : false,
+					'height'            :  250,
+					'width'             :  350,
+					'transitionIn'      : 'none',
+					'transitionOut'     : 'none',
+					'showCloseButton'	: false,
+					'modal'				: false
+				}
+		);
+		document.getElementById("raiosProporcionaisOk").onclick = function(){
+			s.opcoes.tipo = "raiosProporcionais";
+			s.opcoes.size = document.getElementById("raiosProporcionaisSize").value;
+			s.opcoes.indicecoluna = [parseInt(document.getElementById("raiosProporcionaisColuna").value,10)];
+			var cor = $('input[name="colour"]').val();
+			s.opcoes.cores = [hex2rgb(cor)];
+			s.render();
+			$.fancybox.close();
+		};
+		document.getElementById("raiosProporcionaisCancela").onclick = function(){
+			$.fancybox.close();
+			s.fecharMapa();
+		};
+		jQuery('select[name="colour"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+	},
+	circulosProporcionais: function(s){
+		this.opcoes.size = 10;
+		$.fancybox("Escolha uma cor:  "+this.cores()+
+				"Tamanho inicial do c&iacute;rculo (em pixels):<br><input type=text value='"+this.opcoes.size+"' size=6 id='circulosProporcionaisSize' />" +
+				"<br>Coluna com os valores:<br>"+
+				"<select id='circulosProporcionaisColuna' style='border:1px solid #BBBBBB;'>"+this.opcoesColunas()+"</select>" +
+				"<br><input type=button value='OK' id='circulosProporcionaisOk' />" +
+				"&nbsp; <input type=button value='Cancela' id='circulosProporcionaisCancela' />"
+				,
+				{
+					'autoDimensions'    : false,
+					'autoScale'         : false,
+					'height'            :  250,
+					'width'             :  350,
+					'transitionIn'      : 'none',
+					'transitionOut'     : 'none',
+					'showCloseButton'	: false,
+					'modal'				: false
+				}
+		);
+		document.getElementById("circulosProporcionaisOk").onclick = function(){
+			s.opcoes.tipo = "circulosProporcionais";
+			s.opcoes.size = document.getElementById("circulosProporcionaisSize").value;
+			s.opcoes.indicecoluna = [parseInt(document.getElementById("circulosProporcionaisColuna").value,10)];
+			var cor = $('input[name="colour"]').val();
+			s.opcoes.cores = [hex2rgb(cor)];
+			s.render();
+			$.fancybox.close();
+		};
+		document.getElementById("circulosProporcionaisCancela").onclick = function(){
+			$.fancybox.close();
+			s.fecharMapa();
+		};
+		jQuery('select[name="colour"]').colourPicker({
+				ico:    'js/jquery/jquery.colourPicker.gif',
+				title:    false
+		});
+	},
+
+	opcoesColunas: function(){
+		var m = this.data.metadata,
+			n = m.length,
+			i = 0,
+			ins = [];
+		for(i=1;i<n;i++){
+			ins.push("<option value='"+m[i].colIndex+"' >"+m[i].colName+"</option>");
+		}
+		return ins.join("");
+	},
+	cores: function(nome){
+		if(!nome){
+			nome = "colour";
+		}
+		var cor = "<div id='jquery-colour-picker-example' >" +
+			"<p><select name='"+nome+"'>"+
+			"<option value='ffffff' selected='selected'>#ffffff</option>"+
+			"<option value='ffccc9'>#ffccc9</option>"+
+			"<option value='ffce93'>#ffce93</option>"+
+			"<option value='fffc9e'>#fffc9e</option>"+
+			"<option value='ffffc7'>#ffffc7</option>"+
+			"<option value='9aff99'>#9aff99</option>"+
+			"<option value='96fffb'>#96fffb</option>"+
+			"<option value='cdffff'>#cdffff</option>"+
+			"<option value='cbcefb'>#cbcefb</option>"+
+			"<option value='cfcfcf'>#cfcfcf</option>"+
+			"<option value='fd6864'>#fd6864</option>"+
+			"<option value='fe996b'>#fe996b</option>"+
+			"<option value='fffe65'>#fffe65</option>"+
+			"<option value='fcff2f'>#fcff2f</option>"+
+			"<option value='67fd9a'>#67fd9a</option>"+
+			"<option value='38fff8'>#38fff8</option>"+
+			"<option value='68fdff'>#68fdff</option>"+
+			"<option value='9698ed'>#9698ed</option>"+
+			"<option value='c0c0c0'>#c0c0c0</option>"+
+			"<option value='fe0000'>#fe0000</option>"+
+			"<option value='f8a102'>#f8a102</option>"+
+			"<option value='ffcc67'>#ffcc67</option>"+
+			"<option value='f8ff00'>#f8ff00</option>"+
+			"<option value='34ff34'>#34ff34</option>"+
+			"<option value='68cbd0'>#68cbd0</option>"+
+			"<option value='34cdf9'>#34cdf9</option>"+
+			"<option value='6665cd'>#6665cd</option>"+
+			"<option value='9b9b9b'>#9b9b9b</option>"+
+			"<option value='cb0000'>#cb0000</option>"+
+			"<option value='f56b00'>#f56b00</option>"+
+			"<option value='ffcb2f'>#ffcb2f</option>"+
+			"<option value='ffc702'>#ffc702</option>"+
+			"<option value='32cb00'>#32cb00</option>"+
+			"<option value='00d2cb'>#00d2cb</option>"+
+			"<option value='3166ff'>#3166ff</option>"+
+			"<option value='6434fc'>#6434fc</option>"+
+			"<option value='656565'>#656565</option>"+
+			"<option value='9a0000'>#9a0000</option>"+
+			"<option value='ce6301'>#ce6301</option>"+
+			"<option value='cd9934'>#cd9934</option>"+
+			"<option value='999903'>#999903</option>"+
+			"<option value='009901'>#009901</option>"+
+			"<option value='329a9d'>#329a9d</option>"+
+			"<option value='3531ff'>#3531ff</option>"+
+			"<option value='6200c9'>#6200c9</option>"+
+			"<option value='343434'>#343434</option>"+
+			"<option value='680100'>#680100</option>"+
+			"<option value='963400'>#963400</option>"+
+			"<option value='986536'>#986536</option>"+
+			"<option value='646809'>#646809</option>"+
+			"<option value='036400'>#036400</option>"+
+			"<option value='34696d'>#34696d</option>"+
+			"<option value='00009b'>#00009b</option>"+
+			"<option value='303498'>#303498</option>"+
+			"<option value='000000'>#000000</option>"+
+			"<option value='330001'>#330001</option>"+
+			"<option value='643403'>#643403</option>"+
+			"<option value='663234'>#663234</option>"+
+			"<option value='343300'>#343300</option>"+
+			"<option value='013300'>#013300</option>"+
+			"<option value='003532'>#003532</option>"+
+			"<option value='010066'>#010066</option>"+
+			"<option value='340096'>#340096</option></select></p></div>";
+		return cor;
+	},
+	render: function() {
+		if (! $(this.workspace.toolbar.el).find('.i3GeoMap').hasClass('on')) {
+			this.fecha();
+			this.fecharMapa();
+			return;
+		}
+		var series=[];
+		//nome das colunas
+		var column=[];
+		var columnGeoCod = "";
+		var indiceColumnGeoCod = "";
+		var metadata = [];
+		var indicecoluna = "";
+		for(var i=0; i < this.data.metadata.length; i++){
+			if(this.opcoes.indicecoluna == this.data.metadata[i].colIndex){
+				indicecoluna = i;
+			}
+			column[i] = this.data.metadata[i].colName;
+			//se o usuario escolheu uma coluna, as demais sao marcadas com o nome vazio
+			if(this.opcoes.indicecoluna != ""){
+				//if(this.opcoes.indicecoluna.indexOf(this.data.metadata[i].colIndex) != -1)
+				if(this.opcoes.indicecoluna.indexOf(this.data.metadata[i].colIndex) != -1 || column[i].search("GeoCod") > 0){
+					metadata.push(this.data.metadata[i]);
+				}
+			}
+			else{
+				metadata.push(this.data.metadata[i]);
+			}
+			//pega a coluna GeoCod
+			if(column[i].search("GeoCod") > 0){
+				//verifica se tem mais de um GeoCod
+				if(columnGeoCod != ""){
+					alert("Existem mais de uma coluna GeoCod!");
+					this.fecha();
+					$.fancybox.close();
+					return;
+				}
+				columnGeoCod = column[i];
+				indiceColumnGeoCod = i;
+			}
+		}
+		if(columnGeoCod === ""){
+			alert("Coluna GeoCod nao existe!");
+			this.fecha();
+			$.fancybox.close();
+			//this.nav.find('input').hide();
+			return;
+		}
+		series[0]=column;
+		var dados = [];
+		if(indicecoluna != ""){
+			if (this.data.resultset.length > 0 ) {
+				$.each(this.data.resultset, function(key, value) {
+					dados.push([value[indiceColumnGeoCod],value[indicecoluna]]);
+				});
+			}
+		}
+		else{
+			if (this.data.resultset.length > 0 ) {
+				$.each(this.data.resultset, function(key, value) {
+					var aux=value[0]+'';
+					aux = aux.split(" \/ ");
+					aux = aux[indiceColumnGeoCod];
+					value[0]=aux;
+					dados.push(value);
+				});
+			}
+		}
+		//preenche os dados do formulario
+		this.opcoes.locaplic = parametroUrl("locaplic");
+		this.opcoes.mapext = parametroUrl("mapext");
+		document.getElementById("formi3GeoMapOpcoes").value = JSON.stringify(this.opcoes);
+		document.getElementById("formi3GeoMapdados").value = JSON.stringify(dados);
+		document.getElementById("formi3GeoMapmetadados").value = JSON.stringify(metadata);
+		document.getElementById("iframei3GeoMap").style.height = parseInt($(this.workspace.el).find('.workspace_results')[0].style.height) - 50 +"px";
+		document.getElementById("formi3GeoMap").submit();
+		document.getElementById("iframei3GeoMap").style.display = "block";
+	},
+	receive_data: function(args) {
+		if ($(this.workspace.toolbar.el).find('.i3GeoMap').hasClass('on')) {
+			this.fecha();
+			this.fecharMapa();
+			return false;
+		}
+		return _.delay(this.process_data, 0, args);
+	},
+	process_data: function(args) {
+		this.data = {};
+		this.data.resultset = [];
+		this.data.metadata = [];
+		this.data.height = 0;
+		this.data.width = 0;
+		if (! $(this.workspace.toolbar.el).find('.i3GeoMap').hasClass('on')) {
+			this.fecha();
+			this.fecharMapa();
+			return;
+		}
+		var cellset = args.data.cellset;
+		var nome = "";
+		var colunaGeocod = "";
+		var colunaGeocodIndice = "";
+		if (cellset && cellset.length > 0) {
+			var lowest_level = 0;
+			var data_start = 0;
+			for (var row = 0; data_start == 0 && row < cellset.length; row++) {
+				this.data.metadata = [];
+				for (var field = 0; field < cellset[row].length; field++) {
+					var firstHeader = [];
+
+					while (cellset[row][field].type == "COLUMN_HEADER" && cellset[row][field].value == "null") {
+						row++;
+					}
+					nome = "";
+					//colunaGeocod = "";
+					//colunaGeocodIndice = "";
+					if (cellset[row][field].type == "ROW_HEADER_HEADER") {
+						while(cellset[row][field].type == "ROW_HEADER_HEADER") {
+							nome = cellset[row][field].value;
+							firstHeader.push(nome);
+							if(nome.search("GeoCod") > 0){
+								colunaGeocod = nome;
+								colunaGeocodIndice = field;
+							}
+							field++;
+						}
+						tipo = "linha";
+						identificador = cellset[row][field-1].properties.level;
+						if(firstHeader.join('/').search("GeoCod") > 0){
+							this.data.metadata.push({
+								colIndex: 0,
+								colType: "String",
+								colName: colunaGeocod,
+								tipo: tipo,
+								identificador: identificador
+							});
+							lowest_level = field - 1;
+						}
+
+					}
+					if (cellset[row][field].type == "COLUMN_HEADER" && cellset[row][field].value != "null") {
+						var lowest_col_header = 0;
+						var colheader = [];
+						while(lowest_col_header <= row) {
+							colheader.push(cellset[lowest_col_header][field].value);
+							lowest_col_header++;
+						}
+
+						tipo = "coluna";
+						identificador = cellset[row][lowest_col_header].properties.uniquename;
+
+						this.data.metadata.push({
+							colIndex: field - lowest_level + 1,
+							colType: "Numeric",
+							colName: colheader.join('/'),
+							tipo: tipo,
+							identificador: identificador
+						});
+						data_start = row+1;
+					}
+				}
+			}
+
+			for (var row = data_start; row < cellset.length; row++) {
+				if (cellset[row][0].value !== "") {
+					var record = [];
+					this.data.width = cellset[row].length - lowest_level + 1;
+					var label = "";
+					if(cellset[row][colunaGeocodIndice]){
+						label = cellset[row][colunaGeocodIndice].value;
+					}
+					/*
+					if(label in labelsSet) {
+						labelsSet[label] = labelsSet[label]+1;
+						label = label + ' [' + (labelsSet[label] + 1) + ']';
+					} else {
+						labelsSet[label] = 0;
+					}
+					*/
+					record.push(label);
+
+					for (var col = lowest_level + 1; col < cellset[row].length; col++) {
+						var cell = cellset[row][col];
+						var value = cell.value || 0;
+						// check if the resultset contains the raw value, if not try to parse the given value
+						var raw = cell.properties.raw;
+						if (raw && raw !== "null") {
+								value = parseFloat(raw);
+						} else if (typeof(cell.value) !== "number" && parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''))) {
+								value = parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''));
+						}
+						record.push(value);
+					}
+					this.data.resultset.push(record);
+				}
+			}
+			//makeSureUniqueLabels(this.data.resultset);
+			this.hasProcessed = true;
+			this.data.height = this.data.resultset.length;
+			//this.cccOptions = this.getQuickOptions(this.cccOptions);
+			//this.render();
+		} else {
+			$(this.el).find('.canvas_wrapper').text("No results").show();
+			this.workspace.processing.hide();
+			this.workspace.adjust();
+		}
+	}
+});
+function hex2rgb(hex,tipo) {
+	if(!tipo){
+		tipo = "array";
+	}
+	if (hex[0]=="#") hex=hex.substr(1);
+	if (hex.length==3) {
+		var temp=hex; hex='';
+		temp = /^([a-f0-9])([a-f0-9])([a-f0-9])$/i.exec(temp).slice(1);
+		for (var i=0;i<3;i++) hex+=temp[i]+temp[i];
+	}
+	var triplets = /^([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.exec(hex).slice(1);
+	if(tipo == "array"){
+		return {
+			red:   parseInt(triplets[0],16),
+			green: parseInt(triplets[1],16),
+			blue:  parseInt(triplets[2],16)
+		};
+	}
+	else{
+		return parseInt(triplets[0],16)+ " " + parseInt(triplets[1],16) + " " + parseInt(triplets[2],16);
+	}
+}
+function coresHex2Rgb(lista){
+	var n = lista.length,
+		i =0,
+		f = [];
+	for(i=0;i<n;i++){
+		f.push(hex2rgb(lista[i]," "));
+	}
+	return f;
+}
+function loadCSS(file){
+	var headID = document.getElementsByTagName("head")[0];
+	var cssNode = document.createElement('link');
+	cssNode.type = 'text/css';
+	cssNode.rel = 'stylesheet';
+	cssNode.href = file;
+	cssNode.media = 'screen';
+	headID.appendChild(cssNode);
+}
+
+function loadJS(file){
+	var headID = document.getElementsByTagName("head")[0];
+	var newScript = document.createElement('script');
+	newScript.type = 'text/javascript';
+	newScript.src = file;
+	headID.appendChild(newScript);
+}
+
+function messageUser(msg){
+	$("#message").html(msg).show('slow');
+	setTimeout(function(){ jQuery("#message").hide('slow'); }, 2000);
+}
+
+function parametroUrl(parametro){
+	var params = window.location.search.replace("?","").split("&"),
+		n = params.length,
+		valor = "",
+		i,param;
+	for(i=0;i<n;i++){
+		param = params[i].split("=");
+		if(param[0] == parametro){
+			valor = param[1];
+		}
+	}
+	return valor;
+}
+/**
+ * Start Plugin
+ */
+Saiku.events.bind('session:new', function(session) {
+	function new_workspace(args) {
+		// Add stats element
+			if (typeof args.workspace.i3GeoMap == "undefined") {
+				args.workspace.i3GeoMap = new i3GeoMap({ workspace: args.workspace });
+			}
+	}
+
+	function clear_workspace(args) {
+			if (typeof args.workspace.i3GeoMap != "undefined") {
+				$(args.workspace.i3GeoMap.nav).hide();
+					$(args.workspace.i3GeoMap.el).parents().find('.workspace_results table').show();
+					$(args.workspace.i3GeoMap.el).hide();
+			}
+	}
+
+
+	// Attach stats to existing tabs
+	for(var i = 0; i < Saiku.tabs._tabs.length; i++) {
+			var tab = Saiku.tabs._tabs[i];
+			new_workspace({
+					workspace: tab.content
+			});
+	};
+
+	// Attach stats to future tabs
+	Saiku.session.bind("workspace:new", new_workspace);
+	Saiku.session.bind("workspace:clear", clear_workspace);
+});
diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views/QueryToolbar.js b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views/QueryToolbar.js
new file mode 100755
index 0000000..b67db96
--- /dev/null
+++ b/ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views/QueryToolbar.js
@@ -0,0 +1,228 @@
+/*
+ *   Copyright 2012 OSBI Ltd
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+/**
+ * The query toolbar, and associated actions
+ */
+var QueryToolbar = Backbone.View.extend({
+
+
+
+		events: {
+				'click .options a.button': 'call',
+				'click .renderer a.button' : 'switch_render_button'
+		},
+
+		chart: {},
+
+		render_mode: "table",
+		spark_mode: null,
+
+
+		initialize: function(args) {
+				// Keep track of parent workspace
+				this.workspace = args.workspace;
+
+				// Maintain `this` in callbacks
+				_.bindAll(this, "call","activate_buttons", "spark_bar", "spark_line", "render_row_viz", "run_row_viz", "switch_render_button");
+
+				this.render_mode = "table";
+				this.spark_mode = null;
+
+				// Activate buttons when a new query is created or run
+				this.workspace.bind('query:new', this.activate_buttons);
+				this.workspace.bind('query:result', this.activate_buttons);
+				this.workspace.bind('table:rendered', this.run_row_viz);
+
+		},
+
+		activate_buttons: function(args) {
+				if (typeof args != "undefined" && args != null ) {
+						$(this.el).find('a').removeClass('disabled_toolbar');
+						if (!args.data) {
+								$(this.el).find('a.export_button, a.stats').addClass('disabled_toolbar');
+						}
+						if (isIE) {
+								$(this.el).find('a.export_button').addClass('disabled_toolbar');
+						}
+				}
+
+		},
+
+		template: function() {
+				var template = $("#template-query-toolbar").html() || "";
+				return _.template(template)();
+		},
+
+		render: function() {
+				$(this.el).html(this.template());
+
+				$(this.el).find('render_table').addClass('on');
+				$(this.el).find('ul.table').show();
+
+				return this;
+		},
+
+		switch_render_button: function(event) {
+				$target = $(event.target);
+				event.preventDefault();
+				if ($(event.target).hasClass('disabled_toolbar')) {
+						return false;
+				}
+				//i3geomap
+				$(this.workspace.toolbar.el).find('.i3GeoMap').removeClass('on');
+				$target.parent().siblings().find('.on').removeClass('on');
+				if ($target.hasClass('render_chart')) {
+						this.switch_render('chart');
+						this.workspace.query.setProperty('saiku.ui.render.mode', 'chart');
+						var c = $(this.el).find('ul.chart li a.on:first').size() > 0 ?
+												$(this.el).find('ul.chart li a.on:first').attr('href').replace('#', '')
+												: null;
+						if (c != null) {
+								this.workspace.query.setProperty('saiku.ui.render.type', c);
+						}
+				} else {
+						this.switch_render('table');
+						this.workspace.query.setProperty('saiku.ui.render.mode', 'table');
+						this.workspace.query.setProperty('saiku.ui.render.type', this.spark_mode);
+
+				}
+
+
+		},
+		switch_render: function(render_type) {
+				render_type = (typeof render_type != "undefined" ? render_type.toLowerCase() : "table");
+				$(this.el).find('ul.renderer a.on').removeClass('on');
+				$(this.el).find('ul.renderer a.render_' + render_type).addClass('on');
+				if ("chart" == render_type) {
+						$(this.el).find('ul.chart').show();
+						$(this.el).find('ul.table').hide();
+						this.render_mode = "chart";
+						$(this.workspace.el).find('.workspace_results').children().hide();
+						$(this.workspace.chart.el).children().hide();
+						this.workspace.chart.show();
+				} else {
+						$(this.el).find('ul.chart').hide();
+						$(this.el).find('ul.table').show();
+						$(this.el).find('ul.table .stats').removeClass('on');
+						$(this.workspace.el).find('.workspace_results').children().hide();
+						$(this.workspace.el).find('.workspace_results table').show();
+						$(this.workspace.chart.el).hide().children().hide();
+						this.render_mode = "table";
+						var hasRun = this.workspace.query.result.hasRun();
+						if (hasRun) {
+								this.workspace.table.render({ data: this.workspace.query.result.lastresult() });
+						}
+
+				}
+				return false;
+		},
+
+		call: function(event) {
+				event.preventDefault();
+				$target = $(event.target).hasClass('button') ? $(event.target) : $(event.target).parent();
+				if (! $target.hasClass('disabled_toolbar')) {
+						// Determine callback
+						var callback = $target.attr('href').replace('#', '');
+
+						// Attempt to call callback
+						if (this.render_mode == "table" && this[callback]) {
+								this[callback](event);
+						} else if (this.render_mode == "chart" && this.workspace.chart[callback]) {
+								this.workspace.chart.button(event);
+								this.workspace.chart[callback](event);
+						}
+				}
+				return false;
+		},
+
+		spark_bar: function() {
+				$(this.el).find('ul.table .spark_bar').toggleClass('on');
+				$(this.el).find('ul.table .spark_line').removeClass('on');
+
+				$(this.workspace.table.el).find('td.spark').remove();
+				if ($(this.el).find('ul.table .spark_bar').hasClass('on')) {
+						this.spark_mode = "spark_bar";
+						this.workspace.query.setProperty('saiku.ui.render.type', 'spark_bar');
+						_.delay(this.render_row_viz, 10, "spark_bar");
+				} else {
+						this.spark_mode = null;
+				}
+		},
+
+		spark_line: function() {
+				$(this.el).find('ul.table .spark_line').toggleClass('on');
+				$(this.el).find('ul.table .spark_bar').removeClass('on');
+
+				$(this.workspace.table.el).find('td.spark').remove();
+				if ($(this.el).find('ul.table .spark_line').hasClass('on')) {
+						this.spark_mode = "spark_line";
+						this.workspace.query.setProperty('saiku.ui.render.type', 'spark_line');
+						_.delay(this.render_row_viz, 10, "spark_line");
+				} else {
+						this.spark_mode = null;
+				}
+		},
+
+		run_row_viz: function(args) {
+				if (this.render_mode == "table" && this.spark_mode != null) {
+						this.render_row_viz(this.spark_mode);
+				}
+
+		},
+
+		render_row_viz: function(type) {
+				$(this.workspace.table.el).find('tr').each(function(index, element) {
+						var rowData = [];
+						$(element).find('td.data div').each(function(i,data) {
+								var val = $(data).attr('alt');
+								val = (typeof val != "undefined" && val != "" && val != null && val  != "undefined") ? parseFloat(val) : 0;
+								rowData.push(val);
+						});
+
+						$("<td class='data spark'>&nbsp;<div id='chart" + index + "'></div></td>").appendTo($(element));
+
+						var width = rowData.length * 9;
+
+								if (rowData.length > 0) {
+										var vis = new pv.Panel()
+												.canvas('chart' + index)
+												.height(12)
+												.width(width)
+												.margin(0);
+
+										if (type == "spark_bar") {
+												vis.add(pv.Bar)
+														.data(rowData)
+														.left(pv.Scale.linear(0, rowData.length).range(0, width).by(pv.index))
+														.height(pv.Scale.linear(0,_.max(rowData)).range(0, 12))
+														.width(6)
+														.bottom(0);
+										} else if (type == "spark_line") {
+												width = width / 2;
+												vis.width(width);
+												vis.add(pv.Line)
+														.data(rowData)
+														.left(pv.Scale.linear(0, rowData.length - 1).range(0, width).by(pv.index))
+														.bottom(pv.Scale.linear(rowData).range(0, 12))
+														.strokeStyle("#000")
+														.lineWidth(1);
+										}
+										vis.render();
+								}
+				});
+		}
+});
diff --git a/mashups/openlayers.js b/mashups/openlayers.js
index 5450480..0ee02c2 100755
--- a/mashups/openlayers.js
+++ b/mashups/openlayers.js
@@ -1,8 +1,8 @@
-$i = function(id)
-{return document.getElementById(id);};
 //seta as vari&aacute;veis navn e navm
 navn = false;
 navm = false;
+$i = function(id)
+{return document.getElementById(id);};
 app = navigator.appName.substring(0,1);
 if (app==='N'){navn=true;}else{navm=true;}
 
@@ -47,7 +47,7 @@ i3GEO.editorOL = {
 		"Base cartogr&aacute;fica",
 		"http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
 		{layers:'baseraster',SRS:'EPSG:4618',FORMAT:'image/png'},
-		{singleTile:true}
+		{singleTile:false}
 	),
 	ol_wms: new OpenLayers.Layer.WMS.Untiled(
 		"OpenLayers WMS",
@@ -180,7 +180,7 @@ i3GEO.editorOL = {
 					try{
 						eval("i3GEO.editorOL."+fundo[i]+".transitionEffect = 'resize';");
 						eval("i3GEO.editorOL."+fundo[i]+".setVisibility(false);");
-						eval("i3GEO.editorOL."+fundo[i]+".singleTile = single;");
+						eval("i3GEO.editorOL."+fundo[i]+".singleTile = false;");
 						eval("alayers.push(i3GEO.editorOL."+fundo[i]+");");
 					}
 					catch(e){
@@ -559,9 +559,11 @@ i3GEO.editorOL = {
 			ins = "",i;
 		for(i=0;i<nlayers;i++){
 			try{
-				var url = layers[i].getFullRequestString({"request":"getlegendgraphic"});
-				url = url.replace("LAYERS","LAYER");
-				ins += "<img src='"+url+"' /><br>";
+				if(layers[i].isBaseLayer === false){
+					var url = layers[i].getFullRequestString({"request":"getlegendgraphic"});
+					url = url.replace("LAYERS","LAYER");
+					ins += layers[i].name+"<br><img src='"+url+"' /><br>";
+				}
 			}
 			catch(e){}
 		}
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 1320efc..7a4a034 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -222,7 +222,12 @@ if($temas != ""){
 								if($l->status == MS_DEFAULT){
 									$visivel = "true";
 								}
-								$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+								if($tituloLayer != ""){
+									$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+								}
+								else{
+									$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+								}
 							}
 						}
 						//var_dump($objOpenLayers);exit;
diff --git a/mashups/openlayers_compacto.js b/mashups/openlayers_compacto.js
index 808a823..22e3bd8 100644
--- a/mashups/openlayers_compacto.js
+++ b/mashups/openlayers_compacto.js
@@ -3062,7 +3062,7 @@ ol_mma: new OpenLayers.Layer.WMS(
 "Base cartogr&aacute;fica",
 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
 {layers:'baseraster',SRS:'EPSG:4618',FORMAT:'image/png'},
-{singleTile:true}
+{singleTile:false}
 ),
 ol_wms: new OpenLayers.Layer.WMS.Untiled(
 "OpenLayers WMS",
@@ -3195,7 +3195,7 @@ if(fundo[i] != ""){
 try{
 eval("i3GEO.editorOL."+fundo[i]+".transitionEffect = 'resize';");
 eval("i3GEO.editorOL."+fundo[i]+".setVisibility(false);");
-eval("i3GEO.editorOL."+fundo[i]+".singleTile = single;");
+eval("i3GEO.editorOL."+fundo[i]+".singleTile = false;");
 eval("alayers.push(i3GEO.editorOL."+fundo[i]+");");
 }
 catch(e){
@@ -3571,9 +3571,11 @@ nlayers = layers.length,
 ins = "",i;
 for(i=0;i<nlayers;i++){
 try{
+if(layers[i].isBaseLayer === false){
 var url = layers[i].getFullRequestString({"request":"getlegendgraphic"});
 url = url.replace("LAYERS","LAYER");
-ins += "<img src='"+url+"' /><br>";
+ins += layers[i].name+"<br><img src='"+url+"' /><br>";
+}
 }
 catch(e){}
 }
diff --git a/mashups/openlayers_compacto.js.php b/mashups/openlayers_compacto.js.php
index 67b1f8f..c0b9e6e 100644
--- a/mashups/openlayers_compacto.js.php
+++ b/mashups/openlayers_compacto.js.php
@@ -3062,7 +3062,7 @@ ol_mma: new OpenLayers.Layer.WMS(
 "Base cartogr&aacute;fica",
 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
 {layers:'baseraster',SRS:'EPSG:4618',FORMAT:'image/png'},
-{singleTile:true}
+{singleTile:false}
 ),
 ol_wms: new OpenLayers.Layer.WMS.Untiled(
 "OpenLayers WMS",
@@ -3195,7 +3195,7 @@ if(fundo[i] != ""){
 try{
 eval("i3GEO.editorOL."+fundo[i]+".transitionEffect = 'resize';");
 eval("i3GEO.editorOL."+fundo[i]+".setVisibility(false);");
-eval("i3GEO.editorOL."+fundo[i]+".singleTile = single;");
+eval("i3GEO.editorOL."+fundo[i]+".singleTile = false;");
 eval("alayers.push(i3GEO.editorOL."+fundo[i]+");");
 }
 catch(e){
@@ -3571,9 +3571,11 @@ nlayers = layers.length,
 ins = "",i;
 for(i=0;i<nlayers;i++){
 try{
+if(layers[i].isBaseLayer === false){
 var url = layers[i].getFullRequestString({"request":"getlegendgraphic"});
 url = url.replace("LAYERS","LAYER");
-ins += "<img src='"+url+"' /><br>";
+ins += layers[i].name+"<br><img src='"+url+"' /><br>";
+}
 }
 catch(e){}
 }
--
libgit2 0.21.2