Download as
Browse Code »

Commit 5855b772fa5eb0ab970ade828866ea2ec14a745c

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

Correção na inclusão de diretivas de processamento duplicadas

Showing 4 changed files with 44 additions and 22 deletions   Show diff stats
classesphp/classe_mapa.php
  Diff comments   View file @5855b77
... ... @@ -1262,8 +1262,13 @@ class Mapa
1262 1262 $nlayer = $nmap->getlayerbyname($n);
1263 1263 //evita problemas no modo tile
1264 1264 if($this->v > 5){
1265   - $nlayer->setprocessing("LABEL_NO_CLIP=True");
1266   - $nlayer->setprocessing("POLYLINE_NO_CLIP=True");
  1265 + $p = $nlayer->getProcessing();
  1266 + if(!in_array("LABEL_NO_CLIP=True",$p)){
  1267 + $nlayer->setprocessing("LABEL_NO_CLIP=True");
  1268 + }
  1269 + if(!in_array("POLYLINE_NO_CLIP=True",$p)){
  1270 + $nlayer->setprocessing("POLYLINE_NO_CLIP=True");
  1271 + }
1267 1272 }
1268 1273 //para impedir erros na legenda
1269 1274 if($nlayer->getmetadata("classe") == ""){
... ...
ms_criamapa.php
  Diff comments   View file @5855b77
... ... @@ -136,7 +136,7 @@ filtros - filtros podem ser adicionados incluindo o parametro da seguinte forma:
136 136 Exemplo de filtro
137 137  
138 138 http://localhost/i3geo/ms_criamapa.php?temasa=_lbiomashp&map_layer__lbiomashp_filter=(('[CD_LEGENDA]'='CAATINGA'))&temasa=_lbiomashp
139   -
  139 +
140 140 no caso de camadas Postgis basta usar map_layer__lbiomashp_filter=cd_legenda='CAATINGA'
141 141 */
142 142  
... ... @@ -215,9 +215,9 @@ filtros - filtros podem ser adicionados incluindo o parametro da seguinte forma:
215 215 Exemplo de filtro
216 216  
217 217 http://localhost/i3geo/ms_criamapa.php?layers=_lbiomashp&temasa=_lbiomashp&map_layer__lbiomashp_filter=(('[CD_LEGENDA]'='CAATINGA'))
218   -
  218 +
219 219 no caso de camadas Postgis basta usar map_layer__lbiomashp_filter=cd_legenda='CAATINGA'
220   -
  220 +
221 221 ";
222 222 exit;
223 223 }
... ... @@ -645,8 +645,14 @@ function adaptaLayers($tmpfname,$versao){
645 645 $layer->setmetadata("classe","");
646 646 }
647 647 if($versao > 5){
648   - $layer->setprocessing("LABEL_NO_CLIP=True");
649   - $layer->setprocessing("POLYLINE_NO_CLIP=True");
  648 + $pr = $layer->getProcessing();
  649 + if(!in_array("LABEL_NO_CLIP=True",$pr)){
  650 + $layer->setprocessing("LABEL_NO_CLIP=True");
  651 + }
  652 + if(!in_array("POLYLINE_NO_CLIP=True",$pr)){
  653 + $layer->setprocessing("POLYLINE_NO_CLIP=True");
  654 + }
  655 +
650 656 }
651 657 //
652 658 //verifica se deve aplicar filtro
... ...
ogc.php
  Diff comments   View file @5855b77
... ... @@ -411,9 +411,14 @@ else{
411 411 }
412 412 autoClasses($l,$oMap);
413 413 if($versao > 5){
414   - $l->setprocessing("LABEL_NO_CLIP=True");
415   - $l->setprocessing("POLYLINE_NO_CLIP=True");
416   - }
  414 + $pr = $l->getProcessing();
  415 + if(!in_array("LABEL_NO_CLIP=True",$pr)){
  416 + $l->setprocessing("LABEL_NO_CLIP=True");
  417 + }
  418 + if(!in_array("POLYLINE_NO_CLIP=True",$pr)){
  419 + $l->setprocessing("POLYLINE_NO_CLIP=True");
  420 + }
  421 + }
417 422 //
418 423 //verifica se existem parametros de substituicao passados via url
419 424 //
... ...
temas/_lbiomashp.map
  Diff comments   View file @5855b77
... ... @@ -44,49 +44,55 @@ MAP
44 44 NAME "CAATINGA"
45 45 EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
46 46 STYLE
47   - COLOR 220 255 198
  47 + COLOR 183 247 169
48 48 OUTLINECOLOR 255 255 255
49 49 END # STYLE
  50 + TITLE ""
50 51 END # CLASS
51 52 CLASS
52   - NAME "PAMPA"
53   - EXPRESSION ('[CD_LEGENDA]'eq'PAMPA')
  53 + NAME "PAMPA area > 5"
  54 + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA area > 5')
54 55 STYLE
55   - COLOR 146 184 126
  56 + COLOR 239 22 152
56 57 OUTLINECOLOR 255 255 255
57 58 END # STYLE
  59 + TITLE ""
58 60 END # CLASS
59 61 CLASS
60 62 NAME "CERRADO"
61 63 EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
62 64 STYLE
63   - COLOR 49 19 199
  65 + COLOR 57 32 234
64 66 OUTLINECOLOR 255 255 255
65 67 END # STYLE
  68 + TITLE ""
66 69 END # CLASS
67 70 CLASS
68 71 NAME "PANTANAL"
69 72 EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
70 73 STYLE
71   - COLOR 252 72 119
  74 + COLOR 214 107 232
72 75 OUTLINECOLOR 255 255 255
73 76 END # STYLE
  77 + TITLE ""
74 78 END # CLASS
75 79 CLASS
76   - NAME "AMAZÔNIA"
77   - EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
  80 + NAME "AMAZÔNIA"
  81 + EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
78 82 STYLE
79   - COLOR 31 233 4
  83 + COLOR 102 177 195
80 84 OUTLINECOLOR 255 255 255
81 85 END # STYLE
  86 + TITLE ""
82 87 END # CLASS
83 88 CLASS
84   - NAME "MATA ATLÂNTICA"
85   - EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
  89 + NAME "MATA ATLÂNTICA"
  90 + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
86 91 STYLE
87   - COLOR 141 178 208
  92 + COLOR 44 215 49
88 93 OUTLINECOLOR 255 255 255
89 94 END # STYLE
  95 + TITLE ""
90 96 END # CLASS
91 97 END # LAYER
92 98  
... ...