diff --git a/admin/admin.db b/admin/admin.db index f6e0d27..ebc51b5 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php index 43ebb82..dd4854f 100644 --- a/classesphp/mapa_openlayers.php +++ b/classesphp/mapa_openlayers.php @@ -112,7 +112,9 @@ if(isset($_GET["TileMatrix"])){ $temp = $temp / 2; } $_GET["tms"] = "/wmts/".$_GET["layer"]."/".$z."/".$x."/".$y.".png"; - + if($z."/".$x."/".$y == "0/0/0" || $x == -1 || $y == -1){ + return; + } $top_left_minx = -180; $top_left_maxy = 90; diff --git a/ferramentas/selecao/index.js b/ferramentas/selecao/index.js index 70f211b..461901a 100644 --- a/ferramentas/selecao/index.js +++ b/ferramentas/selecao/index.js @@ -374,6 +374,7 @@ i3GEOF.selecao = if(i3GEO.Interface["ATUAL"] === "openlayers"){ if (typeof OpenLayers == "undefined") { api = "ol3"; + i3GEO.Interface.openlayers.interacoes[0].setActive(true);//duplo clique } else { api = "openlayers"; } @@ -882,6 +883,36 @@ i3GEOF.selecao = * Seleciona elementos com base em uma figura existente no mapa */ figura : { + ol3 : { + draw : "", + inicia : function() { + var features = i3GEO.desenho.layergrafico.getFeatures(); + if(features.getLength() === 0){ + return; + } + i3GEO.eventos.cliquePerm.desativa(); + i3GEOF.selecao.figura.ol3.removeControle(); + i3GEOF.selecao.figura.ol3.draw = new ol.interaction.Select(); + i3GEOF.selecao.figura.ol3.draw.on("select",function(evt){ + var wkt, geo, i, n, f, format = new ol.format.WKT(); + geo = i3GEOF.selecao.figura.ol3.draw.getFeatures(); + n = geo.getLength(); + for(i=0; i "; - i3GEO.janela.cria("500px", "350px", url, "", "", titulo, idjanela, false, "hd", cabecalho, minimiza); + i3GEO.janela.cria("500px", "350px", url, "", "", titulo, idjanela, false, "hd", cabecalho, minimiza, "", "", "", "", false); } }, /** -- libgit2 0.21.2