Commit 1ff7aa312c6736482b6ca033d608e3499cf05d02
1 parent
d0335375
Exists in
master
and in
7 other branches
--no commit message
Showing
3 changed files
with
37 additions
and
4 deletions
Show diff stats
admin/admin.db
No preview for this file type
classesphp/classe_atributos.php
| @@ -2264,6 +2264,7 @@ class Atributos | @@ -2264,6 +2264,7 @@ class Atributos | ||
| 2264 | $layer->set("tolerance",$resolucao); | 2264 | $layer->set("tolerance",$resolucao); |
| 2265 | $ident = @$layer->queryByPoint($pt, 1, -1); | 2265 | $ident = @$layer->queryByPoint($pt, 1, -1); |
| 2266 | } | 2266 | } |
| 2267 | + | ||
| 2267 | if ($ident == MS_SUCCESS){ | 2268 | if ($ident == MS_SUCCESS){ |
| 2268 | //$ident = @$layer->queryByPoint($pt, 1, -1); | 2269 | //$ident = @$layer->queryByPoint($pt, 1, -1); |
| 2269 | //verifica se o layer e editavel no sistema METAESTAT | 2270 | //verifica se o layer e editavel no sistema METAESTAT |
| @@ -2404,3 +2405,7 @@ class Atributos | @@ -2404,3 +2405,7 @@ class Atributos | ||
| 2404 | } | 2405 | } |
| 2405 | } | 2406 | } |
| 2406 | ?> | 2407 | ?> |
| 2408 | + | ||
| 2409 | + | ||
| 2410 | +"funcao=identifica3&opcao=tema&xy=-51.047115325927734,0.05132674484407409&resolucao=1&g_sid=g7mjje3s6ongd1j5b3kg6qag37&ext=-51.202383041381836 -0.006952285749539264 -50.94780921936035 0.07767674927679344&listaDeTemas=&wkt=sim&tema=fff2a4fb9e4c237522d70e5b99f3c6ac" | ||
| 2411 | +"funcao=identifica3&opcao=tema&xy=-51.04745864868164,0.05132674484407409&resolucao=1&g_sid=g7mjje3s6ongd1j5b3kg6qag37&ext=-51.202383041381836 -0.006952285749539264 -50.94780921936035 0.07767674927679344&listaDeTemas=&wkt=sim&tema=fff2a4fb9e4c237522d70e5b99f3c6ac" |
ferramentas/metaestat/editorlimites.js
| @@ -314,9 +314,11 @@ i3GEOF.editorlimites = { | @@ -314,9 +314,11 @@ i3GEOF.editorlimites = { | ||
| 314 | */ | 314 | */ |
| 315 | ativa: function(botao){ | 315 | ativa: function(botao){ |
| 316 | i3GEOF.editorlimites.mudaicone(botao); | 316 | i3GEOF.editorlimites.mudaicone(botao); |
| 317 | - i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pointer",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic); | 317 | + |
| 318 | + i3GEO.eventos.cliquePerm.desativa(); | ||
| 318 | if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEOF.editorlimites.capturaPoligonoTema.captura()") < 0) | 319 | if(i3GEO.eventos.MOUSECLIQUE.toString().search("i3GEOF.editorlimites.capturaPoligonoTema.captura()") < 0) |
| 319 | {i3GEO.eventos.MOUSECLIQUE.push("i3GEOF.editorlimites.capturaPoligonoTema.captura()");} | 320 | {i3GEO.eventos.MOUSECLIQUE.push("i3GEOF.editorlimites.capturaPoligonoTema.captura()");} |
| 321 | + i3GEO.util.mudaCursor(i3GEO.configura.cursores,"crosshair",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic); | ||
| 320 | }, | 322 | }, |
| 321 | desativa: function(){ | 323 | desativa: function(){ |
| 322 | }, | 324 | }, |
| @@ -346,6 +348,10 @@ i3GEOF.editorlimites = { | @@ -346,6 +348,10 @@ i3GEOF.editorlimites = { | ||
| 346 | } | 348 | } |
| 347 | //obtem os dados buscando nos itens que vem da requisicao ao wms | 349 | //obtem os dados buscando nos itens que vem da requisicao ao wms |
| 348 | temp = retorno.data[0].resultado[0]; | 350 | temp = retorno.data[0].resultado[0]; |
| 351 | + if(temp === " "){ | ||
| 352 | + i3GEO.janela.tempoMsg("Nada encontrado"); | ||
| 353 | + return; | ||
| 354 | + } | ||
| 349 | n = temp.length; | 355 | n = temp.length; |
| 350 | for(i=0;i<n;i++){ | 356 | for(i=0;i<n;i++){ |
| 351 | if(temp[i].alias == "wkt"){ | 357 | if(temp[i].alias == "wkt"){ |
| @@ -511,9 +517,9 @@ i3GEOF.editorlimites = { | @@ -511,9 +517,9 @@ i3GEOF.editorlimites = { | ||
| 511 | } | 517 | } |
| 512 | var pol; | 518 | var pol; |
| 513 | if (Wkt.isArray(obj)) { // Distinguish multigeometries (Arrays) from objects | 519 | if (Wkt.isArray(obj)) { // Distinguish multigeometries (Arrays) from objects |
| 514 | - for (i in obj) { | ||
| 515 | - if (obj.hasOwnProperty(i) && !Wkt.isArray(obj[i])) { | ||
| 516 | - pol = new google.maps.Polygon({ | 520 | + for (i in obj) { |
| 521 | + if (obj.hasOwnProperty(i) && !Wkt.isArray(obj[i])) { | ||
| 522 | + pol = new google.maps.Polygon({ | ||
| 517 | path: obj[i].getPath(), | 523 | path: obj[i].getPath(), |
| 518 | map: i3GeoMap, | 524 | map: i3GeoMap, |
| 519 | fillColor: '#ffff00', | 525 | fillColor: '#ffff00', |
| @@ -558,6 +564,28 @@ i3GEOF.editorlimites = { | @@ -558,6 +564,28 @@ i3GEOF.editorlimites = { | ||
| 558 | i3GEOF.editorlimites.shapes.push(pol); | 564 | i3GEOF.editorlimites.shapes.push(pol); |
| 559 | return; | 565 | return; |
| 560 | } | 566 | } |
| 567 | + if (obj.type === 'marker'){ | ||
| 568 | + pol = new google.maps.Marker({ | ||
| 569 | + position: new google.maps.LatLng(obj.getPosition().ob,obj.getPosition().pb), | ||
| 570 | + map: i3GeoMap, | ||
| 571 | + fillColor: '#ffff00', | ||
| 572 | + fillOpacity: .5, | ||
| 573 | + strokeWeight: 2, | ||
| 574 | + clickable: true, | ||
| 575 | + zIndex: 1, | ||
| 576 | + draggable: true, | ||
| 577 | + tema: tema, | ||
| 578 | + colunaid: colunaid, | ||
| 579 | + valorid: valorid, | ||
| 580 | + colunanome: colunanome, | ||
| 581 | + valornome: valornome | ||
| 582 | + }); | ||
| 583 | + google.maps.event.addListener(pol, 'click', function() { | ||
| 584 | + i3GEOF.editorlimites.setSelection(pol); | ||
| 585 | + }); | ||
| 586 | + i3GEOF.editorlimites.shapes.push(pol); | ||
| 587 | + return; | ||
| 588 | + } | ||
| 561 | }, | 589 | }, |
| 562 | /** | 590 | /** |
| 563 | * Salva um poligono no banco de dados | 591 | * Salva um poligono no banco de dados |