Commit c863aceddaf415ebe43ba0b7c4695242dd7ff75d
1 parent
cbb82496
Exists in
master
and in
7 other branches
--no commit message
Showing
1 changed file
with
4 additions
and
1 deletions
Show diff stats
classesphp/funcoes_gerais.php
| @@ -1418,7 +1418,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | @@ -1418,7 +1418,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | ||
| 1418 | $layer = $map->getlayerbyname($tema); | 1418 | $layer = $map->getlayerbyname($tema); |
| 1419 | //e necessario abrir ou nao vai projetar | 1419 | //e necessario abrir ou nao vai projetar |
| 1420 | $layer->open(); | 1420 | $layer->open(); |
| 1421 | - $prjMapa = $map->getProjection(); | 1421 | + $prjMapa = $map->getProjection(); |
| 1422 | $prjTema = $layer->getProjection(); | 1422 | $prjTema = $layer->getProjection(); |
| 1423 | if($prjTema != ""){ | 1423 | if($prjTema != ""){ |
| 1424 | $projInObj = new projectionObj($prjTema); | 1424 | $projInObj = new projectionObj($prjTema); |
| @@ -1427,6 +1427,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | @@ -1427,6 +1427,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | ||
| 1427 | else{ | 1427 | else{ |
| 1428 | $projInObj = ""; | 1428 | $projInObj = ""; |
| 1429 | $projOutObj = ""; | 1429 | $projOutObj = ""; |
| 1430 | + $projetaToMap = false; | ||
| 1430 | } | 1431 | } |
| 1431 | 1432 | ||
| 1432 | $layer->set("template","none.htm"); | 1433 | $layer->set("template","none.htm"); |
| @@ -1482,6 +1483,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | @@ -1482,6 +1483,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE,$prj="",$proj | ||
| 1482 | $novoshpf = ms_newShapefileObj($nomeshp.".shp", -2); | 1483 | $novoshpf = ms_newShapefileObj($nomeshp.".shp", -2); |
| 1483 | $novoshpf->addShape($shape); | 1484 | $novoshpf->addShape($shape); |
| 1484 | $resultadoFinal = true; | 1485 | $resultadoFinal = true; |
| 1486 | + | ||
| 1485 | } | 1487 | } |
| 1486 | else{ | 1488 | else{ |
| 1487 | $shapesSel = retornaShapesSelecionados($layer,$map_file,$map,false); | 1489 | $shapesSel = retornaShapesSelecionados($layer,$map_file,$map,false); |
| @@ -1892,6 +1894,7 @@ function downloadTema2($map_file,$tema,$locaplic,$dir_tmp,$postgis_mapa) | @@ -1892,6 +1894,7 @@ function downloadTema2($map_file,$tema,$locaplic,$dir_tmp,$postgis_mapa) | ||
| 1892 | if($db){$nreg = xbase_numrecords($db);} | 1894 | if($db){$nreg = xbase_numrecords($db);} |
| 1893 | } | 1895 | } |
| 1894 | } | 1896 | } |
| 1897 | + | ||
| 1895 | // | 1898 | // |
| 1896 | //gera um mapfile para download | 1899 | //gera um mapfile para download |
| 1897 | // | 1900 | // |