From 534efd4a5ffe5494812e8c2e9665d65d1e58b9d5 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 17 Oct 2013 18:51:30 +0000 Subject: [PATCH] $1 --- admin/php/editormapfile.php | 48 ++++++++++++++++++++++++++++++++++++++---------- temas/_lbiomashp.map | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------- 2 files changed, 117 insertions(+), 96 deletions(-) diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php index 5302992..b563783 100644 --- a/admin/php/editormapfile.php +++ b/admin/php/editormapfile.php @@ -157,13 +157,13 @@ switch (strtoupper($funcao)) if($base == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ $base = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"; } - if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ + if($base == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ $base = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map"; } - if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ + if($base == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ $base = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map"; } - if($f == "") + if($base == "") { $base = $locaplic."/aplicmap/geral1v".$versao.".map"; } @@ -1237,20 +1237,48 @@ function autoClassesLayer() include_once("$locaplic/classesphp/classe_alteraclasse.php"); error_reporting(0); $nometemp = $dir_tmp."/".nomerandomico().".map"; - if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) - { - $geral = $locaplic."/aplicmap/geral1windows.map"; + + $versao = versao(); + $versao = $versao["principal"]; + if($base == "" || !isset($base)){ + $base = ""; + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) + { + $base = $locaplic."/aplicmap/geral1windowsv".$versao.".map"; + } + else + { + if($base == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ + $base = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"; + } + if($base == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ + $base = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map"; + } + if($base == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ + $base = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map"; + } + if($base == "") + { + $base = $locaplic."/aplicmap/geral1v".$versao.".map"; + } + } } - else - {$geral = $locaplic."/aplicmap/geral1.map"; + else{ + if(!file_exists($base)) + { + $base = $locaplic."/aplicmap/".$base; + } } - $mapageral = ms_newMapObj($geral); + + $mapageral = ms_newMapObj($base); + $numlayers = $mapageral->numlayers; for ($i=0;$i < $numlayers;$i++) { $layertemp = $mapageral->getlayer($i); $layertemp->set("status",MS_DELETE); } + $mapatemp = ms_newMapObj($mapfile); $numlayers = $mapatemp->numlayers; for ($i=0;$i < $numlayers;$i++) @@ -2152,4 +2180,4 @@ function rrmdir($dir) { rmdir($dir); } } -?> \ No newline at end of file +?> diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map index b989b3d..7c4a111 100644 --- a/temas/_lbiomashp.map +++ b/temas/_lbiomashp.map @@ -1,86 +1,79 @@ -MAP - FONTSET "../symbols/fontes.txt" - SYMBOLSET "../symbols/simbolos.sym" - LAYER - CONNECTION "" - DATA "/var/www/i3geo/aplicmap/dados/biomas.shp" - METADATA - "METAESTAT_ID_MEDIDA_VARIAVEL" "" - #"cache" "SIM" - "CLASSE" "SIM" - "permitekmz" "nao" - "METAESTAT_CODIGO_TIPO_REGIAO" "" - "permitedownload" "sim" - "metaestat" "" - "permiteogc" "sim" - "permitekml" "sim" - "convcaracter" "" - "TEMA" "Biomas shapefile (acentuação)" - END # METADATA - NAME "_lbiomashp" - PROCESSING "ITEMS=CD_LEGENDA" - STATUS OFF - TEMPLATE "none.htm" - #MAXSCALEDENOM 5000000 - TILEITEM "location" - OPACITY 50 - TYPE POLYGON - UNITS METERS - CLASS - NAME "CAATINGA" - EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') - STYLE - ANGLE 0 - COLOR 200 0 0 - OFFSET 0 0 - END # STYLE - END # CLASS - CLASS - NAME "PAMPA" - EXPRESSION ('[CD_LEGENDA]'eq'PAMPA') - STYLE - ANGLE 0 - COLOR 225 189 199 - OFFSET 0 0 - END # STYLE - END # CLASS - CLASS - NAME "CERRADO" - EXPRESSION ('[CD_LEGENDA]'eq'CERRADO') - STYLE - ANGLE 0 - COLOR 17 235 39 - OFFSET 0 0 - END # STYLE - END # CLASS - CLASS - NAME "PANTANAL" - EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL') - STYLE - ANGLE 0 - COLOR 0 192 145 - OFFSET 0 0 - END # STYLE - END # CLASS - CLASS - NAME "AMAZONIA" - EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA') - STYLE - ANGLE 0 - COLOR 149 120 37 - OFFSET 0 0 - END # STYLE - END # CLASS - CLASS - NAME "MATA ATLANTICA" - EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA') - STYLE - ANGLE 0 - COLOR 208 160 125 - OFFSET 0 0 - END # STYLE - END # CLASS - END # LAYER - -END # MAP - +MAP + FONTSET "/var/www/i3geo/symbols/fontes.txt" + SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym" + LAYER + CONNECTION "" + DATA "/var/www/i3geo/aplicmap/dados/biomas.shp" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "cache" "" + "CLASSE" "SIM" + "permitekmz" "nao" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "permitedownload" "sim" + "metaestat" "" + "permiteogc" "sim" + "permitekml" "sim" + "convcaracter" "" + "TEMA" "Biomas shapefile (acentuação)" + END # METADATA + NAME "_lbiomashp" + PROCESSING "ITEMS=CD_LEGENDA" + STATUS OFF + TEMPLATE "none.htm" + TILEITEM "location" + OPACITY 50 + TYPE POLYGON + UNITS METERS + CLASS + NAME "CAATINGA" + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') + STYLE + COLOR 164 186 131 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + CLASS + NAME "PAMPA" + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA') + STYLE + COLOR 129 208 7 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + CLASS + NAME "CERRADO" + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO') + STYLE + COLOR 74 234 68 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + CLASS + NAME "PANTANAL" + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL') + STYLE + COLOR 60 196 145 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + CLASS + NAME "AMAZONIA" + EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA') + STYLE + COLOR 248 68 118 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + CLASS + NAME "MATA ATLANTICA" + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA') + STYLE + COLOR 7 115 180 + OUTLINECOLOR 255 255 255 + END # STYLE + END # CLASS + END # LAYER + +END # MAP + -- libgit2 0.21.2