From 20a554c27b22b3c821a8493f74b5ec767a4ec764 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Tue, 28 May 2013 14:07:02 +0000 Subject: [PATCH] Modificações feitas para testes de performance --- admin/admin.db | Bin 201728 -> 0 bytes aplicmap/geral1debianv6.map | 34 +++++++++++++++++----------------- interface/teste.htm | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ temas/_lbairros.map | 87 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- temas/_lbiomashp.map | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------- temas/_lcbersgeo.map | 66 +++++++++++++++++++++++++++++++++--------------------------------- temas/_llocali.map | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------ testamapfile.php | 23 +++++++++++++---------- 8 files changed, 424 insertions(+), 268 deletions(-) create mode 100755 interface/teste.htm diff --git a/admin/admin.db b/admin/admin.db index 3a154cb..9ad2c46 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/aplicmap/geral1debianv6.map b/aplicmap/geral1debianv6.map index 55f149f..1ffa508 100644 --- a/aplicmap/geral1debianv6.map +++ b/aplicmap/geral1debianv6.map @@ -41,29 +41,29 @@ MAP OUTPUTFORMAT NAME 'AGG_Q' - DRIVER AGG/PNG - IMAGEMODE RGB - FORMATOPTION "QUANTIZE_FORCE=ON" - FORMATOPTION "QUANTIZE_DITHER=OFF" - FORMATOPTION "QUANTIZE_COLORS=256" + DRIVER AGG/PNG + IMAGEMODE RGB + FORMATOPTION "QUANTIZE_FORCE=ON" + FORMATOPTION "QUANTIZE_DITHER=OFF" + FORMATOPTION "QUANTIZE_COLORS=256" FORMATOPTION "INTERLACE=OFF" END #OUTPUTFORMAT - # NAME svg - # MIMETYPE "image/svg+xml" - # DRIVER cairo/svg - ##FORMATOPTION "COMPRESSED_OUTPUT=TRUE" - ##FORMATOPTION "FULL_RESOLUTION=TRUE" - #END + # NAME svg + # MIMETYPE "image/svg+xml" + # DRIVER cairo/svg + ##FORMATOPTION "COMPRESSED_OUTPUT=TRUE" + ##FORMATOPTION "FULL_RESOLUTION=TRUE" + #END OUTPUTFORMAT - NAME jpeg - DRIVER "AGG/JPEG" - MIMETYPE "image/jpeg" - IMAGEMODE RGB - EXTENSION jpg - FORMATOPTION "INTERLACE=OFF" + NAME jpeg + DRIVER "AGG/JPEG" + MIMETYPE "image/jpeg" + IMAGEMODE RGB + EXTENSION jpg + FORMATOPTION "INTERLACE=OFF" END OUTPUTFORMAT diff --git a/interface/teste.htm b/interface/teste.htm new file mode 100755 index 0000000..12e2ad8 --- /dev/null +++ b/interface/teste.htm @@ -0,0 +1,151 @@ + + + + + + +i3GEO - OpenLayers para testes de performance + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + diff --git a/temas/_lbairros.map b/temas/_lbairros.map index 3f9df2f..c47b912 100644 --- a/temas/_lbairros.map +++ b/temas/_lbairros.map @@ -1,47 +1,48 @@ MAP - FONTSET "../symbols/fontes.txt" - SYMBOLSET "../symbols/simbolos.sym" - LAYER - CONNECTION "user=postgres password=postgres dbname=geosaude host=localhost port=5432" - #CONNECTION "postgres" - CONNECTIONTYPE POSTGIS - DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326" - METADATA - "METAESTAT_ID_MEDIDA_VARIAVEL" "" - "ID_MEDIDA_VARIAVEL" "" - "cache" "" - "CLASSE" "SIM" - "permitekmz" "nao" - "METAESTAT_CODIGO_TIPO_REGIAO" "" - "permitedownload" "sim" - "metaestat" "" - "permiteogc" "sim" - "permitekml" "sim" - "TEMA" "Bairros IBGE" - "convcaracter" "" - END # METADATA - NAME "_lbairros" - STATUS DEFAULT - TEMPLATE "none.htm" - TILEITEM "location" - TYPE POLYGON - UNITS METERS - CLASS - NAME "" - STYLE - ANGLE 0 - OFFSET 0 0 - OUTLINECOLOR 255 0 0 - SYMBOL "p0" - END # STYLE - STYLE - ANGLE 0 - COLOR 255 255 255 - OFFSET 0 0 - OPACITY 20 - END # STYLE - END # CLASS - END # LAYER + FONTSET "../symbols/fontes.txt" + SYMBOLSET "../symbols/simbolos.sym" + LAYER + CONNECTION "user=postgres password=postgres dbname=geosaude host=localhost port=5432" + #CONNECTION "postgres" + CONNECTIONTYPE POSTGIS + DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "ID_MEDIDA_VARIAVEL" "" + "cache" "SIM" + "CLASSE" "SIM" + "permitekmz" "nao" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "permitedownload" "sim" + "metaestat" "" + "permiteogc" "sim" + "permitekml" "sim" + "TEMA" "Bairros IBGE" + "convcaracter" "" + END # METADATA + NAME "_lbairros" + #PROCESSING "CLOSE_CONNECTION=DEFER" + STATUS DEFAULT + TEMPLATE "none.htm" + TILEITEM "location" + TYPE POLYGON + UNITS METERS + CLASS + NAME "" + STYLE + ANGLE 0 + OFFSET 0 0 + OUTLINECOLOR 255 0 0 + SYMBOL "p0" + END # STYLE + STYLE + ANGLE 0 + COLOR 255 255 255 + OFFSET 0 0 + OPACITY 20 + END # STYLE + END # CLASS + END # LAYER END # MAP diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map index 91e981c..13f02ec 100644 --- a/temas/_lbiomashp.map +++ b/temas/_lbiomashp.map @@ -1,85 +1,85 @@ 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" - TILEITEM "location" - OPACITY 50 - TYPE POLYGON - UNITS METERS - CLASS - NAME "CAATINGA" - EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') - STYLE - ANGLE 0 - COLOR 255 255 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 + 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" + TILEITEM "location" + OPACITY 50 + TYPE POLYGON + UNITS METERS + CLASS + NAME "CAATINGA" + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') + STYLE + ANGLE 0 + COLOR 255 255 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 diff --git a/temas/_lcbersgeo.map b/temas/_lcbersgeo.map index ec6aa69..9ba8e6f 100644 --- a/temas/_lcbersgeo.map +++ b/temas/_lcbersgeo.map @@ -1,37 +1,37 @@ MAP - FONTSET "../symbols/fontes.txt" - SYMBOLSET "../symbols/simbolos.sym" - LAYER - DATA "/var/www/geodados/cbersgeo.img" - METADATA - "METAESTAT_ID_MEDIDA_VARIAVEL" "" - "classe" "NAO" - "permitekmz" "nao" - "iconetema" "" - "METAESTAT_CODIGO_TIPO_REGIAO" "" - "permitedownload" "sim" - "metaestat" "" - "DOWNLOAD" "sim" - "permitekml" "sim" - "permiteogc" "sim" - "tema" "_Imagem cbersgeo" - "cache" "sim" - END # METADATA - NAME "_lcbersgeo" - STATUS DEFAULT - TILEITEM "location" - TYPE RASTER - UNITS METERS - CLASS - NAME "" - STYLE - ANGLE 0 - COLOR 0 255 255 - OFFSET 0 0 - OUTLINECOLOR 0 0 0 - END # STYLE - END # CLASS - END # LAYER + FONTSET "../symbols/fontes.txt" + SYMBOLSET "../symbols/simbolos.sym" + LAYER + DATA "/var/www/geodados/cbersgeo.img" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "classe" "NAO" + "permitekmz" "nao" + "iconetema" "" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "permitedownload" "sim" + "metaestat" "" + "DOWNLOAD" "sim" + "permitekml" "sim" + "permiteogc" "sim" + "tema" "_Imagem cbersgeo" + "cache" "SIM" + END # METADATA + NAME "_lcbersgeo" + STATUS DEFAULT + TILEITEM "location" + TYPE RASTER + UNITS METERS + CLASS + NAME "" + STYLE + ANGLE 0 + COLOR 0 255 255 + OFFSET 0 0 + OUTLINECOLOR 0 0 0 + END # STYLE + END # CLASS + END # LAYER END # MAP diff --git a/temas/_llocali.map b/temas/_llocali.map index 1e1420e..7dd962d 100644 --- a/temas/_llocali.map +++ b/temas/_llocali.map @@ -1,84 +1,85 @@ -MAP - FONTSET "../symbols/fontes.txt" - SYMBOLSET "../symbols/simbolos.sym" - LAYER - CONNECTION "" - DATA "/var/www/i3geo/aplicmap/dados/locali.shp" - METADATA - "METAESTAT_ID_MEDIDA_VARIAVEL" "" - "cache" "sim" - "LTEMPOITEMIMAGEM" "" - "TIP" "TIPO,ANOCRIA,NOMELOC" - "LTEMPOITEMDESCRICAO" "TIPO" - "CLASSE" "SIM" - "palletestep" "" - "LTEMPOITEMINICIO" "ANOCRIA" - "temporizador" "" - "LTEMPOITEMTIP" "ANOCRIA" - "permitekmz" "nao" - "description_template" "" - "LTEMPOITEMTITULO" "NOMELOC" - "iconetema" "" - "LTEMPOITEMLINK" "" - "METAESTAT_CODIGO_TIPO_REGIAO" "" - "palletefile" "" - "LTEMPOFORMATODATA" "iso8601" - "permitedownload" "sim" - "LTEMPOITEMICONE" "" - "permitecomentario" "" - "metaestat" "" - "itembuscarapida" "NOMELOC" - "arquivokmz" "" - "arquivodownload" "" - "transitioneffect" "NAO" - "permiteogc" "sim" - "permitekml" "sim" - "convcaracter" "" - "TEMA" "Localidades (usar com timeline)" - "LTEMPOCONVENCODE" "SIM" - "editorsql" "" - "legendaimg" "" - "LTEMPOITEMFIM" "" - END # METADATA - NAME "_llocali" - STATUS DEFAULT - TEMPLATE "none.htm" - TYPE POINT - UNITS METERS - CLASS - NAME "Vila" - EXPRESSION ('[TIPO]'eq'Vila') - STYLE - ANGLE 0 - COLOR 250 193 4 - OFFSET 0 0 - SIZE 4 - SYMBOL "ponto" - END # STYLE - END # CLASS - CLASS - NAME "Cidade" - EXPRESSION ('[TIPO]'eq'Cidade') - STYLE - ANGLE 0 - COLOR 62 9 41 - OFFSET 0 0 - SIZE 6 - SYMBOL "ponto" - END # STYLE - END # CLASS - CLASS - NAME "Capital" - EXPRESSION ('[TIPO]'eq'Capital') - STYLE - ANGLE 0 - COLOR 112 203 244 - OFFSET 0 0 - SIZE 6 - SYMBOL "capital" - END # STYLE - END # CLASS - END # LAYER - -END # MAP - +MAP + FONTSET "../symbols/fontes.txt" + #SYMBOLSET "../symbols/vazio.sym" + SYMBOLSET "../symbols/simbolos.sym" + LAYER + CONNECTION "" + DATA "/var/www/i3geo/aplicmap/dados/locali.shp" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "cache" "nao" + "LTEMPOITEMIMAGEM" "" + "TIP" "TIPO,ANOCRIA,NOMELOC" + "LTEMPOITEMDESCRICAO" "TIPO" + "CLASSE" "SIM" + "palletestep" "" + "LTEMPOITEMINICIO" "ANOCRIA" + "temporizador" "" + "LTEMPOITEMTIP" "ANOCRIA" + "permitekmz" "nao" + "description_template" "" + "LTEMPOITEMTITULO" "NOMELOC" + "iconetema" "" + "LTEMPOITEMLINK" "" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "palletefile" "" + "LTEMPOFORMATODATA" "iso8601" + "permitedownload" "sim" + "LTEMPOITEMICONE" "" + "permitecomentario" "" + "metaestat" "" + "itembuscarapida" "NOMELOC" + "arquivokmz" "" + "arquivodownload" "" + "transitioneffect" "NAO" + "permiteogc" "sim" + "permitekml" "sim" + "convcaracter" "" + "TEMA" "Localidades (usar com timeline)" + "LTEMPOCONVENCODE" "SIM" + "editorsql" "" + "legendaimg" "" + "LTEMPOITEMFIM" "" + END # METADATA + NAME "_llocali" + STATUS DEFAULT + TEMPLATE "none.htm" + TYPE POINT + UNITS METERS + CLASS + NAME "Vila" + EXPRESSION ('[TIPO]'eq'Vila') + STYLE + ANGLE 0 + COLOR 250 193 4 + OFFSET 0 0 + SIZE 4 + SYMBOL "ponto" + END # STYLE + END # CLASS + CLASS + NAME "Cidade" + EXPRESSION ('[TIPO]'eq'Cidade') + STYLE + ANGLE 0 + COLOR 62 9 41 + OFFSET 0 0 + SIZE 6 + SYMBOL "ponto" + END # STYLE + END # CLASS + CLASS + NAME "Capital" + EXPRESSION ('[TIPO]'eq'Capital') + STYLE + ANGLE 0 + COLOR 112 203 244 + OFFSET 0 0 + SIZE 6 + SYMBOL "capital" + END # STYLE + END # CLASS + END # LAYER + +END # MAP + diff --git a/testamapfile.php b/testamapfile.php index 5c606b9..b27c421 100644 --- a/testamapfile.php +++ b/testamapfile.php @@ -123,7 +123,7 @@ echo ''; echo ''; echo ''; function verifica($map,$solegenda){ - global $tipo,$locaplic,$postgis_mapa,$versao,$base; + global $tipo,$locaplic,$postgis_mapa,$versao,$base,$dir_tmp; $mapUrl = $map; if ($tipo == "mini" && file_exists('temas/miniaturas/'.$map.".mini.png")){ Header("Content-type: image/png"); @@ -322,20 +322,23 @@ function verifica($map,$solegenda){ } if ($tipo == "mini"){ - $mapa->setsize(50,50); - $sca = $mapa->scalebar; - $sca->set("status",MS_OFF); + $mapa->setsize(50,50); + $sca = $mapa->scalebar; + $sca->set("status",MS_OFF); } if ($tipo == "grande"){ - $mapa->setsize(300,300); - $sca = $mapa->scalebar; - $sca->set("status",MS_OFF); + $mapa->setsize(300,300); + $sca = $mapa->scalebar; + $sca->set("status",MS_OFF); } if($tipo == "todos"){ - $mapa->setsize(150,150); - $sca = $mapa->scalebar; - $sca->set("status",MS_OFF); + $mapa->setsize(150,150); + $sca = $mapa->scalebar; + $sca->set("status",MS_OFF); } + $destino = $dir_tmp."/".nomeRandomico().".map"; + $mapa->save($destino); + $mapa = ms_newMapObj($destino); $objImagem = @$mapa->draw(); $objImagemLegenda = @$mapa->drawLegend(); if (!$objImagem){ -- libgit2 0.21.2