Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev

catalog/static/catalog/css/map.css

@@ -43,7 +43,7 @@ html, body
 	width: 50px;
 	height: 50px;
 	position: absolute;
-	right: 20px;  /*270px*/
+	right: 290px;  /*270px*/
 	bottom: 15px;
 	z-index: 1000;
 	background-color: white;  
@@ -56,7 +56,7 @@ html, body
 	width: 50px;
 	height: 50px;
 	position: absolute;
-	right: 20px;  /*270px*/
+	right: 290px;  /*270px*/
 	bottom: 75px;
 	z-index: 1000;
 	background-color: white;  

catalog/static/catalog/js/dataRetrieval.js

@@ -393,7 +393,7 @@ function showProductTabPane() {
     $('#control-sidebar-settings-tab').removeClass("active");
     $('#control-sidebar-home-tab').addClass("active");
     $('aside').addClass("control-sidebar-open");
-    moveLayer();
+
 }
 
 function showCarProductsTabPanel(){
@@ -674,17 +674,3 @@ $(document).ready(function () {
     });
 });
 
-var imc = true;
-function moveLayer() {
-    if(imc){
-        setTimeout(function() {
-            document.getElementById("idmapControl").style.right = "290px";
-        },500)
-        imc = false
-    }else{
-        setTimeout(function() {
-            document.getElementById("idmapControl").style.right = "20px";
-        },500)
-        imc = true
-    }
-}

catalog/templates/base_top.html

@@ -100,7 +100,7 @@
                             {% else %}
                                 <li id="panelShowCart">
                                     {% if showcart %}
-                                        <a id="product-list-toggle" href="#" data-toggle="control-sidebar" onclick = "moveLayer()" >
+                                        <a id="product-list-toggle" href="#" data-toggle="control-sidebar">
                                         <i class="fa fa-shopping-cart"></i></a>
                                     {% endif %}
                                 </li>
@@ -214,7 +214,19 @@
         </aside>
         <!-- /.control-sidebar -->
         <!-- Add the sidebar's background. This div must be placed immediately after the control sidebar -->
-        <div class="control-sidebar-bg"></div>
+        <div class="control-sidebar-bg">
+            <!-- control de version de mapas -->
+            <div id="idmapControl" class="mapControl" onclick="cambio.changeMap()">
+                <i class="fas fa-layer-group fa-2x  iii"></i> 
+            </div>
+            <!-- control de version de mapas -->
+
+            <!-- control para dibujar el poligono -->
+            <div id="drawControl" class="drawControl" onclick="osmap.changeInteraction()">
+                <i class="fas fa-vector-square fa-2x  iii"></i> 
+            </div>
+            <!-- control para dibujar el poligono -->
+        </div>
     </div>
     <!-- ./wrapper -->
 

catalog/templates/map.html

@@ -240,18 +240,6 @@
         
     <!-- <div class="ad"> </div> -->
 
-    <!-- control de version de mapas -->
-    <div id="idmapControl" class="mapControl" onclick="cambio.changeMap()">
-        <i class="fas fa-layer-group fa-2x  iii"></i> 
-    </div>
-    <!-- control de version de mapas -->
-
-    <!-- control para dibujar el poligono -->
-    <div id="drawControl" class="drawControl" onclick="osmap.changeInteraction()">
-        <i class="fas fa-vector-square fa-2x  iii"></i> 
-    </div>
-    <!-- control para dibujar el poligono -->
-
     <footer class=" page-footer font-small special-color-dark pt-5" style="bottom: 0; position: absolute">
         <!-- Footer Elements -->
         <div class="container">

reports/static/reports/css/control-map.css

 .mapControl{
-  width: 33%;
+  width: 36%;
   height: auto;
   position: absolute;
   right: 15px;

reports/static/reports/js/Reports_scripts.js

@@ -79,6 +79,9 @@ function showMyModalSetTitle(name, data) {
     $('#myModalTitle').empty();
     $('#myModalTitle').append(name);
     $("#mapmodal").modal();
+    
+    //console.log(data)
+    document.getElementById("polygonText").value = data; 
 
 
     setTimeout(function () {
@@ -88,6 +91,14 @@ function showMyModalSetTitle(name, data) {
 
 }
 
+function copyPolygonText(){
+    const textarea = document.getElementById("polygonText");
+    textarea.select();
+    document.execCommand('copy');
+    //console.log("copy")
+}
+
+
 
 function createmap(data) {
     /*var map = new ol.Map({

reports/static/reports/js/minimap.js

@@ -31,6 +31,13 @@ const night = new ol.layer.Tile({
     })
 });
 
+const cycle = new ol.layer.Tile({
+    name: 'mapbox',
+    source: new ol.source.XYZ({
+		url: 'https://api.tiles.mapbox.com/v4/mapbox.outdoors/{z}/{x}/{y}.png?access_token=' + MAPBOX_ACCESS_TOKEN
+	}),
+});
+
 
 const polygonLayer = new ol.layer.Vector({
     name: 'polygon',
@@ -299,6 +306,10 @@ function changeMap(selectedMap) {
             map.getLayers().insertAt(0, night);
             currentMap = night;
             break;
+        case 'cycle':
+            map.getLayers().insertAt(0, cycle);
+            currentMap = cycle;
+            break;
     }
 }
 

reports/templates/Reports.html

@@ -310,7 +310,15 @@
                     <div id="map" class="map"></div>
 
                 </div>
+              
+                
                 <div class="modal-footer">
+                 <div align = "left">
+                    <textarea id ="polygonText" readonly rows="5" style="width: 61em; resize:none; font-size: 7pt;">
+                       POLYGON
+                    </textarea>
+                </div>  
+                    <button style="float: left; type="button" class="btn btn-default" onclick="copyPolygonText()">Copy polygon</button>
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 </div>
             </div>

reports/templates/sclData.html

@@ -168,7 +168,7 @@
         <div class="mapControl" style="">
             <div id="controlMap" class="controlContainer">
                 <div class="row">
-                    <div class="col-lg-4">
+                    <div class="col-lg-3">
                         <div class="baseMap" onclick="changeMap('light')">
                             <img src="../../static/images/light.png" width="100%" height="100%">
                             <span class="mapSelector">
@@ -177,7 +177,7 @@
                             </span>
                         </div>
                     </div>
-                    <div class="col-lg-4">
+                    <div class="col-lg-3">
                         <div class="baseMap" onclick="changeMap('streets')">
                             <img src="../../static/images/Streets.png" width="100%" height="100%">
                             <span class="mapSelector">
@@ -186,7 +186,7 @@
                             </span>
                         </div>
                     </div>
-                    <div class="col-lg-4">
+                    <div class="col-lg-3">
                         <div class="baseMap" onclick="changeMap('night')">
                             <img src="../../static/images/night.png" width="100%" height="100%">
                             <span class="mapSelector">
@@ -195,6 +195,15 @@
                             </span>
                         </div>
                     </div>
+                    <div class="col-lg-3">
+                        <div class="baseMap" onclick="changeMap('cycle')">
+                            <img src="../../static/images/cycle.png" width="100%" height="100%">
+                            <span class="mapSelector">
+                                <input id="cycle" type="radio" name="layerOption">
+                                <span>Cycle</span>
+                            </span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>