Download as
Browse Code »

Commit ab3ed684491f44e82daa42b29162add7e283ceaa

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

Atualização do repositório

Showing 5 changed files with 36 additions and 29 deletions   Show diff stats
ferramentas/imprimir/geotif.php
  Diff comments   View file @ab3ed68
... ... @@ -69,7 +69,7 @@ substituiConObj($map,$postgis_mapa);
69 69 $of = $map->outputformat;
70 70 $of->set("driver","GDAL/GTiff");
71 71 $of->set("imagemode","RGB");
72   -$map = ms_newMapObj($temp);
  72 +
73 73 if($map->getmetadata("interface") == "googlemaps"){
74 74 $proj4 = pegaProjecaoDefault("proj4");
75 75 $map->setProjection($proj4);
... ... @@ -105,7 +105,7 @@ for ($j=0;$j < $numlayers;$j++){
105 105 if ($l->numclasses > 0){
106 106 $classe = $l->getclass(0);
107 107 if (($classe->name == "") || ($classe->name == " ")){
108   - $classe->set("name",$layer->getmetadata("tema"));
  108 + $classe->set("name",$l->getmetadata("tema"));
109 109 }
110 110 }
111 111 }
... ...
ferramentas/imprimir/index.js
  Diff comments   View file @ab3ed68
... ... @@ -176,7 +176,15 @@ i3GEOF.imprimir = {
176 176 url = url+"?g_sid="+i3GEO.configura.sid+"&interface="+interf+"&mapexten="+i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
177 177 var id = "imprimir"+Math.random();
178 178 if(tipoAbertura){
179   - i3GEO.janela.cria("350px","350px",url,"","","<div class='i3GeoTituloJanela'>Arquivos</div>",id);
  179 + i3GEO.janela.cria(
  180 + "350px",
  181 + "350px",
  182 + url,
  183 + "",
  184 + "",
  185 + "<div class='i3GeoTituloJanela'>Arquivos</div>",
  186 + id
  187 + );
180 188 }
181 189 else{
182 190 window.open(url);
... ...
ferramentas/imprimir/jpeg.php
  Diff comments   View file @ab3ed68
... ... @@ -108,7 +108,7 @@ for ($j=0;$j &lt; $numlayers;$j++){
108 108 if ($l->numclasses > 0){
109 109 $classe = $l->getclass(0);
110 110 if (($classe->name == "") || ($classe->name == " ")){
111   - $classe->set("name",$layer->getmetadata("tema"));
  111 + $classe->set("name",$l->getmetadata("tema"));
112 112 }
113 113 }
114 114 }
... ...
ferramentas/imprimir/svg.php
  Diff comments   View file @ab3ed68
... ... @@ -66,47 +66,44 @@ $nomes = nomeRandomico();
66 66  
67 67 $map = ms_newMapObj($map_file);
68 68 substituiConObj($map,$postgis_mapa);
69   -if($map->getmetadata("interface") == "googlemaps")
70   -{
  69 +if($map->getmetadata("interface") == "googlemaps"){
71 70 $proj4 = pegaProjecaoDefault("proj4");
72 71 $map->setProjection($proj4);
73 72 $map->set("units",MS_METERS);
74 73 $map->preparequery();
75 74 $map->set("scaledenom",$map->scaledenom * 100000);
76 75 }
77   -$v = versao();
78 76  
79   -$leb = $eb->label;
  77 +$v = versao();
80 78  
81   -if($leb->type == "MS_BITMAP"){
82   - $leb->set("type",MS_TRUETYPE);
83   - $leb->set("font","Arial");
84   -}
85 79 //legenda
86 80 //corrige o titulo da legenda
87 81 $numlayers = $map->numlayers;
88 82 for ($j=0;$j < $numlayers;$j++){
89 83 $l = $map->getlayer($j);
90   - if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){
91   - if ($l->numclasses > 0){
92   - $classe = $l->getclass(0);
93   - if (($classe->name == "") || ($classe->name == " ")){
94   - $classe->set("name",$layer->getmetadata("tema"));
95   - }
  84 + //para evitar fontes bitmap
  85 + if($l->name == "copyright"){
  86 + $l->set("status",MS_DELETE);
  87 + }
  88 + if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){
  89 + if ($l->numclasses > 0){
  90 + $classe = $l->getclass(0);
  91 + if (($classe->name == "") || ($classe->name == " ")){
  92 + $classe->set("name",$l->getmetadata("tema"));
96 93 }
97 94 }
98   - if($l->type != 3 && $l->type != 4){
99   - $nclass = $l->numclasses;
100   - for($i=0;$i<$nclass;$i++){
101   - $classe = $l->getclass($i);
102   - if($classe->title === ""){
103   - $classe->title = $classe->name;
104   - }
  95 + }
  96 + if($l->type != 3 && $l->type != 4){
  97 + $nclass = $l->numclasses;
  98 + for($i=0;$i<$nclass;$i++){
  99 + $classe = $l->getclass($i);
  100 + if($classe->title === ""){
  101 + $classe->title = $classe->name;
105 102 }
106 103 }
  104 + }
107 105 }
108 106  
109   -$o = $map->outputformat;
110 107 if($mapexten != ""){
111 108 $ext = explode(" ",$mapexten);
112 109 $extatual = $map->extent;
... ... @@ -116,8 +113,10 @@ $map-&gt;selectOutputFormat(&quot;svg&quot;);
116 113 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
117 114 //mapa
118 115 $imgo = $map->draw();
119   -if($imgo->imagepath == "")
120   -{echo "Erro IMAGEPATH vazio";exit;}
  116 +if($imgo->imagepath == ""){
  117 + echo "Erro IMAGEPATH vazio";
  118 + exit;
  119 +}
121 120 $nomer = ($imgo->imagepath)."mapa".$nomes.".svg";
122 121 $imgo->saveImage($nomer);
123 122 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
... ...
js/janela.js
  Diff comments   View file @ab3ed68
... ... @@ -371,7 +371,7 @@ i3GEO.janela =
371 371 temp = $i(id + "_corpo");
372 372  
373 373 janela.bringToTop();
374   - if(waltura !== "auto"){
  374 + if(waltura !== "auto" && wsrc == ""){
375 375 i3GEO.janela.applyScrollBar(temp.id,"",{live:true,liveSelector:".customScrollBar"});
376 376 i3GEO.janela.applyScrollBar(temp.id,"",{live:true,liveSelector:".customScrollBarXY",advanced:{ autoExpandHorizontalScroll: false }});
377 377 }
... ...