Download as
Browse Code »

Commit 2798f0736c13c87457a0d60f76d992d7c210cad1

Authored by Edmar Moretti
1 parent ceac7cf1
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Modificação na regra de funcionamento da ferramenta de identificação para que se… 

…jam retornado todas as colunas ao invés de restringis àquelas configuradas com alias
Showing 3 changed files with 5 additions and 18 deletions   Show diff stats
classesphp/classe_atributos.php
  Diff comments   View file @2798f07
... ... @@ -1238,7 +1238,6 @@ class Atributos
1238 1238 $temas = $this->mapa->getalllayernames();
1239 1239 }
1240 1240 foreach ($temas as $tem){
1241   -
1242 1241 $vermultilayer = new vermultilayer();
1243 1242 $vermultilayer->verifica($this->arquivo,$tem);
1244 1243 if ($vermultilayer->resultado == 1) {
... ... @@ -1292,7 +1291,7 @@ class Atributos
1292 1291 $listatemas[] = $this->nome;
1293 1292 }
1294 1293 foreach ($listatemas as $tema){
1295   - $resultados[$tema] = $this->identificaQBP3($tema,$xyarray[0],$xyarray[1],"",$resolucao,"","",false,$ext,$wkt);
  1294 + $resultados[$tema] = $this->identificaQBP3($tema,$xyarray[0],$xyarray[1],"",$resolucao,"","",false,$ext,$wkt,true);
1296 1295 }
1297 1296 }
1298 1297 //pesquisa todos os temas acrescentados no mapa
... ... @@ -1317,7 +1316,6 @@ class Atributos
1317 1316 $l = $this->mapa->getlayerbyname($tema);
1318 1317 $resultados[$tema] = $this->identificaQBP3($tema,$xyarray[0],$xyarray[1],"",$resolucao,"","",false,$ext,$wkt);
1319 1318 }
1320   - //var_dump($resultados);
1321 1319 }
1322 1320 //pesquisa apenas os temas com tip
1323 1321 if ($opcao == "tip"){
... ... @@ -2100,8 +2098,7 @@ class Atributos
2100 2098  
2101 2099 $etip {booblean} - indica se a solicitação é para obtenção dos dados do tipo etiqueta
2102 2100 */
2103   - function identificaQBP3($tema="",$x=0,$y=0,$map_file="",$resolucao=0,$item="",$tiporetorno="",$etip=false,$ext="",$wkt="nao"){
2104   - //$wkt = "sim";
  2101 + function identificaQBP3($tema="",$x=0,$y=0,$map_file="",$resolucao=0,$item="",$tiporetorno="",$etip=false,$ext="",$wkt="nao",$todosItens = false){
2105 2102 if($map_file == ""){
2106 2103 $mapa = $this->mapa;
2107 2104 $map_file = $this->arquivo;
... ... @@ -2113,7 +2110,6 @@ class Atributos
2113 2110 $extmapa = $mapa->extent;
2114 2111 $e = explode(" ",$ext);
2115 2112 $extmapa->setextent((min($e[0],$e[2])),(min($e[1],$e[3])),(max($e[0],$e[2])),(max($e[1],$e[3])));
2116   - //$mapa->save($this->arquivo);
2117 2113 }
2118 2114 if($tema == ""){
2119 2115 $layer = $this->layer;
... ... @@ -2168,10 +2164,7 @@ class Atributos
2168 2164 $res = str_replace("INFOFORMAT","INFO_FORMAT",$res);
2169 2165 $res2 = $layer->getWMSFeatureInfoURL($ptimg->x, $ptimg->y, 1,"MIME");
2170 2166 $res2 = str_replace("INFOFORMAT","INFO_FORMAT",$res2);
2171   - //echo $res." ".$res2;exit;
2172   -
2173 2167 $resposta = file($res);
2174   - //var_dump($resposta);exit;
2175 2168 $n = array();
2176 2169 if(strtoupper($formatoinfo) != "TEXT/HTML" && strtoupper($formatoinfo) != "MIME"){
2177 2170 foreach($resposta as $r){
... ... @@ -2190,7 +2183,6 @@ class Atributos
2190 2183 }
2191 2184 //caso esri
2192 2185 if(count($n) > 0 && $n[0] == ""){
2193   - //error_reporting(0);
2194 2186 $resposta = file($res);
2195 2187 $cabecalho = str_replace('" "','"|"',$resposta[0]);
2196 2188 $cabecalho = explode("|",$cabecalho);
... ... @@ -2208,7 +2200,6 @@ class Atributos
2208 2200 }
2209 2201 }
2210 2202 }
2211   - //var_dump($n);exit;
2212 2203 $id = nomeRandomico();
2213 2204 if(count($n) == 0 && strtoupper($formatoinfo) != "TEXT/HTML"){
2214 2205 $formatoinfo = "MIME";
... ... @@ -2255,28 +2246,24 @@ class Atributos
2255 2246 else{
2256 2247 $itens = explode(",",$itens);
2257 2248 }
2258   -
2259 2249 if($itensdesc == ""){
2260 2250 $itensdesc = $itensLayer;
2261   - }//array_fill(0, $nitens-1,'');}
  2251 + }
2262 2252 else{
2263 2253 $itensdesc = explode(",",$itensdesc);
2264 2254 }
2265   -
2266 2255 if($lks == ""){
2267 2256 $lks = array_fill(0, count($itens),'');
2268 2257 }
2269 2258 else{
2270 2259 $lks = explode(",",$lks);
2271 2260 }
2272   -
2273 2261 if($itemimg == ""){
2274 2262 $itemimg = array_fill(0, count($itens),'');
2275 2263 }
2276 2264 else{
2277 2265 $itemimg = explode(",",$itemimg);
2278 2266 }
2279   -
2280 2267 if($locimg == ""){
2281 2268 $locimg = array_fill(0, count($itens),'');
2282 2269 }
... ... @@ -2286,7 +2273,7 @@ class Atributos
2286 2273 $tips = str_replace(" ",",",$tips);
2287 2274 $tips = explode(",",$tips);
2288 2275 //o retorno deve ser do tipo TIP
2289   - if($etip == true){
  2276 + if($etip == true || $todosItens = true){
2290 2277 $temp = array_combine($itens,$itensdesc);
2291 2278 $templ = array_combine($itens,$lks);
2292 2279 $tempimg = array_combine($itens,$itemimg);
... ... @@ -2296,7 +2283,7 @@ class Atributos
2296 2283 $lks = array();
2297 2284 $itemimg = array();
2298 2285 $locimg = array();
2299   - //foreach($tips as $t){
  2286 +
2300 2287 foreach($itensLayer as $t){
2301 2288 $itens[] = $t;
2302 2289 if($temp[$t] != ""){
... ...
css/i3geo7.css.php 100644 → 100755
  Diff comments   View file @2798f07
js/i3geo_tudo_compacto7.js.php 100644 → 100755
  Diff comments   View file @2798f07