From 77f09ebdf8fe37c5768612e4b07001802ad87c34 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Fri, 13 Jan 2012 17:31:26 +0000 Subject: [PATCH] --- admin/admin.db | Bin 75776 -> 0 bytes admin/php/xml.php | 5 ++++- atlas/geral.htm | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------- css/botoes.css | 11 ++++++++++- css/botoes2.css | 12 +++++++++++- css/i3geo46.css | 12 +++++++++++- css/i3geo46.css.php | 12 +++++++++++- documentacao/manual_de_usuário_do_i3geo.odt | Bin 269259 -> 0 bytes mashups/index.html | 4 ++-- mashups/openlayers.js.php | 12 +++--------- mashups/openlayers.php | 1 - mashups/openlayers_compacto.js | 12 +++--------- mashups/openlayers_compacto.js.php | 12 +++--------- 13 files changed, 154 insertions(+), 102 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index cc0111c..d8e56b4 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/php/xml.php b/admin/php/xml.php index 6eee1fc..848c7d3 100644 --- a/admin/php/xml.php +++ b/admin/php/xml.php @@ -444,7 +444,10 @@ function geraXmlRSS($locaplic,$sql,$descricao) $xml .= "\n"; $xml .= "".entity_decode($row["nome_ws"])."\n"; $xml .= "".xmlTexto_prepara(entity_decode($row["desc_ws"]))."\n"; - $xml .= "http://".$_SERVER["HTTP_HOST"].dirname($_SERVER["REQUEST_URI"])."/".xmlTexto_prepara($row["link_ws"])."\n"; + $link = xmlTexto_prepara($row["link_ws"]); + if(stristr($link, 'http') === FALSE) + {$link = "http://".$_SERVER["HTTP_HOST"].dirname($_SERVER["REQUEST_URI"])."/".$link;} + $xml .= "".$link."\n"; $xml .= "\n"; $xml .= "".xmlTexto_prepara($row["autor_ws"])."\n"; $xml .= "\n"; diff --git a/atlas/geral.htm b/atlas/geral.htm index 52d2bd0..ed8f1ab 100644 --- a/atlas/geral.htm +++ b/atlas/geral.htm @@ -22,12 +22,9 @@ - - -
-
@@ -35,7 +32,6 @@
@@ -45,7 +41,7 @@ - +
@@ -84,23 +80,22 @@ - -geoprocessamento@mma.gov.br -
-

- - - - - - - - - - +

i3Geo - Software livre para criação de mapas interativos e geoprocessamento

Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro

logomarca
-
+ + + + + + + + +

i3Geo - Software livre para criação de mapas interativos e geoprocessamento

Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro

+ +
diff --git a/css/botoes.css b/css/botoes.css index 329323b..5b2fb9b 100644 --- a/css/botoes.css +++ b/css/botoes.css @@ -2,7 +2,16 @@ utiliza botões antigos até a versão 4.4 do i3geo */ #importarwmc,#soltaLeg,#uploadgpx,#metar,#carouselTemas,#identificaBalao,#rota,#buscafotos,#area,#confluence,#scielo,#wiki,#inseregrafico,#realca,#reinicia,#google,#zoomtot,#pan,#zoomli,#zoomlo,#zoomiauto,#zoomoauto,#identifica,#lentei,#reinicia,#exten,#selecao,#inserexy,#textofid,#mede,#cruza,#tamanho,#imprimir,#salva,#carrega,#referencia,#pegaimagens,#v3d -{cursor:pointer;border: 0px solid rgb(50,50,50);border-bottom:1px solid rgb(50,50,50);border-left:1px solid rgb(50,50,50);width:22;height:22;z-index:1000;position:relative;} +{ + cursor:pointer; + border: 0px solid rgb(50,50,50); + border-bottom:1px solid rgb(50,50,50); + border-left:1px solid rgb(50,50,50); + width:22px; + height:22px; + z-index:1000; + position:relative; +} #box1 {font-size:0px;cursor:crosshair;opacity:.25;background-color: gray;position: absolute;visibility: hidden;width: 0px;height: 0px;border: 2px solid #ff0000;} #boxg diff --git a/css/botoes2.css b/css/botoes2.css index 9430d60..64c6db0 100644 --- a/css/botoes2.css +++ b/css/botoes2.css @@ -1,5 +1,15 @@ #localizar,#barraedicao,#abregoogleearth,#uploadgpx,#metar,#carouselTemas,#identificaBalao,#rota,#buscafotos,#area,#confluence,#scielo,#wiki,#inseregrafico,#realca,#reinicia,#google,#zoomtot,#pan,#zoomli,#zoomlo,#zoomiauto,#zoomoauto,#identifica,#lentei,#reinicia,#exten,#selecao,#inserexy,#textofid,#mede,#perfil,#cruza,#tamanho,#imprimir,#salva,#carrega,#referencia,#pegaimagens,#v3d -{margin:2px;cursor:pointer;border: 0px solid rgb(50,50,50);border-bottom:1px solid rgb(50,50,50);border-left:1px solid rgb(50,50,50);width:24;height:24;z-index:1000;position:relative;} +{ + margin:2px; + cursor:pointer; + border: 0px solid rgb(50,50,50); + border-bottom:1px solid rgb(50,50,50); + border-left:1px solid rgb(50,50,50); + width:24px; + height:24px; + z-index:1000; + position:relative; +} #box1 {font-size:0px;cursor:crosshair;opacity:.25;background-color: gray;position: absolute;visibility: hidden;width: 0px;height: 0px;border: 2px solid #ff0000;} #boxg diff --git a/css/i3geo46.css b/css/i3geo46.css index 1e4571a..0f98e8f 100644 --- a/css/i3geo46.css +++ b/css/i3geo46.css @@ -201,7 +201,17 @@ cursor: se-resize; #localizarxy {display:none !important;} } #localizar,#barraedicao,#abregoogleearth,#uploadgpx,#metar,#carouselTemas,#identificaBalao,#rota,#buscafotos,#area,#confluence,#scielo,#wiki,#inseregrafico,#realca,#reinicia,#google,#zoomtot,#pan,#zoomli,#zoomlo,#zoomiauto,#zoomoauto,#identifica,#lentei,#reinicia,#exten,#selecao,#inserexy,#textofid,#mede,#perfil,#cruza,#tamanho,#imprimir,#salva,#carrega,#referencia,#pegaimagens,#v3d -{margin:2px;cursor:pointer;border: 0px solid rgb(50,50,50);border-bottom:1px solid rgb(50,50,50);border-left:1px solid rgb(50,50,50);width:24;height:24;z-index:1000;position:relative;} +{ +margin:2px; +cursor:pointer; +border: 0px solid rgb(50,50,50); +border-bottom:1px solid rgb(50,50,50); +border-left:1px solid rgb(50,50,50); +width:24px; +height:24px; +z-index:1000; +position:relative; +} #box1 {font-size:0px;cursor:crosshair;opacity:.25;background-color: gray;position: absolute;visibility: hidden;width: 0px;height: 0px;border: 2px solid #ff0000;} #boxg diff --git a/css/i3geo46.css.php b/css/i3geo46.css.php index 806b3d8..3655b64 100644 --- a/css/i3geo46.css.php +++ b/css/i3geo46.css.php @@ -201,7 +201,17 @@ cursor: se-resize; #localizarxy {display:none !important;} } #localizar,#barraedicao,#abregoogleearth,#uploadgpx,#metar,#carouselTemas,#identificaBalao,#rota,#buscafotos,#area,#confluence,#scielo,#wiki,#inseregrafico,#realca,#reinicia,#google,#zoomtot,#pan,#zoomli,#zoomlo,#zoomiauto,#zoomoauto,#identifica,#lentei,#reinicia,#exten,#selecao,#inserexy,#textofid,#mede,#perfil,#cruza,#tamanho,#imprimir,#salva,#carrega,#referencia,#pegaimagens,#v3d -{margin:2px;cursor:pointer;border: 0px solid rgb(50,50,50);border-bottom:1px solid rgb(50,50,50);border-left:1px solid rgb(50,50,50);width:24;height:24;z-index:1000;position:relative;} +{ +margin:2px; +cursor:pointer; +border: 0px solid rgb(50,50,50); +border-bottom:1px solid rgb(50,50,50); +border-left:1px solid rgb(50,50,50); +width:24px; +height:24px; +z-index:1000; +position:relative; +} #box1 {font-size:0px;cursor:crosshair;opacity:.25;background-color: gray;position: absolute;visibility: hidden;width: 0px;height: 0px;border: 2px solid #ff0000;} #boxg diff --git a/documentacao/manual_de_usuário_do_i3geo.odt b/documentacao/manual_de_usuário_do_i3geo.odt index 782a680..7cc7bcf 100644 Binary files a/documentacao/manual_de_usuário_do_i3geo.odt and b/documentacao/manual_de_usuário_do_i3geo.odt differ diff --git a/mashups/index.html b/mashups/index.html index eba646a..3e1a619 100644 --- a/mashups/index.html +++ b/mashups/index.html @@ -26,8 +26,8 @@ body,td conter um grande número de funcionalidades.

Para ver todos os parâmetros: i3geo/mashups/openlayers.php

O gerador de Web Services do i3GEO pode ser utilizado para abrir o mashup. Exemplo: ogc.php?temas=biomashp&format=application/openlayers&bbox=-54,-14,-50,-10

-

Exemplo: todas as opções e um tema adicionado openlayers.php?temas=biomashp&largura=800

-

Exemplo: duas camadas mas com apenas uma visível na inicialização do mapa openlayers.php?temas=biomashp,locali&largura=800&visiveis=biomashp

+

Exemplo: todas as opções e um tema adicionado openlayers.php?temas=biomashp&largura=800&altura=500

+

Exemplo: duas camadas mas com apenas uma visível na inicialização do mapa openlayers.php?temas=biomashp,locali&largura=800&altura=500&visiveis=biomashp

Exemplo: zoom para uma região openlayers.php?temas=biomashp&largura=800&mapext=-68.39967 -12.16172 -62.67402 -5.366808

Exemplo: Botões principais e barra de zoom maior openlayers.php?temas=biomashp&largura=800&botoes=pan,zoombox,zoomtot,distancia,area,identifica&numzoomlevels=10

Exemplo: Inclusão de pontos openlayers.php?temas=biomashp&largura=800&pontos=-54 -12 -56 -15 diff --git a/mashups/openlayers.js.php b/mashups/openlayers.js.php index b1df868..a24be8b 100644 --- a/mashups/openlayers.js.php +++ b/mashups/openlayers.js.php @@ -35,14 +35,8 @@ i3GEO.editorOL = { ), jpl_wms: new OpenLayers.Layer.WMS( "NASA Global Mosaic", - "http://wms.jpl.nasa.gov/wms.cgi", - {layers: "modis,global_mosaic"}, - {singleTile:true} - ), - osm_wms: new OpenLayers.Layer.WMS( - "Open Street Map", - "http://full.wms.geofabrik.de/std/demo_key?", - {layers: ""} + "http://wms.jpl.nasa.gov/wms.cgi?", + {layers: "global_mosaic"} ), top_wms: new OpenLayers.Layer.WMS( "Toponímia MMA", @@ -54,7 +48,7 @@ i3GEO.editorOL = { "http://mapas.mma.gov.br/i3geo/ogc.php?tema=estadosl&", {layers: "estadosl",FORMAT:'image/png'} ), - fundo: "ol_mma,ol_wms,jpl_wms,osm_wms,top_wms,est_wms", + fundo: "ol_mma,ol_wms,jpl_wms,top_wms,est_wms", kml: [], layersIniciais: [], botoes: { diff --git a/mashups/openlayers.php b/mashups/openlayers.php index 254e9bc..3297608 100644 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -183,7 +183,6 @@ Parâmetros: ol_mma - base cartográfica do Brasil ol_wms - base mundial da Meta Carta jpl_wms - mosaico de imagens de satélite - osm_wms - base do open Street Map top_wms - toponímia do servidor do MMA usado no mapa de referência est_wms - estados do Brasil diff --git a/mashups/openlayers_compacto.js b/mashups/openlayers_compacto.js index 8bcc79b..9dac7a4 100644 --- a/mashups/openlayers_compacto.js +++ b/mashups/openlayers_compacto.js @@ -3047,14 +3047,8 @@ ol_wms: new OpenLayers.Layer.WMS.Untiled( ), jpl_wms: new OpenLayers.Layer.WMS( "NASA Global Mosaic", -"http://wms.jpl.nasa.gov/wms.cgi", -{layers: "modis,global_mosaic"}, -{singleTile:true} -), -osm_wms: new OpenLayers.Layer.WMS( -"Open Street Map", -"http://full.wms.geofabrik.de/std/demo_key?", -{layers: ""} +"http://wms.jpl.nasa.gov/wms.cgi?", +{layers: "global_mosaic"} ), top_wms: new OpenLayers.Layer.WMS( "Toponímia MMA", @@ -3066,7 +3060,7 @@ est_wms: new OpenLayers.Layer.WMS( "http://mapas.mma.gov.br/i3geo/ogc.php?tema=estadosl&", {layers: "estadosl",FORMAT:'image/png'} ), -fundo: "ol_mma,ol_wms,jpl_wms,osm_wms,top_wms,est_wms", +fundo: "ol_mma,ol_wms,jpl_wms,top_wms,est_wms", kml: [], layersIniciais: [], botoes: { diff --git a/mashups/openlayers_compacto.js.php b/mashups/openlayers_compacto.js.php index 4eecbc5..50bc051 100644 --- a/mashups/openlayers_compacto.js.php +++ b/mashups/openlayers_compacto.js.php @@ -3047,14 +3047,8 @@ ol_wms: new OpenLayers.Layer.WMS.Untiled( ), jpl_wms: new OpenLayers.Layer.WMS( "NASA Global Mosaic", -"http://wms.jpl.nasa.gov/wms.cgi", -{layers: "modis,global_mosaic"}, -{singleTile:true} -), -osm_wms: new OpenLayers.Layer.WMS( -"Open Street Map", -"http://full.wms.geofabrik.de/std/demo_key?", -{layers: ""} +"http://wms.jpl.nasa.gov/wms.cgi?", +{layers: "global_mosaic"} ), top_wms: new OpenLayers.Layer.WMS( "Toponímia MMA", @@ -3066,7 +3060,7 @@ est_wms: new OpenLayers.Layer.WMS( "http://mapas.mma.gov.br/i3geo/ogc.php?tema=estadosl&", {layers: "estadosl",FORMAT:'image/png'} ), -fundo: "ol_mma,ol_wms,jpl_wms,osm_wms,top_wms,est_wms", +fundo: "ol_mma,ol_wms,jpl_wms,top_wms,est_wms", kml: [], layersIniciais: [], botoes: { -- libgit2 0.21.2