From 9688ca20df2335fc231bd5386a35c4b7b2620bf9 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 11 Dec 2015 11:44:09 +0000
Subject: [PATCH] Correção nos botões da ferramenta de análise de geometria

---
 admin/admin.db                                  | Bin 323584 -> 0 bytes
 ferramentas/analisageometrias/template_mst.html | 12 ++++++++----
 interface/osmdebug.htm                          |  8 +++++++-
 js/interface.js                                 |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 1fcbccd..2211a99 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/analisageometrias/template_mst.html b/ferramentas/analisageometrias/template_mst.html
index b422e37..a20bfdd 100644
--- a/ferramentas/analisageometrias/template_mst.html
+++ b/ferramentas/analisageometrias/template_mst.html
@@ -61,7 +61,7 @@
 			<input id='i3GEOanalisageometriasbotaocalculo' type='button' value='{{{aplicar}}}' />
 		</p>
 		<br>
-		<p class='paragrafo'>{{{perimetro}}}:</p>
+		<p class='paragrafo'>{{{operacaoGeom2}}}:</p>
 		<div class=styled-select>
 			<select id='i3GEOanalisageometriasselecaofuncoes' >
 				<option value='' selected>---</option>
@@ -71,9 +71,11 @@
 				<option value='symdifference'>{{{diferencaInversa}}}</option>
 				<option value='convexhull'>{{{convexo}}}</option>
 			</select>
-			<input id='i3GEOanalisageometriasbotaofuncoes' type='button' value='{{{aplicar}}}' />
-		</div>
 
+		</div>
+		<br><p class='paragrafo'>
+			<input id='i3GEOanalisageometriasbotaofuncoes' type='button' value='{{{aplicar}}}' />
+		</p>
 		<br>
 		<p class='paragrafo'>{{{operacaoGeom3}}}:</p>
 		<div class=styled-select>
@@ -82,8 +84,10 @@
 				<option value='convexhull'>{{{convexo}}}</option>
 				<option value='boundary'>{{{entorno}}}</option>
 			</select>
-			<input id='i3GEOanalisageometriasbotaofuncoes1' type='button' value='{{{aplicar}}}' />
 		</div>
+		<br><p class='paragrafo'>
+			<input id='i3GEOanalisageometriasbotaofuncoes1' type='button' value='{{{aplicar}}}' />
+		</p>
 		<br>
 		<div id='i3GEOanalisageometriasmen2' style='text-align: left; left: 0px'>
 			<p class='paragrafo'>{{{ajuda3}}}
diff --git a/interface/osmdebug.htm b/interface/osmdebug.htm
index be0649d..1825501 100755
--- a/interface/osmdebug.htm
+++ b/interface/osmdebug.htm
@@ -210,7 +210,13 @@
 			    	  url : "http://tile.openstreetmap.org/${z}/${x}/${y}.png"
 			      })
 			    });
-			i3GEO.Interface.openlayers.LAYERSADICIONAIS = [osm];
+			tdb = new ol.layer.Tile({
+			      source: new ol.source.TileDebug({
+			        projection: 'EPSG:3857',
+			        tileGrid: new ol.source.OSM().getTileGrid()
+			      })
+			    });
+			i3GEO.Interface.openlayers.LAYERSADICIONAIS = [osm,tdb];
 
 			/*
 
diff --git a/js/interface.js b/js/interface.js
index 19b15df..a6fe23c 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -953,6 +953,9 @@ i3GEO.Interface =
 					// precisa disso?
 					// i3GEO.Interface.openlayers.parametrosView.extent = ol.proj.get('EPSG:4326').getExtent();
 				}
+				else{
+					i3GEO.Interface.openlayers.parametrosView.projection = "EPSG:3857";
+				}
 				i3GEO.Interface.openlayers.parametrosMap.view = new ol.View(i3GEO.Interface.openlayers.parametrosView);
 				i3GEO.Interface.openlayers.parametrosMap.interactions = i3GEO.Interface.openlayers.interacoes;
 				//
--
libgit2 0.21.2