Download as
Browse Code »

Commit 6c349a1f02e6e2e9b9eb4d874f74d0ee474cfeb6

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

--no commit message

Showing 16 changed files with 100 additions and 22 deletions   Show diff stats
admin/admin.db
View file @6c349a1
No preview for this file type
aplicmap/simptv6.map
  Diff comments   View file @6c349a1
@@ -16,11 +16,11 @@ FONTSET "../symbols/fontes.txt" @@ -16,11 +16,11 @@ FONTSET "../symbols/fontes.txt"
16 METADATA 16 METADATA
17 END 17 END
18 STYLE 18 STYLE
19 - COLOR 0 0 0 19 + COLOR 0 0 0
20 MAXSIZE 500 20 MAXSIZE 500
21 MINSIZE 1 21 MINSIZE 1
22 SIZE 8 22 SIZE 8
23 - SYMBOL "seta" 23 + SYMBOL "ponto"
24 END 24 END
25 END 25 END
26 END 26 END
classesphp/classe_atributos.php
  Diff comments   View file @6c349a1
@@ -199,15 +199,19 @@ $registro - Índice do registro que será consultado. @@ -199,15 +199,19 @@ $registro - Índice do registro que será consultado.
199 function extensaoRegistro($registro) 199 function extensaoRegistro($registro)
200 { 200 {
201 if(!$this->layer){return "erro";} 201 if(!$this->layer){return "erro";}
  202 + //error_reporting(E_ALL);
202 $this->layer->set("template","none.htm"); 203 $this->layer->set("template","none.htm");
203 $this->layer->setfilter(""); 204 $this->layer->setfilter("");
204 $ext = ""; 205 $ext = "";
205 //procura o registro e pega a extensão geográfica 206 //procura o registro e pega a extensão geográfica
206 - if($this->v == 6)  
207 - {$shape = $this->layer->getShape(new resultObj($registro));} 207 + if($this->v == 6){
  208 + $this->layer->open();
  209 + $shape = $this->layer->getShape(new resultObj($registro));
  210 + }
208 else{ 211 else{
209 if (@$this->layer->open() == MS_SUCCESS) 212 if (@$this->layer->open() == MS_SUCCESS)
210 { 213 {
  214 +
211 if (@$this->layer->queryByrect($this->mapa->extent) == MS_SUCCESS) 215 if (@$this->layer->queryByrect($this->mapa->extent) == MS_SUCCESS)
212 { 216 {
213 $this->layer->open(); 217 $this->layer->open();
classesphp/classe_legenda.php
  Diff comments   View file @6c349a1
@@ -519,7 +519,7 @@ String no formato HTML com as imagens dos símbolos @@ -519,7 +519,7 @@ String no formato HTML com as imagens dos símbolos
519 { 519 {
520 $versao = versao(); 520 $versao = versao();
521 $versao = $versao["principal"]; 521 $versao = $versao["principal"];
522 - //error_reporting(E_ALL); 522 + error_reporting(E_ALL);
523 if ($tipo == 3){$tipo = 2;} //tipo raster 523 if ($tipo == 3){$tipo = 2;} //tipo raster
524 if($imgdir == "") 524 if($imgdir == "")
525 {$dir = $dir_tmp;} 525 {$dir = $dir_tmp;}
@@ -539,7 +539,6 @@ String no formato HTML com as imagens dos símbolos @@ -539,7 +539,6 @@ String no formato HTML com as imagens dos símbolos
539 else 539 else
540 {$mapatemp = ms_newMapObj($this->localaplicacao."/aplicmap/".$t);} 540 {$mapatemp = ms_newMapObj($this->localaplicacao."/aplicmap/".$t);}
541 $ins = ""; 541 $ins = "";
542 -  
543 $l = $mapatemp->getlayer(0); 542 $l = $mapatemp->getlayer(0);
544 $novoss = dirname($this->mapa->symbolsetfilename)."\\".basename($mapatemp->symbolsetfilename); 543 $novoss = dirname($this->mapa->symbolsetfilename)."\\".basename($mapatemp->symbolsetfilename);
545 $this->mapa->setsymbolset($novoss); 544 $this->mapa->setsymbolset($novoss);
classesphp/funcoes_gerais.php
  Diff comments   View file @6c349a1
@@ -1208,7 +1208,7 @@ function pegaValoresM($mapa,$layer,$itens,$exclui="nulo",$selecionados="nao",$ch @@ -1208,7 +1208,7 @@ function pegaValoresM($mapa,$layer,$itens,$exclui="nulo",$selecionados="nao",$ch
1208 $nclasses = $layer->numclasses; 1208 $nclasses = $layer->numclasses;
1209 if (@$layer->queryByrect($mapa->extent) == MS_SUCCESS) 1209 if (@$layer->queryByrect($mapa->extent) == MS_SUCCESS)
1210 { 1210 {
1211 - $layer->draw(); 1211 + //$layer->draw();
1212 $sopen = $layer->open(); 1212 $sopen = $layer->open();
1213 if($sopen == MS_FAILURE){return "erro";} 1213 if($sopen == MS_FAILURE){return "erro";}
1214 $res_count = $layer->getNumresults(); 1214 $res_count = $layer->getNumresults();
classesphp/graficos.php
  Diff comments   View file @6c349a1
@@ -375,6 +375,7 @@ function iniciaDadosGrafico($map_file,$tema,$exclui,$itemclasses,$itemvalores,$t @@ -375,6 +375,7 @@ function iniciaDadosGrafico($map_file,$tema,$exclui,$itemclasses,$itemvalores,$t
375 { 375 {
376 global $interface; 376 global $interface;
377 //pega os valores 377 //pega os valores
  378 + //error_reporting(E_ALL);
378 $map = ms_newMapObj($map_file); 379 $map = ms_newMapObj($map_file);
379 if($interface == "googlemaps") 380 if($interface == "googlemaps")
380 { 381 {
documentacao/manual_de_usuario_do_i3geo.odt
View file @6c349a1
No preview for this file type
ferramentas/tabela/relatorio.php
  Diff comments   View file @6c349a1
@@ -145,7 +145,10 @@ if ($itemagruparel == "") @@ -145,7 +145,10 @@ if ($itemagruparel == "")
145 $conta = 0; 145 $conta = 0;
146 foreach($linhas as $v) 146 foreach($linhas as $v)
147 { 147 {
148 - echo "<td>$v</td>"; 148 + if(is_numeric(trim($v)))
  149 + {echo "<td style='text-align:right'>".number_format($v,2,",",".")."</td>";}
  150 + else
  151 + {echo "<td style='text-align:left'>$v</td>";}
149 if ($statrel == "true") 152 if ($statrel == "true")
150 { 153 {
151 $v = trim($v); 154 $v = trim($v);
@@ -167,12 +170,12 @@ if ($itemagruparel == &quot;&quot;) @@ -167,12 +170,12 @@ if ($itemagruparel == &quot;&quot;)
167 echo "<tr style=background-color:orange >"; 170 echo "<tr style=background-color:orange >";
168 echo "<td>soma</td>"; 171 echo "<td>soma</td>";
169 foreach($soma as $s) 172 foreach($soma as $s)
170 - echo "<td>$s</td>"; 173 + echo "<td style='text-align:right'>".number_format($s,2,",",".")."</td>";
171 echo "</tr>"; 174 echo "</tr>";
172 echo "<tr style=background-color:orange >"; 175 echo "<tr style=background-color:orange >";
173 echo "<td>m&eacute;dia</td>"; 176 echo "<td>m&eacute;dia</td>";
174 foreach($soma as $s) 177 foreach($soma as $s)
175 - echo "<td>".($s / $ocorrencias)."</td>"; 178 + echo "<td style='text-align:right'>".number_format(($s / $ocorrencias),2,",",".")."</td>";
176 echo "</tr>"; 179 echo "</tr>";
177 } 180 }
178 echo "</table>"; 181 echo "</table>";
@@ -213,7 +216,10 @@ else @@ -213,7 +216,10 @@ else
213 $conta = 0; 216 $conta = 0;
214 foreach($linhas as $v) 217 foreach($linhas as $v)
215 { 218 {
216 - echo "<td>$v</td>"; 219 + if(is_numeric(trim($v)))
  220 + {echo "<td style='text-align:right'>".number_format($v,2,",",".")."</td>";}
  221 + else
  222 + {echo "<td style='text-align:left'>$v</td>";}
217 if ($statrel == "true") 223 if ($statrel == "true")
218 { 224 {
219 $v = trim($v); 225 $v = trim($v);
@@ -235,12 +241,12 @@ else @@ -235,12 +241,12 @@ else
235 echo "<tr style=background-color:orange >"; 241 echo "<tr style=background-color:orange >";
236 echo "<td>soma</td>"; 242 echo "<td>soma</td>";
237 foreach($soma as $s) 243 foreach($soma as $s)
238 - echo "<td>$s</td>"; 244 + echo "<td style='text-align:right'>".number_format($s,2,",",".")."</td>";
239 echo "</tr>"; 245 echo "</tr>";
240 echo "<tr style=background-color:orange >"; 246 echo "<tr style=background-color:orange >";
241 echo "<td>m&eacute;dia</td>"; 247 echo "<td>m&eacute;dia</td>";
242 foreach($soma as $s) 248 foreach($soma as $s)
243 - echo "<td>".($s / $ocorrencias)."</td>"; 249 + echo "<td style='text-align:right'>".number_format(($s / $ocorrencias),2,",",".")."</td>";
244 echo "</tr>"; 250 echo "</tr>";
245 } 251 }
246 echo "</table>"; 252 echo "</table>";
@@ -249,8 +255,9 @@ else @@ -249,8 +255,9 @@ else
249 } 255 }
250 function calculaarea($geo) 256 function calculaarea($geo)
251 { 257 {
  258 + global $postgis_con;
252 $v = versao(); 259 $v = versao();
253 - if (($v["principal"] != 5) && ($postgis_con == "")) 260 + if (($v["principal"] < 5) && ($postgis_con == ""))
254 {return ("erro. É necessária uma versão maior que 5.0 do Mapserver.");} 261 {return ("erro. É necessária uma versão maior que 5.0 do Mapserver.");}
255 $g = $geo->towkt(); 262 $g = $geo->towkt();
256 $shape = ms_shapeObjFromWkt($g); 263 $shape = ms_shapeObjFromWkt($g);
mashups/openlayers.js.php
  Diff comments   View file @6c349a1
@@ -44,7 +44,8 @@ i3GEO.editorOL = { @@ -44,7 +44,8 @@ i3GEO.editorOL = {
44 ol_mma: new OpenLayers.Layer.WMS( 44 ol_mma: new OpenLayers.Layer.WMS(
45 "Base cartográfica", 45 "Base cartográfica",
46 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&", 46 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
47 - {layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'} 47 + {layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'},
  48 + {singleTile:true}
48 ), 49 ),
49 ol_wms: new OpenLayers.Layer.WMS.Untiled( 50 ol_wms: new OpenLayers.Layer.WMS.Untiled(
50 "OpenLayers WMS", 51 "OpenLayers WMS",
mashups/openlayers.php
  Diff comments   View file @6c349a1
@@ -147,7 +147,7 @@ if($temas != &quot;&quot;) @@ -147,7 +147,7 @@ if($temas != &quot;&quot;)
147 $visivel = "false"; 147 $visivel = "false";
148 if(in_array($tema,$visiveis)) 148 if(in_array($tema,$visiveis))
149 {$visivel = "true";} 149 {$visivel = "true";}
150 - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.($layern->getmetadata("tema")).'", "../ogc.php?tema='.$tema.'&",{layers:"'.implode(",",$layers).'",transparent: "true", format: "image/png"},{visibility:'.$visivel.',isBaseLayer:'.$ebase.'})'; 150 + $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.($layern->getmetadata("tema")).'", "../ogc.php?tema='.$tema.'&",{layers:"'.implode(",",$layers).'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
151 } 151 }
152 else 152 else
153 {echo $tema." não foi encontrado.<br>";} 153 {echo $tema." não foi encontrado.<br>";}
mashups/openlayers_compacto.js
  Diff comments   View file @6c349a1
@@ -3056,7 +3056,8 @@ e_wsm: new OpenLayers.Layer.ArcGIS93Rest( @@ -3056,7 +3056,8 @@ e_wsm: new OpenLayers.Layer.ArcGIS93Rest(
3056 ol_mma: new OpenLayers.Layer.WMS( 3056 ol_mma: new OpenLayers.Layer.WMS(
3057 "Base cartográfica", 3057 "Base cartográfica",
3058 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&", 3058 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
3059 -{layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'} 3059 +{layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'},
  3060 +{singleTile:true}
3060 ), 3061 ),
3061 ol_wms: new OpenLayers.Layer.WMS.Untiled( 3062 ol_wms: new OpenLayers.Layer.WMS.Untiled(
3062 "OpenLayers WMS", 3063 "OpenLayers WMS",
mashups/openlayers_compacto.js.php
  Diff comments   View file @6c349a1
@@ -3056,7 +3056,8 @@ e_wsm: new OpenLayers.Layer.ArcGIS93Rest( @@ -3056,7 +3056,8 @@ e_wsm: new OpenLayers.Layer.ArcGIS93Rest(
3056 ol_mma: new OpenLayers.Layer.WMS( 3056 ol_mma: new OpenLayers.Layer.WMS(
3057 "Base cartográfica", 3057 "Base cartográfica",
3058 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&", 3058 "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
3059 -{layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'} 3059 +{layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'},
  3060 +{singleTile:true}
3060 ), 3061 ),
3061 ol_wms: new OpenLayers.Layer.WMS.Untiled( 3062 ol_wms: new OpenLayers.Layer.WMS.Untiled(
3062 "OpenLayers WMS", 3063 "OpenLayers WMS",
@@ -116,12 +116,13 @@ if(isset($lista) &amp;&amp; $lista == &quot;temas&quot;) @@ -116,12 +116,13 @@ if(isset($lista) &amp;&amp; $lista == &quot;temas&quot;)
116 //cria o web service 116 //cria o web service
117 // 117 //
118 include("classesphp/funcoes_gerais.php"); 118 include("classesphp/funcoes_gerais.php");
119 -error_reporting(E_ALL); 119 +error_reporting(0);
120 $versao = versao(); 120 $versao = versao();
121 $versao = $versao["principal"]; 121 $versao = $versao["principal"];
122 $req = ms_newowsrequestobj(); 122 $req = ms_newowsrequestobj();
123 $tipo = ""; 123 $tipo = "";
124 $_GET = array_merge($_GET,$_POST); 124 $_GET = array_merge($_GET,$_POST);
  125 +
125 if(isset($_GET["sld"]) || isset($_GET["filter"])) 126 if(isset($_GET["sld"]) || isset($_GET["filter"]))
126 {$cache = false;} 127 {$cache = false;}
127 foreach ($_GET as $k=>$v) 128 foreach ($_GET as $k=>$v)
symbols/simbolosptv6.sym
  Diff comments   View file @6c349a1
@@ -569,7 +569,6 @@ TYPE TRUETYPE @@ -569,7 +569,6 @@ TYPE TRUETYPE
569 FONT "arial" 569 FONT "arial"
570 CHARACTER "#" 570 CHARACTER "#"
571 ANTIALIAS TRUE 571 ANTIALIAS TRUE
572 -GAP 10  
573 END 572 END
574 573
575 574
temas/grid.map 0 → 100644
  Diff comments   View file @6c349a1
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
  1 +MAP
  2 + FONTSET "c:\ms4w\apache\htdocs\i3geo\symbols\fontes.txt"
  3 + SYMBOLSET "c:\ms4w\apache\htdocs\i3geo\symbols\simbolos.sym"
  4 + LAYER
  5 + METADATA
  6 + "ltempoitemimagem" ""
  7 + "cache" "SIM"
  8 + "CLASSE" "SIM"
  9 + "ltempoitemdescricao" ""
  10 + "palletestep" ""
  11 + "ltempoiteminicio" ""
  12 + "permitekmz" "sim"
  13 + "ltempoitemtip" ""
  14 + "description_template" ""
  15 + "ltempoitemtitulo" ""
  16 + "ltempoitemlink" ""
  17 + "palletefile" ""
  18 + "NOMEORIGINAL" ""
  19 + "permitedownload" "sim"
  20 + "ltempoformatodata" ""
  21 + "ltempoitemicone" ""
  22 + "download" "SIM"
  23 + "permitekml" "sim"
  24 + "permiteogc" ""
  25 + "convcaracter" ""
  26 + "TEMA" "grade de coordenadas"
  27 + "identifica" "NAO"
  28 + "editorsql" ""
  29 + "ltempoitemfim" ""
  30 + END
  31 + NAME "grid"
  32 + STATUS OFF
  33 + TYPE LINE
  34 +PROJECTION
  35 + "init=epsg:4291"
  36 +END
  37 + CLASS
  38 + NAME "Graticule"
  39 + COLOR 0 0 0
  40 + LABEL
  41 + COLOR 255 0 0
  42 + SIZE 8
  43 + POSITION AUTO
  44 + PARTIALS FALSE
  45 + BUFFER 5
  46 + OUTLINECOLOR 255 255 255
  47 + END
  48 + END
  49 + GRID
  50 + LABELFORMAT "DDMM"
  51 + # LABELFORMAT '%g°' # dec degrees with symbol
  52 + MAXARCS 10
  53 + MAXINTERVAL 5
  54 + MAXSUBDIVIDE 2
  55 + # LABELFORMAT '%7.0f m' # nice if a projected SRS used
  56 + # MININTERVAL 20000
  57 + # MAXSUBDIVIDE 2
  58 + END
  59 +
  60 +
  61 + END
  62 +
  63 +END
0 \ No newline at end of file 64 \ No newline at end of file
testamapfile.php
  Diff comments   View file @6c349a1
@@ -120,6 +120,7 @@ if (isset($map) &amp;&amp; $map != &quot;&quot;) @@ -120,6 +120,7 @@ if (isset($map) &amp;&amp; $map != &quot;&quot;)
120 function verifica($map,$solegenda) 120 function verifica($map,$solegenda)
121 { 121 {
122 global $tipo,$locaplic,$postgis_mapa,$versao,$base; 122 global $tipo,$locaplic,$postgis_mapa,$versao,$base;
  123 + $mapUrl = $map;
123 if ($tipo == "mini" && file_exists('temas/miniaturas/'.$map.".mini.png")) 124 if ($tipo == "mini" && file_exists('temas/miniaturas/'.$map.".mini.png"))
124 { 125 {
125 Header("Content-type: image/png"); 126 Header("Content-type: image/png");
@@ -190,8 +191,8 @@ function verifica($map,$solegenda) @@ -190,8 +191,8 @@ function verifica($map,$solegenda)
190 eval($pegarext."(\$mapa);"); 191 eval($pegarext."(\$mapa);");
191 } 192 }
192 else{ 193 else{
193 - if(file_exists($tema))  
194 - {$nmapa = ms_newMapObj($tema);} 194 + if(file_exists($mapUrl))
  195 + {$nmapa = ms_newMapObj($mapUrl);}
195 else{ 196 else{
196 if(@ms_newMapObj($locaplic."/".$tema)) 197 if(@ms_newMapObj($locaplic."/".$tema))
197 { 198 {