Download as
Browse Code »

Commit 42c5064b4d72cf3332db53b8564d03a3c1118b8d

Authored by Edmar Moretti
1 parent 24f5107b
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 8 changed files with 19 additions and 12 deletions   Show diff stats
classesphp/mapa_googlemaps.php
  Diff comments   View file @42c5064
@@ -101,7 +101,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; @@ -101,7 +101,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"];
101 $lon2 = $x / $n * 360.0 - 180.0; 101 $lon2 = $x / $n * 360.0 - 180.0;
102 $lat1 = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n)))); 102 $lat1 = rad2deg(atan(sinh(pi() * (1 - 2 * $y / $n))));
103 103
104 -$projInObj = ms_newprojectionobj("proj=latlong"); 104 +$projInObj = ms_newprojectionobj("proj=latlong,a=6378137,b=6378137");
105 $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"); 105 $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");
106 106
107 $poPoint1 = ms_newpointobj(); 107 $poPoint1 = ms_newpointobj();
@@ -174,7 +174,7 @@ if(!isset($_GET["telaR"])){//no caso de projecoes remotas, o mapfile nao´e alter @@ -174,7 +174,7 @@ if(!isset($_GET["telaR"])){//no caso de projecoes remotas, o mapfile nao´e alter
174 } 174 }
175 } 175 }
176 if($l->getProjection() == "" ) 176 if($l->getProjection() == "" )
177 - {$l->setProjection("proj=latlong");} 177 + {$l->setProjection("proj=latlong,a=6378137,b=6378137");}
178 } 178 }
179 if($layerName == $_GET["layer"]) 179 if($layerName == $_GET["layer"])
180 { 180 {
@@ -194,7 +194,7 @@ else{ @@ -194,7 +194,7 @@ else{
194 foreach ($layersNames as $layerName){ 194 foreach ($layersNames as $layerName){
195 $l = $mapa->getLayerByname($layerName); 195 $l = $mapa->getLayerByname($layerName);
196 if($l->getProjection() == "" ) 196 if($l->getProjection() == "" )
197 - {$l->setProjection("proj=latlong");} 197 + {$l->setProjection("proj=latlong,a=6378137,b=6378137");}
198 } 198 }
199 } 199 }
200 200
documentacao/diagramas/atividade_atualizar_versao.dia 0 → 100644
View file @42c5064
No preview for this file type
documentacao/diagramas/atividade_atualizar_versao.png 0 → 100644
View file @42c5064

67.7 KB
ferramentas/tme/index.js.php
  Diff comments   View file @42c5064
@@ -116,7 +116,7 @@ i3GEOF.tme = { @@ -116,7 +116,7 @@ i3GEOF.tme = {
116 '<div id=i3GEOtmelistai class=digitar style="text-align:left;left:0px;top:0px;330px;height:80px;overflow:auto;display:block;"></div>' + 116 '<div id=i3GEOtmelistai class=digitar style="text-align:left;left:0px;top:0px;330px;height:80px;overflow:auto;display:block;"></div>' +
117 '<br>' + 117 '<br>' +
118 '<input id=i3GEOtmebotao1 size=35 type=button value="Aplicar" />' + 118 '<input id=i3GEOtmebotao1 size=35 type=button value="Aplicar" />' +
119 - '<div id=i3GEOtmemen1 style=top:15px;left:0px; ><p class=paragrafo >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.</div>'; 119 + '<div id=i3GEOtmemen1 style=top:15px;left:0px; ><p class=paragrafo >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</div>';
120 return ins; 120 return ins;
121 }, 121 },
122 /* 122 /*
pacotes/cswclient/csw-proxy.php
  Diff comments   View file @42c5064
@@ -99,8 +99,9 @@ curl_setopt($session, CURLOPT_RETURNTRANSFER, true); @@ -99,8 +99,9 @@ curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
99 99
100 100
101 // Make the call 101 // Make the call
102 -//$xml = curl_exec($session); 102 +$xml = curl_exec($session);
103 // The web service returns XML. Set the Content-Type appropriately 103 // The web service returns XML. Set the Content-Type appropriately
  104 +/*
104 if(file_exists("c:/temp/csw.xml")){ 105 if(file_exists("c:/temp/csw.xml")){
105 $fp = fopen("c:/temp/csw.xml","r"); 106 $fp = fopen("c:/temp/csw.xml","r");
106 $xml = fread($fp,filesize("c:/temp/csw.xml")); 107 $xml = fread($fp,filesize("c:/temp/csw.xml"));
@@ -108,7 +109,7 @@ if(file_exists(&quot;c:/temp/csw.xml&quot;)){ @@ -108,7 +109,7 @@ if(file_exists(&quot;c:/temp/csw.xml&quot;)){
108 } 109 }
109 else 110 else
110 {$xml = curl_exec($session);} 111 {$xml = curl_exec($session);}
111 - 112 +*/
112 header("Content-Type: text/xml"); 113 header("Content-Type: text/xml");
113 114
114 if ($logging) { 115 if ($logging) {
pacotes/cswclient/lib/scripts/cswclient.js
  Diff comments   View file @42c5064
@@ -25,7 +25,10 @@ CSWClient = function(cswhost, host){ @@ -25,7 +25,10 @@ CSWClient = function(cswhost, host){
25 this.defaults_xml = this.loadDocument("lib/xml/defaults.xml"); 25 this.defaults_xml = this.loadDocument("lib/xml/defaults.xml");
26 this.defaultschema = this.defaults_xml.selectSingleNode("/defaults/outputschema/text()").nodeValue; 26 this.defaultschema = this.defaults_xml.selectSingleNode("/defaults/outputschema/text()").nodeValue;
27 } 27 }
28 - 28 +CSWClient.prototype.abreINDE = function(id)
  29 +{
  30 + window.open("http://www.metadados.inde.gov.br/geonetwork/srv/br/main.home?uuid="+id,"new");
  31 +}
29 CSWClient.prototype.setCSWHost = function(host) 32 CSWClient.prototype.setCSWHost = function(host)
30 { 33 {
31 this.cswhost = host; 34 this.cswhost = host;
@@ -77,11 +80,13 @@ CSWClient.prototype.handleCSWResponse = function(request, xml) @@ -77,11 +80,13 @@ CSWClient.prototype.handleCSWResponse = function(request, xml)
77 80
78 var outputDiv = document.getElementById("csw-output"); 81 var outputDiv = document.getElementById("csw-output");
79 if (request == "getrecordbyid"){ 82 if (request == "getrecordbyid"){
80 - outputDiv = document.getElementById("metadata"); 83 +
  84 + //outputDiv = window.open().document.body;//document.getElementById("metadata");
  85 + //output = '<head><link rel="stylesheet" type="text/css" href="http://localhost/i3geo/pacotes/cswclient/lib/css/cswclient.css"/></head>' + output;
81 //this.positionDiv(document.getElementById('popup'), document.getElementById('results')) 86 //this.positionDiv(document.getElementById('popup'), document.getElementById('results'))
82 //this.positionPopUp(document.getElementById('popup'), document.getElementById('results')) 87 //this.positionPopUp(document.getElementById('popup'), document.getElementById('results'))
83 - this.positionPopUp(document.getElementById('popup'), document.getElementById('cswclient'))  
84 - this.showDiv(document.getElementById('popup')); 88 + //this.positionPopUp(document.getElementById('popup'), document.getElementById('cswclient'))
  89 + //this.showDiv(document.getElementById('popup'));
85 } 90 }
86 outputDiv.innerHTML = output; 91 outputDiv.innerHTML = output;
87 } 92 }
pacotes/cswclient/lib/xsl/csw-metadata.xsl
  Diff comments   View file @42c5064
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </xsl:template> 17 </xsl:template>
18 18
19 <xsl:template match="/*[local-name()='GetRecordByIdResponse']"> 19 <xsl:template match="/*[local-name()='GetRecordByIdResponse']">
20 - <xsl:apply-templates select="cat:FullRecord"/> 20 + <xsl:apply-templates select="cat:FullRecord"/>
21 <xsl:apply-templates select="*[local-name()='Record']"/> 21 <xsl:apply-templates select="*[local-name()='Record']"/>
22 <xsl:apply-templates select="*[local-name()='SummaryRecord']"/> 22 <xsl:apply-templates select="*[local-name()='SummaryRecord']"/>
23 <xsl:apply-templates select="*[local-name()='BriefRecord']"/> 23 <xsl:apply-templates select="*[local-name()='BriefRecord']"/>
pacotes/cswclient/lib/xsl/csw-results.xsl
  Diff comments   View file @42c5064
@@ -115,12 +115,13 @@ @@ -115,12 +115,13 @@
115 <td class="meta-value"> 115 <td class="meta-value">
116 <a> 116 <a>
117 <xsl:attribute name="href"> 117 <xsl:attribute name="href">
118 - <xsl:text>javascript:csw_client.getRecordById</xsl:text> 118 + <xsl:text>javascript:csw_client.abreINDE</xsl:text>
119 <xsl:text>('</xsl:text> 119 <xsl:text>('</xsl:text>
120 <xsl:value-of select="./gmd:fileIdentifier/gco:CharacterString"/> 120 <xsl:value-of select="./gmd:fileIdentifier/gco:CharacterString"/>
121 <xsl:text>')</xsl:text> 121 <xsl:text>')</xsl:text>
122 </xsl:attribute> 122 </xsl:attribute>
123 <xsl:value-of select="./gmd:fileIdentifier/gco:CharacterString"/> 123 <xsl:value-of select="./gmd:fileIdentifier/gco:CharacterString"/>
  124 + <xsl:text> (abre em nova janela)</xsl:text>
124 </a> 125 </a>
125 </td> 126 </td>
126 </tr> 127 </tr>