Commit 43ddb4d75b396a041df20ce3a67b031a5aae7f18
1 parent
0212807d
Exists in
master
and in
7 other branches
--no commit message
Showing
1 changed file
with
13 additions
and
16 deletions
Show diff stats
mashups/openlayers.php
@@ -170,8 +170,11 @@ if($temas != "") | @@ -170,8 +170,11 @@ if($temas != "") | ||
170 | $tituloLayer = $layern->getmetadata("tema"); | 170 | $tituloLayer = $layern->getmetadata("tema"); |
171 | } | 171 | } |
172 | $ebase = "false"; | 172 | $ebase = "false"; |
173 | - if(isset($fundo) && in_array($tema,$fundo)) | ||
174 | - {$ebase = "true";} | 173 | + if(isset($fundo) && $fundo != ""){ |
174 | + if(in_array($tema,$fundo)){ | ||
175 | + $ebase = "true"; | ||
176 | + } | ||
177 | + } | ||
175 | $visivel = "false"; | 178 | $visivel = "false"; |
176 | if(in_array($tema,$visiveis)) | 179 | if(in_array($tema,$visiveis)) |
177 | {$visivel = "true";} | 180 | {$visivel = "true";} |
@@ -365,31 +368,30 @@ i3GEO.editorOL.ativarodadomouse = "<?php | @@ -365,31 +368,30 @@ i3GEO.editorOL.ativarodadomouse = "<?php | ||
365 | else | 368 | else |
366 | {echo "true";} | 369 | {echo "true";} |
367 | ?>"; | 370 | ?>"; |
368 | -<?php if(isset($fundo)){ | 371 | +<?php |
372 | +if(isset($fundo) && $fundo != ""){ | ||
369 | echo "i3GEO.editorOL.fundo = '".implode(",",$fundo)."';"; | 373 | echo "i3GEO.editorOL.fundo = '".implode(",",$fundo)."';"; |
370 | } | 374 | } |
371 | -?> | ||
372 | -<?php if(isset($controles)){ | 375 | + |
376 | +if(isset($controles)){ | ||
373 | echo "i3GEO.editorOL.controle = [".implode(",",$objControles)."];"; | 377 | echo "i3GEO.editorOL.controle = [".implode(",",$objControles)."];"; |
374 | } | 378 | } |
375 | -?> | ||
376 | -<?php if(isset($numzoomlevels)){ | 379 | +if(isset($numzoomlevels)){ |
377 | echo "i3GEO.editorOL.numzoom = ".$numzoomlevels.";"; | 380 | echo "i3GEO.editorOL.numzoom = ".$numzoomlevels.";"; |
378 | } | 381 | } |
379 | -?> | ||
380 | -<?php | ||
381 | if(isset($maxextent)){ | 382 | if(isset($maxextent)){ |
382 | $maxextent = str_replace(" ",",",$maxextent); | 383 | $maxextent = str_replace(" ",",",$maxextent); |
383 | echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(".$maxextent.");"; | 384 | echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(".$maxextent.");"; |
384 | } | 385 | } |
385 | else | 386 | else |
386 | {echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);";} | 387 | {echo "i3GEO.editorOL.maxext = new OpenLayers.Bounds(-76.5125927,-39.3925675209,-29.5851853,9.49014852081);";} |
387 | -?> | ||
388 | -<?php | ||
389 | if(isset($mapext)){ | 388 | if(isset($mapext)){ |
390 | $mapext = str_replace(" ",",",$mapext); | 389 | $mapext = str_replace(" ",",",$mapext); |
391 | echo "i3GEO.editorOL.mapext = new OpenLayers.Bounds(".$mapext.");"; | 390 | echo "i3GEO.editorOL.mapext = new OpenLayers.Bounds(".$mapext.");"; |
392 | } | 391 | } |
392 | +if(empty($fundo)){ | ||
393 | + //echo "i3GEO.editorOL.mapa.allOverlays = true;"; | ||
394 | +} | ||
393 | ?> | 395 | ?> |
394 | i3GEO.editorOL.mapa = new OpenLayers.Map( | 396 | i3GEO.editorOL.mapa = new OpenLayers.Map( |
395 | 'i3geoMapa', | 397 | 'i3geoMapa', |
@@ -398,11 +400,6 @@ i3GEO.editorOL.mapa = new OpenLayers.Map( | @@ -398,11 +400,6 @@ i3GEO.editorOL.mapa = new OpenLayers.Map( | ||
398 | resolutions:[0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.000021457672119140625] | 400 | resolutions:[0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,0.0006866455078125,0.00034332275390625,0.000171661376953125,0.0000858306884765625,0.00004291534423828125,0.000021457672119140625] |
399 | } | 401 | } |
400 | ); | 402 | ); |
401 | -<?php if(empty($fundo)){ | ||
402 | - echo "i3GEO.editorOL.mapa.allOverlays = true;"; | ||
403 | -} | ||
404 | -?> | ||
405 | - | ||
406 | i3GEO.editorOL.inicia(); | 403 | i3GEO.editorOL.inicia(); |
407 | </script> | 404 | </script> |
408 | </body> | 405 | </body> |