From 0a7bce6cf0e4d045a128183e319cf0c49062f368 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Tue, 24 Nov 2015 21:24:21 +0000 Subject: [PATCH] Adaptação do código para funcionamento com versão 7 do Mapserver remoção de --- admin/admin.db | Bin 323584 -> 0 bytes admin/dicionario/operacoes.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin/js/core.js | 2 ++ admin/js/editormapfile.js | 2 +- admin/js/operacoes.js | 24 ++++++++++++------------ admin/php/estat_mapa_upload.php | 1 + admin/php/menutemas.php | 1 + admin/php/metaestat_mapa_uploadimagem.php | 1 + admin/php/metaestat_uploadcsv_submit.php | 1 + admin/php/metaestat_uploadshp_submit.php | 1 + admin/php/uploadgvp.php | 1 + admin/principal.html | 2 +- classesjs/compactajs.php | 2 ++ classesjs/geradordelinks.js | 2 ++ classesjs/i3geonaocompacto.js | 1 + classesphp/classe_analise.php | 19 +++++++++---------- classesphp/classe_selecao.php | 4 ++-- classesphp/classe_shp.php | 2 +- classesphp/funcoes_gerais.php | 4 ++-- classesphp/mapa_controle.php | 2 +- css/geral.css | 161 ++--------------------------------------------------------------------------------------------------------------------------------------------------------------- css/i3geo6.css | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------- css/i3geo6.css.php | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------- css/i3geo_ferramentas6.css | 343 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------- css/input.css | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ferramentas/aplicarsld/upload.php | 1 + ferramentas/bufferpt/index.js | 3 +-- ferramentas/bufferpt/template_mst.html | 8 +++++--- ferramentas/carregamapa/upload.php | 1 + ferramentas/editorol/editorol.js | 1667 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ferramentas/importarwmc/upload.php | 1 + ferramentas/imprimir/a4l.htm | 1 + ferramentas/imprimir/a4p.htm | 1 + ferramentas/loginusuario/index.js | 14 +++++++++----- ferramentas/tabela/relatorio.php | 2 +- ferramentas/upload/upload.php | 1 + ferramentas/uploaddbf/upload.php | 1 + ferramentas/uploadgpx/upload.php | 1 + ferramentas/uploadkml/upload.php | 1 + ferramentas/uploadsimbolo/upload.php | 1 + imagens/oxygen/22x22/preferences-desktop-user-password.png | Bin 0 -> 1111 bytes imagens/oxygen/22x22/system-users.png | Bin 0 -> 1141 bytes 42 files changed, 1693 insertions(+), 1446 deletions(-) create mode 100644 css/input.css create mode 100644 imagens/oxygen/22x22/preferences-desktop-user-password.png create mode 100644 imagens/oxygen/22x22/system-users.png diff --git a/admin/admin.db b/admin/admin.db index 3e81308..f7ede3e 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/dicionario/operacoes.js b/admin/dicionario/operacoes.js index 15b1c6b..bf92909 100755 --- a/admin/dicionario/operacoes.js +++ b/admin/dicionario/operacoes.js @@ -30,5 +30,75 @@ i3GEOadmin.operacoes.dicionario = { pt : "Operações controladas:", en : "", es : "" + } ], + 'msgBuscaOperacoes' : [ { + pt : "buscando operações...", + en : "", + es : "" + } ], + 'adicionaPapel' : [ { + pt : "Adicionar novo papel", + en : "", + es : "" + } ], + 'editaOperacao' : [ { + pt : "Edite para definir a operação!!!", + en : "", + es : "" + } ], + 'codigo' : [ { + pt : "Código:", + en : "", + es : "" + } ], + 'operacao' : [ { + pt : "Operação", + en : "", + es : "" + } ], + 'descricao' : [ { + pt : "(opcional) Descrição:", + en : "", + es : "" + } ], + 'msgErroExclui' : [ { + pt : "Não foi possível excluir. Verifique se não existem menus vinculados a este tema", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" + } ], + '' : [ { + pt : "", + en : "", + es : "" } ] }; diff --git a/admin/js/core.js b/admin/js/core.js index 50ee06d..6fb9df7 100644 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1771,6 +1771,7 @@ function core_parseMustacheBody (hashMustache){ //arquivos css // cssfiles =new Array( + i3GEO.configura.locaplic+"/css/input.css", i3GEO.configura.locaplic+"/admin/html/admin.css" ); } @@ -1814,6 +1815,7 @@ function core_parseMustacheBody (hashMustache){ "../../pacotes/yui290/build/treeview/assets/skins/sam/treeview.css", "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css", "../../pacotes/yui290/build/resize/assets/skins/sam/resize.css", + "../../css/input.css", "../../css/janelaflutuante.css", "../html/admin.css" ); diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js index c9aa50b..4e13ba5 100644 --- a/admin/js/editormapfile.js +++ b/admin/js/editormapfile.js @@ -660,7 +660,7 @@ function clonarMapfile(codigoMap) core_dialogoPergunta(handleYes,handleNo,mensagem,largura); } function alteraNomeTema(obj,codigoMap){ - var handleYes, handleNo, codigoMap, mensagem, largura = "300"; + var handleYes, handleNo, mensagem, largura = "300"; mensagem = ""+ $trad("novoTitulo",i3GEOadmin.core.dicionario) +"
"; handleNo = function(){ diff --git a/admin/js/operacoes.js b/admin/js/operacoes.js index edc821e..293964c 100644 --- a/admin/js/operacoes.js +++ b/admin/js/operacoes.js @@ -45,7 +45,7 @@ function ativaBotaoAdicionaOperacao(sUrl,idBotao){ var botao, adiciona = function() { core_carregando("ativa"); - core_carregando(" adicionando um novo registro"); + core_carregando($trad("msgNovoRegistro",i3GEOadmin.core.dicionario)); var callback = { success:function(o) @@ -76,7 +76,7 @@ Obtém a lista de atlas */ function pegaOperacoes(){ - core_pegaDados("buscando operações...","../php/operacoes.php?funcao=pegaOperacoes","montaArvore"); + core_pegaDados($trad("msgBuscaOperacoes",i3GEOadmin.operacoes.dicionario),"../php/operacoes.php?funcao=pegaOperacoes","montaArvore"); } /* Function: montaArvore @@ -143,7 +143,7 @@ function adicionaNosPapeis(no,dados,redesenha) } if(!redesenha) { - var conteudo = "Adicionar novo papel"; + var conteudo = ""+ $trad("adicionaPapel",i3GEOadmin.operacoes.dicionario) +""; var d = {html:conteudo}; var tempNode = new YAHOO.widget.HTMLNode(d, no, false,true); tempNode.isLeaf = true; @@ -170,7 +170,7 @@ function adicionaNosOperacoes(dados,redesenha){ if(dados[i].codigo != "") {conteudo += " "+dados[i].codigo+" - "+dados[i].descricao+"";} else - {conteudo += " Edite para definir a operação!!!";} + {conteudo += " "+ $trad("editaOperacao",i3GEOadmin.operacoes.dicionario) +"";} var d = {html:conteudo,id_operacao:dados[i].id_operacao,tipo:"operacao"}; var tempNode = new YAHOO.widget.HTMLNode(d, root, false,true); tempNode.enableHighlight = false; @@ -185,7 +185,7 @@ Abre o editor de um no function editar(tipo,id) { core_carregando("ativa"); - core_carregando(" buscando dados"); + core_carregando($trad("msgBuscaDados",i3GEOadmin.core.dicionario)); var sUrl = null; var callback = { @@ -196,7 +196,7 @@ function editar(tipo,id) if(tipo == "operacao") { var dados = YAHOO.lang.JSON.parse(o.responseText)[0]; - core_montaEditor("gravaDados('operacao','"+id+"')","","","","Operação",true,true,false); + core_montaEditor("gravaDados('operacao','"+id+"')","","","",$trad("operacao",i3GEOadmin.operacoes.dicionario),true,true,false); $i("editor_bd").innerHTML = montaDivOperacao(dados); core_carregando("desativa"); } @@ -225,8 +225,8 @@ function editar(tipo,id) function montaDivOperacao(i){ var param = { "linhas":[ - {titulo:"Código:",id:"Ecodigo",size:"50",value:i.codigo,tipo:"text",div:""}, - {titulo:"(opcional) Descrição:",id:"Edescricao",size:"50",value:i.descricao,tipo:"text",div:""} + {titulo:$trad("codigo",i3GEOadmin.operacoes.dicionario),id:"Ecodigo",size:"50",value:i.codigo,tipo:"text",div:""}, + {titulo:$trad("descricao",i3GEOadmin.operacoes.dicionario),id:"Edescricao",size:"50",value:i.descricao,tipo:"text",div:""} ] }; var ins = ""; @@ -252,7 +252,7 @@ Exclui um elemento do atlas */ function excluir(tipo,id_operacao,id_papel) { - var mensagem = " excluindo o registro do id= "+id_operacao+" - "+id_papel; + var mensagem = $trad("msgExclui",i3GEOadmin.core.dicionario)+id_operacao+" - "+id_papel; var no = null; var sUrl = null; if(tipo == "papel") @@ -296,7 +296,7 @@ function gravaDados(tipo,id) success:function(o){ try { if(YAHOO.lang.JSON.parse(o.responseText) == "erro") { - core_carregando("Não foi possível excluir. Verifique se não existem menus vinculados a este tema"); + core_carregando(""+ $trad("msgErroExclui",i3GEOadmin.operacoes.dicionario) +""); setTimeout("core_carregando('desativa')",3000); } else{ @@ -322,8 +322,8 @@ function gravaDados(tipo,id) }; if(prog && par){ core_carregando("ativa"); - core_carregando(" gravando o registro do id= "+id); + core_carregando($trad("gravaId",i3GEOadmin.core.dicionario)+id); var sUrl = prog+par; core_makeRequest(sUrl,callback,'POST'); } -} \ No newline at end of file +} diff --git a/admin/php/estat_mapa_upload.php b/admin/php/estat_mapa_upload.php index a6a1804..73fa128 100644 --- a/admin/php/estat_mapa_upload.php +++ b/admin/php/estat_mapa_upload.php @@ -8,6 +8,7 @@ error_reporting(0); ?> + diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php index d824527..3c69efa 100644 --- a/admin/php/menutemas.php +++ b/admin/php/menutemas.php @@ -1164,6 +1164,7 @@ function alteraTemas() { $layer = $mapa->getlayer($i); $layer->setmetadata("permitedownload",strtolower($download)); + $layer->setmetadata("download",strtolower($download)); $layer->setmetadata("permiteogc",strtolower($ogc)); $layer->setmetadata("permitekml",strtolower($kml)); $layer->setmetadata("permitekmz",strtolower($kmz)); diff --git a/admin/php/metaestat_mapa_uploadimagem.php b/admin/php/metaestat_mapa_uploadimagem.php index b2d731f..12b165f 100644 --- a/admin/php/metaestat_mapa_uploadimagem.php +++ b/admin/php/metaestat_mapa_uploadimagem.php @@ -12,6 +12,7 @@ error_reporting(0); ?> + diff --git a/admin/php/metaestat_uploadcsv_submit.php b/admin/php/metaestat_uploadcsv_submit.php index 216c127..72d314f 100644 --- a/admin/php/metaestat_uploadcsv_submit.php +++ b/admin/php/metaestat_uploadcsv_submit.php @@ -15,6 +15,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/admin/php/metaestat_uploadshp_submit.php b/admin/php/metaestat_uploadshp_submit.php index 68d2f55..baeb2a1 100644 --- a/admin/php/metaestat_uploadshp_submit.php +++ b/admin/php/metaestat_uploadshp_submit.php @@ -15,6 +15,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/admin/php/uploadgvp.php b/admin/php/uploadgvp.php index 31beb6c..dcb6ec7 100644 --- a/admin/php/uploadgvp.php +++ b/admin/php/uploadgvp.php @@ -9,6 +9,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/admin/principal.html b/admin/principal.html index 54a8b98..06115b4 100644 --- a/admin/principal.html +++ b/admin/principal.html @@ -4,7 +4,7 @@ - + diff --git a/classesjs/compactajs.php b/classesjs/compactajs.php index e9c4d83..bc7174f 100644 --- a/classesjs/compactajs.php +++ b/classesjs/compactajs.php @@ -210,6 +210,7 @@ salvatudojs($jsfiles,$buffer,"i3geo_tudo_compacto6.js","js"); // $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", @@ -236,6 +237,7 @@ $buffer = ""; salvatudojs($cssfiles,$buffer,"../css/i3geo6.css","css"); //css das ferramentas $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/button.css", "../css/ferramentas.css", diff --git a/classesjs/geradordelinks.js b/classesjs/geradordelinks.js index 9b7b485..0ab5164 100644 --- a/classesjs/geradordelinks.js +++ b/classesjs/geradordelinks.js @@ -50,6 +50,8 @@ Veja // //carrega as dependências // + +//TODO aplicar o padrao de css nos inputs (ver HTML) (function(){ var scriptLocation = ""; var scripts = document.getElementsByTagName('script'); diff --git a/classesjs/i3geonaocompacto.js b/classesjs/i3geonaocompacto.js index ad4eb45..2367451 100644 --- a/classesjs/i3geonaocompacto.js +++ b/classesjs/i3geonaocompacto.js @@ -77,6 +77,7 @@ //css var allCssTags = ""; var cssfiles = new Array( + "../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php index 38619ca..a94f7e7 100644 --- a/classesphp/classe_analise.php +++ b/classesphp/classe_analise.php @@ -1276,7 +1276,7 @@ class Analise $projInObj = $layerorigem->getProjection(); if ($projInObj == "") { - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); } $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $origemdestino = array(); @@ -1413,7 +1413,9 @@ class Analise foreach($listaShapes as $shape){ //calcula a extensão geografica $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + //proj=longlat,ellps=WGS84,datum=WGS84,no_defs + //proj=latlong + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); $poPoint->setXY($rect->minx, $rect->miny); @@ -1440,8 +1442,7 @@ class Analise //faz a união dos elementos se necessário if($unir == "sim"){ $ns = $buffers[0]; - for($s=1;$s < count($buffers);$s++) - { + for($s=1;$s < count($buffers);$s++){ $ns = $ns->union($buffers[$s]); } $buffers = array($ns); @@ -1465,10 +1466,8 @@ class Analise $db=xbase_open($dbname,2); else $db=dbase_open($dbname,2); - for($i = 0;$i < count($buffers);++$i) - { - foreach ($items as $ni) - { + for($i = 0;$i < count($buffers);++$i){ + foreach ($items as $ni){ if(!empty($shapes[$i]->values[$ni])){ $reg[] = $this->truncaS($shapes[$i]->values[$ni]); } @@ -2646,7 +2645,7 @@ class Analise case "perimetro": $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000,units=m"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); @@ -2657,7 +2656,7 @@ class Analise case "area": $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=laea,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=500000,y_0=10000000,ellps=GRS67,units=m,no_defs"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); diff --git a/classesphp/classe_selecao.php b/classesphp/classe_selecao.php index 7f84795..14f4ef5 100644 --- a/classesphp/classe_selecao.php +++ b/classesphp/classe_selecao.php @@ -589,7 +589,7 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa|novo else { error_reporting(0); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$pt->x.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); @@ -976,7 +976,7 @@ $geos - array com os dados function projetaDistancia($shape,$distancia){ error_reporting(0); $pt = $shape->getCentroid(); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$pt->x.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); $poPoint->setXY($pt->x, $pt->y); diff --git a/classesphp/classe_shp.php b/classesphp/classe_shp.php index cbf5387..1a35397 100644 --- a/classesphp/classe_shp.php +++ b/classesphp/classe_shp.php @@ -257,7 +257,7 @@ $projecao - codigo epsg da projeção das coordenadas $poPoint->setXY($xy[$i],$xy[$i+1]); if($projecao != "") { - $projOutObj = ms_newprojectionobj("proj=latlong"); + $projOutObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projInObj = ms_newprojectionobj("init=epsg:".$projecao); $poPoint->project($projInObj, $projOutObj); } diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index b9be630..e6114f5 100644 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -1238,7 +1238,7 @@ array( */ function geo2utm($x,$y,$zona) { - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); if($y < 0){$ns = "south";} else {$ns = "north";} @@ -1920,7 +1920,7 @@ function calculaAreaPixel($map_file,$celsize) { $mapa = ms_newMapObj($map_file); $rect = $mapa->extent; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $y = $rect->maxy - ((($rect->maxy) - ($rect->miny)) / 2); $x = $rect->maxx - ((($rect->maxx) - ($rect->minx)) / 2); diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php index fd1b119..7b83713 100644 --- a/classesphp/mapa_controle.php +++ b/classesphp/mapa_controle.php @@ -2417,7 +2417,7 @@ function projetaExt($map_file,$ext,$separador=" ") $rect = ms_newRectObj(); $rect->setextent($extA[0],$extA[1],$extA[2],$extA[3]); $prjMapa = $mapa->getProjection(); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj($prjMapa); $rect->project($projInObj, $projOutObj); if($ponto == false) diff --git a/css/geral.css b/css/geral.css index e291b75..ad9cd6d 100644 --- a/css/geral.css +++ b/css/geral.css @@ -8,13 +8,7 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ - -webkit-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; -} + /* Para nao marcar links */ @@ -641,43 +635,6 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; } -input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(180, 180, 180); - text-align: center; - cursor: text; -} - -input[type=checkbox] { - border: 0px solid white; -} - -input[type=file] { - border: 0px solid white; - background-color: none; - background: none; -} - -select { - box-shadow: 1px 1px 3px 0 lightgray; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(230, 230, 230); - text-align: left; - cursor: pointer; -} - -select option:hover { - background-color: #CCFFFF; -} - .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -712,17 +669,6 @@ select option:hover { font-size: 10px; } -.inputsb { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 0px solid gray; - text-align: center; - cursor: text; -} - .legendatemas { cursor: pointer; text-align: left; @@ -933,6 +879,7 @@ select option:hover { .digitar input { border: 1px solid rgb(180, 180, 180); } + .digitarOver { margin: 0px; color: #426252; @@ -1385,110 +1332,6 @@ h1 { } } -.styled-select input, .styled-select150 input { - width: 100%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - background-size: 16px 144px; - } -} - -.i3geoForm, .i3geoForm150, .i3geoForm100 { - width: 252px; - overflow: hidden; - background: #F8F8F8; - border: 1px solid #DDDDDD; - height: 22px; - border-radius: 2px; -} - -.i3geoForm150 { - width: 150px; -} - -.i3geoForm100 { - width: 100px; -} - -.i3geoFormIconeEdita { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormSemIcone { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormTag { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - background-size: 16px 144px; - } - border-radius: 8px; - background-color: #F0F0F0; - cursor: pointer; -} - -.i3geoFormIconeAquarela { - cursor: pointer; - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } - -} - -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { - width: 90%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - cursor: text; -} - -.i3geoFormIconeAquarela input{ - width: 80%; -} - -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and - (-webkit-min-device-pixel-ratio:0) { - .inputsb { - border: 1px solid black - } -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo6.css b/css/i3geo6.css index 6fdfd64..3928ba8 100644 --- a/css/i3geo6.css +++ b/css/i3geo6.css @@ -1,3 +1,164 @@ +input{ +font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ +-webkit-user-select: text; +-khtml-user-select: text; +-moz-user-select: text; +-o-user-select: text; +user-select: text; +} +input[type=text] { +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(180, 180, 180); +text-align: center; +cursor: text; +height: 22px; +} +input[type=checkbox] { +border: 0px solid white; +} +input[type=file] { +border: 0px solid white; +background-color: none; +background: none; +} +select { +box-shadow: 1px 1px 3px 0 lightgray; +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(230, 230, 230); +text-align: left; +cursor: pointer; +} +select option:hover { +background-color: #CCFFFF; +} +.inputsb { +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 0px solid gray; +text-align: center; +cursor: text; +} +.styled-select input, .styled-select150 input { +width: 100%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +background-size: 16px 144px; +} +} +.i3geoForm, .i3geoForm150, .i3geoForm100 { +width: 252px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.i3geoForm150 { +width: 150px; +} +.i3geoForm100 { +width: 100px; +} +.i3geoFormIconeEdita { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormIconeUsuario { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormIconeSenha { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormSemIcone { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormTag { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +background-size: 16px 144px; +} +border-radius: 8px; +background-color: #F0F0F0; +cursor: pointer; +} +.i3geoFormIconeAquarela { +cursor: pointer; +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { +width: 90%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +cursor: text; +} +.i3geoFormIconeAquarela input{ +width: 80%; +} +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and +(-webkit-min-device-pixel-ratio:0) { +.inputsb { +border: 1px solid black +} +} /* para nao selecionar */ @@ -8,13 +169,6 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ --webkit-user-select: text; --khtml-user-select: text; --moz-user-select: text; --o-user-select: text; -user-select: text; -} /* Para nao marcar links */ @@ -576,38 +730,6 @@ text-align: center; font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif; } -input { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(180, 180, 180); -text-align: center; -cursor: text; -} -input[type=checkbox] { -border: 0px solid white; -} -input[type=file] { -border: 0px solid white; -background-color: none; -background: none; -} -select { -box-shadow: 1px 1px 3px 0 lightgray; -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(230, 230, 230); -text-align: left; -cursor: pointer; -} -select option:hover { -background-color: #CCFFFF; -} .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -639,16 +761,6 @@ background-position: right; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; } -.inputsb { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 0px solid gray; -text-align: center; -cursor: text; -} .legendatemas { cursor: pointer; text-align: left; @@ -1237,99 +1349,6 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input, .styled-select150 input { -width: 100%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -background-size: 16px 144px; -} -} -.i3geoForm, .i3geoForm150, .i3geoForm100 { -width: 252px; -overflow: hidden; -background: #F8F8F8; -border: 1px solid #DDDDDD; -height: 22px; -border-radius: 2px; -} -.i3geoForm150 { -width: 150px; -} -.i3geoForm100 { -width: 100px; -} -.i3geoFormIconeEdita { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormSemIcone { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormTag { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -background-size: 16px 144px; -} -border-radius: 8px; -background-color: #F0F0F0; -cursor: pointer; -} -.i3geoFormIconeAquarela { -cursor: pointer; -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { -width: 90%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -cursor: text; -} -.i3geoFormIconeAquarela input{ -width: 80%; -} -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and -(-webkit-min-device-pixel-ratio:0) { -.inputsb { -border: 1px solid black -} -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php index 5b51d32..04b34f3 100644 --- a/css/i3geo6.css.php +++ b/css/i3geo6.css.php @@ -1,4 +1,165 @@ -/* +input{ +font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ +-webkit-user-select: text; +-khtml-user-select: text; +-moz-user-select: text; +-o-user-select: text; +user-select: text; +} +input[type=text] { +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(180, 180, 180); +text-align: center; +cursor: text; +height: 22px; +} +input[type=checkbox] { +border: 0px solid white; +} +input[type=file] { +border: 0px solid white; +background-color: none; +background: none; +} +select { +box-shadow: 1px 1px 3px 0 lightgray; +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(230, 230, 230); +text-align: left; +cursor: pointer; +} +select option:hover { +background-color: #CCFFFF; +} +.inputsb { +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 0px solid gray; +text-align: center; +cursor: text; +} +.styled-select input, .styled-select150 input { +width: 100%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +background-size: 16px 144px; +} +} +.i3geoForm, .i3geoForm150, .i3geoForm100 { +width: 252px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.i3geoForm150 { +width: 150px; +} +.i3geoForm100 { +width: 100px; +} +.i3geoFormIconeEdita { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormIconeUsuario { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormIconeSenha { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormSemIcone { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormTag { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +background-size: 16px 144px; +} +border-radius: 8px; +background-color: #F0F0F0; +cursor: pointer; +} +.i3geoFormIconeAquarela { +cursor: pointer; +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { +width: 90%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +cursor: text; +} +.i3geoFormIconeAquarela input{ +width: 80%; +} +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and +(-webkit-min-device-pixel-ratio:0) { +.inputsb { +border: 1px solid black +} +} +/* para nao selecionar */ * { @@ -8,13 +169,6 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ --webkit-user-select: text; --khtml-user-select: text; --moz-user-select: text; --o-user-select: text; -user-select: text; -} /* Para nao marcar links */ @@ -576,38 +730,6 @@ text-align: center; font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif; } -input { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(180, 180, 180); -text-align: center; -cursor: text; -} -input[type=checkbox] { -border: 0px solid white; -} -input[type=file] { -border: 0px solid white; -background-color: none; -background: none; -} -select { -box-shadow: 1px 1px 3px 0 lightgray; -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(230, 230, 230); -text-align: left; -cursor: pointer; -} -select option:hover { -background-color: #CCFFFF; -} .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -639,16 +761,6 @@ background-position: right; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; } -.inputsb { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 0px solid gray; -text-align: center; -cursor: text; -} .legendatemas { cursor: pointer; text-align: left; @@ -1237,99 +1349,6 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input, .styled-select150 input { -width: 100%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -background-size: 16px 144px; -} -} -.i3geoForm, .i3geoForm150, .i3geoForm100 { -width: 252px; -overflow: hidden; -background: #F8F8F8; -border: 1px solid #DDDDDD; -height: 22px; -border-radius: 2px; -} -.i3geoForm150 { -width: 150px; -} -.i3geoForm100 { -width: 100px; -} -.i3geoFormIconeEdita { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormSemIcone { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormTag { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -background-size: 16px 144px; -} -border-radius: 8px; -background-color: #F0F0F0; -cursor: pointer; -} -.i3geoFormIconeAquarela { -cursor: pointer; -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { -width: 90%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -cursor: text; -} -.i3geoFormIconeAquarela input{ -width: 80%; -} -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and -(-webkit-min-device-pixel-ratio:0) { -.inputsb { -border: 1px solid black -} -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo_ferramentas6.css b/css/i3geo_ferramentas6.css index 74a1388..1806ccc 100644 --- a/css/i3geo_ferramentas6.css +++ b/css/i3geo_ferramentas6.css @@ -1,3 +1,185 @@ +input{ + font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -o-user-select: text; + user-select: text; +} + +input[type=text] { + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(180, 180, 180); + text-align: center; + cursor: text; + height: 22px; +} + +input[type=checkbox] { + border: 0px solid white; +} + +input[type=file] { + border: 0px solid white; + background-color: none; + background: none; +} + +select { + box-shadow: 1px 1px 3px 0 lightgray; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(230, 230, 230); + text-align: left; + cursor: pointer; +} + +select option:hover { + background-color: #CCFFFF; +} + +.inputsb { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 0px solid gray; + text-align: center; + cursor: text; +} + +.styled-select input, .styled-select150 input { + width: 100%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + background-size: 16px 144px; + } +} + +.i3geoForm, .i3geoForm150, .i3geoForm100 { + width: 252px; + overflow: hidden; + background: #F8F8F8; + border: 1px solid #DDDDDD; + height: 22px; + border-radius: 2px; +} + +.i3geoForm150 { + width: 150px; +} + +.i3geoForm100 { + width: 100px; +} + +.i3geoFormIconeEdita { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeUsuario { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeSenha { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormSemIcone { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormTag { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + background-size: 16px 144px; + } + border-radius: 8px; + background-color: #F0F0F0; + cursor: pointer; +} + +.i3geoFormIconeAquarela { + cursor: pointer; + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } + +} + +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { + width: 90%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + cursor: text; +} + +.i3geoFormIconeAquarela input{ + width: 80%; +} + +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and + (-webkit-min-device-pixel-ratio:0) { + .inputsb { + border: 1px solid black + } +} + /* para nao selecionar */ @@ -8,13 +190,7 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ - -webkit-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; -} + /* Para nao marcar links */ @@ -641,43 +817,6 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; } -input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(180, 180, 180); - text-align: center; - cursor: text; -} - -input[type=checkbox] { - border: 0px solid white; -} - -input[type=file] { - border: 0px solid white; - background-color: none; - background: none; -} - -select { - box-shadow: 1px 1px 3px 0 lightgray; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(230, 230, 230); - text-align: left; - cursor: pointer; -} - -select option:hover { - background-color: #CCFFFF; -} - .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -712,17 +851,6 @@ select option:hover { font-size: 10px; } -.inputsb { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 0px solid gray; - text-align: center; - cursor: text; -} - .legendatemas { cursor: pointer; text-align: left; @@ -933,6 +1061,7 @@ select option:hover { .digitar input { border: 1px solid rgb(180, 180, 180); } + .digitarOver { margin: 0px; color: #426252; @@ -1385,110 +1514,6 @@ h1 { } } -.styled-select input, .styled-select150 input { - width: 100%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - background-size: 16px 144px; - } -} - -.i3geoForm, .i3geoForm150, .i3geoForm100 { - width: 252px; - overflow: hidden; - background: #F8F8F8; - border: 1px solid #DDDDDD; - height: 22px; - border-radius: 2px; -} - -.i3geoForm150 { - width: 150px; -} - -.i3geoForm100 { - width: 100px; -} - -.i3geoFormIconeEdita { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormSemIcone { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormTag { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - background-size: 16px 144px; - } - border-radius: 8px; - background-color: #F0F0F0; - cursor: pointer; -} - -.i3geoFormIconeAquarela { - cursor: pointer; - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } - -} - -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { - width: 90%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - cursor: text; -} - -.i3geoFormIconeAquarela input{ - width: 80%; -} - -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and - (-webkit-min-device-pixel-ratio:0) { - .inputsb { - border: 1px solid black - } -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/input.css b/css/input.css new file mode 100644 index 0000000..45edac0 --- /dev/null +++ b/css/input.css @@ -0,0 +1,181 @@ +input{ + font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -o-user-select: text; + user-select: text; +} + +input[type=text] { + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(180, 180, 180); + text-align: center; + cursor: text; + height: 22px; +} + +input[type=checkbox] { + border: 0px solid white; +} + +input[type=file] { + border: 0px solid white; + background-color: none; + background: none; +} + +select { + box-shadow: 1px 1px 3px 0 lightgray; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(230, 230, 230); + text-align: left; + cursor: pointer; +} + +select option:hover { + background-color: #CCFFFF; +} + +.inputsb { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 0px solid gray; + text-align: center; + cursor: text; +} + +.styled-select input, .styled-select150 input { + width: 100%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + background-size: 16px 144px; + } +} + +.i3geoForm, .i3geoForm150, .i3geoForm100 { + width: 252px; + overflow: hidden; + background: #F8F8F8; + border: 1px solid #DDDDDD; + height: 22px; + border-radius: 2px; +} + +.i3geoForm150 { + width: 150px; +} + +.i3geoForm100 { + width: 100px; +} + +.i3geoFormIconeEdita { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeUsuario { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeSenha { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormSemIcone { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormTag { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + background-size: 16px 144px; + } + border-radius: 8px; + background-color: #F0F0F0; + cursor: pointer; +} + +.i3geoFormIconeAquarela { + cursor: pointer; + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } + +} + +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { + width: 90%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + cursor: text; +} + +.i3geoFormIconeAquarela input{ + width: 80%; +} + +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and + (-webkit-min-device-pixel-ratio:0) { + .inputsb { + border: 1px solid black + } +} diff --git a/ferramentas/aplicarsld/upload.php b/ferramentas/aplicarsld/upload.php index adeb1a7..6a26e40 100644 --- a/ferramentas/aplicarsld/upload.php +++ b/ferramentas/aplicarsld/upload.php @@ -13,6 +13,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; ?> + diff --git a/ferramentas/bufferpt/index.js b/ferramentas/bufferpt/index.js index d1db073..b37e5a9 100644 --- a/ferramentas/bufferpt/index.js +++ b/ferramentas/bufferpt/index.js @@ -64,7 +64,6 @@ i3GEOF.bufferpt = { */ mustacheHash : function() { var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.bufferpt.dicionario); - dicionario["distancia"] = $inputText('','','i3GEOFbufferptDistancia','',10,0); dicionario["x"] = i3GEOF.bufferpt.x; dicionario["y"] = i3GEOF.bufferpt.y; return dicionario; @@ -139,7 +138,7 @@ i3GEOF.bufferpt = { titulo = "
" + $trad("u10")+"
"; janela = i3GEO.janela.cria( "290px", - "110px", + "130px", "", "", "", diff --git a/ferramentas/bufferpt/template_mst.html b/ferramentas/bufferpt/template_mst.html index e0b4dc1..eb788e9 100644 --- a/ferramentas/bufferpt/template_mst.html +++ b/ferramentas/bufferpt/template_mst.html @@ -1,8 +1,10 @@

{{{entorno}}}

-{{{distancia}}} -
+
+ +

-

+
+

X: {{{x}}} Y: {{{y}}} \ No newline at end of file diff --git a/ferramentas/carregamapa/upload.php b/ferramentas/carregamapa/upload.php index 90932d9..c20af47 100644 --- a/ferramentas/carregamapa/upload.php +++ b/ferramentas/carregamapa/upload.php @@ -12,6 +12,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; ?> + diff --git a/ferramentas/editorol/editorol.js b/ferramentas/editorol/editorol.js index d96f1d1..a8075ab 100755 --- a/ferramentas/editorol/editorol.js +++ b/ferramentas/editorol/editorol.js @@ -80,92 +80,6 @@ i3GEO.editorOL = map : i3geoOL }), nomeFuncaoSalvar : "i3GEO.editorOL.salvaGeo()", - //substituir por i3GEO.Interface.openlayers.fundoDefault() - /* - e_oce : new ol.layer.Tile( - { - title : "ESRI Ocean Basemap", - visible : false, - isBaseLayer : true, - name : "oce", - source : new ol.source.TileArcGISRest( - { - url : "http://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer", - attributions : [ - new ol.Attribution( - { - html : 'Tiles © ArcGIS' - }) - ] - }) - }), - e_ims : new ol.layer.Tile( - { - title : "ESRI Imagery World 2D", - visible : false, - isBaseLayer : true, - name : "ims", - source : new ol.source.TileArcGISRest( - { - url : "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer", - attributions : [ - new ol.Attribution( - { - html : 'Tiles © ArcGIS' - }) - ] - }) - }), - e_wsm : new ol.layer.Tile( - { - title : "ESRI World Street Map", - visible : false, - isBaseLayer : true, - name : "wsm", - source : new ol.source.TileArcGISRest( - { - url : "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer", - attributions : [ - new ol.Attribution( - { - html : 'Tiles © ArcGIS' - }) - ] - }) - }), - ol_mma : new ol.layer.Tile({ - title : "Base carto MMA", - visible : false, - isBaseLayer : true, - name : "bra", - source : new ol.source.TileWMS({ - url : "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&", - params : { - 'layers' : "baseraster", - 'srs' : "EPSG:4326", - 'format' : "image/png" - } - }) - }), - ol_wms : new ol.layer.Tile( - { - title : "ESRI World Street Map", - visible : false, - isBaseLayer : true, - name : "wsm", - source : new ol.source.TileArcGISRest( - { - url : "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer", - attributions : [ - new ol.Attribution( - { - html : 'Tiles © ArcGIS' - }) - ] - }) - }), - fundo : "e_ims,e_wsm,ol_mma,ol_wms,top_wms", - */ kml : [], layersIniciais : [], //essa configuracao dos botoes afeta apenas o mashup @@ -468,39 +382,38 @@ i3GEO.editorOL = ins += "
" + $trad("t23") + ":
"; ins += "

"; ins += "
'" + $trad("result") + "':
"; - try { - YAHOO.namespace("procura.container"); - YAHOO.procura.container.panel = new YAHOO.widget.Panel("panelprocura", { - zIndex : 2000, - iframe : false, - width : "250px", - visible : false, - draggable : true, - close : true - }); - YAHOO.procura.container.panel.setHeader("Encontre no mapa"); - YAHOO.procura.container.panel.setBody(ins); - YAHOO.procura.container.panel.setFooter(""); - YAHOO.procura.container.panel.render(document.body); - YAHOO.procura.container.panel.center(); - document.getElementById("i3GEOOLbotaoBusca").onclick = - function() { - var layer = i3GEO.editorOL.layerAtivo(), item = document.getElementById("i3GEOOLbuscaItem").value, palavra = - document.getElementById("i3GEOOLpalavraBusca").value; - if (item === "" || palavra === "") { - alert("Escolha o item e o texto de busca"); - return; - } - i3GEO.editorOL.busca(layer, item, palavra, "i3GEOOLcomboresultado"); - }; - document.getElementById("i3GEOOLlistaTemasBusca").onchange = function() { - i3GEO.editorOL.ativaTema(this.value); - document.getElementById("i3GEOOLcomboitens").innerHTML = "..."; - i3GEO.editorOL.listaItens(i3GEO.editorOL.layerAtivo(), "i3GEOOLcomboitens", "i3GEOOLbuscaItem"); + YAHOO.namespace("procura.container"); + YAHOO.procura.container.panel = new YAHOO.widget.Panel("panelprocura", { + zIndex : 2000, + iframe : false, + width : "250px", + visible : false, + draggable : true, + close : true + }); + YAHOO.procura.container.panel.setHeader("Encontre no mapa"); + YAHOO.procura.container.panel.setBody(ins); + YAHOO.procura.container.panel.setFooter(""); + YAHOO.procura.container.panel.render(document.body); + YAHOO.procura.container.panel.center(); + + document.getElementById("i3GEOOLbotaoBusca").onclick = + function() { + var layer = i3GEO.editorOL.layerAtivo(), item = document.getElementById("i3GEOOLbuscaItem").value, palavra = + document.getElementById("i3GEOOLpalavraBusca").value; + if (item === "" || palavra === "") { + alert("Escolha o item e o texto de busca"); + return; + } + i3GEO.editorOL.busca(layer, item, palavra, "i3GEOOLcomboresultado"); }; - } catch (e) { - } + document.getElementById("i3GEOOLlistaTemasBusca").onchange = function() { + i3GEO.editorOL.ativaTema(this.value); + document.getElementById("i3GEOOLcomboitens").innerHTML = "..."; + i3GEO.editorOL.listaItens(i3GEO.editorOL.layerAtivo(), "i3GEOOLcomboitens", "i3GEOOLbuscaItem"); + }; + }, criaComboTemas : function() { var layers = i3GEO.editorOL.layersLigados(), nlayers = layers.length, i, nometema = "", combo = @@ -719,9 +632,6 @@ i3GEO.editorOL = } catch (e) { } } - // var w = window.open(); - // w.document.write(ins); - // w.document.close(); if (!document.getElementById("panellegendaeditorOL")) { YAHOO.namespace("legendaeditorOL.container"); YAHOO.legendaeditorOL.container.panel = new YAHOO.widget.Panel("panellegendaeditorOL", { @@ -747,8 +657,8 @@ i3GEO.editorOL = YAHOO.legendaeditorOL.container.panel.show(); } }, - captura : function(x,y,tema) { - var d = 0.1, + captura : function(x,y,tema,idunico) { + var d = 0.001, layer = i3geoOL.getLayersByName(tema)[0], xy = [x,y], u = layer.getSource().getUrls()[0], @@ -809,6 +719,9 @@ i3GEO.editorOL = }) ); f.setId(i3GEO.util.uid()); + f.setProperties({ + idUnico : idunico + }); c.addFeature(f); } }; @@ -818,7 +731,8 @@ i3GEO.editorOL = cpJSON.call(u, "foo", retorno, ""); }, salvaGeometrias : function() { - var geos = i3GEO.desenho.layergrafico.selectedFeatures, n = geos.length, ins = ""; + var n = i3GEO.editorOL.idsSelecionados.length, + ins = ""; if (n > 0) { if ($i("panelsalvageometrias")) { if (YAHOO.i3GEO) { @@ -872,28 +786,13 @@ i3GEO.editorOL = i3GEO.editorOL.processageo("incorporar"); }, listaGeometriasSel : function() { - var geos = i3GEO.desenho.layergrafico.selectedFeatures, n = geos.length, ins = "", i, a, w, g; + var n = i3GEO.editorOL.idsSelecionados.length, + ins = "", + s = i3GEO.desenho.layergrafico.getSource(), + i, w, g; for (i = 0; i < n; i++) { - g = geos[i]; - ins += "" + $trad("u6") + ": " + i + "
" + i3GEO.editorOL.google2wgs(g.geometry) + "

"; - ins += "" + $trad("atrib") + ": " + i + "
"; - a = g.attributes; - for (key in a) { - if (a[key]) { - ins += key + " = " + a[key] + "
"; - } - } - // lista os registros se for fruto de uma captura - if (g.attributes.registros) { - ins += "" + $trad("reg") + ": " + i + "
"; - a = g.attributes.registros; - for (key in a) { - if (a[key]) { - ins += key + " = " + a[key] + "
"; - } - } - } - ins += "
"; + g = s.getFeatureById(i3GEO.editorOL.idsSelecionados[i]); + ins += "" + $trad("u6") + ": #" + i + "
" + i3GEO.editorOL.google2wgs(g.getGeometry().getCoordinates()) + "

"; } w = window.open(); w.document.write(ins); @@ -903,53 +802,55 @@ i3GEO.editorOL = alert("Funcao nao disponivel. Defina o nome da funcao em i3GEO.editorOL.nomeFuncaoSalvar "); }, salvaGeo : function() { - // i3GEO.editorOL.testeSalvar(); - // return; - var geos = i3GEO.desenho.layergrafico.selectedFeatures, n = geos.length, funcaoOK = - function() { + var s = i3GEO.desenho.layergrafico.getSource(), + n = i3GEO.editorOL.idsSelecionados.length, + funcaoOK = function() { // verifica se a geometria contem o atributo que indica a coluna ou codigo unico - if (geos[0].geometry) { - var registros = "", valorunico = "", nometema = $i("editorOLcomboTemaEditavel").value, key = "", tema, redesenha, p, g = - i3GEO.editorOL.google2wgs(geos[0].geometry); - if (nometema == "") { - return; - } - tema = i3GEO.arvoreDeCamadas.pegaTema(nometema, "", "name"); - // o tema contem o indicador de qual e a coluna que contem o identificador unico - if (geos[0].attributes.registros) { - registros = geos[0].attributes.registros; - for (key in registros) { - if (registros[key] && key == tema.colunaidunico) { - valorunico = registros[key]; - } - } - } - redesenha = function(retorno) { - i3GEO.janela.fechaAguarde("aguardeSalvaPonto"); - i3GEO.desenho.layergrafico.removeFeatures(i3GEO.desenho.layergrafico.selectedFeatures); - i3GEO.Interface.atualizaTema("", nometema); - }; - i3GEO.janela.AGUARDEMODAL = true; - i3GEO.janela.abreAguarde("aguardeSalvaPonto", $trad("adic") + "..."); - i3GEO.janela.AGUARDEMODAL = false; + var f = s.getFeatureById(i3GEO.editorOL.idsSelecionados[0]), + g = f.getGeometry(), + tema = $i("editorOLcomboTemaEditavel").value, + redesenha, p, format; - // cria um novo registro - if (valorunico == "") { - p = - i3GEO.configura.locaplic + "/ferramentas/editortema/exec.php?funcao=adicionaGeometria&g_sid=" - + i3GEO.configura.sid; - cpJSON.call(p, "foo", redesenha, "&tema=" + nometema + "&wkt=" + g); - } else { - // atualiza a geometria - p = - i3GEO.configura.locaplic + "/ferramentas/editortema/exec.php?funcao=atualizaGeometria&g_sid=" - + i3GEO.configura.sid; - cpJSON.call(p, "foo", redesenha, "&idunico=" + valorunico + "&tema=" + nometema + "&wkt=" + g); - } + g = i3GEO.editorOL.google2wgs(g); + format = new ol.format.WKT(); + f.setGeometry(g); + + if (tema == "") { + return; + } + redesenha = function(retorno) { + i3GEO.janela.fechaAguarde("aguardeSalvaPonto"); + i3GEO.editorOL.removeFeaturesSel(); + i3GEO.Interface.atualizaTema("", tema); + }; + i3GEO.janela.AGUARDEMODAL = true; + i3GEO.janela.abreAguarde("aguardeSalvaPonto", $trad("adic") + "..."); + i3GEO.janela.AGUARDEMODAL = false; + + // cria um novo registro + if(!f.getProperties().idUnico || f.getProperties().idUnico == ""){ + p = i3GEO.configura.locaplic + + "/ferramentas/editortema/exec.php?funcao=adicionaGeometria&g_sid=" + + i3GEO.configura.sid; + cpJSON.call(p, "foo", redesenha, "&tema=" + tema + "&wkt=" + format.writeFeatures([f])); + } else { + // atualiza a geometria + p = i3GEO.configura.locaplic + + "/ferramentas/editortema/exec.php?funcao=atualizaGeometria&g_sid=" + + i3GEO.configura.sid; + cpJSON.call( + p, + "foo", + redesenha, + "&idunico=" + f.getProperties().idUnico + "&tema=" + tema + "&wkt=" + format.writeFeatures([f]) + ); } - }, funcaoCombo = function(obj) { - $i("editorOLondeComboTemaEditavel").innerHTML = obj.dados; - }, texto = $trad("stema") + ":



"; + }, + funcaoCombo = function(obj) { + $i("editorOLondeComboTemaEditavel").innerHTML = obj.dados; + }, + texto = $trad("stema") + ":

"+$trad("salvaDadosEditor")+"



"; + //monta a janela para o usuario escolher em qual camada os dados serao salvos if (n != 1) { i3GEO.janela.tempoMsg($trad("seluma")); } else { @@ -981,620 +882,719 @@ i3GEO.editorOL = } i3GEO.editorOL.interacoes = []; }, + botaoProcura : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLprocuraItemInactive olButton"; + temp.title = $trad("t23"); + temp.onclick = function(){ + i3GEO.editorOL.criaJanelaBusca(); + YAHOO.procura.container.panel.show(); + }; + return temp; + }, + botaoPan : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLpanItemInactive olButton"; + temp.title = "pan"; + temp.onclick = function(){ + i3GEO.editorOL.marcaBotao("editorOLpan"); + }; + return temp; + }, + botaoZoomBox : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLzoomboxItemInactive olButton"; + temp.title = "zoombox"; + temp.onclick = function(){ + i3GEO.barraDeBotoes.defBotao("zoomli").funcaoonclick(); + }; + return temp; + }, + botaoZoomTot : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLzoomtotItemInactive olButton"; + temp.title = $trad("d2t"); + temp.onclick = function(){ + if (i3GEO.editorOL.mapext && i3GEO.editorOL.mapext != "") { + i3GEO.Interface.openlayers.zoom2ext(i3GEO.editorOL.mapext.join(" ")); + } else { + i3GEO.Interface.openlayers.zoom2ext(i3GEO.parametros.extentTotal); + } + }; + return temp; + }, + botaoZoomIn : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLzoominItemInactive olButton"; + temp.title = $trad("d5t"); + temp.onclick = function(){ + var v = i3GEO.editorOL.mapa.getView(); + v.setZoom(v.getZoom() + 1); + }; + return temp; + }, + botaoZoomOut : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLzoomoutItemInactive olButton"; + temp.title = $trad("d5t"); + temp.onclick = function(){ + var v = i3GEO.editorOL.mapa.getView(); + v.setZoom(v.getZoom() - 1); + }; + return temp; + }, + botaoLegenda : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLlegendaItemInactive olButton"; + temp.title = $trad("p3"); + temp.onclick = function(){ + i3GEO.editorOL.mostraLegenda(); + }; + return temp; + }, + botaoDistancia : function(){ + var temp = document.createElement("div"); + temp.className = "editorOLdistanciaItemInactive olButton"; + temp.onclick = function(){ + i3GEO.editorOL.marcaBotao("editorOLdistancia"); + i3GEO.barraDeBotoes.defBotao("mede").funcaoonclick(); + }; + return temp; + }, + botaoArea: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLareaItemInactive olButton"; + temp.onclick = function(){ + i3GEO.editorOL.marcaBotao("editorOLarea"); + i3GEO.barraDeBotoes.defBotao("area").funcaoonclick(); + }; + return temp; + }, + botaoLinha: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLlinhaItemInactive olButton"; + temp.title = $trad("dlinha"); + temp.onclick = function(){ + i3GEO.eventos.cliquePerm.desativa(); + i3GEO.editorOL.marcaBotao("editorOLlinha"); + var draw = new ol.interaction.Draw({ + type : "LineString" + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + //desativa ol.interaction.DoubleClickZoom + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + evt.feature.setStyle( + new ol.style.Style({ + stroke: new ol.style.Stroke({ + color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', + width: i3GEO.editorOL.simbologia.strokeWidth + }), + fill: new ol.style.Fill({ + color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' + }) + }) + ); + evt.feature.setId(i3GEO.util.uid()); + i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); + draw.setActive(false); + draw.setActive(true); + if (document.getElementById("panellistagEditor")) { + i3GEO.editorOL.listaGeometrias(); + } + }); + i3geoOL.addInteraction(draw); + }; + return temp; + }, + botaoPonto: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLpontoItemInactive olButton"; + temp.title = $trad("dponto"); + temp.onclick = function(){ + i3GEO.eventos.cliquePerm.desativa(); + i3GEO.editorOL.marcaBotao("editorOLponto"); + var draw = new ol.interaction.Draw({ + type : "Point" + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + var simbolo, url; + url = i3GEO.editorOL.simbologia.externalGraphic; + if(url === ""){ + simbolo = new ol.style.Circle({ + radius: i3GEO.editorOL.simbologia.pointRadius, + fill: new ol.style.Fill({ + color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' + }), + stroke: new ol.style.Stroke({ + color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', + width: i3GEO.editorOL.simbologia.pointRadius / 3 + }) + }); + } + else{ + simbolo = new ol.style.Icon({ + src : url, + size : [i3GEO.editorOL.simbologia.graphicWidth,i3GEO.editorOL.simbologia.graphicHeight] + }); + } + evt.feature.setStyle( + new ol.style.Style({ + image: simbolo + }) + ); + evt.feature.setId(i3GEO.util.uid()); + i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); + draw.setActive(false); + draw.setActive(true); + if (document.getElementById("panellistagEditor")) { + i3GEO.editorOL.listaGeometrias(); + } + }); + i3geoOL.addInteraction(draw); + }; + return temp; + }, + botaoPoligono: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLpoligonoItemInactive olButton"; + temp.title = $trad("dpol"); + temp.onclick = function(){ + i3GEO.editorOL.marcaBotao("editorOLpoligono"); + var draw = new ol.interaction.Draw({ + type : "Polygon" + }); + /* + snap = new ol.interaction.Snap({ + source: i3GEO.desenho.layergrafico.getSource() + }); + i3GEO.editorOL.interacoes.push(snap); + */ + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + evt.feature.setStyle( + new ol.style.Style({ + stroke: new ol.style.Stroke({ + color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', + width: i3GEO.editorOL.simbologia.strokeWidth + }), + fill: new ol.style.Fill({ + color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' + }) + }) + ); + evt.feature.setId(i3GEO.util.uid()); + i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); + draw.setActive(false); + draw.setActive(true); + if (document.getElementById("panellistagEditor")) { + i3GEO.editorOL.listaGeometrias(); + } + }); + i3geoOL.addInteraction(draw); + }; + return temp; + }, + botaoTexto: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLtextoItemInactive olButton"; + temp.title = $trad("dtexto"); + temp.onclick = function(){ + i3GEO.eventos.cliquePerm.desativa(); + i3GEO.editorOL.marcaBotao("editorOLtexto"); + var draw = new ol.interaction.Draw({ + type : "Point" + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + var texto = window.prompt("Texto", ""); + evt.feature.setStyle( + new ol.style.Style({ + text: new ol.style.Text({ + text: texto, + font: 'Bold ' + parseInt(i3GEO.editorOL.simbologia.fontSize,10) + 'px Arial', + textAlign: 'left', + stroke: new ol.style.Stroke({ + color: 'white', + width: i3GEO.editorOL.simbologia.strokeWidth + }), + fill: new ol.style.Fill({ + color: i3GEO.editorOL.simbologia.fontColor + }), + zIndex: 2000 + }) + }) + ); + evt.feature.setId(i3GEO.util.uid()); + i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); + draw.setActive(false); + draw.setActive(true); + i3GEO.editorOL.marcaBotao(); + }); + i3geoOL.addInteraction(draw); + }; + return temp; + }, + botaoSelecao: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLselecaoItemInactive olButton"; + temp.title = $trad("d24t"); + temp.onclick = function(){ + i3GEO.editorOL.marcaBotao("editorOLselecao"); + var sel = new ol.interaction.Select(); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(sel); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + sel.on("select", function(evt) { + var s,i, n, id, f; + n = evt.selected.length; + for(i=0; i 0){ + x = window.confirm($trad("excsel") + "?"); + if(x){ + i3GEO.editorOL.removeFeaturesSel(); + i3GEO.desenho.layergrafico.getSource().changed(); + } + } + else{ + i3GEO.janela.tempoMsg($trad("selum")); + } + }; + return temp; + }, + botaoFrente: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLfrenteItemInactive olButton"; + temp.title = $trad("frente"); + temp.onclick = function(){ + var nsel = i3GEO.editorOL.idsSelecionados.length; + if(nsel > 0){ + i3GEO.editorOL.marcaBotao(); + i3GEO.editorOL.trazParaFrente(); + } + else{ + i3GEO.janela.tempoMsg($trad("selum")); + } + }; + return temp; + }, + //FIXME Translate nao funciona nessa versao do openlayers 3x precisa atualizar + botaoEdita: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLeditaItemInactive olButton"; + temp.title = $trad("dpol"); + temp.onclick = function(){ + i3GEO.editorOL.featuresBackup = []; + var draw, nsel, f, c; + nsel = i3GEO.editorOL.idsSelecionados.length; + if(nsel > 0){ + i3GEO.editorOL.marcaBotao("editorOLedita"); + f = i3GEO.desenho.layergrafico.getSource().getFeatureById(i3GEO.editorOL.idsSelecionados[nsel - 1]); + i3GEO.editorOL.featuresBackup.push(f.clone()); + c = new ol.Collection(); + c.push(f); + draw = new ol.interaction.Modify({ + features: c + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + i3geoOL.addInteraction(draw); + } + else{ + i3GEO.janela.tempoMsg($trad("selum")); + } + }; + return temp; + }, + botaoCorta: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLcortaItemInactive olButton"; + temp.title = $trad("cortaf"); + temp.onclick = function(){ + var nsel = i3GEO.editorOL.idsSelecionados.length; + if (nsel != 1) { + alert("Selecione primeiro um elemento para ser cortado"); + } else { + i3GEO.janela.tempoMsg("Desenhe um polígono"); + i3GEO.editorOL.marcaBotao("editorOLcorta"); + var draw = new ol.interaction.Draw({ + type : "Polygon" + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + var temp, f, c, format, fwkt, cwkt; + f = evt.feature; + c = i3GEO.desenho.layergrafico.getSource().getFeatureById(i3GEO.editorOL.idsSelecionados[nsel - 1]); + i3GEO.editorOL.featuresBackup.push(c.clone()); + i3GEO.editorOL.marcaBotao(); + //corta + format = new ol.format.WKT(); + if(f && c){ + fwkt = format.writeFeatures([f]); + cwkt = format.writeFeatures([c]); + if(fwkt && cwkt){ + temp = function(retorno) { + i3GEO.janela.fechaAguarde("i3GEO.cortador"); + if (retorno != "" && retorno.data && retorno.data != "") { + i3GEO.janela.fechaAguarde("i3GEO.cortador"); + c.setGeometry(format.readGeometry(retorno.data)); + if (document.getElementById("panellistagEditor")) { + i3GEO.editorOL.listaGeometrias(); + } + } + }; + i3GEO.janela.abreAguarde("i3GEO.cortador", "Cortando"); + i3GEO.php.funcoesGeometriasWkt(temp, cwkt + "|" + fwkt, "difference"); + } + } + }); + i3geoOL.addInteraction(draw); + } + }; + return temp; + }, + botaoListaGeometrias: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLlistagItemInactive olButton"; + temp.title = $trad("listag"); + temp.onclick = function(){ + i3GEO.editorOL.listaGeometrias(); + }; + return temp; + }, + botaoAjuda: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLajudaItemInactive olButton"; + temp.title = $trad("s1"); + temp.onclick = function(){ + if(i3GEO.configura && i3GEO.configura.locaplic){ + i3GEO.janela.cria("400px", "200px", i3GEO.configura.locaplic + + "/mashups/openlayers_ajuda.php?completo=none", "", "", $trad("s1"), "editorOlAjuda"); + } + else{ + window.open("openlayers_ajuda.php"); + } + }; + return temp; + }, + botaoFecha: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLfechaItemInactive olButton"; + temp.title = $trad("x74"); + temp.onclick = function(){ + i3GEO.editorOL.unselTodos(); + i3GEO.editorOL.featuresBackup = []; + i3GEO.editorOL.marcaBotao(); + i3GEO.eventos.cliquePerm.ativa(); + $i("i3GEObarraEdicao").style.display = "none"; + }; + return temp; + }, + botaoTools: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLtoolsItemInactive olButton"; + temp.title = $trad("u15a"); + temp.onclick = function(){ + // fora do i3geo, usa o jsts + if (i3GEO.php) { + i3GEO.editorOL.ferramentas(); + } else { + i3GEO.editorOL.carregajts("i3GEO.editorOL.ferramentas()"); + } + }; + return temp; + }, + botaoPropriedades: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLpropriedadesItemInactive olButton"; + temp.title = $trad("p13"); + temp.onclick = function(){ + i3GEO.editorOL.propriedades(); + }; + return temp; + }, + botaoIdentifica: function(){ + i3GEO.eventos.cliquePerm.desativa(); + var temp = document.createElement("div"); + temp.className = "editorOLidentificaItemInactive olButton"; + temp.title = $trad("d7t"); + temp.onclick = function(){ + i3GEO.editorOL.criaJanelaAtivaTema(); + i3GEO.eventos.cliquePerm.desativa(); + i3GEO.editorOL.marcaBotao("editorOLidentifica"); + var draw = new ol.interaction.Draw({ + type : "Point" + }); + //adiciona a interacao para poder ser removida + i3GEO.editorOL.interacoes.push(draw); + i3GEO.Interface.openlayers.interacoes[0].setActive(false); + draw.on("drawend", function(evt) { + var xy, p, retorno, url, layer, tema = $i("i3GEOOLlistaTemasAtivos"); + if(tema){ + layer = i3geoOL.getLayersByName(tema.value)[0]; + url = layer.getSource().getUrls()[0]; + xy = evt.target.downPx_; + retorno = function(r){ + var valorunico = "", camada, texto = "", lonlattexto, xy, temp, temp1, n, i, f = [], textoN = r.split(":"); + camada = i3GEO.arvoreDeCamadas.pegaTema(tema.value, "", "name"); + xy = evt.feature.getGeometry().getFirstCoordinate(); + i3GEO.eventos.cliquePerm.ativo = true; + try { + if (textoN.length > 1) { + temp = textoN[2].replace(/\n\r/g, ""); + temp = temp.replace(/'/g, ""); + temp = temp.replace(/\n/g, "|"); + temp = temp.replace(/_/g, " "); + temp = temp.replace(/=/g, ":"); + temp = temp.split("|"); + n = temp.length; + for (i = 0; i < n; i++) { + temp1 = temp[i].replace(/^\s+/, ""); + temp1 = temp1.replace(/\s+$/, ""); + if (temp1 != ""){ + //verifica se a coluna eh o idunico e pega o valor + if(camada.colunaidunico != "" && temp1.split(":")[0].trim() == camada.colunaidunico){ + valorunico = temp1.split(":")[1].trim(); + temp1 = "(*) "+temp1; + } + f.push(temp1); + } + } + texto = "
" + f.join("
") + "
"; + } + } catch (e) {} + //funcao para capturar a geometria + lonlattexto = + "edita geometria
"; + i3GEO.Interface.openlayers.balao("
" + lonlattexto + texto + "
","", xy[0], xy[1], false, false); + i3GEO.eventos.cliquePerm.ativo = false; + }; + p = i3GEO.configura.locaplic + "/classesphp/proxy.php?" + + url + + "&tipoRetornoProxy=string&REQUEST=GetFeatureInfo&TIPOIMAGEM=nenhum&DESLIGACACHE=sim&STYLES=&SERVICE=WMS&VERSION=1.1.1&FEATURE_COUNT=1" + + "&FORMAT=image/png&INFO_FORMAT=text/plain&SRS=EPSG:4326" + + "&LAYERS=" + tema.value + + "&layer=" + tema.value + + "&QUERY_LAYERS=" + tema.value + + "&HEIGHT=" + i3GEO.parametros.h + + "&WIDTH=" + i3GEO.parametros.w + + "&BBOX=" + i3geoOL.getExtent().toBBOX().split(",").join(" ") + + "&X=" + xy[0] + "&Y=" + xy[1]; + cpJSON.call(p, "foo", retorno, ""); + } + }); + i3geoOL.addInteraction(draw); + }; + return temp; + }, + botaoSalva: function(){ + var temp = document.createElement("div"); + temp.className = "editorOLsalvaItemInactive olButton"; + temp.title = $trad("salva"); + temp.onclick = function(){ + i3GEO.editorOL.salvaGeometrias(); + }; + return temp; + }, criaBotoes : function(botoes) { if($i("i3GEObarraEdicao")){ $i("i3GEObarraEdicao").style.display = "block"; return; } - var temp; - //cria o painel onde entrarão os icones + //cria o painel onde entrarao os icones i3GEOpanelEditor = document.createElement("div"); i3GEOpanelEditor.id = "i3GEObarraEdicao"; i3GEOpanelEditor.className = "olControlEditingToolbar1 noprint"; //cria os icones if (botoes.procura === true) { - temp = document.createElement("div"); - temp.className = "editorOLprocuraItemInactive olButton"; - temp.title = $trad("t23"); - temp.onclick = function(){ - YAHOO.procura.container.panel.show(); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoProcura()); } if (botoes.pan === true) { - temp = document.createElement("div"); - temp.className = "editorOLpanItemInactive olButton"; - temp.title = "pan"; - temp.onclick = function(){ - i3GEO.editorOL.marcaBotao("editorOLpan"); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoPan()); } if (botoes.zoombox === true) { - temp = document.createElement("div"); - temp.className = "editorOLzoomboxItemInactive olButton"; - temp.title = "zoombox"; - temp.onclick = function(){ - i3GEO.barraDeBotoes.defBotao("zoomli").funcaoonclick; - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoZoomBox()); } if (botoes.zoomtot === true) { - temp = document.createElement("div"); - temp.className = "editorOLzoomtotItemInactive olButton"; - temp.title = $trad("d2t"); - temp.onclick = function(){ - if (i3GEO.editorOL.mapext && i3GEO.editorOL.mapext != "") { - i3GEO.Interface.openlayers.zoom2ext(i3GEO.editorOL.mapext.join(" ")); - } else { - i3GEO.Interface.openlayers.zoom2ext(i3GEO.parametros.extentTotal); - } - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoZoomTot()); } if (botoes.zoomin === true) { - temp = document.createElement("div"); - temp.className = "editorOLzoominItemInactive olButton"; - temp.title = $trad("d5t"); - temp.onclick = function(){ - var v = i3GEO.editorOL.mapa.getView(); - v.setZoom(v.getZoom() + 1); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoZoomIn()); } if (botoes.zoomout === true) { - temp = document.createElement("div"); - temp.className = "editorOLzoomoutItemInactive olButton"; - temp.title = $trad("d5t"); - temp.onclick = function(){ - var v = i3GEO.editorOL.mapa.getView(); - v.setZoom(v.getZoom() - 1); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoZoomOut()); } if (botoes.legenda === true) { - temp = document.createElement("div"); - temp.className = "editorOLlegendaItemInactive olButton"; - temp.title = $trad("p3"); - temp.onclick = function(){ - i3GEO.editorOL.mostraLegenda(); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoLegenda()); } if (botoes.distancia === true) { - temp = document.createElement("div"); - temp.className = "editorOLdistanciaItemInactive olButton"; - temp.title = $trad("d21t"); - temp.onclick = function(){ - i3GEO.editorOL.marcaBotao("editorOLdistancia"); - i3GEO.barraDeBotoes.defBotao("mede").funcaoonclick; - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoDistancia()); } if (botoes.area === true) { - temp = document.createElement("div"); - temp.className = "editorOLareaItemInactive olButton"; - temp.title = $trad("d21at"); - temp.onclick = function(){ - i3GEO.editorOL.marcaBotao("editorOLarea"); - i3GEO.barraDeBotoes.defBotao("area").funcaoonclick; - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoArea()); + } + if (botoes.identifica === true) { + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoIdentifica()); } if (botoes.linha === true) { - temp = document.createElement("div"); - temp.className = "editorOLlinhaItemInactive olButton"; - temp.title = $trad("dlinha"); - temp.onclick = function(){ - i3GEO.eventos.cliquePerm.desativa(); - i3GEO.editorOL.marcaBotao("editorOLlinha"); - var draw = new ol.interaction.Draw({ - type : "LineString" - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - //desativa ol.interaction.DoubleClickZoom - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - evt.feature.setStyle( - new ol.style.Style({ - stroke: new ol.style.Stroke({ - color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', - width: i3GEO.editorOL.simbologia.strokeWidth - }), - fill: new ol.style.Fill({ - color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' - }) - }) - ); - evt.feature.setId(i3GEO.util.uid()); - i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); - draw.setActive(false); - draw.setActive(true); - if (document.getElementById("panellistagEditor")) { - i3GEO.editorOL.listaGeometrias(); - } - }); - i3geoOL.addInteraction(draw); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoLinha()); } - //TODO falta definir imagem if (botoes.ponto === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLpontoItemInactive olButton"; - temp.title = $trad("dponto"); - temp.onclick = function(){ - i3GEO.eventos.cliquePerm.desativa(); - i3GEO.editorOL.marcaBotao("editorOLponto"); - var draw = new ol.interaction.Draw({ - type : "Point" - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - evt.feature.setStyle( - new ol.style.Style({ - image: new ol.style.Circle({ - radius: i3GEO.editorOL.simbologia.pointRadius, - fill: new ol.style.Fill({ - color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' - }), - stroke: new ol.style.Stroke({ - color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', - width: i3GEO.editorOL.simbologia.pointRadius / 3 - }) - }) - }) - ); - evt.feature.setId(i3GEO.util.uid()); - i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); - draw.setActive(false); - draw.setActive(true); - if (document.getElementById("panellistagEditor")) { - i3GEO.editorOL.listaGeometrias(); - } - }); - i3geoOL.addInteraction(draw); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoPonto()); } if (botoes.poligono === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLpoligonoItemInactive olButton"; - temp.title = $trad("dpol"); - temp.onclick = function(){ - i3GEO.editorOL.marcaBotao("editorOLpoligono"); - var draw = new ol.interaction.Draw({ - type : "Polygon" - }); - /* - snap = new ol.interaction.Snap({ - source: i3GEO.desenho.layergrafico.getSource() - }); - i3GEO.editorOL.interacoes.push(snap); - */ - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - evt.feature.setStyle( - new ol.style.Style({ - stroke: new ol.style.Stroke({ - color: 'rgba(' + i3GEO.editorOL.simbologia.strokeColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')', - width: i3GEO.editorOL.simbologia.strokeWidth - }), - fill: new ol.style.Fill({ - color: 'rgba(' + i3GEO.editorOL.simbologia.fillColor + ',' + i3GEO.editorOL.simbologia.opacidade + ')' - }) - }) - ); - evt.feature.setId(i3GEO.util.uid()); - i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); - draw.setActive(false); - draw.setActive(true); - if (document.getElementById("panellistagEditor")) { - i3GEO.editorOL.listaGeometrias(); - } - }); - i3geoOL.addInteraction(draw); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoPoligono()); } - if (botoes.texto === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLtextoItemInactive olButton"; - temp.title = $trad("dtexto"); - temp.onclick = function(){ - i3GEO.eventos.cliquePerm.desativa(); - i3GEO.editorOL.marcaBotao("editorOLtexto"); - var draw = new ol.interaction.Draw({ - type : "Point" - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - var texto = window.prompt("Texto", ""); - evt.feature.setStyle( - new ol.style.Style({ - text: new ol.style.Text({ - text: texto, - font: 'Bold ' + parseInt(i3GEO.editorOL.simbologia.fontSize,10) + 'px Arial', - textAlign: 'left', - stroke: new ol.style.Stroke({ - color: 'white', - width: i3GEO.editorOL.simbologia.strokeWidth - }), - fill: new ol.style.Fill({ - color: i3GEO.editorOL.simbologia.fontColor - }), - zIndex: 2000 - }) - }) - ); - evt.feature.setId(i3GEO.util.uid()); - i3GEO.desenho.layergrafico.getSource().addFeature(evt.feature); - draw.setActive(false); - draw.setActive(true); - i3GEO.editorOL.marcaBotao(); - }); - i3geoOL.addInteraction(draw); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoTexto()); + } + if (botoes.edita === true) { + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoEdita()); } - if (botoes.selecao === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLselecaoItemInactive olButton"; - temp.title = $trad("d24t"); - temp.onclick = function(){ - i3GEO.editorOL.marcaBotao("editorOLselecao"); - var sel = new ol.interaction.Select(); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(sel); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - sel.on("select", function(evt) { - var s,i, n, id, f; - n = evt.selected.length; - for(i=0; i 0){ - x = window.confirm($trad("excsel") + "?"); - if(x){ - i3GEO.editorOL.removeFeaturesSel(); - i3GEO.desenho.layergrafico.getSource().changed(); - } - } - else{ - i3GEO.janela.tempoMsg($trad("selum")); - } - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoApaga()); } - if (botoes.frente === true) { - temp = document.createElement("div"); - temp.className = "editorOLfrenteItemInactive olButton"; - temp.title = $trad("frente"); - temp.onclick = function(){ - var nsel = i3GEO.editorOL.idsSelecionados.length; - if(nsel > 0){ - i3GEO.editorOL.marcaBotao(); - i3GEO.editorOL.trazParaFrente(); - } - else{ - i3GEO.janela.tempoMsg($trad("selum")); - } - }; - i3GEOpanelEditor.appendChild(temp); - } - //TODO Translate nao funciona nessa versao do openlayers 3x precisa atualizar - if (botoes.edita === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLeditaItemInactive olButton"; - temp.title = $trad("dpol"); - temp.onclick = function(){ - i3GEO.editorOL.featuresBackup = []; - var draw, nsel, f, c; - nsel = i3GEO.editorOL.idsSelecionados.length; - if(nsel > 0){ - i3GEO.editorOL.marcaBotao("editorOLedita"); - f = i3GEO.desenho.layergrafico.getSource().getFeatureById(i3GEO.editorOL.idsSelecionados[nsel - 1]); - i3GEO.editorOL.featuresBackup.push(f.clone()); - c = new ol.Collection(); - c.push(f); - draw = new ol.interaction.Modify({ - features: c - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - i3geoOL.addInteraction(draw); - } - else{ - i3GEO.janela.tempoMsg($trad("selum")); - } - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoFrente()); } if (botoes.edita === true && botoes.corta === true && i3GEO.php) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLcortaItemInactive olButton"; - temp.title = $trad("cortaf"); - temp.onclick = function(){ - var nsel = i3GEO.editorOL.idsSelecionados.length; - if (nsel != 1) { - alert("Selecione primeiro um elemento para ser cortado"); - } else { - i3GEO.janela.tempoMsg("Desenhe um polígono"); - i3GEO.editorOL.marcaBotao("editorOLcorta"); - var draw = new ol.interaction.Draw({ - type : "Polygon" - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - var temp, f, c, format, fwkt, cwkt; - f = evt.feature; - c = i3GEO.desenho.layergrafico.getSource().getFeatureById(i3GEO.editorOL.idsSelecionados[nsel - 1]); - i3GEO.editorOL.featuresBackup.push(c.clone()); - i3GEO.editorOL.marcaBotao(); - //corta - format = new ol.format.WKT(); - if(f && c){ - fwkt = format.writeFeatures([f]); - cwkt = format.writeFeatures([c]); - if(fwkt && cwkt){ - temp = function(retorno) { - i3GEO.janela.fechaAguarde("i3GEO.cortador"); - if (retorno != "" && retorno.data && retorno.data != "") { - i3GEO.janela.fechaAguarde("i3GEO.cortador"); - c.setGeometry(format.readGeometry(retorno.data)); - //i3GEO.editorOL.substituiFeaturesSel(retorno.data); - if (document.getElementById("panellistagEditor")) { - i3GEO.editorOL.listaGeometrias(); - } - } - }; - i3GEO.janela.abreAguarde("i3GEO.cortador", "Cortando"); - i3GEO.php.funcoesGeometriasWkt(temp, cwkt + "|" + fwkt, "difference"); - } - } - }); - i3geoOL.addInteraction(draw); - } - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoCorta()); } if (botoes.edita === true && botoes.listag === true) { - temp = document.createElement("div"); - temp.className = "editorOLlistagItemInactive olButton"; - temp.title = $trad("listag"); - temp.onclick = function(){ - i3GEO.editorOL.listaGeometrias(); - }; - i3GEOpanelEditor.appendChild(temp); - } - if (botoes.ajuda === true) { - temp = document.createElement("div"); - temp.className = "editorOLajudaItemInactive olButton"; - temp.title = $trad("s1"); - temp.onclick = function(){ - if(i3GEO.configura && i3GEO.configura.locaplic){ - i3GEO.janela.cria("400px", "200px", i3GEO.configura.locaplic - + "/mashups/openlayers_ajuda.php?completo=none", "", "", $trad("s1"), "editorOlAjuda"); - } - else{ - window.open("openlayers_ajuda.php"); - } - }; - i3GEOpanelEditor.appendChild(temp); - } - if (botoes.fecha === true) { - temp = document.createElement("div"); - temp.className = "editorOLfechaItemInactive olButton"; - temp.title = $trad("x74"); - temp.onclick = function(){ - i3GEO.editorOL.unselTodos(); - i3GEO.editorOL.featuresBackup = []; - i3GEO.editorOL.marcaBotao(); - i3GEO.eventos.cliquePerm.ativa(); - $i("i3GEObarraEdicao").style.display = "none"; - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoListaGeometrias()); } if (botoes.tools === true) { - temp = document.createElement("div"); - temp.className = "editorOLtoolsItemInactive olButton"; - temp.title = $trad("u15a"); - temp.onclick = function(){ - // fora do i3geo, usa o jsts - if (i3GEO.php) { - i3GEO.editorOL.ferramentas(); - } else { - i3GEO.editorOL.carregajts("i3GEO.editorOL.ferramentas()"); - } - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoTools()); } if (botoes.propriedades === true) { - temp = document.createElement("div"); - temp.className = "editorOLpropriedadesItemInactive olButton"; - temp.title = $trad("p13"); - temp.onclick = function(){ - i3GEO.editorOL.propriedades(); - }; - i3GEOpanelEditor.appendChild(temp); + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoPropriedades()); } - if (botoes.identifica === true) { - i3GEO.eventos.cliquePerm.desativa(); - temp = document.createElement("div"); - temp.className = "editorOLidentificaItemInactive olButton"; - temp.title = $trad("d7t"); - temp.onclick = function(){ - i3GEO.editorOL.criaJanelaAtivaTema(); - i3GEO.eventos.cliquePerm.desativa(); - i3GEO.editorOL.marcaBotao("editorOLidentifica"); - var draw = new ol.interaction.Draw({ - type : "Point" - }); - //adiciona a interacao para poder ser removida - i3GEO.editorOL.interacoes.push(draw); - i3GEO.Interface.openlayers.interacoes[0].setActive(false); - draw.on("drawend", function(evt) { - var xy, p, retorno, url, layer, tema = $i("i3GEOOLlistaTemasAtivos"); - if(tema){ - layer = i3geoOL.getLayersByName(tema.value)[0]; - url = layer.getSource().getUrls()[0]; - xy = evt.target.downPx_; - retorno = function(r){ - var texto = "", lonlattexto, xy, temp, temp1, n, i, f = [], textoN = r.split(":"); - xy = evt.feature.getGeometry().getFirstCoordinate(); - i3GEO.eventos.cliquePerm.ativo = true; - try { - if (textoN.length > 1) { - temp = textoN[2].replace(/\n\r/g, ""); - temp = temp.replace(/'/g, ""); - temp = temp.replace(/\n/g, "|"); - temp = temp.replace(/_/g, " "); - temp = temp.replace(/=/g, ":"); - temp = temp.split("|"); - n = temp.length; - for (i = 0; i < n; i++) { - temp1 = temp[i].replace(/^\s+/, ""); - temp1 = temp1.replace(/\s+$/, ""); - if (temp1 != "") - f.push(temp1); - } - texto = "
" + f.join("
") + "
"; - } - } catch (e) {} - //funcao para capturar a geometria - lonlattexto = - "edita geometria
"; - i3GEO.Interface.openlayers.balao("
" + lonlattexto + texto + "
","", xy[0], xy[1], false, false); - i3GEO.eventos.cliquePerm.ativo = false; - }; - p = i3GEO.configura.locaplic + "/classesphp/proxy.php?" - + url - + "&tipoRetornoProxy=string&REQUEST=GetFeatureInfo&TIPOIMAGEM=nenhum&DESLIGACACHE=sim&STYLES=&SERVICE=WMS&VERSION=1.1.1&FEATURE_COUNT=1" - + "&FORMAT=image/png&INFO_FORMAT=text/plain&SRS=EPSG:4326" - + "&LAYERS=" + tema.value - + "&layer=" + tema.value - + "&QUERY_LAYERS=" + tema.value - + "&HEIGHT=" + i3GEO.parametros.h - + "&WIDTH=" + i3GEO.parametros.w - + "&BBOX=" + i3geoOL.getExtent().toBBOX().split(",").join(" ") - + "&X=" + xy[0] + "&Y=" + xy[1]; - cpJSON.call(p, "foo", retorno, ""); - } - //i3GEO.editorOL.marcaBotao(); - }); - i3geoOL.addInteraction(draw); - }; - i3GEOpanelEditor.appendChild(temp); + if (botoes.salva === true) { + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoSalva()); + } + if (botoes.ajuda === true) { + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoAjuda()); + } + if (botoes.fecha === true) { + i3GEOpanelEditor.appendChild(i3GEO.editorOL.botaoFecha()); } i3GEOpanelEditor.style.width = i3GEOpanelEditor.getElementsByTagName("div").length * 33 + "px"; i3GEO.editorOL.mapa.getViewport().getElementsByClassName("ol-overlaycontainer-stopevent")[0].appendChild(i3GEOpanelEditor); - - /* - if (botoes.salva === true) { - - button = new OpenLayers.Control.Button({ - displayClass : "editorOLsalva", - trigger : function() { - i3GEO.editorOL.salvaGeometrias(); - }, - title : $trad("salva"), - type : OpenLayers.Control.TYPE_BUTTON - }); - controles.push(button); - adiciona = true; - - } - */ }, removeFeaturesSel : function(){ var s, i, nsel, f; @@ -1617,13 +1617,24 @@ i3GEO.editorOL = for(i=0; i' + '' + '' - + '

Cor do preenchimento

' + + '

Cor do preenchimento

' + '
' + '' + '
' - + '

Cor da fonte

' + + '

Cor da fonte

' + '
' + '' + '
' - + '

Tamanho da fonte

' + + '

Tamanho da fonte

' + '
' + '' + '
' - + '

Opacidade (de 0 a 1)

' + + '

Opacidade (de 0 a 1)

' + '
' + '' + '
' - + '

Largura da linha/contorno

' + + '

Largura da linha/contorno

' + '
' + '' + + '
' + + '

Url de uma imagem

' + + '
' + + '' + + '
' + + '

Largura da imagem

' + + '
' + + '' + + '
' + + '

Altura da imagem

' + + '
' + + '' + '
'; - //TODO incluir propriedades de uma figura - /* - + ' ' - + ' Url de uma figura' - + ' ' - + ' ' - + ' Largura e altura ' - + ' ' - */ - //TODO implementar ao atualizar OL3 /* + '
' @@ -1993,9 +2000,6 @@ i3GEO.editorOL = } var polis, linhas, pontos, temp, nsel = i3GEO.editorOL.idsSelecionados.length; if (nsel > 0) { - polis = i3GEO.editorOL.retornaGeometriasTipo("Polygon"); - linhas = i3GEO.editorOL.retornaGeometriasTipo("LineString"); - pontos = i3GEO.editorOL.retornaGeometriasTipo("Point"); temp = function(retorno) { if (i3GEO.janela) { i3GEO.janela.fechaAguarde("i3GEO.editorPoli"); @@ -2011,6 +2015,9 @@ i3GEO.editorOL = } }; if (operacao === "incorporar") { + polis = i3GEO.editorOL.retornaFeaturesTipo("Polygon"); + linhas = i3GEO.editorOL.retornaFeaturesTipo("LineString"); + pontos = i3GEO.editorOL.retornaFeaturesTipo("Point"); if (polis.length > 0) { temp = i3GEO.editorOL.merge(polis); } @@ -2026,6 +2033,9 @@ i3GEO.editorOL = return; } if (operacao === "union" && !i3GEO.php) { + polis = i3GEO.editorOL.retornaFeaturesTipo("Polygon"); + linhas = i3GEO.editorOL.retornaFeaturesTipo("LineString"); + pontos = i3GEO.editorOL.retornaFeaturesTipo("Point"); if (polis.length > 0) { temp = i3GEO.editorOL.uniaojts(polis); i3GEO.editorOL.substituiFeaturesSel(temp); @@ -2039,6 +2049,9 @@ i3GEO.editorOL = i3GEO.editorOL.substituiFeaturesSel(temp); } } else { + polis = i3GEO.editorOL.retornaGeometriasTipo("Polygon"); + linhas = i3GEO.editorOL.retornaGeometriasTipo("LineString"); + pontos = i3GEO.editorOL.retornaGeometriasTipo("Point"); if (polis.length > 0) { i3GEO.janela.abreAguarde("i3GEO.editorPoli", "Poligonos"); i3GEO.php.funcoesGeometriasWkt(temp, polis.join("|"), operacao); @@ -2059,8 +2072,12 @@ i3GEO.editorOL = } }, merge : function(geoms) { - var n = geoms.length, w = new Wkt.Wkt(), g, m, i, format = new ol.format.WKT(); - w.read(format.writeFeatures([geoms[0]])); + var n = geoms.length, + w = new Wkt.Wkt(), + g, m, i,f, + format = new ol.format.WKT(); + f = format.writeFeatures([geoms[0]]); + w.read(f); if (n > 1) { for (i = 1; i < n; i++) { g = format.writeFeatures([geoms[i]]); @@ -2078,12 +2095,15 @@ i3GEO.editorOL = wwkt = new jsts.io.WKTWriter(), g, i, uniao; if (n > 1) { + //converte em wkt uniao = fwkt.writeFeatures([geoms[0]]); + //le na jsts uniao = rwkt.read(uniao); for (i = 1; i <= n; i++) { g = fwkt.writeFeatures([geoms[i]]); uniao = uniao.union(rwkt.read(g)); } + //gera em wkt uniao = wwkt.write(uniao); return [ fwkt.readFeatures(uniao) @@ -2104,6 +2124,17 @@ i3GEO.editorOL = } return lista; }, + retornaFeaturesTipo : function(tipo) { + var n = i3GEO.editorOL.idsSelecionados.length, lista = [], i, + s = i3GEO.desenho.layergrafico.getSource(); + for (i = 0; i < n; i++) { + f = s.getFeatureById(i3GEO.editorOL.idsSelecionados[i]); + if (f.getGeometry().getType() == tipo) { + lista.push(f); + } + } + return lista; + }, guardaBackup : function() { return; // if(!i3GEO.editorOL.backup) @@ -2142,10 +2173,24 @@ i3GEO.editorOL = }) }) ); - f.setProperties({ - fillColor: st.getImage().getFill().getColor(), - strokeColor: st.getImage().getStroke().getColor() - }); + if(st.getImage().getSrc){ + f.setProperties({ + fillColor: "", + strokeColor: "", + externalGraphic: st.getImage().getSrc(), + graphicHeight : st.getImage().getSize()[1], + graphicWidth : st.getImage().getSize()[0] + }); + } + else{ + f.setProperties({ + fillColor: st.getImage().getFill().getColor(), + strokeColor: st.getImage().getStroke().getColor(), + externalGraphic: "", + graphicHeight: "", + graphicWidth: "" + }); + } } else{ f.setProperties({ @@ -2168,20 +2213,32 @@ i3GEO.editorOL = st = f.getStyle(); //caso de ponto if(st.getImage()){ - f.setStyle( - new ol.style.Style({ - image: new ol.style.Circle({ - radius: i3GEO.editorOL.simbologia.pointRadius, - fill: new ol.style.Fill({ - color: f.getProperties().fillColor - }), - stroke: new ol.style.Stroke({ - color: f.getProperties().strokeColor, - width: i3GEO.editorOL.simbologia.pointRadius / 3 + if(st.getImage().getSrc || f.getProperties().externalGraphic != ""){ + f.setStyle( + new ol.style.Style({ + image: new ol.style.Icon({ + src : f.getProperties().externalGraphic, + size : [f.getProperties().graphicWidth,f.getProperties().graphicHeight] }) }) - }) - ); + ); + } + else{ + f.setStyle( + new ol.style.Style({ + image: new ol.style.Circle({ + radius: i3GEO.editorOL.simbologia.pointRadius, + fill: new ol.style.Fill({ + color: f.getProperties().fillColor + }), + stroke: new ol.style.Stroke({ + color: f.getProperties().strokeColor, + width: i3GEO.editorOL.simbologia.pointRadius / 3 + }) + }) + }) + ); + } } else{ st.getFill().setColor(f.getProperties().fillColor); @@ -2205,8 +2262,14 @@ i3GEO.editorOL = s = i3GEO.desenho.layergrafico.getSource(); f = s.getFeatureById(id); if(f){ - f.getStyle().getFill().setColor(f.getProperties().fillColor); - f.getStyle().getStroke().setColor(f.getProperties().strokeColor); + if(f.getStyle().getSrc()){ + f.getStyle().setSrc(f.getProperties().externalGraphic); + f.getStyle().setSize([f.getProperties().graphicWidth,f.getProperties().graphicHeight]); + } + else{ + f.getStyle().getFill().setColor(f.getProperties().fillColor); + f.getStyle().getStroke().setColor(f.getProperties().strokeColor); + } } i3GEO.editorOL.idsSelecionados.remove(id); i3GEO.desenho.layergrafico.getSource().changed(); @@ -2294,7 +2357,8 @@ i3GEO.editorOL = i3GEO.editorOL.idsSelecionados.push(id); f.setProperties({ fillColor: f.getStyle().getFill().getColor(), - strokeColor: f.getStyle().getStroke().getColor() + strokeColor: f.getStyle().getStroke().getColor(), + externalGraphic: "" }); f.getStyle().getFill().setColor('rgba(255, 255, 255, 0.5)'); f.getStyle().getStroke().setColor('blue'); @@ -2347,8 +2411,7 @@ i3GEO.editorOL = }, google2wgs : function(obj) { if (i3GEO.Interface.openlayers.googleLike === true) { - var projWGS84 = new OpenLayers.Projection("EPSG:4326"), proj900913 = new OpenLayers.Projection("EPSG:900913"); - return obj.transform(proj900913, projWGS84); + return obj.transform("EPSG:900913","EPSG:4326"); } else { return obj; } diff --git a/ferramentas/importarwmc/upload.php b/ferramentas/importarwmc/upload.php index 900a1d8..88aae4d 100644 --- a/ferramentas/importarwmc/upload.php +++ b/ferramentas/importarwmc/upload.php @@ -10,6 +10,7 @@ $map_file = $_SESSION["map_file"]; ?> + diff --git a/ferramentas/imprimir/a4l.htm b/ferramentas/imprimir/a4l.htm index 9692030..ab8fb28 100644 --- a/ferramentas/imprimir/a4l.htm +++ b/ferramentas/imprimir/a4l.htm @@ -1,5 +1,6 @@ + diff --git a/ferramentas/imprimir/a4p.htm b/ferramentas/imprimir/a4p.htm index 9692030..ab8fb28 100644 --- a/ferramentas/imprimir/a4p.htm +++ b/ferramentas/imprimir/a4p.htm @@ -1,5 +1,6 @@ + diff --git a/ferramentas/loginusuario/index.js b/ferramentas/loginusuario/index.js index d649c4f..2865580 100644 --- a/ferramentas/loginusuario/index.js +++ b/ferramentas/loginusuario/index.js @@ -113,11 +113,15 @@ i3GEOF.loginusuario = { usuario = ""; } ins = '

'+$trad("x30")+': '+u+"" + - '

'+$trad("x27")+':
' + - '' + - '

'+$trad("x28")+':
' + - '
' + - '

 ' + + '

'+$trad("x27")+':

' + + '
' + + '' + + '
' + + '

'+$trad("x28")+':

' + + '
' + + '
' + + '
' + + '

 ' + '

'+$trad("x32")+'

' + '

'+$trad("x52")+'

' + '
'; diff --git a/ferramentas/tabela/relatorio.php b/ferramentas/tabela/relatorio.php index 9e4cb48..db20c42 100644 --- a/ferramentas/tabela/relatorio.php +++ b/ferramentas/tabela/relatorio.php @@ -291,7 +291,7 @@ function calculaarea($geo) $g = $geo->towkt(); $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=laea,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=500000,y_0=10000000,ellps=GRS67,units=m,no_defs"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); diff --git a/ferramentas/upload/upload.php b/ferramentas/upload/upload.php index baaf60b..37609a7 100644 --- a/ferramentas/upload/upload.php +++ b/ferramentas/upload/upload.php @@ -19,6 +19,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/ferramentas/uploaddbf/upload.php b/ferramentas/uploaddbf/upload.php index 1a41cbb..61321d2 100644 --- a/ferramentas/uploaddbf/upload.php +++ b/ferramentas/uploaddbf/upload.php @@ -13,6 +13,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadgpx/upload.php b/ferramentas/uploadgpx/upload.php index 5a5ef2d..580c671 100644 --- a/ferramentas/uploadgpx/upload.php +++ b/ferramentas/uploadgpx/upload.php @@ -14,6 +14,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadkml/upload.php b/ferramentas/uploadkml/upload.php index 9ff9b43..bfeffba 100644 --- a/ferramentas/uploadkml/upload.php +++ b/ferramentas/uploadkml/upload.php @@ -14,6 +14,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadsimbolo/upload.php b/ferramentas/uploadsimbolo/upload.php index c463129..f64b7a8 100644 --- a/ferramentas/uploadsimbolo/upload.php +++ b/ferramentas/uploadsimbolo/upload.php @@ -12,6 +12,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/imagens/oxygen/22x22/preferences-desktop-user-password.png b/imagens/oxygen/22x22/preferences-desktop-user-password.png new file mode 100644 index 0000000..9976e34 Binary files /dev/null and b/imagens/oxygen/22x22/preferences-desktop-user-password.png differ diff --git a/imagens/oxygen/22x22/system-users.png b/imagens/oxygen/22x22/system-users.png new file mode 100644 index 0000000..da48b18 Binary files /dev/null and b/imagens/oxygen/22x22/system-users.png differ -- libgit2 0.21.2