Download as
Browse Code »

Commit d37a04464676d8280a4d1c38bab71d223447be3a

Authored by Edmar Moretti
1 parent 9f5812d7
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 13 changed files with 104 additions and 144 deletions   Show diff stats
@@ -25,9 +25,16 @@ @@ -25,9 +25,16 @@
25 <nature>org.eclipse.wst.jsdt.core.jsNature</nature> 25 <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
26 <nature>org.eclipse.php.core.PHPNature</nature> 26 <nature>org.eclipse.php.core.PHPNature</nature>
27 </natures> 27 </natures>
  28 + <linkedResources>
  29 + <link>
  30 + <name>gvsig</name>
  31 + <type>2</type>
  32 + <location>/var/www/i3geo/pacotes/gvsig</location>
  33 + </link>
  34 + </linkedResources>
28 <filteredResources> 35 <filteredResources>
29 <filter> 36 <filter>
30 - <id>1399312895196</id> 37 + <id>1406724317282</id>
31 <name></name> 38 <name></name>
32 <type>30</type> 39 <type>30</type>
33 <matcher> 40 <matcher>
@@ -36,7 +43,7 @@ @@ -36,7 +43,7 @@
36 </matcher> 43 </matcher>
37 </filter> 44 </filter>
38 <filter> 45 <filter>
39 - <id>1399312895197</id> 46 + <id>1406724317287</id>
40 <name></name> 47 <name></name>
41 <type>30</type> 48 <type>30</type>
42 <matcher> 49 <matcher>
@@ -45,7 +52,7 @@ @@ -45,7 +52,7 @@
45 </matcher> 52 </matcher>
46 </filter> 53 </filter>
47 <filter> 54 <filter>
48 - <id>1399312895199</id> 55 + <id>1406724317292</id>
49 <name></name> 56 <name></name>
50 <type>30</type> 57 <type>30</type>
51 <matcher> 58 <matcher>
@@ -54,7 +61,7 @@ @@ -54,7 +61,7 @@
54 </matcher> 61 </matcher>
55 </filter> 62 </filter>
56 <filter> 63 <filter>
57 - <id>1399312895201</id> 64 + <id>1406724317296</id>
58 <name></name> 65 <name></name>
59 <type>30</type> 66 <type>30</type>
60 <matcher> 67 <matcher>
@@ -63,7 +70,7 @@ @@ -63,7 +70,7 @@
63 </matcher> 70 </matcher>
64 </filter> 71 </filter>
65 <filter> 72 <filter>
66 - <id>1399312895202</id> 73 + <id>1406724317299</id>
67 <name></name> 74 <name></name>
68 <type>30</type> 75 <type>30</type>
69 <matcher> 76 <matcher>
@@ -71,5 +78,14 @@ @@ -71,5 +78,14 @@
71 <arguments>1.0-name-matches-false-false-*compacto*</arguments> 78 <arguments>1.0-name-matches-false-false-*compacto*</arguments>
72 </matcher> 79 </matcher>
73 </filter> 80 </filter>
  81 + <filter>
  82 + <id>1406724317303</id>
  83 + <name></name>
  84 + <type>22</type>
  85 + <matcher>
  86 + <id>org.eclipse.ui.ide.multiFilter</id>
  87 + <arguments>1.0-name-matches-false-false-*.css.php</arguments>
  88 + </matcher>
  89 + </filter>
74 </filteredResources> 90 </filteredResources>
75 </projectDescription> 91 </projectDescription>
.settings/.jsdtscope
  Diff comments   View file @d37a044
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <classpath> 2 <classpath>
3 <classpathentry kind="src" path="admin/js"/> 3 <classpathentry kind="src" path="admin/js"/>
4 - <classpathentry excluding="compactados/" kind="src" path="classesjs"/>  
5 - <classpathentry kind="src" path="classesjs/compactados"/> 4 + <classpathentry kind="src" path="classesjs"/>
6 <classpathentry kind="src" path="documentacao/javascript"/> 5 <classpathentry kind="src" path="documentacao/javascript"/>
  6 + <classpathentry excluding="atlas/" kind="src" path="exemplos"/>
7 <classpathentry kind="src" path="exemplos/atlas"/> 7 <classpathentry kind="src" path="exemplos/atlas"/>
8 <classpathentry kind="src" path="ferramentas/3d"/> 8 <classpathentry kind="src" path="ferramentas/3d"/>
9 <classpathentry kind="src" path="ferramentas/agrupaelementos"/> 9 <classpathentry kind="src" path="ferramentas/agrupaelementos"/>
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 <classpathentry kind="src" path="ferramentas/graficointerativo"/> 52 <classpathentry kind="src" path="ferramentas/graficointerativo"/>
53 <classpathentry kind="src" path="ferramentas/graficointerativo1"/> 53 <classpathentry kind="src" path="ferramentas/graficointerativo1"/>
54 <classpathentry kind="src" path="ferramentas/graficotema"/> 54 <classpathentry kind="src" path="ferramentas/graficotema"/>
  55 + <classpathentry kind="src" path="ferramentas/heatmap"/>
55 <classpathentry kind="src" path="ferramentas/identifica"/> 56 <classpathentry kind="src" path="ferramentas/identifica"/>
56 <classpathentry kind="src" path="ferramentas/importarwmc"/> 57 <classpathentry kind="src" path="ferramentas/importarwmc"/>
57 <classpathentry kind="src" path="ferramentas/imprimir"/> 58 <classpathentry kind="src" path="ferramentas/imprimir"/>
@@ -85,9 +86,9 @@ @@ -85,9 +86,9 @@
85 <classpathentry kind="src" path="ferramentas/pontosdistri"/> 86 <classpathentry kind="src" path="ferramentas/pontosdistri"/>
86 <classpathentry kind="src" path="ferramentas/preferencias"/> 87 <classpathentry kind="src" path="ferramentas/preferencias"/>
87 <classpathentry kind="src" path="ferramentas/redessociais"/> 88 <classpathentry kind="src" path="ferramentas/redessociais"/>
88 - <classpathentry excluding="saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/|saiku-server/tomcat/webapps/ROOT/js/saiku/views/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/|saiku-server/tomcat/webapps/ROOT/js/saiku/|saiku-server/tomcat/webapps/ROOT/js/jquery/" kind="src" path="ferramentas/saiku"/> 89 + <classpathentry excluding="saiku-server/tomcat/webapps/ROOT/js/jquery/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/|saiku-server/tomcat/webapps/ROOT/js/saiku/|saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/|saiku-server/tomcat/webapps/ROOT/js/saiku/views/" kind="src" path="ferramentas/saiku"/>
89 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery"/> 90 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/jquery"/>
90 - <classpathentry excluding="plugins/i3GeoMap/|views/|plugins/CCC_Chart/" kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku"/> 91 + <classpathentry excluding="plugins/i3GeoMap/|plugins/CCC_Chart/|views/" kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku"/>
91 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart"/> 92 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart"/>
92 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap"/> 93 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap"/>
93 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views"/> 94 <classpathentry kind="src" path="ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/views"/>
@@ -110,97 +111,6 @@ @@ -110,97 +111,6 @@
110 <classpathentry kind="src" path="ferramentas/wmstime"/> 111 <classpathentry kind="src" path="ferramentas/wmstime"/>
111 <classpathentry kind="src" path="init"/> 112 <classpathentry kind="src" path="init"/>
112 <classpathentry kind="src" path="mashups"/> 113 <classpathentry kind="src" path="mashups"/>
113 - <classpathentry excluding="google/|yui290/build/utilities/|simile/timeline_2.3.0/timeline_js/scripts/l10n/en/|yui290/build/json/|yui290/build/swfdetect/|yui290/build/event-simulate/|yui290/build/datemath/|yui290/build/swfstore/|simile/timeline_2.3.0/timeline_js/scripts/l10n/it/|yui290/build/stylesheet/|ccc2/ccc/|yui290/build/carousel/|yui290/build/history/|proj4js/lib/|yui290/build/logger/|yui290/build/charts/|yui290/build/uploader/|yui290/assets/|openlayers/|yui290/build/dom/|simile/timeline_2.3.0/timeline_js/scripts/l10n/es/|yui290/build/selector/|proj4js/demo/maps/|openflashchart/|proj4js/lib/projCode/|yui290/build/progressbar/|yui290/build/colorpicker/|simile/timeline_2.3.0/timeline_ajax/scripts/|yui290/build/datatable/|yui290/build/event-mouseenter/|simile/timeline_2.3.0/timeline_js/scripts/l10n/vi/|simile/timeline_2.3.0/timeline_js/|cswclient/lib/scripts/|simile/timeline_2.3.0/timeline_js/scripts/l10n/tr/|yui290/build/cookie/|yui290/build/yuiloader/|yui290/build/calendar/|yui290/build/yahoo/|yui290/build/storage/|yui290/build/editor/|proj4js/demo/|jsts/lib/|richdraw/|tme/javascript/|simile/timeline_2.3.0/timeline_js/scripts/l10n/zh/|balloon-tooltips/htdocs/js/|balloon-tooltips/htdocs_depreciado/js/|yui290/build/swf/|yui290/build/autocomplete/|yui290/build/get/|proj4js/docs/NaturalDocs/javascript/|cpaint/|yui290/build/tabview/|yui290/build/treeview/|yui290/build/profilerviewer/|simile/timeline_2.3.0/timeline_js/scripts/l10n/cs/|simile/timeline_2.3.0/timeline_js/scripts/l10n/nl/|yui290/build/imagecropper/|yui290/build/datasource/|simile/timeline_2.3.0/timeline_js/scripts/l10n/fr/|eudock/js/|yui290/build/connection/|yui290/build/animation/|mobileesp/|yui290/build/yuiloader-dom-event/|yui290/build/element/|yui290/build/yuitest/|wicket/|proj4js/lib/defs/|cpaint/JSON/|yui290/build/resize/|simile/timeline_2.3.0/timeline_js/scripts/l10n/se/|yui290/build/container/|yui290/build/slider/|yui290/build/imageloader/|simile/timeline_2.3.0/timeline_ajax/|simile/timeline_2.3.0/timeline_js/scripts/l10n/ru/|simile/timeline_2.3.0/timeline_js/scripts/l10n/de/|yui290/build/event/|yui290/build/button/|yui290/build/layout/|yui290/build/profiler/|yui290/build/element-delegate/|yui290/build/paginator/|simile/timeline_local_example_1.0/local_example/|yui290/build/yahoo-dom-event/|wpcumulus/|yui290/build/dragdrop/|yui290/build/menu/|yui290/build/event-delegate/" kind="src" path="pacotes"/>  
114 - <classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs_depreciado/js"/>  
115 - <classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs/js"/>  
116 - <classpathentry kind="src" path="pacotes/ccc2/ccc"/>  
117 - <classpathentry excluding="JSON/" kind="src" path="pacotes/cpaint"/>  
118 - <classpathentry kind="src" path="pacotes/cpaint/JSON"/>  
119 - <classpathentry kind="src" path="pacotes/cswclient/lib/scripts"/>  
120 - <classpathentry kind="src" path="pacotes/eudock/js"/>  
121 - <classpathentry kind="src" path="pacotes/google"/>  
122 - <classpathentry kind="src" path="pacotes/jsts/lib"/>  
123 - <classpathentry kind="src" path="pacotes/mobileesp"/>  
124 - <classpathentry kind="src" path="pacotes/openflashchart"/>  
125 - <classpathentry kind="src" path="pacotes/openlayers"/>  
126 - <classpathentry excluding="maps/" kind="src" path="pacotes/proj4js/demo"/>  
127 - <classpathentry kind="src" path="pacotes/proj4js/demo/maps"/>  
128 - <classpathentry kind="src" path="pacotes/proj4js/docs/NaturalDocs/javascript"/>  
129 - <classpathentry excluding="projCode/|defs/" kind="src" path="pacotes/proj4js/lib"/>  
130 - <classpathentry kind="src" path="pacotes/proj4js/lib/defs"/>  
131 - <classpathentry kind="src" path="pacotes/proj4js/lib/projCode"/>  
132 - <classpathentry kind="src" path="pacotes/richdraw"/>  
133 - <classpathentry excluding="scripts/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax"/>  
134 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax/scripts"/>  
135 - <classpathentry excluding="scripts/l10n/en/|scripts/l10n/it/|scripts/l10n/es/|scripts/l10n/vi/|scripts/l10n/tr/|scripts/l10n/zh/|scripts/l10n/cs/|scripts/l10n/nl/|scripts/l10n/fr/|scripts/l10n/se/|scripts/l10n/ru/|scripts/l10n/de/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js"/>  
136 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/cs"/>  
137 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/de"/>  
138 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/en"/>  
139 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/es"/>  
140 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/fr"/>  
141 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/it"/>  
142 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/nl"/>  
143 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/ru"/>  
144 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/se"/>  
145 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/tr"/>  
146 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/vi"/>  
147 - <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/zh"/>  
148 - <classpathentry kind="src" path="pacotes/simile/timeline_local_example_1.0/local_example"/>  
149 - <classpathentry kind="src" path="pacotes/tme/javascript"/>  
150 - <classpathentry kind="src" path="pacotes/wicket"/>  
151 - <classpathentry kind="src" path="pacotes/wpcumulus"/>  
152 - <classpathentry kind="src" path="pacotes/yui290/assets"/>  
153 - <classpathentry kind="src" path="pacotes/yui290/build/animation"/>  
154 - <classpathentry kind="src" path="pacotes/yui290/build/autocomplete"/>  
155 - <classpathentry kind="src" path="pacotes/yui290/build/button"/>  
156 - <classpathentry kind="src" path="pacotes/yui290/build/calendar"/>  
157 - <classpathentry kind="src" path="pacotes/yui290/build/carousel"/>  
158 - <classpathentry kind="src" path="pacotes/yui290/build/charts"/>  
159 - <classpathentry kind="src" path="pacotes/yui290/build/colorpicker"/>  
160 - <classpathentry kind="src" path="pacotes/yui290/build/connection"/>  
161 - <classpathentry kind="src" path="pacotes/yui290/build/container"/>  
162 - <classpathentry kind="src" path="pacotes/yui290/build/cookie"/>  
163 - <classpathentry kind="src" path="pacotes/yui290/build/datasource"/>  
164 - <classpathentry kind="src" path="pacotes/yui290/build/datatable"/>  
165 - <classpathentry kind="src" path="pacotes/yui290/build/datemath"/>  
166 - <classpathentry kind="src" path="pacotes/yui290/build/dom"/>  
167 - <classpathentry kind="src" path="pacotes/yui290/build/dragdrop"/>  
168 - <classpathentry kind="src" path="pacotes/yui290/build/editor"/>  
169 - <classpathentry kind="src" path="pacotes/yui290/build/element"/>  
170 - <classpathentry kind="src" path="pacotes/yui290/build/element-delegate"/>  
171 - <classpathentry kind="src" path="pacotes/yui290/build/event"/>  
172 - <classpathentry kind="src" path="pacotes/yui290/build/event-delegate"/>  
173 - <classpathentry kind="src" path="pacotes/yui290/build/event-mouseenter"/>  
174 - <classpathentry kind="src" path="pacotes/yui290/build/event-simulate"/>  
175 - <classpathentry kind="src" path="pacotes/yui290/build/get"/>  
176 - <classpathentry kind="src" path="pacotes/yui290/build/history"/>  
177 - <classpathentry kind="src" path="pacotes/yui290/build/imagecropper"/>  
178 - <classpathentry kind="src" path="pacotes/yui290/build/imageloader"/>  
179 - <classpathentry kind="src" path="pacotes/yui290/build/json"/>  
180 - <classpathentry kind="src" path="pacotes/yui290/build/layout"/>  
181 - <classpathentry kind="src" path="pacotes/yui290/build/logger"/>  
182 - <classpathentry kind="src" path="pacotes/yui290/build/menu"/>  
183 - <classpathentry kind="src" path="pacotes/yui290/build/paginator"/>  
184 - <classpathentry kind="src" path="pacotes/yui290/build/profiler"/>  
185 - <classpathentry kind="src" path="pacotes/yui290/build/profilerviewer"/>  
186 - <classpathentry kind="src" path="pacotes/yui290/build/progressbar"/>  
187 - <classpathentry kind="src" path="pacotes/yui290/build/resize"/>  
188 - <classpathentry kind="src" path="pacotes/yui290/build/selector"/>  
189 - <classpathentry kind="src" path="pacotes/yui290/build/slider"/>  
190 - <classpathentry kind="src" path="pacotes/yui290/build/storage"/>  
191 - <classpathentry kind="src" path="pacotes/yui290/build/stylesheet"/>  
192 - <classpathentry kind="src" path="pacotes/yui290/build/swf"/>  
193 - <classpathentry kind="src" path="pacotes/yui290/build/swfdetect"/>  
194 - <classpathentry kind="src" path="pacotes/yui290/build/swfstore"/>  
195 - <classpathentry kind="src" path="pacotes/yui290/build/tabview"/>  
196 - <classpathentry kind="src" path="pacotes/yui290/build/treeview"/>  
197 - <classpathentry kind="src" path="pacotes/yui290/build/uploader"/>  
198 - <classpathentry kind="src" path="pacotes/yui290/build/utilities"/>  
199 - <classpathentry kind="src" path="pacotes/yui290/build/yahoo"/>  
200 - <classpathentry kind="src" path="pacotes/yui290/build/yahoo-dom-event"/>  
201 - <classpathentry kind="src" path="pacotes/yui290/build/yuiloader"/>  
202 - <classpathentry kind="src" path="pacotes/yui290/build/yuiloader-dom-event"/>  
203 - <classpathentry kind="src" path="pacotes/yui290/build/yuitest"/>  
204 <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> 114 <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
205 <classpathentry kind="output" path=""/> 115 <classpathentry kind="output" path=""/>
206 </classpath> 116 </classpath>
.settings/org.eclipse.wst.jsdt.ui.superType.container
  Diff comments   View file @d37a044
1 -org.eclipse.wst.jsdt.launching.JRE_CONTAINER  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +org.eclipse.wst.jsdt.launching.baseBrowserLibrary
3 \ No newline at end of file 3 \ No newline at end of file
.settings/org.eclipse.wst.jsdt.ui.superType.name
  Diff comments   View file @d37a044
1 -Global  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +Window
3 \ No newline at end of file 3 \ No newline at end of file
ferramentas/heatmap/funcoes.php
  Diff comments   View file @d37a044
@@ -20,7 +20,7 @@ function heatmapDados($map_file){ @@ -20,7 +20,7 @@ function heatmapDados($map_file){
20 } 20 }
21 else{ 21 else{
22 foreach($registros as $r){ 22 foreach($registros as $r){
23 - $resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r[$coluna].'"}'; 23 + $resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r["valores"][0]["valor"].'"}';
24 } 24 }
25 } 25 }
26 if (!connection_aborted()){ 26 if (!connection_aborted()){
ferramentas/heatmap/index.js
  Diff comments   View file @d37a044
1 /** 1 /**
2 * Title: heatmap 2 * Title: heatmap
3 - * 3 + *
4 * Gera um mapa de calor baseado em uma camada existente no mapa. 4 * Gera um mapa de calor baseado em uma camada existente no mapa.
5 - * 5 + *
6 * Mapas de calor s&atilde;o camadas que utilizam o plugin de camadas heatmap. Veja em classesjs/classe_plugini3geo.js 6 * Mapas de calor s&atilde;o camadas que utilizam o plugin de camadas heatmap. Veja em classesjs/classe_plugini3geo.js
7 - * 7 + *
8 * A ferramenta altera o mapfile em uso clonando o mapfile escolhido e adicionando os metadados necess&aacute;rios ao uso do heatmap 8 * A ferramenta altera o mapfile em uso clonando o mapfile escolhido e adicionando os metadados necess&aacute;rios ao uso do heatmap
9 - * 9 + *
10 * Veja: 10 * Veja:
11 - * 11 + *
12 * <i3GEO.analise.dialogo.heatmap> 12 * <i3GEO.analise.dialogo.heatmap>
13 - * 13 + *
14 * Arquivo: 14 * Arquivo:
15 - * 15 + *
16 * i3geo/ferramentas/heatmap/index.js.php 16 * i3geo/ferramentas/heatmap/index.js.php
17 - * 17 + *
18 * Licenca: 18 * Licenca:
19 - * 19 + *
20 * GPL2 20 * GPL2
21 - * 21 + *
22 * i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet 22 * i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
23 - * 23 + *
24 * Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com 24 * Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
25 - * 25 + *
26 * Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a 26 * Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a
27 * P&uacute;blica Geral GNU conforme publicada pela Free Software Foundation; 27 * P&uacute;blica Geral GNU conforme publicada pela Free Software Foundation;
28 - * 28 + *
29 * Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til, por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a 29 * Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til, por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a
30 * garantia impl&iacute;cita de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA. Consulte a Licen&ccedil;a 30 * garantia impl&iacute;cita de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA. Consulte a Licen&ccedil;a
31 * P&uacute;blica Geral do GNU para mais detalhes. Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do 31 * P&uacute;blica Geral do GNU para mais detalhes. Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
@@ -39,7 +39,7 @@ i3GEOF.heatmap = @@ -39,7 +39,7 @@ i3GEOF.heatmap =
39 { 39 {
40 /** 40 /**
41 * Variavel: aguarde 41 * Variavel: aguarde
42 - * 42 + *
43 * Objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela. 43 * Objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela.
44 */ 44 */
45 aguarde : "", 45 aguarde : "",
@@ -51,9 +51,9 @@ i3GEOF.heatmap = @@ -51,9 +51,9 @@ i3GEOF.heatmap =
51 }, 51 },
52 /** 52 /**
53 * Function: iniciaDicionario 53 * Function: iniciaDicionario
54 - * 54 + *
55 * Carrega o dicion&aacute;rio e chama a fun&ccedil;&atilde;o que inicia a ferramenta 55 * Carrega o dicion&aacute;rio e chama a fun&ccedil;&atilde;o que inicia a ferramenta
56 - * 56 + *
57 * O Javascript &eacute; carregado com o id i3GEOF.nomedaferramenta.dicionario_script 57 * O Javascript &eacute; carregado com o id i3GEOF.nomedaferramenta.dicionario_script
58 */ 58 */
59 iniciaDicionario : function() { 59 iniciaDicionario : function() {
@@ -68,11 +68,11 @@ i3GEOF.heatmap = @@ -68,11 +68,11 @@ i3GEOF.heatmap =
68 }, 68 },
69 /** 69 /**
70 * Function: inicia 70 * Function: inicia
71 - * 71 + *
72 * Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante 72 * Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante
73 - * 73 + *
74 * Parametro: 74 * Parametro:
75 - * 75 + *
76 * iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta 76 * iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta
77 */ 77 */
78 inicia : function(iddiv) { 78 inicia : function(iddiv) {
@@ -85,11 +85,11 @@ i3GEOF.heatmap = @@ -85,11 +85,11 @@ i3GEOF.heatmap =
85 }, 85 },
86 /** 86 /**
87 * Function: html 87 * Function: html
88 - * 88 + *
89 * Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta 89 * Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta
90 - * 90 + *
91 * Retorno: 91 * Retorno:
92 - * 92 + *
93 * String com o c&oacute;digo html 93 * String com o c&oacute;digo html
94 */ 94 */
95 html : function() { 95 html : function() {
@@ -102,7 +102,7 @@ i3GEOF.heatmap = @@ -102,7 +102,7 @@ i3GEOF.heatmap =
102 }, 102 },
103 /** 103 /**
104 * Function: iniciaJanelaFlutuante 104 * Function: iniciaJanelaFlutuante
105 - * 105 + *
106 * Cria a janela flutuante para controle da ferramenta. 106 * Cria a janela flutuante para controle da ferramenta.
107 */ 107 */
108 iniciaJanelaFlutuante : function() { 108 iniciaJanelaFlutuante : function() {
@@ -199,7 +199,6 @@ i3GEOF.heatmap = @@ -199,7 +199,6 @@ i3GEOF.heatmap =
199 "i3GEOheatmapresultado", 199 "i3GEOheatmapresultado",
200 true, 200 true,
201 "i3GEOF.heatmap_rodape"); 201 "i3GEOF.heatmap_rodape");
202 - i3GEOF.heatmap.comboItens();  
203 }, 202 },
204 t4 : function() { 203 t4 : function() {
205 var ins = "<p class='paragrafo'>" + $trad(6, i3GEOF.heatmap.dicionario); 204 var ins = "<p class='paragrafo'>" + $trad(6, i3GEOF.heatmap.dicionario);
@@ -220,9 +219,9 @@ i3GEOF.heatmap = @@ -220,9 +219,9 @@ i3GEOF.heatmap =
220 }, 219 },
221 /** 220 /**
222 * Function: criaheatmap 221 * Function: criaheatmap
223 - * 222 + *
224 * Executa a opera&ccedil;&atilde;o de gera&ccedil;&atilde;o do heatmap 223 * Executa a opera&ccedil;&atilde;o de gera&ccedil;&atilde;o do heatmap
225 - * 224 + *
226 */ 225 */
227 criaheatmap : function() { 226 criaheatmap : function() {
228 try { 227 try {
@@ -259,11 +258,11 @@ i3GEOF.heatmap = @@ -259,11 +258,11 @@ i3GEOF.heatmap =
259 }, 258 },
260 /** 259 /**
261 * Function: comboTemasSel 260 * Function: comboTemasSel
262 - * 261 + *
263 * Cria um combo com a lista de temas 262 * Cria um combo com a lista de temas
264 - * 263 + *
265 * Veja: 264 * Veja:
266 - * 265 + *
267 * <i3GEO.util.comboTemas> 266 * <i3GEO.util.comboTemas>
268 */ 267 */
269 comboTemasSel : function() { 268 comboTemasSel : function() {
@@ -283,13 +282,13 @@ i3GEOF.heatmap = @@ -283,13 +282,13 @@ i3GEOF.heatmap =
283 }, 282 },
284 /** 283 /**
285 * Function: comboItens 284 * Function: comboItens
286 - * 285 + *
287 * Cria um combo para escolha de um item do tema 286 * Cria um combo para escolha de um item do tema
288 - * 287 + *
289 * Veja: 288 * Veja:
290 - * 289 + *
291 * <i3GEO.util.comboItens> 290 * <i3GEO.util.comboItens>
292 - * 291 + *
293 */ 292 */
294 comboItens : function() { 293 comboItens : function() {
295 i3GEO.util 294 i3GEO.util
ferramentas/markercluster/.project 0 → 100755
  Diff comments   View file @d37a044
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<projectDescription>
  3 + <name>ferramentas heatmap</name>
  4 + <comment></comment>
  5 + <projects>
  6 + </projects>
  7 + <buildSpec>
  8 + <buildCommand>
  9 + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
  10 + <arguments>
  11 + </arguments>
  12 + </buildCommand>
  13 + </buildSpec>
  14 + <natures>
  15 + <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
  16 + </natures>
  17 +</projectDescription>
ferramentas/markercluster/.settings/.jsdtscope 0 → 100755
  Diff comments   View file @d37a044
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="output" path=""/>
  4 +</classpath>
ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.container 0 → 100755
  Diff comments   View file @d37a044
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +org.eclipse.wst.jsdt.launching.JRE_CONTAINER
0 \ No newline at end of file 2 \ No newline at end of file
ferramentas/markercluster/.settings/org.eclipse.wst.jsdt.ui.superType.name 0 → 100755
  Diff comments   View file @d37a044
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Global
0 \ No newline at end of file 2 \ No newline at end of file
ferramentas/markercluster/funcoes.php
  Diff comments   View file @d37a044
@@ -17,7 +17,7 @@ function markerclusterDados($map_file){ @@ -17,7 +17,7 @@ function markerclusterDados($map_file){
17 } 17 }
18 else{ 18 else{
19 foreach($registros as $r){ 19 foreach($registros as $r){
20 - $resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r[$coluna].'"}'; 20 + $resultado[] = '{"lat":"'.$r["y"].'","lng":"'.$r["x"].'","count":"'.$r["valores"][0]["valor"].'"}';
21 } 21 }
22 } 22 }
23 if (!connection_aborted()){ 23 if (!connection_aborted()){
ferramentas/saiku/cartograma.php
  Diff comments   View file @d37a044
@@ -81,6 +81,12 @@ foreach($dados as $dado){ @@ -81,6 +81,12 @@ foreach($dados as $dado){
81 } 81 }
82 $valores[] = "(".implode(",",$linha).")"; 82 $valores[] = "(".implode(",",$linha).")";
83 } 83 }
  84 +//
  85 +//o nome da coluna com os dados e acentuado em alguns casos
  86 +//por isso, camadas baseadas em plugins precisam mudar isso
  87 +if($opcoes["tipo"] == "calor" && count($nomesColunas) > 1){
  88 + $nomesColunas[count($nomesColunas) - 1] = "colunaCalor";
  89 +}
84 $sqldados = " 90 $sqldados = "
85 select st_setsrid(".$sqlColunaGeo.",".$srid.") as $colunageo, ".implode(",",$colunastabela).",dataset.* 91 select st_setsrid(".$sqlColunaGeo.",".$srid.") as $colunageo, ".implode(",",$colunastabela).",dataset.*
86 from ".$meta["esquemadb"].".".$meta["tabela"]." INNER JOIN 92 from ".$meta["esquemadb"].".".$meta["tabela"]." INNER JOIN
@@ -107,6 +113,9 @@ for($i=0;$i&lt;$nlayers;$i++){ @@ -107,6 +113,9 @@ for($i=0;$i&lt;$nlayers;$i++){
107 $ll->set("status",MS_OFF); 113 $ll->set("status",MS_OFF);
108 } 114 }
109 } 115 }
  116 + if($ll->getmetadata("tema") == "Limites"){
  117 + $ll->set("status",MS_DELETE);
  118 + }
110 } 119 }
111 120
112 $layer = ms_newLayerObj($mapa); 121 $layer = ms_newLayerObj($mapa);
@@ -196,8 +205,9 @@ if($opcoes[&quot;tipo&quot;] == &quot;coresChapadas&quot;){ @@ -196,8 +205,9 @@ if($opcoes[&quot;tipo&quot;] == &quot;coresChapadas&quot;){
196 $m->salva(); 205 $m->salva();
197 } 206 }
198 if($opcoes["tipo"] == "calor"){ 207 if($opcoes["tipo"] == "calor"){
199 - $parametros = '{"plugin":"heatmap","parametros":{"tipoGradiente":"default","opacity":".8","coluna":"","radius":"'.$opcoes["raio"].'","max":"'.$opcoes["max"].'"}}'; 208 + $parametros = '{"plugin":"heatmap","parametros":{"tipoGradiente":"default","opacity":".8","valorPonto":'.$opcoes["valorPonto"].',"coluna":"'.$nomesColunas[1].'","radius":"'.$opcoes["raio"].'"}}';
200 $layer->setmetadata("PLUGINI3GEO",$parametros); 209 $layer->setmetadata("PLUGINI3GEO",$parametros);
  210 + $layer->setmetadata("SAIKU",$opcoes["tipo"]);
201 $mapa->save($map_file); 211 $mapa->save($map_file);
202 } 212 }
203 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"]); 213 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"]);
ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/i3GeoMap/plugin.js
  Diff comments   View file @d37a044
@@ -48,8 +48,8 @@ var i3GeoMap = Backbone.View.extend({ @@ -48,8 +48,8 @@ var i3GeoMap = Backbone.View.extend({
48 //"<ul class='connectable ui-sortable' style=''>"+ 48 //"<ul class='connectable ui-sortable' style=''>"+
49 "<input type=button name=mapaBarras value='Barras' />"+ 49 "<input type=button name=mapaBarras value='Barras' />"+
50 "<input type=button name=mapaPizzas value='Pizzas' />"+ 50 "<input type=button name=mapaPizzas value='Pizzas' />"+
51 - "&nbsp;<input type=button name=raiosProporcionais value='Raios proporcionais' />"+  
52 - "&nbsp;<input type=button name=circulosProporcionais value='C&iacute;rculos proporcionais' />"+ 51 + "&nbsp;<input type=button name=raiosProporcionais value='Raios' />"+
  52 + "&nbsp;<input type=button name=circulosProporcionais value='C&iacute;rculos' />"+
53 "&nbsp;<input type=button name=coresChapadas value='Cores' />"+ 53 "&nbsp;<input type=button name=coresChapadas value='Cores' />"+
54 "&nbsp;<input type=button name=calor value='Calor' />"+ 54 "&nbsp;<input type=button name=calor value='Calor' />"+
55 "&nbsp;<input type=button name=atualizarMapa value='Atualiza' />"+ 55 "&nbsp;<input type=button name=atualizarMapa value='Atualiza' />"+
@@ -327,9 +327,12 @@ var i3GeoMap = Backbone.View.extend({ @@ -327,9 +327,12 @@ var i3GeoMap = Backbone.View.extend({
327 calor: function(s){ 327 calor: function(s){
328 this.opcoes.size = 10; 328 this.opcoes.size = 10;
329 $.fancybox("Raio de um ponto em pixels:<br><input type=text value='10' size=6 id='calorRaio' /><br>" + 329 $.fancybox("Raio de um ponto em pixels:<br><input type=text value='10' size=6 id='calorRaio' /><br>" +
330 - "Valor m&aacute;ximo em cada ponto:<br><input type=text value='10' size=6 id='calorMax' /><br>" +  
331 "<br>Coluna com os valores:<br>"+ 330 "<br>Coluna com os valores:<br>"+
332 - "<select id='calorColuna' style='border:1px solid #BBBBBB;'>"+this.opcoesColunas()+"</select>" + 331 + "<select id='calorColuna' style='border:1px solid #BBBBBB;'>" +
  332 + "<option value=''>---</option>" +
  333 + this.opcoesColunas() +
  334 + "</select>" +
  335 + "<br>Ou valor de cada ponto:<br><input type=text value='1' size=6 id='valorPonto' /><br>" +
333 "<br><input type=button value='OK' id='calorOk' />" + 336 "<br><input type=button value='OK' id='calorOk' />" +
334 "&nbsp; <input type=button value='Cancela' id='calorCancela' />" 337 "&nbsp; <input type=button value='Cancela' id='calorCancela' />"
335 , 338 ,
@@ -346,10 +349,9 @@ var i3GeoMap = Backbone.View.extend({ @@ -346,10 +349,9 @@ var i3GeoMap = Backbone.View.extend({
346 ); 349 );
347 document.getElementById("calorOk").onclick = function(){ 350 document.getElementById("calorOk").onclick = function(){
348 s.opcoes.tipo = "calor"; 351 s.opcoes.tipo = "calor";
349 - //s.opcoes.size = document.getElementById("raiosProporcionaisSize").value; 352 + s.opcoes.valorPonto = document.getElementById("valorPonto").value;
350 s.opcoes.indicecoluna = [parseInt(document.getElementById("calorColuna").value,10)]; 353 s.opcoes.indicecoluna = [parseInt(document.getElementById("calorColuna").value,10)];
351 s.opcoes.raio = document.getElementById("calorRaio").value; 354 s.opcoes.raio = document.getElementById("calorRaio").value;
352 - s.opcoes.max = document.getElementById("calorMax").value;  
353 s.render(); 355 s.render();
354 $.fancybox.close(); 356 $.fancybox.close();
355 }; 357 };