diff --git a/.project b/.project
index 8516ede..6b72ac1 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>i3Geo 7.0</name>
+	<name>i3GEO 7</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -25,48 +25,32 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.php.core.PHPNature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>cesium</name>
-			<type>2</type>
-			<location>/var/www/i3geo/pacotes/cesium</location>
-		</link>
-	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1431135588159</id>
+			<id>1432066670858</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*compact*</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1431135588160</id>
-			<name></name>
-			<type>26</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-pacotes</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1431135588161</id>
+			<id>1432066670860</id>
 			<name></name>
-			<type>10</type>
+			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-documentacao</arguments>
+				<arguments>1.0-name-matches-false-false-compactados</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1431135588162</id>
+			<id>1432066670863</id>
 			<name></name>
-			<type>14</type>
+			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-.svn</arguments>
+				<arguments>1.0-name-matches-false-false-*compacto*</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
index 74fb49d..c3e8b26 100644
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -1,321 +1,5 @@
 <?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="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"/>
-	<classpathentry kind="src" path="ferramentas/analisageometrias"/>
-	<classpathentry kind="src" path="ferramentas/animacao"/>
-	<classpathentry kind="src" path="ferramentas/aplicarsld"/>
-	<classpathentry kind="src" path="ferramentas/buffer"/>
-	<classpathentry kind="src" path="ferramentas/bufferpt"/>
-	<classpathentry kind="src" path="ferramentas/busca"/>
-	<classpathentry kind="src" path="ferramentas/buscafotos"/>
-	<classpathentry kind="src" path="ferramentas/buscainde"/>
-	<classpathentry kind="src" path="ferramentas/buscarapida"/>
-	<classpathentry kind="src" path="ferramentas/carouseltemas"/>
-	<classpathentry kind="src" path="ferramentas/carregakml"/>
-	<classpathentry kind="src" path="ferramentas/carregamapa"/>
-	<classpathentry kind="src" path="ferramentas/centroide"/>
-	<classpathentry kind="src" path="ferramentas/centromassa"/>
-	<classpathentry kind="src" path="ferramentas/colorpicker"/>
-	<classpathentry kind="src" path="ferramentas/colourramp"/>
-	<classpathentry kind="src" path="ferramentas/comentarios"/>
-	<classpathentry kind="src" path="ferramentas/conectargeojson"/>
-	<classpathentry kind="src" path="ferramentas/conectargeorss"/>
-	<classpathentry kind="src" path="ferramentas/conectarwms"/>
-	<classpathentry kind="src" path="ferramentas/confluence"/>
-	<classpathentry kind="src" path="ferramentas/convertekml"/>
-	<classpathentry kind="src" path="ferramentas/convertemapakml"/>
-	<classpathentry kind="src" path="ferramentas/convertews"/>
-	<classpathentry kind="src" path="ferramentas/cortina"/>
-	<classpathentry kind="src" path="ferramentas/dissolve"/>
-	<classpathentry kind="src" path="ferramentas/distanciaptpt"/>
-	<classpathentry kind="src" path="ferramentas/download"/>
-	<classpathentry kind="src" path="ferramentas/editorsql"/>
-	<classpathentry kind="src" path="ferramentas/especies"/>
-	<classpathentry kind="src" path="ferramentas/etiqueta"/>
-	<classpathentry kind="src" path="ferramentas/excluirarvore"/>
-	<classpathentry kind="src" path="ferramentas/filtro"/>
-	<classpathentry kind="src" path="ferramentas/filtroarvore"/>
-	<classpathentry kind="src" path="ferramentas/geolocal"/>
-	<classpathentry kind="src" path="ferramentas/geonames"/>
-	<classpathentry kind="src" path="ferramentas/googlemaps"/>
-	<classpathentry kind="src" path="ferramentas/googlemaps1"/>
-	<classpathentry kind="src" path="ferramentas/gradecoord"/>
-	<classpathentry kind="src" path="ferramentas/gradehex"/>
-	<classpathentry kind="src" path="ferramentas/gradepol"/>
-	<classpathentry kind="src" path="ferramentas/gradepontos"/>
-	<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"/>
-	<classpathentry kind="src" path="ferramentas/inseregrafico"/>
-	<classpathentry kind="src" path="ferramentas/inseretxt"/>
-	<classpathentry kind="src" path="ferramentas/inserexy2"/>
-	<classpathentry kind="src" path="ferramentas/legenda"/>
-	<classpathentry kind="src" path="ferramentas/linhadotempo"/>
-	<classpathentry kind="src" path="ferramentas/loginusuario"/>
-	<classpathentry kind="src" path="ferramentas/markercluster"/>
-	<classpathentry excluding="templates/lib/" kind="src" path="ferramentas/metaestat"/>
-	<classpathentry kind="src" path="ferramentas/metaestat/templates/lib"/>
-	<classpathentry kind="src" path="ferramentas/metar"/>
-	<classpathentry kind="src" path="ferramentas/mostraexten"/>
-	<classpathentry kind="src" path="ferramentas/navegapostgis"/>
-	<classpathentry kind="src" path="ferramentas/navegarquivos"/>
-	<classpathentry kind="src" path="ferramentas/nptpol"/>
-	<classpathentry kind="src" path="ferramentas/nuvemtags"/>
-	<classpathentry kind="src" path="ferramentas/nuvemtagsflash"/>
-	<classpathentry kind="src" path="ferramentas/opacidademapa"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_autoredesenha"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_escala"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_fundo"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_label"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_legenda"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_quadros"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_querymap"/>
-	<classpathentry kind="src" path="ferramentas/opcoes_tamanho"/>
-	<classpathentry kind="src" path="ferramentas/outputformat"/>
-	<classpathentry kind="src" path="ferramentas/perfil"/>
-	<classpathentry kind="src" path="ferramentas/pontoempoligono"/>
-	<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/jquery/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/|saiku-server/tomcat/webapps/ROOT/js/saiku/views/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/|saiku-server/tomcat/webapps/ROOT/js/saiku/" kind="src" path="ferramentas/saiku"/>
-	<classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery"/>
-	<classpathentry excluding="plugins/CCC_Chart/|views/|plugins/i3GeoMap/" 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"/>
-	<classpathentry kind="src" path="ferramentas/salvamapa"/>
-	<classpathentry kind="src" path="ferramentas/salvamapfile"/>
-	<classpathentry kind="src" path="ferramentas/scielo"/>
-	<classpathentry kind="src" path="ferramentas/selecao"/>
-	<classpathentry kind="src" path="ferramentas/tabela"/>
-	<classpathentry kind="src" path="ferramentas/telaremota"/>
-	<classpathentry kind="src" path="ferramentas/tipoimagem"/>
-	<classpathentry kind="src" path="ferramentas/tme"/>
-	<classpathentry kind="src" path="ferramentas/toponimia"/>
-	<classpathentry kind="src" path="ferramentas/upload"/>
-	<classpathentry kind="src" path="ferramentas/uploaddbf"/>
-	<classpathentry kind="src" path="ferramentas/uploadgpx"/>
-	<classpathentry kind="src" path="ferramentas/uploadkml"/>
-	<classpathentry kind="src" path="ferramentas/uploadsimbolo"/>
-	<classpathentry kind="src" path="ferramentas/vinde"/>
-	<classpathentry kind="src" path="ferramentas/wiki"/>
-	<classpathentry kind="src" path="ferramentas/wmstime"/>
-	<classpathentry kind="src" path="init"/>
-	<classpathentry kind="src" path="mashups"/>
-	<classpathentry excluding="jsts/lib/|yui290/build/element-delegate/|codemirror/mode/ecl/|codemirror/doc/|eudock/js/|simile/timeline_2.3.0/timeline_js/scripts/l10n/zh/|codemirror/addon/lint/|heatmap/website/js/|codemirror/mode/sql/|yui290/build/profilerviewer/|markercluster/openlayers/|simile/timeline_2.3.0/timeline_js/scripts/l10n/ru/|codemirror/mode/lua/|codemirror/mode/dtd/|codemirror/mode/puppet/|codemirror/addon/tern/|mobileesp/|richdraw/|yui290/build/selector/|yui290/build/tabview/|yui290/build/utilities/|codemirror/mode/vbscript/|codemirror/mode/fortran/|yui290/build/get/|geohash-js-master/|yui290/build/connection/|yui290/build/cookie/|yui290/build/container/|codemirror/mode/octave/|codemirror/mode/clike/|yui290/assets/|codemirror/mode/modelica/|yui290/build/datatable/|simile/timeline_2.3.0/timeline_js/scripts/l10n/tr/|yui290/build/imagecropper/|codemirror/mode/turtle/|yui290/build/uploader/|codemirror/mode/smarty/|simile/timeline_2.3.0/timeline_js/scripts/l10n/en/|codemirror/mode/shell/|codemirror/mode/dylan/|codemirror/mode/css/|yui290/build/swf/|heatmap/tests/|codemirror/mode/smartymixed/|codemirror/mode/nginx/|codemirror/mode/yaml/|codemirror/mode/go/|simile/timeline_2.3.0/timeline_ajax/|codemirror/keymap/|codemirror/mode/rust/|codemirror/test/|codemirror/addon/search/|codemirror/mode/erlang/|simile/timeline_2.3.0/timeline_js/scripts/l10n/es/|yui290/build/slider/|yui290/build/charts/|yui290/build/menu/|codemirror/mode/xml/|yui290/build/json/|codemirror/mode/clojure/|codemirror/mode/sieve/|codemirror/mode/tiki/|proj4js/docs/NaturalDocs/javascript/|codemirror/mode/gfm/|codemirror/mode/pig/|codemirror/addon/scroll/|yui290/build/dragdrop/|codemirror/mode/sparql/|simile/timeline_2.3.0/timeline_js/scripts/l10n/nl/|codemirror/addon/fold/|cswclient/lib/scripts/|yui290/build/yahoo/|codemirror/mode/haskell/|codemirror/mode/julia/|codemirror/lib/|yui290/build/carousel/|codemirror/mode/perl/|balloon-tooltips/htdocs/js/|codemirror/mode/solr/|codemirror/mode/kotlin/|cpaint/|codemirror/mode/tiddlywiki/|simile/timeline_2.3.0/timeline_js/scripts/l10n/cs/|simile/timeline_2.3.0/timeline_js/scripts/l10n/se/|codemirror/mode/ruby/|codemirror/mode/gherkin/|yui290/build/datasource/|heatmap/src/|yui290/build/swfdetect/|codemirror/mode/mllike/|openflashchart/|yui290/build/event-simulate/|codemirror/mode/asterisk/|codemirror/mode/ntriples/|proj4js/lib/|codemirror/addon/edit/|codemirror/mode/rpm/|yui290/build/stylesheet/|codemirror/mode/toml/|codemirror/addon/hint/|simile/timeline_2.3.0/timeline_js/|yui290/build/editor/|yui290/build/calendar/|yui290/build/event-mouseenter/|yui290/build/imageloader/|mustache.js-master/test/_files/|yui290/build/layout/|codemirror/mode/python/|codemirror/mode/pegjs/|codemirror/mode/apl/|codemirror/mode/slim/|codemirror/mode/smalltalk/|simile/timeline_local_example_1.0/local_example/|codemirror/mode/|codemirror/mode/jinja2/|yui290/build/yahoo-dom-event/|codemirror/mode/q/|codemirror/addon/merge/|codemirror/mode/r/|yui290/build/dom/|codemirror/mode/php/|codemirror/mode/z80/|codemirror/mode/verilog/|yui290/build/yuitest/|codemirror/mode/sass/|codemirror/mode/cypher/|yui290/build/event/|codemirror/mode/http/|codemirror/addon/comment/|codemirror/mode/haml/|google/|simile/timeline_2.3.0/timeline_js/scripts/l10n/de/|openlayers/|codemirror/mode/gas/|yui290/build/treeview/|codemirror/mode/vb/|codemirror/mode/xquery/|yui290/build/button/|codemirror/addon/wrap/|codemirror/mode/pascal/|codemirror/mode/rst/|simile/timeline_2.3.0/timeline_js/scripts/l10n/it/|codemirror/mode/markdown/|codemirror/test/lint/|yui290/build/storage/|codemirror/addon/runmode/|mustache.js-master/|balloon-tooltips/htdocs_depreciado/js/|codemirror/mode/stex/|proj4js/lib/defs/|tme/javascript/|codemirror/mode/d/|simile/timeline_2.3.0/timeline_js/scripts/l10n/fr/|wpcumulus/|codemirror/mode/cobol/|yui290/build/colorpicker/|codemirror/mode/groovy/|codemirror/mode/javascript/|codemirror/addon/dialog/|mustache.js-master/test/|yui290/build/autocomplete/|codemirror/addon/selection/|codemirror/mode/htmlembedded/|ccc2/ccc/|yui290/build/logger/|yui290/build/yuiloader/|codemirror/mode/eiffel/|yui290/build/animation/|yui290/build/datemath/|simile/timeline_2.3.0/timeline_ajax/scripts/|yui290/build/element/|codemirror/mode/diff/|codemirror/addon/mode/|proj4js/lib/projCode/|codemirror/addon/display/|codemirror/mode/jade/|yui290/build/profiler/|yui290/build/paginator/|codemirror/mode/haxe/|yui290/build/event-delegate/|codemirror/mode/livescript/|codemirror/mode/htmlmixed/|yui290/build/history/|yui290/build/yuiloader-dom-event/|codemirror/mode/mirc/|heatmap/demo/chromePlugIn_heatmap/web_heatmap/|codemirror/mode/django/|codemirror/mode/commonlisp/|codemirror/mode/coffeescript/|yui290/build/resize/|proj4js/demo/maps/|wicket/|codemirror/mode/tcl/|yui290/build/swfstore/|codemirror/mode/scheme/|markercluster/google/|yui290/build/progressbar/|simile/timeline_2.3.0/timeline_js/scripts/l10n/vi/|codemirror/mode/velocity/|proj4js/demo/|cpaint/JSON/|codemirror/mode/properties/" 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 kind="src" path="pacotes/codemirror/addon/comment"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/dialog"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/display"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/edit"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/fold"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/hint"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/lint"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/merge"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/mode"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/runmode"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/scroll"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/search"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/selection"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/tern"/>
-	<classpathentry kind="src" path="pacotes/codemirror/addon/wrap"/>
-	<classpathentry kind="src" path="pacotes/codemirror/doc"/>
-	<classpathentry kind="src" path="pacotes/codemirror/keymap"/>
-	<classpathentry kind="src" path="pacotes/codemirror/lib"/>
-	<classpathentry excluding="ecl/|sql/|lua/|dtd/|puppet/|vbscript/|fortran/|octave/|clike/|modelica/|turtle/|smarty/|shell/|dylan/|css/|smartymixed/|nginx/|yaml/|go/|rust/|erlang/|xml/|clojure/|sieve/|tiki/|gfm/|pig/|sparql/|haskell/|julia/|perl/|solr/|kotlin/|tiddlywiki/|ruby/|gherkin/|mllike/|asterisk/|ntriples/|rpm/|toml/|python/|pegjs/|apl/|slim/|smalltalk/|jinja2/|q/|r/|php/|z80/|verilog/|sass/|cypher/|http/|haml/|gas/|vb/|xquery/|pascal/|rst/|markdown/|stex/|d/|cobol/|groovy/|javascript/|htmlembedded/|eiffel/|diff/|jade/|haxe/|livescript/|htmlmixed/|mirc/|django/|commonlisp/|coffeescript/|tcl/|scheme/|velocity/|properties/" kind="src" path="pacotes/codemirror/mode"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/apl"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/asterisk"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/clike"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/clojure"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/cobol"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/coffeescript"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/commonlisp"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/css"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/cypher"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/d"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/diff"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/django"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/dtd"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/dylan"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/ecl"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/eiffel"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/erlang"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/fortran"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/gas"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/gfm"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/gherkin"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/go"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/groovy"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/haml"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/haskell"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/haxe"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/htmlembedded"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/htmlmixed"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/http"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/jade"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/javascript"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/jinja2"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/julia"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/kotlin"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/livescript"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/lua"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/markdown"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/mirc"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/mllike"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/modelica"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/nginx"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/ntriples"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/octave"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/pascal"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/pegjs"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/perl"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/php"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/pig"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/properties"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/puppet"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/python"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/q"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/r"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/rpm"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/rst"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/ruby"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/rust"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/sass"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/scheme"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/shell"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/sieve"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/slim"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/smalltalk"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/smarty"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/smartymixed"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/solr"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/sparql"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/sql"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/stex"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/tcl"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/tiddlywiki"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/tiki"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/toml"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/turtle"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/vb"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/vbscript"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/velocity"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/verilog"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/xml"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/xquery"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/yaml"/>
-	<classpathentry kind="src" path="pacotes/codemirror/mode/z80"/>
-	<classpathentry excluding="lint/" kind="src" path="pacotes/codemirror/test"/>
-	<classpathentry kind="src" path="pacotes/codemirror/test/lint"/>
-	<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/geohash-js-master"/>
-	<classpathentry kind="src" path="pacotes/google"/>
-	<classpathentry kind="src" path="pacotes/heatmap/demo/chromePlugIn_heatmap/web_heatmap"/>
-	<classpathentry kind="src" path="pacotes/heatmap/src"/>
-	<classpathentry kind="src" path="pacotes/heatmap/tests"/>
-	<classpathentry kind="src" path="pacotes/heatmap/website/js"/>
-	<classpathentry kind="src" path="pacotes/jsts/lib"/>
-	<classpathentry kind="src" path="pacotes/markercluster/google"/>
-	<classpathentry kind="src" path="pacotes/markercluster/openlayers"/>
-	<classpathentry kind="src" path="pacotes/mobileesp"/>
-	<classpathentry excluding="test/_files/|test/" kind="src" path="pacotes/mustache.js-master"/>
-	<classpathentry excluding="_files/" kind="src" path="pacotes/mustache.js-master/test"/>
-	<classpathentry kind="src" path="pacotes/mustache.js-master/test/_files"/>
-	<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="defs/|projCode/" 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/zh/|scripts/l10n/ru/|scripts/l10n/tr/|scripts/l10n/en/|scripts/l10n/es/|scripts/l10n/nl/|scripts/l10n/cs/|scripts/l10n/se/|scripts/l10n/de/|scripts/l10n/it/|scripts/l10n/fr/|scripts/l10n/vi/" 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="src" path=""/>
 	<classpathentry kind="output" path=""/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.jsdt.core.prefs b/.settings/org.eclipse.wst.jsdt.core.prefs
index d4596c9..5bcda7d 100644
--- a/.settings/org.eclipse.wst.jsdt.core.prefs
+++ b/.settings/org.eclipse.wst.jsdt.core.prefs
@@ -1,4 +1,310 @@
 eclipse.preferences.version=1
+org.eclipse.wst.jsdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.wst.jsdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.wst.jsdt.core.compiler.compliance=1.4
+org.eclipse.wst.jsdt.core.compiler.debug.lineNumber=generate
+org.eclipse.wst.jsdt.core.compiler.debug.localVariable=generate
+org.eclipse.wst.jsdt.core.compiler.debug.sourceFile=generate
+org.eclipse.wst.jsdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.wst.jsdt.core.compiler.problem.deprecation=warning
+org.eclipse.wst.jsdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.wst.jsdt.core.compiler.problem.duplicateLocalVariables=warning
+org.eclipse.wst.jsdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.wst.jsdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.wst.jsdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.wst.jsdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.looseVarDecleration=warning
+org.eclipse.wst.jsdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.wst.jsdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.nullReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.optionalSemicolon=warning
+org.eclipse.wst.jsdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.undefinedField=warning
+org.eclipse.wst.jsdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.uninitializedGlobalVariable=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.uninitializedLocalVariable=warning
+org.eclipse.wst.jsdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedFieldReference=error
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedMethodReference=error
+org.eclipse.wst.jsdt.core.compiler.problem.unresolvedTypeReference=error
+org.eclipse.wst.jsdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.wst.jsdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.wst.jsdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.wst.jsdt.core.compiler.source=1.3
 org.eclipse.wst.jsdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.wst.jsdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,LOW
 org.eclipse.wst.jsdt.core.compiler.taskTags=TODO,FIXME,XXX,XODO,ZODO
+org.eclipse.wst.jsdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression=48
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation=48
+org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_assignment=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression=80
+org.eclipse.wst.jsdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.wst.jsdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer=48
+org.eclipse.wst.jsdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.wst.jsdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_field=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_method=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_before_package=0
+org.eclipse.wst.jsdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.wst.jsdt.core.formatter.blank_lines_between_type_declarations=0
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_objlit_initializer=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.wst.jsdt.core.formatter.comment.format_block_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_header=false
+org.eclipse.wst.jsdt.core.formatter.comment.format_html=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_line_comments=true
+org.eclipse.wst.jsdt.core.formatter.comment.format_source_code=true
+org.eclipse.wst.jsdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.wst.jsdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.wst.jsdt.core.formatter.comment.line_length=140
+org.eclipse.wst.jsdt.core.formatter.compact_else_if=true
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation=1
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer=1
+org.eclipse.wst.jsdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.wst.jsdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.wst.jsdt.core.formatter.indent_empty_lines=false
+org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.wst.jsdt.core.formatter.indentation.size=4
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_objlit_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_object_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_object_initializer=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.wst.jsdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_empty_objlit_initializer_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.wst.jsdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.wst.jsdt.core.formatter.lineSplit=140
+org.eclipse.wst.jsdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.wst.jsdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.wst.jsdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.wst.jsdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.wst.jsdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.wst.jsdt.core.formatter.tabulation.char=tab
+org.eclipse.wst.jsdt.core.formatter.tabulation.size=4
+org.eclipse.wst.jsdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.wst.jsdt.core.formatter.wrap_before_binary_operator=true
+semanticValidation=enabled
diff --git a/js/coordenadas.js b/js/coordenadas.js
index bf9f6a7..8ae5c77 100755
--- a/js/coordenadas.js
+++ b/js/coordenadas.js
@@ -909,8 +909,8 @@ i3GEO.coordenadas =
 				x = (lon[0] + lon[1]) / 2;
 
 				return {
-					latitude : y,
-					longitude : x
+					"latitude" : y,
+					"longitude" : x
 				};
 			},
 			/**
diff --git a/js/editorgm.js b/js/editorgm.js
index 2c3553a..cda2e2c 100644
--- a/js/editorgm.js
+++ b/js/editorgm.js
@@ -2043,7 +2043,7 @@ google.maps.Circle.prototype.type = 'circle';
 						}
 
 						return {
-							comps : comps
+							"comps" : comps
 						};
 					}())
 
diff --git a/js/interface.js b/js/interface.js
index 7972db9..712ee63 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -507,8 +507,7 @@ i3GEO.Interface =
 			parametrosMap : {
 				target : "openlayers",
 				layers : [],
-				controls : [
-				],
+				controls : [],
 				loadTilesWhileAnimating : true,
 				loadTilesWhileInteracting : true
 			},
@@ -772,8 +771,7 @@ i3GEO.Interface =
 			 * i3geoOL = new OpenLayers.Map()
 			 */
 			cria : function(w, h) {
-				var f, ins, temp, j, r, mi = i3GEO.Interface.openlayers.MINEXTENT, ma = i3GEO.Interface.openlayers.MAXEXTENT, i =
-					$i(i3GEO.Interface.IDCORPO), bb = i3GEO.barraDeBotoes;
+				var f, ins, i = $i(i3GEO.Interface.IDCORPO);
 
 				if (i) {
 					f = $i("openlayers");
@@ -801,7 +799,7 @@ i3GEO.Interface =
 				//
 				// funcoes utilitarias
 				//
-				ol.layer.Layer.prototype.setVisibility = function(v){
+				ol.layer.Layer.prototype.setVisibility = function(v) {
 					this.setVisible(v);
 				};
 				i3geoOL.getLayersByName = function(nome) {
@@ -817,21 +815,21 @@ i3GEO.Interface =
 					var n = lista.length, i, lan, l;
 					for (i = 0; i < n; i++) {
 						lan = lista[i].get("name");
-						if(lan){
+						if (lan) {
 							l = this.getLayersByName(lan);
-							if(l.length === 0){
+							if (l.length === 0) {
 								this.addLayer(lista[i]);
 							}
 						}
 					}
 				};
-				i3geoOL.getLayersBase = function(){
-					return i3geoOL.getLayersBy("isBaseLayer",true);
+				i3geoOL.getLayersBase = function() {
+					return i3geoOL.getLayersBy("isBaseLayer", true);
 				};
 				i3geoOL.getLayersBy = function(chave, valor) {
 					var res = [], layers = this.getLayers(), n = layers.getLength(), i;
 					for (i = 0; i < n; i++) {
-						if (layers.item(i)[chave] && layers.item(i)[chave] === valor) {
+						if (layers.item(i).get(chave) && layers.item(i).get(chave) === valor) {
 							res.push(layers.item(i));
 						}
 					}
@@ -1225,7 +1223,7 @@ i3GEO.Interface =
 			 */
 			criaLayers : function() {
 				var matrixIds, resolutions, size, z, projectionExtent, source, configura = i3GEO.configura, url, nlayers =
-					i3GEO.arvoreDeCamadas.CAMADAS.length, layer, camada, urllayer, opcoes, i, n, temp, fundoIsBase = true;
+					i3GEO.arvoreDeCamadas.CAMADAS.length, layer, camada, urllayer, opcoes, i, temp;
 
 				// barra de status
 				temp = $i("i3GEOprogressoDiv");
@@ -1351,14 +1349,11 @@ i3GEO.Interface =
 										if (i3GEO.Interface.openlayers.googleLike === true) {
 											opcoes.projection = "EPSG:3857";
 										}
-										//erro aqui - corrigir
+										// erro aqui - corrigir
 										/*
-										layer = new OpenLayers.Layer.WMS(camada.name, urllayer, {
-											LAYERS : camada.name,
-											format : camada.wmsformat,
-											transparent : true
-										}, opcoes);
-										*/
+										 * layer = new OpenLayers.Layer.WMS(camada.name, urllayer, { LAYERS : camada.name, format :
+										 * camada.wmsformat, transparent : true }, opcoes);
+										 */
 
 									} else {
 										// FIXME testar isso
@@ -1528,36 +1523,18 @@ i3GEO.Interface =
 			 * Ordena os layers no mapa conforme i3GEO.arvoreDeCamadas.CAMADAS
 			 */
 			ordenaLayers : function() {
-				var ordem = i3GEO.arvoreDeCamadas.CAMADAS,
-					nordem = ordem.length,
-					nbase = i3geoOL.getLayersBase().length,
-					layer, layers, i, maiorindice;
-				
+				var ordem = i3GEO.arvoreDeCamadas.CAMADAS, nordem = ordem.length, layer, layers, i;
 				layers = i3geoOL.getLayers();
 				for (i = nordem - 1; i >= 0; i--) {
 					layer = i3geoOL.getLayersByName(ordem[i].name);
-					layer = layers[0];
+					layer = layer[0];
 					if (layer) {
-						layers.setAt(nordem + nbase,layer);
-					}
-				}
-				//TODO precisa subir os layers graficos?
-				//i3GEO.Interface.openlayers.sobeLayersGraficos();
-			},
-			/**
-			 * Sobe ou desce um layer na pilha de camadas
-			 */
-			sobeDesceLayer : function(tema, tipo) {
-				var layer = i3geoOL.getLayersByName(tema)[0], indice;
-				if (layer) {
-					indice = i3geoOL.getLayerIndex(layer);
-					if (tipo === "sobe") {
-						i3geoOL.setLayerIndex(layer, indice + 1);
-					} else {
-						i3geoOL.setLayerIndex(layer, indice - 1);
+						layers.remove(layer);
+						layers.push(layer);
 					}
 				}
-				i3GEO.Interface.openlayers.sobeLayersGraficos();
+				// TODO precisa subir os layers graficos?
+				// i3GEO.Interface.openlayers.sobeLayersGraficos();
 			},
 			/**
 			 * Liga ou desliga um layer
@@ -1567,10 +1544,10 @@ i3GEO.Interface =
 				if (layers.length > 0) {
 					layers[0].setVisibility(obj.checked);
 					if (obj.checked === true) {
-						//layers[0].div.style.display = "block";
+						// layers[0].div.style.display = "block";
 						i3GEO.pluginI3geo.ligaCamada(obj.value);
 					} else {
-						//layers[0].div.style.display = "none";
+						// layers[0].div.style.display = "none";
 						i3GEO.pluginI3geo.desligaCamada(obj.value);
 					}
 				}
@@ -1750,10 +1727,10 @@ i3GEO.Interface =
 					if (modoAtual === "move") {
 						return;
 					}
-					var point, lonlat = false, d, pos = "";
+					var lonlat = false, d, pos = "";
 					lonlat = e.coordinate;
 					if (i3GEO.Interface.openlayers.googleLike === true) {
-						lonlat = ol.proj.transform(lonlat,'EPSG:3857', 'EPSG:4326');
+						lonlat = ol.proj.transform(lonlat, 'EPSG:3857', 'EPSG:4326');
 					}
 					d = i3GEO.calculo.dd2dms(lonlat[0], lonlat[1]);
 					objposicaocursor.ddx = lonlat[0];
diff --git a/js/tema.js b/js/tema.js
index 5fa9ca3..d990909 100644
--- a/js/tema.js
+++ b/js/tema.js
@@ -124,7 +124,6 @@ i3GEO.tema =
 		 * {string} - codigo do tema
 		 */
 		sobe : function(tema) {
-			i3GEO.mapa.ativaTema(tema);
 			i3GEO.php.sobetema(function(retorno) {
 				//
 				// atualiza apenas remonta a arvore
@@ -145,7 +144,6 @@ i3GEO.tema =
 		 * tema - codigo do tema
 		 */
 		desce : function(tema) {
-			i3GEO.mapa.ativaTema(tema);
 			i3GEO.php.descetema(function(retorno) {
 				//
 				// atualiza apenas remonta a arvore
--
libgit2 0.21.2