Commit 606d4a4a0150448688ff5bc4700f1d4a98227859
1 parent
859d1cba
Exists in
master
and in
7 other branches
Corrigida a classe_legenda.php, fuinção criaLegenda, que não estava desligando o…
…s temas marcados com o metadata ESCONDIDO = SIM
Showing
2 changed files
with
11 additions
and
4 deletions
Show diff stats
classesjs/compactajs.php
| @@ -63,6 +63,7 @@ $fecha = fclose ($abre); | @@ -63,6 +63,7 @@ $fecha = fclose ($abre); | ||
| 63 | // | 63 | // |
| 64 | //gera um único js | 64 | //gera um único js |
| 65 | // | 65 | // |
| 66 | + | ||
| 66 | $jsfiles = array( | 67 | $jsfiles = array( |
| 67 | "../pacotes/yui/build/yahoo/yahoo-min.js", | 68 | "../pacotes/yui/build/yahoo/yahoo-min.js", |
| 68 | "../pacotes/yui/build/event/event-min.js", | 69 | "../pacotes/yui/build/event/event-min.js", |
| @@ -112,6 +113,8 @@ $cssfiles = array( | @@ -112,6 +113,8 @@ $cssfiles = array( | ||
| 112 | "../css/reset-min.css", | 113 | "../css/reset-min.css", |
| 113 | "../css/grids-min.css", | 114 | "../css/grids-min.css", |
| 114 | "../css/menu-min.css", | 115 | "../css/menu-min.css", |
| 116 | +//"../pacotes/yui231/build/reset-fonts-grids/reset-fonts-grids.css", | ||
| 117 | +//"../pacotes/yui231/build/menu/assets/skins/sam/menu.css", | ||
| 115 | "jsobjects/jsUI-Treeview/default.css" | 118 | "jsobjects/jsUI-Treeview/default.css" |
| 116 | ); | 119 | ); |
| 117 | $buffer = ""; | 120 | $buffer = ""; |
classesphp/classe_legenda.php
| @@ -161,15 +161,13 @@ string com a legenda HTML | @@ -161,15 +161,13 @@ string com a legenda HTML | ||
| 161 | function criaLegenda() | 161 | function criaLegenda() |
| 162 | { | 162 | { |
| 163 | $l = ""; | 163 | $l = ""; |
| 164 | + $numlayers = $this->mapa->numlayers; | ||
| 164 | if($this->nome != "") | 165 | if($this->nome != "") |
| 165 | { | 166 | { |
| 166 | //verifica se é wms | 167 | //verifica se é wms |
| 167 | $c = $this->layer->connectiontype; | 168 | $c = $this->layer->connectiontype; |
| 168 | if (($c == 7)) | 169 | if (($c == 7)) |
| 169 | - { | ||
| 170 | - return($this->tabelaLegenda()); | ||
| 171 | - } | ||
| 172 | - $numlayers = $this->mapa->numlayers; | 170 | + {return($this->tabelaLegenda());} |
| 173 | for ($i=0;$i < $numlayers;$i++) | 171 | for ($i=0;$i < $numlayers;$i++) |
| 174 | { | 172 | { |
| 175 | $la = $this->mapa->getlayer($i); | 173 | $la = $this->mapa->getlayer($i); |
| @@ -179,6 +177,12 @@ string com a legenda HTML | @@ -179,6 +177,12 @@ string com a legenda HTML | ||
| 179 | {$la->set("status",MS_DEFAULT);} | 177 | {$la->set("status",MS_DEFAULT);} |
| 180 | } | 178 | } |
| 181 | } | 179 | } |
| 180 | + for ($i=0;$i < $numlayers;$i++) | ||
| 181 | + { | ||
| 182 | + $la = $this->mapa->getlayer($i); | ||
| 183 | + if(strtoupper($la->getmetadata("ESCONDIDO")) == "SIM") | ||
| 184 | + {$la->set("status",MS_OFF);} | ||
| 185 | + } | ||
| 182 | $legenda = $this->mapa->legend; | 186 | $legenda = $this->mapa->legend; |
| 183 | $legenda->set("template",$this->templateleg); | 187 | $legenda->set("template",$this->templateleg); |
| 184 | $tmparray["my_tag"] = "value_of_my_tag"; | 188 | $tmparray["my_tag"] = "value_of_my_tag"; |