diff --git a/ferramentas/imprimir/geotif.php b/ferramentas/imprimir/geotif.php index ba8ac6b..58a5f51 100755 --- a/ferramentas/imprimir/geotif.php +++ b/ferramentas/imprimir/geotif.php @@ -69,7 +69,7 @@ substituiConObj($map,$postgis_mapa); $of = $map->outputformat; $of->set("driver","GDAL/GTiff"); $of->set("imagemode","RGB"); -$map = ms_newMapObj($temp); + if($map->getmetadata("interface") == "googlemaps"){ $proj4 = pegaProjecaoDefault("proj4"); $map->setProjection($proj4); @@ -105,7 +105,7 @@ for ($j=0;$j < $numlayers;$j++){ if ($l->numclasses > 0){ $classe = $l->getclass(0); if (($classe->name == "") || ($classe->name == " ")){ - $classe->set("name",$layer->getmetadata("tema")); + $classe->set("name",$l->getmetadata("tema")); } } } diff --git a/ferramentas/imprimir/index.js b/ferramentas/imprimir/index.js index ca41be4..c1af737 100755 --- a/ferramentas/imprimir/index.js +++ b/ferramentas/imprimir/index.js @@ -176,7 +176,15 @@ i3GEOF.imprimir = { url = url+"?g_sid="+i3GEO.configura.sid+"&interface="+interf+"&mapexten="+i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); var id = "imprimir"+Math.random(); if(tipoAbertura){ - i3GEO.janela.cria("350px","350px",url,"","","
Arquivos
",id); + i3GEO.janela.cria( + "350px", + "350px", + url, + "", + "", + "
Arquivos
", + id + ); } else{ window.open(url); diff --git a/ferramentas/imprimir/jpeg.php b/ferramentas/imprimir/jpeg.php index c8eded1..582c34f 100755 --- a/ferramentas/imprimir/jpeg.php +++ b/ferramentas/imprimir/jpeg.php @@ -108,7 +108,7 @@ for ($j=0;$j < $numlayers;$j++){ if ($l->numclasses > 0){ $classe = $l->getclass(0); if (($classe->name == "") || ($classe->name == " ")){ - $classe->set("name",$layer->getmetadata("tema")); + $classe->set("name",$l->getmetadata("tema")); } } } diff --git a/ferramentas/imprimir/svg.php b/ferramentas/imprimir/svg.php index 288b949..bec7e06 100755 --- a/ferramentas/imprimir/svg.php +++ b/ferramentas/imprimir/svg.php @@ -66,47 +66,44 @@ $nomes = nomeRandomico(); $map = ms_newMapObj($map_file); substituiConObj($map,$postgis_mapa); -if($map->getmetadata("interface") == "googlemaps") -{ +if($map->getmetadata("interface") == "googlemaps"){ $proj4 = pegaProjecaoDefault("proj4"); $map->setProjection($proj4); $map->set("units",MS_METERS); $map->preparequery(); $map->set("scaledenom",$map->scaledenom * 100000); } -$v = versao(); -$leb = $eb->label; +$v = versao(); -if($leb->type == "MS_BITMAP"){ - $leb->set("type",MS_TRUETYPE); - $leb->set("font","Arial"); -} //legenda //corrige o titulo da legenda $numlayers = $map->numlayers; for ($j=0;$j < $numlayers;$j++){ $l = $map->getlayer($j); - if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){ - if ($l->numclasses > 0){ - $classe = $l->getclass(0); - if (($classe->name == "") || ($classe->name == " ")){ - $classe->set("name",$layer->getmetadata("tema")); - } + //para evitar fontes bitmap + if($l->name == "copyright"){ + $l->set("status",MS_DELETE); + } + if (($l->data != "") && (strtolower($l->getmetadata("escondido")) != "sim") && (strtolower($l->getmetadata("tema")) != "nao")){ + if ($l->numclasses > 0){ + $classe = $l->getclass(0); + if (($classe->name == "") || ($classe->name == " ")){ + $classe->set("name",$l->getmetadata("tema")); } } - if($l->type != 3 && $l->type != 4){ - $nclass = $l->numclasses; - for($i=0;$i<$nclass;$i++){ - $classe = $l->getclass($i); - if($classe->title === ""){ - $classe->title = $classe->name; - } + } + if($l->type != 3 && $l->type != 4){ + $nclass = $l->numclasses; + for($i=0;$i<$nclass;$i++){ + $classe = $l->getclass($i); + if($classe->title === ""){ + $classe->title = $classe->name; } } + } } -$o = $map->outputformat; if($mapexten != ""){ $ext = explode(" ",$mapexten); $extatual = $map->extent; @@ -116,8 +113,10 @@ $map->selectOutputFormat("svg"); $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); //mapa $imgo = $map->draw(); -if($imgo->imagepath == "") -{echo "Erro IMAGEPATH vazio";exit;} +if($imgo->imagepath == ""){ + echo "Erro IMAGEPATH vazio"; + exit; +} $nomer = ($imgo->imagepath)."mapa".$nomes.".svg"; $imgo->saveImage($nomer); $nomemapa = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'].($imgo->imageurl).basename($nomer); diff --git a/js/janela.js b/js/janela.js index 583d9d6..cc4de66 100755 --- a/js/janela.js +++ b/js/janela.js @@ -371,7 +371,7 @@ i3GEO.janela = temp = $i(id + "_corpo"); janela.bringToTop(); - if(waltura !== "auto"){ + if(waltura !== "auto" && wsrc == ""){ i3GEO.janela.applyScrollBar(temp.id,"",{live:true,liveSelector:".customScrollBar"}); i3GEO.janela.applyScrollBar(temp.id,"",{live:true,liveSelector:".customScrollBarXY",advanced:{ autoExpandHorizontalScroll: false }}); } -- libgit2 0.21.2