Download as
Browse Code »

Commit d3058e89288b84de5946e686683a12c4e0f47b24

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

Corrigida a opção que define se a legenda de um layer deve ou não aparecer ao imprimir o mapa

Showing 9 changed files with 100 additions and 176 deletions   Show diff stats
ferramentas/imprimir/a4lpaisagempdf.php
  Diff comments   View file @d3058e8
@@ -106,14 +106,13 @@ $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); @@ -106,14 +106,13 @@ $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
106 $pathMapa = $dir_tmp."/".basename($imgo->imageurl)."/".basename($nomer); 106 $pathMapa = $dir_tmp."/".basename($imgo->imageurl)."/".basename($nomer);
107 $nomeImagem = nomeRandomico(); 107 $nomeImagem = nomeRandomico();
108 $legenda = $map->legend; 108 $legenda = $map->legend;
109 -//$legenda->set("keysizex",20);  
110 -//$legenda->set("keysizey",20);  
111 -//$label = $legenda->label;  
112 -//$label->set("size",14);  
113 //corrige o titulo da legenda 109 //corrige o titulo da legenda
114 $numlayers = $map->numlayers; 110 $numlayers = $map->numlayers;
115 for ($j=0;$j < $numlayers;$j++){ 111 for ($j=0;$j < $numlayers;$j++){
116 $l = $map->getlayer($j); 112 $l = $map->getlayer($j);
  113 + if(strtoupper($l->getmetadata("classe")) == "NAO"){
  114 + $l->set("status",MS_OFF);
  115 + }
117 if($l->type != 3 && $l->type != 4){ 116 if($l->type != 3 && $l->type != 4){
118 $nclass = $l->numclasses; 117 $nclass = $l->numclasses;
119 for($i=0;$i<$nclass;$i++){ 118 for($i=0;$i<$nclass;$i++){
ferramentas/imprimir/aggpng.php
  Diff comments   View file @d3058e8
@@ -128,11 +128,27 @@ if($imgo-&gt;imagepath == &quot;&quot;) @@ -128,11 +128,27 @@ if($imgo-&gt;imagepath == &quot;&quot;)
128 $nomer = ($imgo->imagepath)."mapa".$nomes.".png"; 128 $nomer = ($imgo->imagepath)."mapa".$nomes.".png";
129 $imgo->saveImage($nomer); 129 $imgo->saveImage($nomer);
130 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); 130 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
  131 +//escala
  132 +$imgo = $map->drawscalebar();
  133 +$nomer = ($imgo->imagepath)."escala".$nomes.".png";
  134 +$imgo->saveImage($nomer);
  135 +$nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
  136 +//refer&ecirc;ncia
  137 +$o = $map->reference->outlinecolor;
  138 +$o->setrgb(255,0,0);
  139 +$map->preparequery();
  140 +$imgo = $map->drawreferencemap();
  141 +$nomer = ($imgo->imagepath)."ref".$nomes.".png";
  142 +$imgo->saveImage($nomer);
  143 +$nomeref = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
131 //legenda 144 //legenda
132 //corrige o titulo da legenda 145 //corrige o titulo da legenda
133 $numlayers = $map->numlayers; 146 $numlayers = $map->numlayers;
134 for ($j=0;$j < $numlayers;$j++){ 147 for ($j=0;$j < $numlayers;$j++){
135 $l = $map->getlayer($j); 148 $l = $map->getlayer($j);
  149 + if(strtoupper($l->getmetadata("classe")) == "NAO"){
  150 + $l->set("status",MS_OFF);
  151 + }
136 if($l->type != 3 && $l->type != 4){ 152 if($l->type != 3 && $l->type != 4){
137 $nclass = $l->numclasses; 153 $nclass = $l->numclasses;
138 for($i=0;$i<$nclass;$i++){ 154 for($i=0;$i<$nclass;$i++){
@@ -147,20 +163,6 @@ $imgo = $map-&gt;drawlegend(); @@ -147,20 +163,6 @@ $imgo = $map-&gt;drawlegend();
147 $nomer = ($imgo->imagepath)."legenda".$nomes.".png"; 163 $nomer = ($imgo->imagepath)."legenda".$nomes.".png";
148 $imgo->saveImage($nomer); 164 $imgo->saveImage($nomer);
149 $nomelegenda = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); 165 $nomelegenda = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
150 -//escala  
151 -$imgo = $map->drawscalebar();  
152 -$nomer = ($imgo->imagepath)."escala".$nomes.".png";  
153 -$imgo->saveImage($nomer);  
154 -$nomeescala = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);  
155 -//refer&ecirc;ncia  
156 -$o = $map->reference->outlinecolor;  
157 -$o->setrgb(255,0,0);  
158 -$map->preparequery();  
159 -$imgo = $map->drawreferencemap();  
160 -$nomer = ($imgo->imagepath)."ref".$nomes.".png";  
161 -$imgo->saveImage($nomer);  
162 -$nomeref = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);  
163 -  
164 166
165 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>"; 167 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>";
166 echo "<p>Arquivos gerados:</p>"; 168 echo "<p>Arquivos gerados:</p>";
ferramentas/imprimir/geotif.php
  Diff comments   View file @d3058e8
@@ -65,68 +65,31 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;); @@ -65,68 +65,31 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;);
65 //error_reporting(0); 65 //error_reporting(0);
66 $nomes = nomeRandomico(); 66 $nomes = nomeRandomico();
67 $map = ms_newMapObj($map_file); 67 $map = ms_newMapObj($map_file);
68 -$temp = str_replace(".map","",$map_file)."xxx.map";  
69 -$map->save($temp);  
70 -substituiCon($temp,$postgis_mapa); 68 +substituiConObj($map,$postgis_mapa);
71 $of = $map->outputformat; 69 $of = $map->outputformat;
72 $of->set("driver","GDAL/GTiff"); 70 $of->set("driver","GDAL/GTiff");
73 $of->set("imagemode","RGB"); 71 $of->set("imagemode","RGB");
74 $map = ms_newMapObj($temp); 72 $map = ms_newMapObj($temp);
75 -if($map->getmetadata("interface") == "googlemaps")  
76 -{ 73 +if($map->getmetadata("interface") == "googlemaps"){
77 $proj4 = pegaProjecaoDefault("proj4"); 74 $proj4 = pegaProjecaoDefault("proj4");
78 $map->setProjection($proj4); 75 $map->setProjection($proj4);
79 $map->set("units",MS_METERS); 76 $map->set("units",MS_METERS);
80 $map->preparequery(); 77 $map->preparequery();
81 $map->set("scaledenom",$map->scaledenom * 100000); 78 $map->set("scaledenom",$map->scaledenom * 100000);
82 } 79 }
83 -//$legenda =$map->legend;  
84 -//$legenda->set("status",MS_EMBED);  
85 -//altera o nome das classes vazias  
86 -$temas = $map->getalllayernames();  
87 -foreach ($temas as $tema)  
88 -{  
89 - $layer = $map->getlayerbyname($tema);  
90 - if (($layer->data != "") && (strtolower($layer->getmetadata("escondido")) != "sim") && (strtolower($layer->getmetadata("tema")) != "nao"))  
91 - {  
92 - if ($layer->numclasses > 0)  
93 - {  
94 - $classe = $layer->getclass(0);  
95 - if (($classe->name == "") || ($classe->name == " "))  
96 - {$classe->set("name",$layer->getmetadata("tema"));}  
97 - }  
98 - }  
99 - if ($layer->getmetadata("classe") == "NAO")  
100 - {  
101 - $nclasses = $layer->numclasses;  
102 - if ($nclasses > 0)  
103 - {  
104 - for($i=0;$i<$nclasses;$i++)  
105 - {  
106 - $classe = $layer->getclass($i);  
107 - $classe->set("name","classeNula");  
108 - }  
109 - }  
110 - }  
111 -}  
112 -$map->save($temp);  
113 -removeLinha("classeNula",$temp);  
114 -$map = ms_newMapObj($temp);  
115 -substituiCon($temp,$postgis_mapa);  
116 $o = $map->outputformat; 80 $o = $map->outputformat;
117 if($mapexten != ""){ 81 if($mapexten != ""){
118 $ext = explode(" ",$mapexten); 82 $ext = explode(" ",$mapexten);
119 $extatual = $map->extent; 83 $extatual = $map->extent;
120 $extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]); 84 $extatual->setextent($ext[0],$ext[1],$ext[2],$ext[3]);
121 } 85 }
122 -//$legenda = $map->legend;  
123 -//$legenda->set("status",MS_EMBED);  
124 $o->set("imagemode",MS_IMAGEMODE_RGB); 86 $o->set("imagemode",MS_IMAGEMODE_RGB);
125 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); 87 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
126 //mapa 88 //mapa
127 $imgo = $map->draw(); 89 $imgo = $map->draw();
128 -if($imgo->imagepath == "")  
129 -{echo "Erro IMAGEPATH vazio";exit;} 90 +if($imgo->imagepath == ""){
  91 + echo "Erro IMAGEPATH vazio";exit;
  92 +}
130 $nomer = ($imgo->imagepath)."mapa".$nomes.".tif"; 93 $nomer = ($imgo->imagepath)."mapa".$nomes.".tif";
131 $imgo->saveImage($nomer); 94 $imgo->saveImage($nomer);
132 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); 95 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
@@ -135,12 +98,24 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu @@ -135,12 +98,24 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu
135 $numlayers = $map->numlayers; 98 $numlayers = $map->numlayers;
136 for ($j=0;$j < $numlayers;$j++){ 99 for ($j=0;$j < $numlayers;$j++){
137 $l = $map->getlayer($j); 100 $l = $map->getlayer($j);
138 - if($l->type != 3 && $l->type != 4){  
139 - $nclass = $l->numclasses;  
140 - for($i=0;$i<$nclass;$i++){  
141 - $classe = $l->getclass($i);  
142 - if($classe->title === ""){  
143 - $classe->title = $classe->name; 101 + if ($l->getmetadata("classe") == "NAO"){
  102 + $l->set("status",MS_OFF);
  103 + } else {
  104 + if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){
  105 + if ($l->numclasses > 0){
  106 + $classe = $l->getclass(0);
  107 + if (($classe->name == "") || ($classe->name == " ")){
  108 + $classe->set("name",$layer->getmetadata("tema"));
  109 + }
  110 + }
  111 + }
  112 + if($l->type != 3 && $l->type != 4){
  113 + $nclass = $l->numclasses;
  114 + for($i=0;$i<$nclass;$i++){
  115 + $classe = $l->getclass($i);
  116 + if($classe->title === ""){
  117 + $classe->title = $classe->name;
  118 + }
144 } 119 }
145 } 120 }
146 } 121 }
ferramentas/imprimir/jpeg.php
  Diff comments   View file @d3058e8
@@ -64,10 +64,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;); @@ -64,10 +64,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;);
64 //error_reporting(0); 64 //error_reporting(0);
65 $nomes = nomeRandomico(); 65 $nomes = nomeRandomico();
66 $map = ms_newMapObj($map_file); 66 $map = ms_newMapObj($map_file);
67 -$temp = str_replace(".map","xxx.map",$map_file);  
68 -$map->save($temp);  
69 -substituiCon($temp,$postgis_mapa);  
70 -$map = ms_newMapObj($temp); 67 +substituiConObj($map,$postgis_mapa);
71 $of = $map->outputformat; 68 $of = $map->outputformat;
72 $of->set("driver","AGG/JPEG"); 69 $of->set("driver","AGG/JPEG");
73 $of->set("imagemode","RGB"); 70 $of->set("imagemode","RGB");
@@ -81,39 +78,6 @@ if($map-&gt;getmetadata(&quot;interface&quot;) == &quot;googlemaps&quot;) @@ -81,39 +78,6 @@ if($map-&gt;getmetadata(&quot;interface&quot;) == &quot;googlemaps&quot;)
81 $map->preparequery(); 78 $map->preparequery();
82 $map->set("scaledenom",$map->scaledenom * 100000); 79 $map->set("scaledenom",$map->scaledenom * 100000);
83 } 80 }
84 -//$legenda =$map->legend;  
85 -//$legenda->set("status",MS_EMBED);  
86 -//altera o nome das classes vazias  
87 -$temas = $map->getalllayernames();  
88 -foreach ($temas as $tema)  
89 -{  
90 - $layer = $map->getlayerbyname($tema);  
91 - if (($layer->data != "") && (strtolower($layer->getmetadata("escondido")) != "sim") && (strtolower($layer->getmetadata("tema")) != "nao"))  
92 - {  
93 - if ($layer->numclasses > 0)  
94 - {  
95 - $classe = $layer->getclass(0);  
96 - if (($classe->name == "") || ($classe->name == " "))  
97 - {$classe->set("name",$layer->getmetadata("tema"));}  
98 - }  
99 - }  
100 - if ($layer->getmetadata("classe") == "NAO")  
101 - {  
102 - $nclasses = $layer->numclasses;  
103 - if ($nclasses > 0)  
104 - {  
105 - for($i=0;$i<$nclasses;$i++)  
106 - {  
107 - $classe = $layer->getclass($i);  
108 - $classe->set("name","classeNula");  
109 - }  
110 - }  
111 - }  
112 -}  
113 -$map->save($temp);  
114 -removeLinha("classeNula",$temp);  
115 -$map = ms_newMapObj($temp);  
116 -substituiCon($temp,$postgis_mapa);  
117 $o = $map->outputformat; 81 $o = $map->outputformat;
118 82
119 if($mapexten != ""){ 83 if($mapexten != ""){
@@ -125,8 +89,10 @@ $o-&gt;set(&quot;imagemode&quot;,MS_IMAGEMODE_RGB); @@ -125,8 +89,10 @@ $o-&gt;set(&quot;imagemode&quot;,MS_IMAGEMODE_RGB);
125 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); 89 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
126 //mapa 90 //mapa
127 $imgo = $map->draw(); 91 $imgo = $map->draw();
128 -if($imgo->imagepath == "")  
129 -{echo "Erro IMAGEPATH vazio";exit;} 92 +if($imgo->imagepath == ""){
  93 + echo "Erro IMAGEPATH vazio";
  94 + exit;
  95 +}
130 $nomer = ($imgo->imagepath)."mapa".$nomes.".jpg"; 96 $nomer = ($imgo->imagepath)."mapa".$nomes.".jpg";
131 $imgo->saveImage($nomer); 97 $imgo->saveImage($nomer);
132 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); 98 $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
@@ -135,12 +101,24 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu @@ -135,12 +101,24 @@ $nomemapa = strtolower($protocolo[0]).&quot;://&quot;.$_SERVER[&#39;HTTP_HOST&#39;].($imgo-&gt;imageu
135 $numlayers = $map->numlayers; 101 $numlayers = $map->numlayers;
136 for ($j=0;$j < $numlayers;$j++){ 102 for ($j=0;$j < $numlayers;$j++){
137 $l = $map->getlayer($j); 103 $l = $map->getlayer($j);
138 - if($l->type != 3 && $l->type != 4){  
139 - $nclass = $l->numclasses;  
140 - for($i=0;$i<$nclass;$i++){  
141 - $classe = $l->getclass($i);  
142 - if($classe->title === ""){  
143 - $classe->title = $classe->name; 104 + if ($l->getmetadata("classe") == "NAO"){
  105 + $l->set("status",MS_OFF);
  106 + } else {
  107 + if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){
  108 + if ($l->numclasses > 0){
  109 + $classe = $l->getclass(0);
  110 + if (($classe->name == "") || ($classe->name == " ")){
  111 + $classe->set("name",$layer->getmetadata("tema"));
  112 + }
  113 + }
  114 + }
  115 + if($l->type != 3 && $l->type != 4){
  116 + $nclass = $l->numclasses;
  117 + for($i=0;$i<$nclass;$i++){
  118 + $classe = $l->getclass($i);
  119 + if($classe->title === ""){
  120 + $classe->title = $classe->name;
  121 + }
144 } 122 }
145 } 123 }
146 } 124 }
@@ -163,7 +141,6 @@ $nomer = ($imgo-&gt;imagepath).&quot;ref&quot;.$nomes.&quot;.jpg&quot;; @@ -163,7 +141,6 @@ $nomer = ($imgo-&gt;imagepath).&quot;ref&quot;.$nomes.&quot;.jpg&quot;;
163 $imgo->saveImage($nomer); 141 $imgo->saveImage($nomer);
164 $nomeref = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); 142 $nomeref = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer);
165 143
166 -  
167 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>"; 144 echo "<p>Utilize a op&ccedil;&atilde;o de altera&ccedil;&atilde;o das propriedades do mapa para ajustar a legenda, tamanho e outras caracter&iacute;sticas antes de gerar os arquivos.</p>";
168 echo "<p>Arquivos gerados:</p>"; 145 echo "<p>Arquivos gerados:</p>";
169 echo "<a style=font-family:Verdana,Arial,Helvetica,sans-serif; href='$nomemapa' target=_blank >Mapa</a><br><br>"; 146 echo "<a style=font-family:Verdana,Arial,Helvetica,sans-serif; href='$nomemapa' target=_blank >Mapa</a><br><br>";
ferramentas/imprimir/svg.php
  Diff comments   View file @d3058e8
@@ -65,10 +65,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;); @@ -65,10 +65,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;);
65 $nomes = nomeRandomico(); 65 $nomes = nomeRandomico();
66 66
67 $map = ms_newMapObj($map_file); 67 $map = ms_newMapObj($map_file);
68 -$temp = str_replace(".map","xxx.map",$map_file);  
69 -$map->save($temp);  
70 -substituiCon($temp,$postgis_mapa);  
71 -$map = ms_newMapObj($temp); 68 +substituiConObj($map,$postgis_mapa);
72 if($map->getmetadata("interface") == "googlemaps") 69 if($map->getmetadata("interface") == "googlemaps")
73 { 70 {
74 $proj4 = pegaProjecaoDefault("proj4"); 71 $proj4 = pegaProjecaoDefault("proj4");
@@ -85,57 +82,30 @@ if($leb-&gt;type == &quot;MS_BITMAP&quot;){ @@ -85,57 +82,30 @@ if($leb-&gt;type == &quot;MS_BITMAP&quot;){
85 $leb->set("type",MS_TRUETYPE); 82 $leb->set("type",MS_TRUETYPE);
86 $leb->set("font","Arial"); 83 $leb->set("font","Arial");
87 } 84 }
88 -//altera o nome das classes vazias 85 +//legenda
  86 +//corrige o titulo da legenda
89 $numlayers = $map->numlayers; 87 $numlayers = $map->numlayers;
90 -for ($i=0;$i < $numlayers;$i++)  
91 -{  
92 - $layer = $map->getlayer($i);  
93 - if (($layer->data != "") && (strtolower($layer->getmetadata("escondido")) != "sim") && (strtolower($layer->getmetadata("tema")) != "sim"))  
94 - {  
95 - if ($layer->numclasses > 0)  
96 - {  
97 - $classe = $layer->getclass(0);  
98 - if (($classe->name == "") || ($classe->name == " "))  
99 - {$classe->set("name",$layer->getmetadata("tema"));}  
100 - }  
101 - }  
102 - if ($layer->getmetadata("classe") == "NAO")  
103 - {  
104 - $nclasses = $layer->numclasses;  
105 - if ($nclasses > 0)  
106 - {  
107 - for($j=0;$j<$nclasses;$j++)  
108 - {  
109 - $classe = $layer->getclass($j);  
110 - $classe->set("name","classeNula"); 88 +for ($j=0;$j < $numlayers;$j++){
  89 + $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 + }
111 } 96 }
112 } 97 }
113 - }  
114 -  
115 - $nclasses = $layer->numclasses;  
116 - if ($nclasses > 0){  
117 - for($j=0;$j<$nclasses;$j++){  
118 - $classe = $layer->getclass($j);  
119 - $leb = false;  
120 - if($v["inteiro"] >= 60200){  
121 - if($classe->numlabels > 0){  
122 - $leb = $classe->getLabel(0); 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;
123 } 104 }
124 } 105 }
125 - else{  
126 - $leb = $classe->label;  
127 - }  
128 - if($leb != false && $leb->type == MS_BITMAP){  
129 - $leb->set("type",MS_TRUETYPE);  
130 - $leb->set("font","Arial");  
131 - }  
132 } 106 }
133 - }  
134 } 107 }
135 -$map->save($temp);  
136 -removeLinha("classeNula",$temp);  
137 -$map = ms_newMapObj($temp);  
138 -substituiCon($temp,$postgis_mapa); 108 +
139 $o = $map->outputformat; 109 $o = $map->outputformat;
140 if($mapexten != ""){ 110 if($mapexten != ""){
141 $ext = explode(" ",$mapexten); 111 $ext = explode(" ",$mapexten);
ferramentas/imprimir/swf.php
  Diff comments   View file @d3058e8
@@ -35,6 +35,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;); @@ -35,6 +35,7 @@ require(dirname(__FILE__).&quot;/../../classesphp/funcoes_gerais.php&quot;);
35 //error_reporting(0); 35 //error_reporting(0);
36 $nomes = nomeRandomico(); 36 $nomes = nomeRandomico();
37 $map = ms_newMapObj($map_file); 37 $map = ms_newMapObj($map_file);
  38 +substituiConObj($map,$postgis_mapa);
38 $legenda =$map->legend; 39 $legenda =$map->legend;
39 $legenda->set("status",MS_EMBED); 40 $legenda->set("status",MS_EMBED);
40 //altera o nome das classes vazias 41 //altera o nome das classes vazias
@@ -64,9 +65,9 @@ foreach ($temas as $tema) @@ -64,9 +65,9 @@ foreach ($temas as $tema)
64 } 65 }
65 } 66 }
66 } 67 }
67 -$map->save($temp); 68 +
68 removeLinha("classeNula",$temp); 69 removeLinha("classeNula",$temp);
69 -$map = ms_newMapObj($temp); 70 +
70 $of = $map->outputformat; 71 $of = $map->outputformat;
71 $of->set("driver","swf"); 72 $of->set("driver","swf");
72 $of->set("imagemode","PC256"); 73 $of->set("imagemode","PC256");
ferramentas/legenda/dicionario.js
  Diff comments   View file @d3058e8
@@ -52,7 +52,7 @@ i3GEOF.legenda.dicionario = @@ -52,7 +52,7 @@ i3GEOF.legenda.dicionario =
52 ], 52 ],
53 'mostraClassesLegenda' : [ 53 'mostraClassesLegenda' : [
54 { 54 {
55 - pt : "Mostra as classes desse tema na legenda do mapa", 55 + pt : "Ao imprimir, mostra as classes desse tema na legenda do mapa ",
56 en : "", 56 en : "",
57 es : "" 57 es : ""
58 } 58 }
@@ -257,7 +257,7 @@ i3GEO.tema = @@ -257,7 +257,7 @@ i3GEO.tema =
257 * {string} - codigo do tema 257 * {string} - codigo do tema
258 */ 258 */
259 invertestatuslegenda : function(idtema) { 259 invertestatuslegenda : function(idtema) {
260 - i3GEO.janela.tempoMsg($trad("x17")); 260 + //i3GEO.janela.tempoMsg($trad("x17"));
261 i3GEO.mapa.ativaTema(idtema); 261 i3GEO.mapa.ativaTema(idtema);
262 i3GEO.php.invertestatuslegenda(function(retorno) { 262 i3GEO.php.invertestatuslegenda(function(retorno) {
263 i3GEO.atualiza(retorno); 263 i3GEO.atualiza(retorno);
temas/_lbiomashp.map
  Diff comments   View file @d3058e8
@@ -5,37 +5,37 @@ MAP @@ -5,37 +5,37 @@ MAP
5 CONNECTION "" 5 CONNECTION ""
6 DATA "/var/www/i3geo/aplicmap/dados/biomas.shp" 6 DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
7 METADATA 7 METADATA
8 - "TIP" "CD_LEGENDA"  
9 "cache" "sim" 8 "cache" "sim"
10 - "CLASSE" "sim" 9 + "TIP" "CD_LEGENDA"
11 "olopacity" "" 10 "olopacity" ""
  11 + "CLASSE" "SIM"
12 "permitekmz" "SIM" 12 "permitekmz" "SIM"
13 "gmopacity" "" 13 "gmopacity" ""
14 "gmstatus" "" 14 "gmstatus" ""
15 "ITENSDESC" "Teste de acentuação" 15 "ITENSDESC" "Teste de acentuação"
16 - "TILES" "SIM"  
17 - "ESCALA" "250000"  
18 "editavel" "" 16 "editavel" ""
  17 + "ESCALA" "250000"
  18 + "TILES" "SIM"
19 "arquivotemaoriginal" "" 19 "arquivotemaoriginal" ""
20 "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909" 20 "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909"
21 - "nomeoriginal" ""  
22 "olstatus" "" 21 "olstatus" ""
  22 + "nomeoriginal" ""
23 "permitedownload" "SIM" 23 "permitedownload" "SIM"
24 - "FILTROORIGINAL" ""  
25 "permitecomentario" "NAO" 24 "permitecomentario" "NAO"
26 - "DATAORIGINAL" "" 25 + "FILTROORIGINAL" ""
27 "escondido" "NAO" 26 "escondido" "NAO"
28 - "download" "SIM" 27 + "DATAORIGINAL" ""
29 "esquematabelaeditavel" "" 28 "esquematabelaeditavel" ""
  29 + "download" "SIM"
30 "itembuscarapida" "CD_LEGENDA" 30 "itembuscarapida" "CD_LEGENDA"
31 "ITENS" "CD_LEGENDA" 31 "ITENS" "CD_LEGENDA"
32 - "permitekml" "SIM"  
33 - "permiteogc" "SIM"  
34 "transitioneffect" "NAO" 32 "transitioneffect" "NAO"
35 - "convcaracter" "SIM" 33 + "permiteogc" "SIM"
  34 + "permitekml" "SIM"
36 "TEMA" "Biomas shapefile (acentuação)" 35 "TEMA" "Biomas shapefile (acentuação)"
37 - "colunaidunico" "" 36 + "convcaracter" "SIM"
38 "colunageometria" "" 37 "colunageometria" ""
  38 + "colunaidunico" ""
39 "identifica" "sim" 39 "identifica" "sim"
40 "tabelaeditavel" "" 40 "tabelaeditavel" ""
41 "legendaimg" "https://mancilha.files.wordpress.com/2008/09/teste2.png" 41 "legendaimg" "https://mancilha.files.wordpress.com/2008/09/teste2.png"