diff --git a/admin/admin.db b/admin/admin.db index f37b2a5..8fa50fc 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js index 0bf650c..2a75b26 100644 --- a/admin/js/editormapfile.js +++ b/admin/js/editormapfile.js @@ -710,7 +710,6 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, return; } } - campos = new Array("name","tema","iconetema","mensagem","escala","extensao","group"); par = "&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer; prog = "../php/editormapfile.php?funcao=alterarTitulo"; @@ -792,7 +791,7 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, {montaEditorEditavel(YAHOO.lang.JSON.parse(o.responseText));} if(tipo=="titulo"){ //o codigo do layer pode ter sido alterado - var no = getNodeByProperty("id",codigoMap+"_"+codigoLayer); + var no = tree.getNodeByProperty("id",codigoMap+"_"+codigoLayer); tree.removeChildren(no) ; no.expand(); montaEditorTitulo(YAHOO.lang.JSON.parse(o.responseText)); diff --git a/admin/js/editormapfile_titulo.js b/admin/js/editormapfile_titulo.js index 7dc5530..b37ebfe 100755 --- a/admin/js/editormapfile_titulo.js +++ b/admin/js/editormapfile_titulo.js @@ -38,6 +38,6 @@ function montaEditorTitulo(dados) $i("editor_bd").innerHTML = ins; var temp = function() - {salvarDadosEditor('titulo',dados.codigoMap,dados.codigoLayer,false);}; + {salvarDadosEditor('titulo',dados.codigoMap,dados.codigoLayer);}; new YAHOO.widget.Button("salvarEditor",{ onclick: { fn: temp }}); } diff --git a/classesjs/classe_plugini3geo.js b/classesjs/classe_plugini3geo.js index 65ddcdb..ea261f7 100644 --- a/classesjs/classe_plugini3geo.js +++ b/classesjs/classe_plugini3geo.js @@ -162,15 +162,15 @@ i3GEO.pluginI3geo = { * Exemplo: * * "PLUGINI3GEO" - * '{"plugin":"heatmap","parametros":{"coluna":"teste","max":"10","radius":"15"}}' + * '{"plugin":"heatmap","parametros":{"tipoGradiente": "default","coluna":"teste","max":"10","radius":"15"}}' * * Coluna é a que contém os dados numéricos que definem * a quantidade de uma medida em cada ponto e é usada para gerar a * representação. Se for vazia, considera-se o valor como 1 * * As cores das classes existentes no LAYER serão utilizadas para - * calcular as cores do mapa de calor. Se não existirem classes, - * será usado o default. + * calcular as cores do mapa de calor. Se tipoGradiente for igual a "default" será utilizado + * o gradiente padrão. * */ heatmap : { @@ -484,32 +484,38 @@ i3GEO.pluginI3geo = { + "/ferramentas/markercluster/googlemaps_js.php", carregaJs = "nao", criaLayer; criaLayer = function() { var markercluster, marcas, latLng, marker, n, i; - n = markercluster_dados.lenght(); + n = markercluster_dados.length; marcas = []; for (i = 0; i < n; i++) { - latLng = new google.maps.LatLng(markercluster_dados[i].lat, markercluster_dados[i].long); + latLng = new google.maps.LatLng(markercluster_dados[i].lat, markercluster_dados[i].lng); marker = new google.maps.Marker({ 'position' : latLng }); marcas.push(marker); } markercluster = new MarkerClusterer(i3GeoMap, marcas, { - "gridSize" : camada.plugini3geo.parametros.gridSize, + "gridSize" : parseInt(camada.plugini3geo.parametros.gridSize,10), "visible" : true, - "opacity" : camada.transparency + "opacity" : camada.transparency, + "name" : camada.name }); i3GEO.janela.fechaAguarde("aguardePlugin"); + markercluster.ligaCamada = function() { - this.liga(); + i3GEO.pluginI3geo.OBJETOS[camada.name].ready_ = true; + i3GEO.pluginI3geo.OBJETOS[camada.name].redraw(); }; markercluster.desLigaCamada = function() { - this.desliga(); + i3GEO.pluginI3geo.OBJETOS[camada.name].resetViewport(true); + i3GEO.pluginI3geo.OBJETOS[camada.name].ready_ = false; }; markercluster.removeCamada = function() { - this.destroy(); + i3GEO.pluginI3geo.OBJETOS[camada.name].clearMarkers(); + }; markercluster.atualizaCamada = function() { - this.draw(); + i3GEO.pluginI3geo.OBJETOS[camada.name].ready_ = true; + i3GEO.pluginI3geo.OBJETOS[camada.name].redraw(); }; i3GEO.pluginI3geo.OBJETOS[camada.name] = markercluster; markercluster_dados = null; diff --git a/ferramentas/markercluster/funcoes.php b/ferramentas/markercluster/funcoes.php index 7dc4b90..529a56e 100644 --- a/ferramentas/markercluster/funcoes.php +++ b/ferramentas/markercluster/funcoes.php @@ -1,5 +1,5 @@ diff --git a/ferramentas/markercluster/openlayers_js.php b/ferramentas/markercluster/openlayers_js.php index 20a3607..024cc17 100755 --- a/ferramentas/markercluster/openlayers_js.php +++ b/ferramentas/markercluster/openlayers_js.php @@ -1,6 +1,6 @@ getlayerbyname($layer) != ""){ + $map_file = $_SESSION["map_file"]; + } + } +} +$map_file = markerclusterMapfile(); //no caso do SAIKU, o nome do mapfile pode estar na sessao -session_name("i3GeoPHP"); -session_start(); -if(!empty($_SESSION["map_file"])){ - $mapateste = ms_newMapObj($_SESSION["map_file"]); - if($mapateste->getlayerbyname($layer) != ""){ - $map_file = $_SESSION["map_file"]; +if($map_file == ""){ + session_name("i3GeoPHP"); + session_start(); + if(!empty($_SESSION["map_file"])){ + $mapateste = ms_newMapObj($_SESSION["map_file"]); + if($mapateste->getlayerbyname($layer) != ""){ + $map_file = $_SESSION["map_file"]; + } } } - -$map_file = heatmapMapfile(); -$resultado = heatmapDados($map_file); +$resultado = markerclusterDados($map_file); echo $nomevariavel.' = ['.implode(",",$resultado).'];'; -if($carregajs === "sim"){ + +if($carregajs === "sim"){ include_once($dir."/../../pacotes/markercluster/openlayers/AnimatedCluster.js"); -} +} ?> \ No newline at end of file diff --git a/interface/black_carto_ol.htm b/interface/black_carto_ol.htm index d259ce7..bcb61d8 100755 --- a/interface/black_carto_ol.htm +++ b/interface/black_carto_ol.htm @@ -58,7 +58,8 @@ -
+ + diff --git a/interface/black_gm.phtml b/interface/black_gm.phtml index e215afd..5a9c2a3 100755 --- a/interface/black_gm.phtml +++ b/interface/black_gm.phtml @@ -47,7 +47,8 @@ include_once("../ms_configura.php"); -
+ + diff --git a/interface/black_ol.htm b/interface/black_ol.htm index 615e789..8596188 100755 --- a/interface/black_ol.htm +++ b/interface/black_ol.htm @@ -57,7 +57,8 @@ -
+ + diff --git a/interface/black_osm.htm b/interface/black_osm.htm index f4c05f4..3a90183 100755 --- a/interface/black_osm.htm +++ b/interface/black_osm.htm @@ -44,7 +44,8 @@ -
+ + diff --git a/interface/carto_ol.htm b/interface/carto_ol.htm index 3f665b9..21631c6 100644 --- a/interface/carto_ol.htm +++ b/interface/carto_ol.htm @@ -45,7 +45,7 @@ diff --git a/interface/googlemapsdebug.phtml b/interface/googlemapsdebug.phtml index df6bd08..7411c4c 100644 --- a/interface/googlemapsdebug.phtml +++ b/interface/googlemapsdebug.phtml @@ -47,7 +47,9 @@ include_once("../ms_configura.php"); diff --git a/interface/ol_parametros.php b/interface/ol_parametros.php index 113e1ed..47ab57a 100644 --- a/interface/ol_parametros.php +++ b/interface/ol_parametros.php @@ -58,7 +58,8 @@
--> -
+ + diff --git a/interface/osmdebug.htm b/interface/osmdebug.htm index 0ddcffe..a81d4be 100755 --- a/interface/osmdebug.htm +++ b/interface/osmdebug.htm @@ -44,7 +44,7 @@ diff --git a/temas/_lmapadecluster.map b/temas/_lmapadecluster.map new file mode 100644 index 0000000..0a4fede --- /dev/null +++ b/temas/_lmapadecluster.map @@ -0,0 +1,83 @@ +MAP + FONTSET "../symbols/fontes.txt" + SYMBOLSET "../symbols/simbolosv6.sym" + LAYER + CONNECTION "" + DATA "/var/www/i3geo/aplicmap/dados/locali.shp" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "cache" "" + "TIP" "TIPO,ANOCRIA,NOMELOC" + "ltempoitemimagem" "" + "CLASSE" "SIM" + "ltempoitemdescricao" "" + "palletestep" "" + "ltempoiteminicio" "" + "permitekmz" "nao" + "ltempoitemtip" "" + "temporizador" "" + "iconetema" "" + "description_template" "" + "ltempoitemtitulo" "" + "ltempoitemlink" "" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "palletefile" "" + "permitedownload" "sim" + "ltempoformatodata" "" + "ltempoitemicone" "" + "permitecomentario" "" + "metaestat" "" + "PLUGINI3GEO" '{"plugin":"markercluster","parametros":{"gridSize":"50"}}' + "itembuscarapida" "" + "arquivokmz" "" + "arquivodownload" "" + "permitekml" "sim" + "permiteogc" "sim" + "convcaracter" "" + "TEMA" "Localidades (usar com mapa de cluster)" + "cortepixels" "0" + "editorsql" "" + "ltempoconvencode" "" + "ltempoitemfim" "" + "legendaimg" "" + END # METADATA + NAME "_lmapadecluster" + STATUS OFF + TEMPLATE "none.htm" + TILEITEM "location" + TYPE POINT + UNITS METERS + CLASS + NAME "0.45" + STYLE + COLOR 0 0 255 + END # STYLE + END # CLASS + CLASS + NAME "0.55" + STYLE + COLOR 0 255 255 + END # STYLE + END # CLASS + CLASS + NAME "0.65" + STYLE + COLOR 0 255 0 + END # STYLE + END # CLASS + CLASS + NAME "0.95" + STYLE + COLOR 255 255 0 + END # STYLE + END # CLASS + CLASS + NAME "1" + STYLE + COLOR 255 0 0 + END # STYLE + END # CLASS + END # LAYER + +END # MAP + -- libgit2 0.21.2
-
+ 		diff --git a/interface/googlemaps_noite.phtml b/interface/googlemaps_noite.phtml index 0dab6e7..a1e3ff2 100755 --- a/interface/googlemaps_noite.phtml +++ b/interface/googlemaps_noite.phtml @@ -47,7 +47,9 @@ include_once("../ms_configura.php"); -
+ + + 		-
+ + + 		-
+