Commit daceb07d9ec9aa8f37c23a57d799923f51d5bb1d

Authored by Edmar Moretti
1 parent db275724

Corrige a geração de serviços WFS na versão 4.6

ogc.php
... ... @@ -124,12 +124,14 @@ $versao = $versao["principal"];
124 124 $req = ms_newowsrequestobj();
125 125 $tipo = "";
126 126 $_GET = array_merge($_GET,$_POST);
127   -
128 127 if(isset($_GET["sld"]) || isset($_GET["filter"])){
129 128 $cache = false;
  129 +}
  130 +if(!isset($_GET["srs"]) && !isset($_GET["SRS"])){
  131 + $_GET["srs"] = "EPSG:4326";
130 132 }
131 133 foreach ($_GET as $k=>$v){
132   - $req->setParameter($k, $v);
  134 + $req->setParameter(strtoupper($k), $v);
133 135 if(strtolower($v) == "getcapabilities"){
134 136 $tipo = "metadados";
135 137 $cache = false;
... ... @@ -142,27 +144,35 @@ foreach ($_GET as $k=>$v){
142 144 {
143 145 $tema = $v;
144 146 }
145   -}
146   -if(empty($srs)){
147   - $srs = "";
148   -}
149   -if(!empty($SRS)){
150   - $srs = $SRS;
151   -}
152   -$listaepsg = $srs." EPSG:4618 EPSG:4291 EPSG:4326 EPSG:22521 EPSG:22522 EPSG:22523 EPSG:22524 EPSG:22525 EPSG:29101 EPSG:29119 EPSG:29120 EPSG:29121 EPSG:29122 EPSG:29177 EPSG:29178 EPSG:29179 EPSG:29180 EPSG:29181 EPSG:29182 EPSG:29183 EPSG:29184 EPSG:29185";
  147 +}
  148 +$req->setParameter("srsName",$req->getValueByName("SRS"));
  149 +$listaepsg = $req->getValueByName("SRS")." EPSG:4618 EPSG:4291 EPSG:4326 EPSG:22521 EPSG:22522 EPSG:22523 EPSG:22524 EPSG:22525 EPSG:29101 EPSG:29119 EPSG:29120 EPSG:29121 EPSG:29122 EPSG:29177 EPSG:29178 EPSG:29179 EPSG:29180 EPSG:29181 EPSG:29182 EPSG:29183 EPSG:29184 EPSG:29185";
  150 +//echo $listaepsg;exit;
153 151 if(count($_GET) == 0){
154 152 $tipo="intervalo";
155 153 $req->setParameter("REQUEST", "getCapabilities");
156 154 $req->setParameter("SERVICE", "WMS");
157 155 $cache = false;
158   -}
159   -
  156 +}
160 157 if(isset($tema) && $tipo != "metadados"){
161 158 $tipo = "";
  159 +}
  160 +if(isset($version) && !isset($VERSION)){
  161 + $VERSION = $version;
162 162 }
163   -if(!isset($version)){
164   - $req->setParameter("VeRsIoN","1.1.0");
165   -}
  163 +if(!isset($VERSION)){
  164 + $req->setParameter("VeRsIoN","1.0.0");
  165 +}
  166 +/*
  167 +$n = $req->numparams;
  168 +for($i=0;$i<$n;$i++){
  169 + echo $req->getName($i);
  170 + echo "=";
  171 + echo $req->getValue($i);
  172 + echo "<br>";
  173 +}
  174 +exit;
  175 +*/
166 176 $oMap = ms_newMapobj($locaplic."/aplicmap/ogcwsv".$versao.".map");
167 177 //
168 178 //altera os caminhos das imagens
... ... @@ -443,7 +453,8 @@ else{
443 453 if($cache == true){
444 454  
445 455 }
446   -ms_ioinstallstdouttobuffer();
  456 +ms_ioinstallstdouttobuffer();
  457 +
447 458 $oMap->owsdispatch($req);
448 459 $contenttype = ms_iostripstdoutbuffercontenttype();
449 460 if(strtolower($request) == "getcapabilities")
... ...
temas/biomaswindows.map 0 → 100644
... ... @@ -0,0 +1,109 @@
  1 +MAP
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolos.sym"
  4 + LAYER
  5 + CONNECTION ""
  6 + DATA "c:/ms4w/apache/htdocs/geodados/brasil/vegetacao/biomas.shp"
  7 + METADATA
  8 + "METAESTAT_ID_MEDIDA_VARIAVEL" ""
  9 + "cache" "SIM"
  10 + "ltempoitemimagem" ""
  11 + "ltempoitemdescricao" ""
  12 + "CLASSE" "SIM"
  13 + "ltempoiteminicio" ""
  14 + "palletestep" ""
  15 + "ltempoitemtip" ""
  16 + "permitekmz" "sim"
  17 + "ltempoitemtitulo" ""
  18 + "description_template" ""
  19 + "iconetema" "http://www.gpsdrive.de/development/map-icons/square.small/leisure/park.png"
  20 + "ltempoitemlink" ""
  21 + "METAESTAT_CODIGO_TIPO_REGIAO" ""
  22 + "extensao" "-44 -23 -39 -21"
  23 + "palletefile" ""
  24 + "NOMEORIGINAL" ""
  25 + "ltempoformatodata" ""
  26 + "permitedownload" "sim"
  27 + "ltempoitemicone" ""
  28 + "metaestat" ""
  29 + "download" "SIM"
  30 + "permiteogc" "sim"
  31 + "permitekml" "sim"
  32 + "TEMA" "Biomas shapefile"
  33 + "convcaracter" ""
  34 + "editorsql" ""
  35 + "identifica" "NAO"
  36 + "ltempoitemfim" ""
  37 + END # METADATA
  38 + NAME "biomaswindows"
  39 + PROCESSING "ITEMS=CD_LEGENDA"
  40 + STATUS OFF
  41 + TEMPLATE "none.htm"
  42 + TILEITEM "location"
  43 + OPACITY 50
  44 + TYPE POLYGON
  45 + UNITS METERS
  46 + CLASS
  47 + NAME "CAATINGA"
  48 + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
  49 + STYLE
  50 + ANGLE 0
  51 + COLOR 21 44 114
  52 + OFFSET 0 0
  53 + END # STYLE
  54 + TITLE ""
  55 + END # CLASS
  56 + CLASS
  57 + NAME "PAMPA"
  58 + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA')
  59 + STYLE
  60 + ANGLE 0
  61 + COLOR 225 189 199
  62 + OFFSET 0 0
  63 + END # STYLE
  64 + TITLE ""
  65 + END # CLASS
  66 + CLASS
  67 + NAME "CERRADO"
  68 + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
  69 + STYLE
  70 + ANGLE 0
  71 + COLOR 17 235 39
  72 + OFFSET 0 0
  73 + END # STYLE
  74 + TITLE ""
  75 + END # CLASS
  76 + CLASS
  77 + NAME "PANTANAL"
  78 + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
  79 + STYLE
  80 + ANGLE 0
  81 + COLOR 242 192 145
  82 + OFFSET 0 0
  83 + END # STYLE
  84 + TITLE ""
  85 + END # CLASS
  86 + CLASS
  87 + NAME "AMAZONIA"
  88 + EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA')
  89 + STYLE
  90 + ANGLE 0
  91 + COLOR 149 120 37
  92 + OFFSET 0 0
  93 + END # STYLE
  94 + TITLE ""
  95 + END # CLASS
  96 + CLASS
  97 + NAME "MATA ATLANTICA"
  98 + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA')
  99 + STYLE
  100 + ANGLE 0
  101 + COLOR 208 160 125
  102 + OFFSET 0 0
  103 + END # STYLE
  104 + TITLE ""
  105 + END # CLASS
  106 + END # LAYER
  107 +
  108 +END # MAP
  109 +
... ...
temas/localiwindows.map 0 → 100644
... ... @@ -0,0 +1,86 @@
  1 +MAP
  2 +FONTSET "c:\ms4w\apache\htdocs\i3geo\symbols\fontes.txt"
  3 +SYMBOLSET "c:\ms4w\apache\htdocs\i3geo\symbols\simbolosv6.sym"
  4 + LAYER
  5 + CONNECTION ""
  6 + DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\locali"
  7 + METADATA
  8 + "METAESTAT_ID_MEDIDA_VARIAVEL" ""
  9 + "cache" "sim"
  10 + "TIP" "TIPO,ANOCRIA,NOMELOC"
  11 + "LTEMPOITEMIMAGEM" ""
  12 + "CLASSE" "SIM"
  13 + "LTEMPOITEMDESCRICAO" "TIPO"
  14 + "LTEMPOITEMINICIO" "ANOCRIA"
  15 + "palletestep" ""
  16 + "permitekmz" "sim"
  17 + "LTEMPOITEMTIP" "ANOCRIA"
  18 + "temporizador" ""
  19 + "iconetema" ""
  20 + "LTEMPOITEMTITULO" "NOMELOC"
  21 + "description_template" ""
  22 + "LTEMPOITEMLINK" ""
  23 + "METAESTAT_CODIGO_TIPO_REGIAO" ""
  24 + "palletefile" ""
  25 + "nomeoriginal" "locali"
  26 + "permitedownload" "sim"
  27 + "LTEMPOFORMATODATA" "iso8601"
  28 + "permitecomentario" ""
  29 + "LTEMPOITEMICONE" ""
  30 + "metaestat" ""
  31 + "itembuscarapida" "NOMELOC"
  32 + "arquivodownload" ""
  33 + "arquivokmz" ""
  34 + "permitekml" "sim"
  35 + "permiteogc" "sim"
  36 + "transitioneffect" "NAO"
  37 + "TEMA" "Localidades"
  38 + "editorsql" ""
  39 + "LTEMPOCONVENCODE" "SIM"
  40 + "LTEMPOITEMFIM" ""
  41 + "legendaimg" ""
  42 + END # METADATA
  43 + MINSCALEDENOM 500000
  44 + NAME "localiwindows"
  45 + STATUS DEFAULT
  46 + TEMPLATE "none.htm"
  47 + TILEITEM "location"
  48 + TYPE POINT
  49 + UNITS METERS
  50 + CLASS
  51 + NAME "Vila"
  52 + EXPRESSION ('[TIPO]'eq'Vila')
  53 + STYLE
  54 + ANGLE 0
  55 + COLOR 250 193 4
  56 + OFFSET 0 0
  57 + SIZE 4
  58 + SYMBOL "ponto"
  59 + END # STYLE
  60 + END # CLASS
  61 + CLASS
  62 + NAME "Cidade"
  63 + EXPRESSION ('[TIPO]'eq'Cidade')
  64 + STYLE
  65 + ANGLE 0
  66 + COLOR 62 9 41
  67 + OFFSET 0 0
  68 + SIZE 6
  69 + SYMBOL "ponto"
  70 + END # STYLE
  71 + END # CLASS
  72 + CLASS
  73 + NAME "Capital"
  74 + EXPRESSION ('[TIPO]'eq'Capital')
  75 + STYLE
  76 + ANGLE 0
  77 + COLOR 112 203 244
  78 + OFFSET 0 0
  79 + SIZE 6
  80 + SYMBOL "capital"
  81 + END # STYLE
  82 + END # CLASS
  83 + END # LAYER
  84 +
  85 +END # MAP
  86 +
... ...