From 25de42cca178c7b7e9d6e9ad569d7d38aef55443 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Mon, 18 Jul 2011 22:21:57 +0000 Subject: [PATCH] --- admin/admin.db | Bin 73728 -> 0 bytes admin/js/arvore.js | 2 +- admin/js/editormapfile.js | 12 +++++++++--- admin/js/listatemas.js | 2 +- admin/php/editormapfile.php | 9 +++++++-- admin/php/editortexto.php | 1 + admin/php/menutemas.php | 12 +++++++----- classesphp/classe_alteraclasse.php | 6 +----- classesphp/classe_temas.php | 2 +- ferramentas/salvamapfile/index.js.php | 4 ++-- temas/acidmap.map | 6 +++++- temas/atlas_biomas.map | 10 +++++++--- temas/biomashp.map | 73 ++++++++++++++++++++++++++++++++++++------------------------------------- 13 files changed, 78 insertions(+), 61 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index b826e26..da352e5 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/js/arvore.js b/admin/js/arvore.js index 3a35320..babab60 100644 --- a/admin/js/arvore.js +++ b/admin/js/arvore.js @@ -544,7 +544,7 @@ function novoSubGrupo(id_menu,id_n1) var d = {idmenu:id_menu,html:conteudo,id_n2:dados.id_n2,tipo:"subgrupo"} var tempNode = new YAHOO.widget.HTMLNode(d, no, false,true); tempNode.isLeaf = false; - tempNode.setDynamicLoad(loadSubgruposData, temaIconMode, id_menu); + tempNode.setDynamicLoad(loadTemasData, temaIconMode, id_menu); tree.draw(); core_carregando("desativa"); editar("subgrupo",dados.id_n2); diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js index 2f52207..70eea4b 100644 --- a/admin/js/editormapfile.js +++ b/admin/js/editormapfile.js @@ -673,8 +673,10 @@ function classesAuto(codigoMap,codigoLayer) { var dados = YAHOO.lang.JSON.parse(o.responseText) var nos = tree.getNodesByProperty("classes",codigoMap+"_"+codigoLayer) - for (var i=0, j=nos.length; ilistaSimbolos($tipo,$dir_tmp,"",$onclick)); exit; diff --git a/admin/php/editortexto.php b/admin/php/editortexto.php index 3076ba0..6298a13 100644 --- a/admin/php/editortexto.php +++ b/admin/php/editortexto.php @@ -13,6 +13,7 @@ Documentação do Mapserver

+Voltar

" method=post > (Salve antes de testar)

diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php index ae5aa2b..6c14d96 100644 --- a/admin/php/menutemas.php +++ b/admin/php/menutemas.php @@ -1003,7 +1003,7 @@ Altera o registro de um tema. Se id for vazio acrescenta o registro */ function alteraTemas() { - global $nome,$desc,$id,$codigo,$tipoa,$download,$ogc,$kml,$link,$tags,$kmz,$locaplic; + global $nome,$desc,$id,$codigo,$tipoa,$download,$ogc,$kml,$link,$tags,$kmz,$locaplic,$es,$it,$en; //error_reporting(E_ALL); try { @@ -1018,9 +1018,9 @@ function alteraTemas() if($id != "") { if(!isset($kmz)) - $dbhw->query("UPDATE i3geoadmin_temas SET tags_tema='$tags', link_tema='$link', nome_tema ='$nome',desc_tema='$desc',codigo_tema='$codigo',tipoa_tema='$tipoa',download_tema='$download',ogc_tema='$ogc',kml_tema='$kml' WHERE id_tema = $id"); + $dbhw->query("UPDATE i3geoadmin_temas SET es='$es', it='$it', en='$en', tags_tema='$tags', link_tema='$link', nome_tema ='$nome',desc_tema='$desc',codigo_tema='$codigo',tipoa_tema='$tipoa',download_tema='$download',ogc_tema='$ogc',kml_tema='$kml' WHERE id_tema = $id"); else - $dbhw->query("UPDATE i3geoadmin_temas SET tags_tema='$tags', link_tema='$link', nome_tema ='$nome',desc_tema='$desc',codigo_tema='$codigo',tipoa_tema='$tipoa',download_tema='$download',ogc_tema='$ogc',kml_tema='$kml',kmz_tema='$kmz' WHERE id_tema = $id"); + $dbhw->query("UPDATE i3geoadmin_temas SET es='$es', it='$it', en='$en',tags_tema='$tags', link_tema='$link', nome_tema ='$nome',desc_tema='$desc',codigo_tema='$codigo',tipoa_tema='$tipoa',download_tema='$download',ogc_tema='$ogc',kml_tema='$kml',kmz_tema='$kmz' WHERE id_tema = $id"); $retorna = $id; if(!isset($kmz)){$kmz = "nao";} $sql = "SELECT * from i3geoadmin_temas where id_tema = '$id'"; @@ -1033,13 +1033,15 @@ function alteraTemas() { $mapa = ms_newMapObj($mapfile); $nomes = $mapa->getalllayernames(); - foreach($nomes as $nome) + foreach($nomes as $n) { - $layer = $mapa->getlayerbyname($nome); + $layer = $mapa->getlayerbyname($n); $layer->setmetadata("permitedownload",strtolower($download)); $layer->setmetadata("permiteogc",strtolower($ogc)); $layer->setmetadata("permitekml",strtolower($kml)); $layer->setmetadata("permitekmz",strtolower($kmz)); + if(count($nomes) == 1) + {$layer->setmetadata("tema",$nome);} } $mapa->save($mapfile); removeCabecalho($mapfile); diff --git a/classesphp/classe_alteraclasse.php b/classesphp/classe_alteraclasse.php index 0b7f522..3ad1c50 100644 --- a/classesphp/classe_alteraclasse.php +++ b/classesphp/classe_alteraclasse.php @@ -396,14 +396,10 @@ $itemNome - item que será usado para definir os nomes das classes (por default s $nomes = array(); foreach($temp as $t) {$nomes[] = $t;} - //$valoresu = array_unique($v); - // processa array com os valores - //rsort($valoresu); - //reset($valoresu); $nclassexist = $this->layer->numclasses; if ($nclassexist > count($valores)) {$nclassexist = count($valores);} - if($nclassexist == 0) + if($this->layer->numclasses == 0) { $temp = ms_newClassObj($this->layer); ms_newStyleObj($temp); diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index f0cfa12..60e33e2 100644 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -892,7 +892,7 @@ lista - lista de item e cores de cada parte do grafico $novolayer = ms_newLayerObj($this->mapa, $this->layer); $nomer = nomeRandomico(); $novolayer->set("name",$nomer); - $novolayer->set("group",$nomer); + //$novolayer->set("group",$nomer); $novolayer->set("type",MS_LAYER_CHART); $novolayer->setprocessing("CHART_TYPE=$tipo"); $novolayer->setprocessing("CHART_SIZE=$tamanho"); diff --git a/ferramentas/salvamapfile/index.js.php b/ferramentas/salvamapfile/index.js.php index 20c6cfe..96f6704 100644 --- a/ferramentas/salvamapfile/index.js.php +++ b/ferramentas/salvamapfile/index.js.php @@ -72,11 +72,11 @@ i3GEOF.salvamapfile = { var nome = retorno.data.nomeoriginal; if(nome == "") { - $i(iddiv).innerHTML = "

Não existe um arquivo mapfile em i3geo/temas já criado para essa camada. Utilize o sistema de admnistração para criar um" + $i(iddiv).innerHTML = "

Não existe um arquivo mapfile em i3geo/temas já criado para essa camada. Utilize o sistema de administração para criar um" } else { - var ins = "

O tema ativo possui um mapfile já criado. Ao salvar, as definições originais de legenda, filtros e outras, serão substituídas pelas atuais

" + + var ins = "

O tema ("+nome+") ativo possui um mapfile já criado. Ao salvar, as definições originais de legenda, filtros e outras, serão substituídas pelas atuais

" + '

  '; $i(iddiv).innerHTML = ins; new YAHOO.widget.Button( diff --git a/temas/acidmap.map b/temas/acidmap.map index a5e32f2..5463cd2 100644 --- a/temas/acidmap.map +++ b/temas/acidmap.map @@ -10,14 +10,18 @@ MAP "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" "wfs" "nao" + "permitekmz" "nao" "wms_force_separate_request" "1" "TEXTO" "NAO" "formatosinfo" "text/plain,application/vnd.ogc.gml,text/html" "wms_name" "i3geo:locali" "nomeoriginal" "i3geo:locali" + "permitedownload" "sim" "wms_format" "image/png" "wms_formatlist" "image/png,application/atom xml,application/atom xml,application/openlayers,application/pdf,application/rss xml,application/rss xml,application/vnd.google-earth.kml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kmz,application/vnd.google-earth.kmz xml,application/vnd.google-earth.kmz xml,atom,image/geotiff,image/geotiff8,image/gif,image/jpeg,image/png8,image/svg,image/svg xml,image/svg xml,image/tiff,image/tiff8,kml,kmz,openlayers,rss" - "tema" "i3geo:locali" + "permiteogc" "sim" + "permitekml" "sim" + "tema" "Acid Mapsx" "wms_server_version" "1.1.1" "wms_style" "" END diff --git a/temas/atlas_biomas.map b/temas/atlas_biomas.map index a8d3105..6c363ce 100644 --- a/temas/atlas_biomas.map +++ b/temas/atlas_biomas.map @@ -9,13 +9,17 @@ MAP "wms_srs" "EPSG:4291 EPSG:4326" "wms_exceptions_format" "application/vnd.ogc.se_xml" "CLASSE" "SIM" + "permitekmz" "" "wms_force_separate_request" "1" - "wms_name" "bioma" "formatosinfo" "text/plain,application/vnd.ogc.gml" - "wms_formatlist" "image/gif,image/png,image/png; mode=24bit,image/jpeg,image/wbmp,image/tiff" + "wms_name" "bioma" + "permitedownload" "sim" "wms_format" "image/png" + "wms_formatlist" "image/gif,image/png,image/png; mode=24bit,image/jpeg,image/wbmp,image/tiff" "wms_connectiontimeout" "30" - "TEMA" "Biomas segundo IBGE-MMA" + "permitekml" "sim" + "permiteogc" "sim" + "TEMA" "atlas_biomas" "wms_server_version" "1.1.0" "wms_style" "default" END diff --git a/temas/biomashp.map b/temas/biomashp.map index 70bdf37..605bb4f 100644 --- a/temas/biomashp.map +++ b/temas/biomashp.map @@ -1,37 +1,36 @@ -MAP - FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt" - SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym" +MAP + FONTSET "c:\ms4w\apache\htdocs\i3geo/symbols/fontes.txt" + SYMBOLSET "c:\ms4w\apache\htdocs\i3geo/symbols/simbolos.sym" LAYER - - CONNECTION "" + CONNECTION "" DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp" GROUP "Grupo 1" METADATA - "ltempoitemimagem" "" "cache" "" - "CLASSE" "SIM" + "ltempoitemimagem" "" "ltempoitemdescricao" "" - "palletestep" "" + "CLASSE" "SIM" "ltempoiteminicio" "" - "permitekmz" "sim" + "palletestep" "" "ltempoitemtip" "" - "iconetema" "http://www.gpsdrive.de/development/map-icons/square.small/leisure/park.png" - "description_template" "" + "permitekmz" "sim" "ltempoitemtitulo" "" + "description_template" "" + "iconetema" "http://www.gpsdrive.de/development/map-icons/square.small/leisure/park.png" "ltempoitemlink" "" + "extensao" "-44 -23 -39 -21" "palletefile" "" - "permitedownload" "sim" "ltempoformatodata" "" + "permitedownload" "sim" "ltempoitemicone" "" "download" "SIM" - "permitekml" "sim" "permiteogc" "" - "TEMA" "Biomas shapefile x" - "identifica" "NAO" + "permitekml" "sim" + "TEMA" "biomashp" + "aplicaextensao" "SIM" "editorsql" "" + "identifica" "NAO" "ltempoitemfim" "" - "extensao" "-44 -23 -39 -21" - "aplicaextensao" "SIM" END NAME "biomashp" STATUS OFF @@ -41,62 +40,62 @@ MAP UNITS METERS CLASS NAME "CAATINGA" - EXPRESSION ('[ID]'eq'2.00') + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') STYLE ANGLE 360 - COLOR 138 134 150 - OPACITY 100 + COLOR 21 44 114 SYMBOL 0 + WIDTH 1 END END CLASS NAME "PAMPA" - EXPRESSION ('[ID]'eq'5.00') + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA') STYLE ANGLE 360 - COLOR 105 219 217 - OPACITY 100 + COLOR 225 189 199 SYMBOL 0 + WIDTH 1 END END CLASS NAME "CERRADO" - EXPRESSION ('[ID]'eq'3.00') + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO') STYLE ANGLE 360 - COLOR 186 52 176 - OPACITY 100 + COLOR 17 235 39 SYMBOL 0 + WIDTH 1 END END CLASS NAME "PANTANAL" - EXPRESSION ('[ID]'eq'6.00') + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL') STYLE ANGLE 360 - COLOR 125 128 2 - OPACITY 100 + COLOR 242 192 145 SYMBOL 0 + WIDTH 1 END END CLASS - NAME "AMAZÔNIA" - EXPRESSION ('[ID]'eq'1.00') + NAME "AMAZONIA" + EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA') STYLE ANGLE 360 - COLOR 129 234 3 - OPACITY 100 + COLOR 149 120 37 SYMBOL 0 + WIDTH 1 END END CLASS - NAME "MATA ATLÂNTICA" - EXPRESSION ('[ID]'eq'4.00') + NAME "MATA ATLANTICA" + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA') STYLE ANGLE 360 - COLOR 159 226 219 - OPACITY 100 + COLOR 208 160 125 SYMBOL 0 + WIDTH 1 END END END -- libgit2 0.21.2