Merge remote-tracking branch 'origin/dev' into dev

reports/static/reports/js/minimap.js

@@ -317,7 +317,7 @@ function showControlMap() {
     if ($('#showControlMap').is(':visible')) {
         $("#showControlMap").hide();
         $("#hideControlMap").show();
-        $(".mapControl").show();
+        // $(".mapControl").show();
     } else {
         $("#showControlMap").show();
         $("#hideControlMap").hide();

reports/templates/aside.html

@@ -62,7 +62,7 @@
             </ul>
         </li>
 
-<!--
+  <!--
             <a class="treeview " href="#" onclick="compare(labels)">
                 <i class="fas fa-columns"></i></i>
                 <i class="fa fa-eye-slash hideChart" style="display:none"></i>
@@ -292,8 +292,8 @@
             </ul>
         </li>
 
-        <li>
-            <a class="treeview " href="#" onclick="showControlMap()">
+        <li class="treeview ">
+            <a href="#" onclick="showControlMap()">
                 <i class="fa fa-globe"></i>
                 <i class="fa fa-globe" style="display:none"></i>
                 <span id="showControlMap">Show Maps</span>
@@ -302,9 +302,27 @@
                     <span class="label label-primary pull-right"></span>
                 </span>
             </a>
+            <ul class="treeview-menu sidebar-form text-center">
+              <span>
+                <div class="form-check submenu" onclick="changeMap('light')">
+                  <input id="light" type="radio" name="layerOption" checked>
+                  <span>Noon</span>
+                </div>
+                <div class="form-check submenu" onclick="changeMap('streets')">
+                  <input id="streets" type="radio" name="layerOption">
+                  <span>Streets</span>
+                </div>
+                <div class="form-check submenu" onclick="changeMap('night')">
+                  <input id="night" type="radio" name="layerOption">
+                  <span>Night</span>
+                </div>
+                <div class="form-check submenu" onclick="changeMap('cycle')">
+                  <input id="cycle" type="radio" name="layerOption">
+                  <span>Cycle</span>
+                </div>
+              </span>
+            </ul>    
         </li>
-
-
   <!--      <li>
             <a class="treeview " href="#" onclick="showComparisons()">
                 <i class="fa fa-eye showImage"></i>