From 1c1ee3d3179ca5e3328d66bfe01224ec8e8fcaca Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 4 Jun 2018 17:49:26 -0300
Subject: [PATCH] Desabilitada o slide para zoom. Inclusão dos botões de zoomin e zoomout na barra de navegação

---
 css/default.css                   | 16 ++++++++--------
 interface/ol.htm                  |  9 +++++++--
 interface/openlayersdebug.htm     |  9 +++++++--
 interface/osm.htm                 |  9 +++++++--
 interface/osmdebug.htm            |  6 ++++--
 interface/templates/camadaGr.html |  3 +--
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/css/default.css b/css/default.css
index eecc4b5..f9db0a4 100755
--- a/css/default.css
+++ b/css/default.css
@@ -1,3 +1,8 @@
+.ol-zoom {
+	position: unset !Important;
+    display: flex !Important;
+}
+
 .ol-FullScreen.ol-unselectable.ol-control  {
     position: unset !Important;
     display: unset !Important;
@@ -347,7 +352,7 @@ hr {
 	z-index: 1;
 	left: auto;
 	right: 2px;
-	top: 5px;
+	top: 1rem;
 	width: 380px;
 }
 #i3GEOguiaMovelMolde {
@@ -570,14 +575,9 @@ no caso do OL3
 	top: 10px;
 }
 
-.ol-zoom {
-	top: 2.8em;
-	font-size: 1.8rem;
-}
-
 .ol-i3GEOcontrols {
-	top: 2.8em;
-	left: 3.5em;
+	top: 2.5rem;
+	left: 1rem;
 	width: auto;
 	font-size: 1.8rem;
 }
diff --git a/interface/ol.htm b/interface/ol.htm
index c9af055..321f91f 100755
--- a/interface/ol.htm
+++ b/interface/ol.htm
@@ -115,6 +115,7 @@
     </div>
     <!-- barra de icones de navegacao -->
     <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
+        <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
         <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
             <i class="material-icons">public</i>
         </button>
@@ -841,6 +842,9 @@
 					source: "i3geo"
 
 				}).setMap(i3geoOL);
+				new ol.control.Zoom({
+					target: $i("i3GEOzoomInOut")
+				}).setMap(i3geoOL);
 				tutorial.init();
 				//i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
 
@@ -970,8 +974,9 @@
 				//opcoes de inicializacao do mapa conforme definido na API do OpenLayers
 				MapOptions : {
 				    layers : [],
-				    controls : [ new ol.control.Zoom(),
-					    new ol.control.ZoomSlider(),
+				    controls : [
+						//new ol.control.Zoom(),
+					    //new ol.control.ZoomSlider(),
 					    new ol.control.ScaleLine(),
 					    new ol.control.Attribution({
 						collapsible : true
diff --git a/interface/openlayersdebug.htm b/interface/openlayersdebug.htm
index 9c2a71c..f6afe12 100755
--- a/interface/openlayersdebug.htm
+++ b/interface/openlayersdebug.htm
@@ -114,6 +114,7 @@
     </div>
     <!-- barra de icones de navegacao -->
     <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
+        <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
         <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
             <i class="material-icons">public</i>
         </button>
@@ -839,6 +840,10 @@
 					source: "i3geo"
 
 				}).setMap(i3geoOL);
+				new ol.control.Zoom({
+					target: $i("i3GEOzoomInOut")
+				}).setMap(i3geoOL);
+
 				//i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
 
 				//setTimeout(function() {
@@ -972,8 +977,8 @@
 				MapOptions : {
 				    layers : [],
 				    controls : [
-						new ol.control.Zoom(),
-					    new ol.control.ZoomSlider(),
+						//new ol.control.Zoom(),
+					    //new ol.control.ZoomSlider(),
 					    new ol.control.ScaleLine(),
 					    new ol.control.Attribution({
 							collapsible : true
diff --git a/interface/osm.htm b/interface/osm.htm
index 39c8f64..ce312ac 100755
--- a/interface/osm.htm
+++ b/interface/osm.htm
@@ -115,6 +115,7 @@
     </div>
     <!-- barra de icones de navegacao -->
     <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
+        <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
         <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
             <i class="material-icons">public</i>
         </button>
@@ -841,6 +842,9 @@
 					source: "i3geo"
 
 				}).setMap(i3geoOL);
+				new ol.control.Zoom({
+					target: $i("i3GEOzoomInOut")
+				}).setMap(i3geoOL);
 				tutorial.init();
 				//i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
 
@@ -970,8 +974,9 @@
 				//opcoes de inicializacao do mapa conforme definido na API do OpenLayers
 				MapOptions : {
 				    layers : [],
-				    controls : [ new ol.control.Zoom(),
-					    new ol.control.ZoomSlider(),
+				    controls : [
+						//new ol.control.Zoom(),
+					    //new ol.control.ZoomSlider(),
 					    new ol.control.ScaleLine(),
 					    new ol.control.Attribution({
 						collapsible : true
diff --git a/interface/osmdebug.htm b/interface/osmdebug.htm
index 80bad27..8d9669e 100755
--- a/interface/osmdebug.htm
+++ b/interface/osmdebug.htm
@@ -115,6 +115,7 @@
     </div>
     <!-- barra de icones de navegacao -->
     <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
+        <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
         <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
             <i class="material-icons">public</i>
         </button>
@@ -970,8 +971,9 @@
 				//opcoes de inicializacao do mapa conforme definido na API do OpenLayers
 				MapOptions : {
 				    layers : [],
-				    controls : [ new ol.control.Zoom(),
-					    new ol.control.ZoomSlider(),
+				    controls : [
+						//new ol.control.Zoom(),
+					    //new ol.control.ZoomSlider(),
 					    new ol.control.ScaleLine(),
 					    new ol.control.Attribution({
 						collapsible : true
diff --git a/interface/templates/camadaGr.html b/interface/templates/camadaGr.html
index 3117651..3f12c8e 100644
--- a/interface/templates/camadaGr.html
+++ b/interface/templates/camadaGr.html
@@ -5,9 +5,8 @@
                 {{{checked}}} onclick="i3geoOL.getLayersGrBy('name','{{{name}}}')[0].setVisibility(this.checked);i3geoOL.getLayersGrBy('name','{{{name}}}')[0].changed()">
             <span class="checkbox-material noprint"><span class="check"></span></span> {{{tema}}}
         </label>
-        <a data-target=".listaLayersGrBtn" class="pull-right collapsed" style="margin-top: 0px; padding-top: 0px; padding-bottom: 0px;" type="button" data-toggle="collapse"> </a>
+        <a data-target="listaLayersGrBtn" class="pull-right collapsed" style="margin-top: 0px; padding-top: 0px; padding-bottom: 0px;" type="button" data-toggle="collapse"> </a>
     </div>
-    <div class="clearfix"></div>
 </div>
 <div class="listaLayersGrBtn collapse" style="overflow: none;width: 35rem;">
     <button title="{{{dlinha}}}" onclick="i3GEO.editor.draw.lineString()" class="btn btn-xs" style="margin: 2px; padding: 2px;">
--
libgit2 0.21.2