Commit 534efd4a5ffe5494812e8c2e9665d65d1e58b9d5
1 parent
d51bcc6c
Exists in
master
and in
7 other branches
$1
Showing
2 changed files
with
117 additions
and
96 deletions
Show diff stats
admin/php/editormapfile.php
... | ... | @@ -157,13 +157,13 @@ switch (strtoupper($funcao)) |
157 | 157 | if($base == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ |
158 | 158 | $base = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"; |
159 | 159 | } |
160 | - if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
160 | + if($base == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
161 | 161 | $base = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map"; |
162 | 162 | } |
163 | - if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
163 | + if($base == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
164 | 164 | $base = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map"; |
165 | 165 | } |
166 | - if($f == "") | |
166 | + if($base == "") | |
167 | 167 | { |
168 | 168 | $base = $locaplic."/aplicmap/geral1v".$versao.".map"; |
169 | 169 | } |
... | ... | @@ -1237,20 +1237,48 @@ function autoClassesLayer() |
1237 | 1237 | include_once("$locaplic/classesphp/classe_alteraclasse.php"); |
1238 | 1238 | error_reporting(0); |
1239 | 1239 | $nometemp = $dir_tmp."/".nomerandomico().".map"; |
1240 | - if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) | |
1241 | - { | |
1242 | - $geral = $locaplic."/aplicmap/geral1windows.map"; | |
1240 | + | |
1241 | + $versao = versao(); | |
1242 | + $versao = $versao["principal"]; | |
1243 | + if($base == "" || !isset($base)){ | |
1244 | + $base = ""; | |
1245 | + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) | |
1246 | + { | |
1247 | + $base = $locaplic."/aplicmap/geral1windowsv".$versao.".map"; | |
1248 | + } | |
1249 | + else | |
1250 | + { | |
1251 | + if($base == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ | |
1252 | + $base = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"; | |
1253 | + } | |
1254 | + if($base == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
1255 | + $base = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map"; | |
1256 | + } | |
1257 | + if($base == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){ | |
1258 | + $base = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map"; | |
1259 | + } | |
1260 | + if($base == "") | |
1261 | + { | |
1262 | + $base = $locaplic."/aplicmap/geral1v".$versao.".map"; | |
1263 | + } | |
1264 | + } | |
1243 | 1265 | } |
1244 | - else | |
1245 | - {$geral = $locaplic."/aplicmap/geral1.map"; | |
1266 | + else{ | |
1267 | + if(!file_exists($base)) | |
1268 | + { | |
1269 | + $base = $locaplic."/aplicmap/".$base; | |
1270 | + } | |
1246 | 1271 | } |
1247 | - $mapageral = ms_newMapObj($geral); | |
1272 | + | |
1273 | + $mapageral = ms_newMapObj($base); | |
1274 | + | |
1248 | 1275 | $numlayers = $mapageral->numlayers; |
1249 | 1276 | for ($i=0;$i < $numlayers;$i++) |
1250 | 1277 | { |
1251 | 1278 | $layertemp = $mapageral->getlayer($i); |
1252 | 1279 | $layertemp->set("status",MS_DELETE); |
1253 | 1280 | } |
1281 | + | |
1254 | 1282 | $mapatemp = ms_newMapObj($mapfile); |
1255 | 1283 | $numlayers = $mapatemp->numlayers; |
1256 | 1284 | for ($i=0;$i < $numlayers;$i++) |
... | ... | @@ -2152,4 +2180,4 @@ function rrmdir($dir) { |
2152 | 2180 | rmdir($dir); |
2153 | 2181 | } |
2154 | 2182 | } |
2155 | -?> | |
2156 | 2183 | \ No newline at end of file |
2184 | +?> | ... | ... |
temas/_lbiomashp.map
1 | -MAP | |
2 | - FONTSET "../symbols/fontes.txt" | |
3 | - SYMBOLSET "../symbols/simbolos.sym" | |
4 | - LAYER | |
5 | - CONNECTION "" | |
6 | - DATA "/var/www/i3geo/aplicmap/dados/biomas.shp" | |
7 | - METADATA | |
8 | - "METAESTAT_ID_MEDIDA_VARIAVEL" "" | |
9 | - #"cache" "SIM" | |
10 | - "CLASSE" "SIM" | |
11 | - "permitekmz" "nao" | |
12 | - "METAESTAT_CODIGO_TIPO_REGIAO" "" | |
13 | - "permitedownload" "sim" | |
14 | - "metaestat" "" | |
15 | - "permiteogc" "sim" | |
16 | - "permitekml" "sim" | |
17 | - "convcaracter" "" | |
18 | - "TEMA" "Biomas shapefile (acentuação)" | |
19 | - END # METADATA | |
20 | - NAME "_lbiomashp" | |
21 | - PROCESSING "ITEMS=CD_LEGENDA" | |
22 | - STATUS OFF | |
23 | - TEMPLATE "none.htm" | |
24 | - #MAXSCALEDENOM 5000000 | |
25 | - TILEITEM "location" | |
26 | - OPACITY 50 | |
27 | - TYPE POLYGON | |
28 | - UNITS METERS | |
29 | - CLASS | |
30 | - NAME "CAATINGA" | |
31 | - EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') | |
32 | - STYLE | |
33 | - ANGLE 0 | |
34 | - COLOR 200 0 0 | |
35 | - OFFSET 0 0 | |
36 | - END # STYLE | |
37 | - END # CLASS | |
38 | - CLASS | |
39 | - NAME "PAMPA" | |
40 | - EXPRESSION ('[CD_LEGENDA]'eq'PAMPA') | |
41 | - STYLE | |
42 | - ANGLE 0 | |
43 | - COLOR 225 189 199 | |
44 | - OFFSET 0 0 | |
45 | - END # STYLE | |
46 | - END # CLASS | |
47 | - CLASS | |
48 | - NAME "CERRADO" | |
49 | - EXPRESSION ('[CD_LEGENDA]'eq'CERRADO') | |
50 | - STYLE | |
51 | - ANGLE 0 | |
52 | - COLOR 17 235 39 | |
53 | - OFFSET 0 0 | |
54 | - END # STYLE | |
55 | - END # CLASS | |
56 | - CLASS | |
57 | - NAME "PANTANAL" | |
58 | - EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL') | |
59 | - STYLE | |
60 | - ANGLE 0 | |
61 | - COLOR 0 192 145 | |
62 | - OFFSET 0 0 | |
63 | - END # STYLE | |
64 | - END # CLASS | |
65 | - CLASS | |
66 | - NAME "AMAZONIA" | |
67 | - EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA') | |
68 | - STYLE | |
69 | - ANGLE 0 | |
70 | - COLOR 149 120 37 | |
71 | - OFFSET 0 0 | |
72 | - END # STYLE | |
73 | - END # CLASS | |
74 | - CLASS | |
75 | - NAME "MATA ATLANTICA" | |
76 | - EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA') | |
77 | - STYLE | |
78 | - ANGLE 0 | |
79 | - COLOR 208 160 125 | |
80 | - OFFSET 0 0 | |
81 | - END # STYLE | |
82 | - END # CLASS | |
83 | - END # LAYER | |
84 | - | |
85 | -END # MAP | |
86 | - | |
1 | +MAP | |
2 | + FONTSET "/var/www/i3geo/symbols/fontes.txt" | |
3 | + SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym" | |
4 | + LAYER | |
5 | + CONNECTION "" | |
6 | + DATA "/var/www/i3geo/aplicmap/dados/biomas.shp" | |
7 | + METADATA | |
8 | + "METAESTAT_ID_MEDIDA_VARIAVEL" "" | |
9 | + "cache" "" | |
10 | + "CLASSE" "SIM" | |
11 | + "permitekmz" "nao" | |
12 | + "METAESTAT_CODIGO_TIPO_REGIAO" "" | |
13 | + "permitedownload" "sim" | |
14 | + "metaestat" "" | |
15 | + "permiteogc" "sim" | |
16 | + "permitekml" "sim" | |
17 | + "convcaracter" "" | |
18 | + "TEMA" "Biomas shapefile (acentuação)" | |
19 | + END # METADATA | |
20 | + NAME "_lbiomashp" | |
21 | + PROCESSING "ITEMS=CD_LEGENDA" | |
22 | + STATUS OFF | |
23 | + TEMPLATE "none.htm" | |
24 | + TILEITEM "location" | |
25 | + OPACITY 50 | |
26 | + TYPE POLYGON | |
27 | + UNITS METERS | |
28 | + CLASS | |
29 | + NAME "CAATINGA" | |
30 | + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') | |
31 | + STYLE | |
32 | + COLOR 164 186 131 | |
33 | + OUTLINECOLOR 255 255 255 | |
34 | + END # STYLE | |
35 | + END # CLASS | |
36 | + CLASS | |
37 | + NAME "PAMPA" | |
38 | + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA') | |
39 | + STYLE | |
40 | + COLOR 129 208 7 | |
41 | + OUTLINECOLOR 255 255 255 | |
42 | + END # STYLE | |
43 | + END # CLASS | |
44 | + CLASS | |
45 | + NAME "CERRADO" | |
46 | + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO') | |
47 | + STYLE | |
48 | + COLOR 74 234 68 | |
49 | + OUTLINECOLOR 255 255 255 | |
50 | + END # STYLE | |
51 | + END # CLASS | |
52 | + CLASS | |
53 | + NAME "PANTANAL" | |
54 | + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL') | |
55 | + STYLE | |
56 | + COLOR 60 196 145 | |
57 | + OUTLINECOLOR 255 255 255 | |
58 | + END # STYLE | |
59 | + END # CLASS | |
60 | + CLASS | |
61 | + NAME "AMAZONIA" | |
62 | + EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA') | |
63 | + STYLE | |
64 | + COLOR 248 68 118 | |
65 | + OUTLINECOLOR 255 255 255 | |
66 | + END # STYLE | |
67 | + END # CLASS | |
68 | + CLASS | |
69 | + NAME "MATA ATLANTICA" | |
70 | + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA') | |
71 | + STYLE | |
72 | + COLOR 7 115 180 | |
73 | + OUTLINECOLOR 255 255 255 | |
74 | + END # STYLE | |
75 | + END # CLASS | |
76 | + END # LAYER | |
77 | + | |
78 | +END # MAP | |
79 | + | ... | ... |