From 42c5064b4d72cf3332db53b8564d03a3c1118b8d Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Mon, 26 Sep 2011 20:34:33 +0000 Subject: [PATCH] --- classesphp/mapa_googlemaps.php | 6 +++--- documentacao/diagramas/atividade_atualizar_versao.dia | Bin 0 -> 4183 bytes documentacao/diagramas/atividade_atualizar_versao.png | Bin 0 -> 69283 bytes ferramentas/tme/index.js.php | 2 +- pacotes/cswclient/csw-proxy.php | 5 +++-- pacotes/cswclient/lib/scripts/cswclient.js | 13 +++++++++---- pacotes/cswclient/lib/xsl/csw-metadata.xsl | 2 +- pacotes/cswclient/lib/xsl/csw-results.xsl | 3 ++- 8 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 documentacao/diagramas/atividade_atualizar_versao.dia create mode 100644 documentacao/diagramas/atividade_atualizar_versao.png diff --git a/classesphp/mapa_googlemaps.php b/classesphp/mapa_googlemaps.php index 250734a..8337b2a 100644 --- a/classesphp/mapa_googlemaps.php +++ b/classesphp/mapa_googlemaps.php @@ -101,7 +101,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; $lon2 = $x / $n * 360.0 - 180.0; $lat1 = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n)))); -$projInObj = ms_newprojectionobj("proj=latlong"); +$projInObj = ms_newprojectionobj("proj=latlong,a=6378137,b=6378137"); $projOutObj = ms_newprojectionobj("proj=merc,a=6378137,b=6378137,lat_ts=0.0,lon_0=0.0,x_0=0.0,y_0=0,k=1.0,units=m"); $poPoint1 = ms_newpointobj(); @@ -174,7 +174,7 @@ if(!isset($_GET["telaR"])){//no caso de projecoes remotas, o mapfile nao´e alter } } if($l->getProjection() == "" ) - {$l->setProjection("proj=latlong");} + {$l->setProjection("proj=latlong,a=6378137,b=6378137");} } if($layerName == $_GET["layer"]) { @@ -194,7 +194,7 @@ else{ foreach ($layersNames as $layerName){ $l = $mapa->getLayerByname($layerName); if($l->getProjection() == "" ) - {$l->setProjection("proj=latlong");} + {$l->setProjection("proj=latlong,a=6378137,b=6378137");} } } diff --git a/documentacao/diagramas/atividade_atualizar_versao.dia b/documentacao/diagramas/atividade_atualizar_versao.dia new file mode 100644 index 0000000..0154238 Binary files /dev/null and b/documentacao/diagramas/atividade_atualizar_versao.dia differ diff --git a/documentacao/diagramas/atividade_atualizar_versao.png b/documentacao/diagramas/atividade_atualizar_versao.png new file mode 100644 index 0000000..1a05c3f Binary files /dev/null and b/documentacao/diagramas/atividade_atualizar_versao.png differ diff --git a/ferramentas/tme/index.js.php b/ferramentas/tme/index.js.php index 27a6067..98a0fee 100644 --- a/ferramentas/tme/index.js.php +++ b/ferramentas/tme/index.js.php @@ -116,7 +116,7 @@ i3GEOF.tme = { '
' + '
' + '' + - '

Será criado um arquivo KML que pode ser aberto com o Google Earth. A coluna com os nomes das regiões define o nome que será mostrado para cada elemento mapeado.

'; + '

Será criado um arquivo KML que pode ser aberto com o Google Earth. A coluna com os nomes das regiões define o nome que será mostrado para cada elemento mapeado. Quando os nomes das colunas com os valores corresponderem a um determinado ano, será mostrado um botão do tipo slide no Google Earth, mas isso só ocorre se o nome da coluna for o mesmo nome do ano, exemplo, para o ano de 1980 o nome da coluna deverá ser 1980

'; return ins; }, /* diff --git a/pacotes/cswclient/csw-proxy.php b/pacotes/cswclient/csw-proxy.php index eb1dfa9..d5063fc 100644 --- a/pacotes/cswclient/csw-proxy.php +++ b/pacotes/cswclient/csw-proxy.php @@ -99,8 +99,9 @@ curl_setopt($session, CURLOPT_RETURNTRANSFER, true); // Make the call -//$xml = curl_exec($session); +$xml = curl_exec($session); // The web service returns XML. Set the Content-Type appropriately +/* if(file_exists("c:/temp/csw.xml")){ $fp = fopen("c:/temp/csw.xml","r"); $xml = fread($fp,filesize("c:/temp/csw.xml")); @@ -108,7 +109,7 @@ if(file_exists("c:/temp/csw.xml")){ } else {$xml = curl_exec($session);} - +*/ header("Content-Type: text/xml"); if ($logging) { diff --git a/pacotes/cswclient/lib/scripts/cswclient.js b/pacotes/cswclient/lib/scripts/cswclient.js index d50c87e..07b6ce0 100644 --- a/pacotes/cswclient/lib/scripts/cswclient.js +++ b/pacotes/cswclient/lib/scripts/cswclient.js @@ -25,7 +25,10 @@ CSWClient = function(cswhost, host){ this.defaults_xml = this.loadDocument("lib/xml/defaults.xml"); this.defaultschema = this.defaults_xml.selectSingleNode("/defaults/outputschema/text()").nodeValue; } - +CSWClient.prototype.abreINDE = function(id) +{ + window.open("http://www.metadados.inde.gov.br/geonetwork/srv/br/main.home?uuid="+id,"new"); +} CSWClient.prototype.setCSWHost = function(host) { this.cswhost = host; @@ -77,11 +80,13 @@ CSWClient.prototype.handleCSWResponse = function(request, xml) var outputDiv = document.getElementById("csw-output"); if (request == "getrecordbyid"){ - outputDiv = document.getElementById("metadata"); + + //outputDiv = window.open().document.body;//document.getElementById("metadata"); + //output = '' + output; //this.positionDiv(document.getElementById('popup'), document.getElementById('results')) //this.positionPopUp(document.getElementById('popup'), document.getElementById('results')) - this.positionPopUp(document.getElementById('popup'), document.getElementById('cswclient')) - this.showDiv(document.getElementById('popup')); + //this.positionPopUp(document.getElementById('popup'), document.getElementById('cswclient')) + //this.showDiv(document.getElementById('popup')); } outputDiv.innerHTML = output; } diff --git a/pacotes/cswclient/lib/xsl/csw-metadata.xsl b/pacotes/cswclient/lib/xsl/csw-metadata.xsl index 5b215d4..4b7ac99 100644 --- a/pacotes/cswclient/lib/xsl/csw-metadata.xsl +++ b/pacotes/cswclient/lib/xsl/csw-metadata.xsl @@ -17,7 +17,7 @@ - + diff --git a/pacotes/cswclient/lib/xsl/csw-results.xsl b/pacotes/cswclient/lib/xsl/csw-results.xsl index ca4e888..48ebbff 100644 --- a/pacotes/cswclient/lib/xsl/csw-results.xsl +++ b/pacotes/cswclient/lib/xsl/csw-results.xsl @@ -115,12 +115,13 @@ - javascript:csw_client.getRecordById + javascript:csw_client.abreINDE (' ') + (abre em nova janela) -- libgit2 0.21.2