From f0bf1ddf1a5203cc8486422b5f66c97374859e47 Mon Sep 17 00:00:00 2001
From: Vadym Pasko <keenon3d@gmail.com>
Date: Fri, 5 Aug 2016 00:47:37 +0300
Subject: [PATCH 1/3] Preserve object lock and orbit display after selecting
 Sun in a FullView. Add reset button to clear lock and orbit.

---
 static/js/3d/main.js  | 62 +++++++++++++++++++++++++++++++++----------
 templates/full3d.html | 10 ++++---
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/static/js/3d/main.js b/static/js/3d/main.js
index ede63a7..d257efc 100644
--- a/static/js/3d/main.js
+++ b/static/js/3d/main.js
@@ -392,16 +392,26 @@
     setAttributeNeedsUpdateFlags();
   }
 
-  // camera locking fns
-  function clearLock(set_default_camera) {
-    if (!locked_object) return;
+  // camera locking and releasing fns
+
+  function resetView() {
+    if (locked_object) {
+      locked_object = null;
+    }
+
+    setDefaultCameraPosition();
+    cameraControls.target = new THREE.Vector3(0,0,0);
+    // reset camera pos
+    setNeutralCameraPosition();
+  }
+
+  function doClearLock(set_default_camera) {
 
     if (set_default_camera) {
       setDefaultCameraPosition();
     }
 
     cameraControls.target = new THREE.Vector3(0,0,0);
-
     // restore color and size
     attributes.value_color.value[locked_object_idx] = locked_object_color;
     attributes.size.value[locked_object_idx] = locked_object_size;
@@ -420,7 +430,12 @@
 
     // reset camera pos so subsequent locks don't get into crazy positions
     setNeutralCameraPosition();
-  }   // end clearLock
+  } 
+
+  function clearLock(set_default_camera) {
+    if (!locked_object) return;
+    doClearLock(set_default_camera)
+  }
 
   function setLock(full_name) {
     if (locked_object) {
@@ -721,6 +736,17 @@
     return THREE.ImageUtils.loadTexture(path);
   }
 
+  function resetColors(blacken) {
+
+    if (blacken) {
+      $('#objects-of-interest tr').css('background-color', '#000');
+    }
+
+    $('#sun-selector').css('background-color', 'yellowgreen'); //olivedrab
+    $('#reset-selector').css('background-color', 'dimgray');
+  }
+
+
   /** Public functions **/
 
   me.clearRankings = function() {
@@ -826,29 +852,36 @@
       $('#objects-of-interest tr:gt(2)').remove();
       setTimeout(function() {
         setLock('342843 Davidbowie');
-        $('#sun-selector').css('background-color', 'black');
-        $('#earth-selector').css('background-color', 'green');
+        resetColors()
       }, 0);
 
-    } else {
-      $('#objects-of-interest tr:gt(1)').remove();
+    } 
+    else {
+      $('#objects-of-interest tr:gt(2)').remove();
     }
     $('#objects-of-interest').append(featured_html).on('click', 'tr', function() {
-      $('#objects-of-interest tr').css('background-color', '#000');
       var $e = $(this);
       var full_name = $e.data('full-name');
-      $('#sun-selector').css('background-color', 'green');
+      resetColors()
       switch (full_name) {
         // special case full names
+
+        case 'reset':
+          doClearLock(true);
+          resetColors(true);
+          return false;
+
         case 'sun':
-          clearLock(true);
+          resetView();
           return false;
+
       }
-      clearLock();
+      // clearLock();
+      resetColors(true)
+      doClearLock();
 
       // set new lock
       $e.css('background-color', 'green');
-      $('#sun-selector').css('background-color', '#000');
       setLock(full_name);
 
       return false;
@@ -879,3 +912,4 @@
     object_movement_on = true;
   };
 }
+
diff --git a/templates/full3d.html b/templates/full3d.html
index c874c36..fcf8617 100644
--- a/templates/full3d.html
+++ b/templates/full3d.html
@@ -56,10 +56,14 @@
     <div id="objects-of-interest-container" style="text-align:center;display:none;opacity:.7;">
       <span>Significant objects<br>&amp; estimated value</span>
       <table id="objects-of-interest">
-        <tr id="sun-selector" data-full-name="sun" style="background-color:green;">
-          <td colspan="2"><a href="#">Sun</a> (default view)</td>
+        <tr id="reset-selector" data-full-name="reset" style="background-color:dimgray; font-weight: bold">
+          <td colspan="2"><a href="#">Reset</a> (default view)</td>
         </tr>
-        <tr id="earth-selector" data-full-name="earth">
+        <tr id="sun-selector" data-full-name="sun" style="background-color:yellowgreen; font-weight: bold">
+          <td colspan="2"><a href="#">Sun</a></td>
+        </tr>
+        <tr id="earth-selector" data-full-name="earth"> <!-- style="background-color:lightseagreen;" -->
+
           <td colspan="2"><a href="#">Earth</a></td>
         </tr>
         <tr id="342843-Davidbowie-selector" data-full-name="342843 Davidbowie">

From 638a058b9e6c9f53fbe2e2f50e264e9335f825ba Mon Sep 17 00:00:00 2001
From: Vadym Pasko <keenon3d@gmail.com>
Date: Fri, 12 Aug 2016 00:18:21 +0300
Subject: [PATCH 2/3] Preserve object lock and orbit display after selecting
 Sun in the main view. Add reset button. Deselect asteroid in main table after
 reset.

---
 static/css/main.css                          |  2 +-
 static/js/3d/main.js                         | 50 ++++++++++----------
 static/js/main/controllers/asterank_3d.js    | 14 +++++-
 static/js/main/controllers/asteroid_table.js |  6 +++
 templates/blocks/webgl.html                  |  1 +
 templates/full3d.html                        |  4 +-
 6 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/static/css/main.css b/static/css/main.css
index fab4030..851773f 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -65,7 +65,7 @@ hr.top-bottom-divider {
 #webgl-controls {
   position: absolute;
   right: 0;
-  width: 325px;
+  width: 380px;
   height: 23px;
   background-color: #ccc;
   color: #000;
diff --git a/static/js/3d/main.js b/static/js/3d/main.js
index d257efc..33fb537 100644
--- a/static/js/3d/main.js
+++ b/static/js/3d/main.js
@@ -60,6 +60,7 @@
     , locked_object_size = -1
     , locked_object_color = -1
 
+  var full_name_temp = null
   // David Bowie special case.
   // Note: If you're updating a featured case here, make sure you update in the
   // full3d.html tempalte too.
@@ -394,24 +395,25 @@
 
   // camera locking and releasing fns
 
-  function resetView() {
-    if (locked_object) {
-      locked_object = null;
+  function resetView(set_default_camera, clear_lock) {
+    locked_object = null;
+
+    // setDefaultCameraPosition();
+    if (set_default_camera) {
+      setDefaultCameraPosition();
     }
 
-    setDefaultCameraPosition();
     cameraControls.target = new THREE.Vector3(0,0,0);
+
+    if (clear_lock){
+      dropLock() 
+    }
+
     // reset camera pos
     setNeutralCameraPosition();
   }
 
-  function doClearLock(set_default_camera) {
-
-    if (set_default_camera) {
-      setDefaultCameraPosition();
-    }
-
-    cameraControls.target = new THREE.Vector3(0,0,0);
+  function dropLock(){
     // restore color and size
     attributes.value_color.value[locked_object_idx] = locked_object_color;
     attributes.size.value[locked_object_idx] = locked_object_size;
@@ -427,14 +429,11 @@
     locked_object_idx = -1;
     locked_object_size = -1;
     locked_object_color = null;
-
-    // reset camera pos so subsequent locks don't get into crazy positions
-    setNeutralCameraPosition();
-  } 
+  }
 
   function clearLock(set_default_camera) {
     if (!locked_object) return;
-    doClearLock(set_default_camera)
+    resetView(set_default_camera, true);
   }
 
   function setLock(full_name) {
@@ -742,11 +741,10 @@
       $('#objects-of-interest tr').css('background-color', '#000');
     }
 
-    $('#sun-selector').css('background-color', 'yellowgreen'); //olivedrab
-    $('#reset-selector').css('background-color', 'dimgray');
+    $('#sun-selector').css('background-color', '#0DDD3B'); // 00D32F
+    $('#reset-selector').css('background-color', '#365A3E');
   }
 
-
   /** Public functions **/
 
   me.clearRankings = function() {
@@ -765,11 +763,16 @@
     }
   };
 
+  me.resetView = function(clear_lock) {
+    return resetView(true, clear_lock);
+  };
+
   me.clearLock = function() {
     return clearLock(true);
   };
 
   me.setLock = function(full_name) {
+    dropLock();
     return setLock(full_name);
   };
 
@@ -867,18 +870,17 @@
         // special case full names
 
         case 'reset':
-          doClearLock(true);
+          resetView(true, true);
           resetColors(true);
           return false;
 
         case 'sun':
-          resetView();
+          resetView(true, false);
           return false;
-
       }
-      // clearLock();
+
       resetColors(true)
-      doClearLock();
+      resetView(false, true);
 
       // set new lock
       $e.css('background-color', 'green');
diff --git a/static/js/main/controllers/asterank_3d.js b/static/js/main/controllers/asterank_3d.js
index af1263d..43b3b5a 100644
--- a/static/js/main/controllers/asterank_3d.js
+++ b/static/js/main/controllers/asterank_3d.js
@@ -1,5 +1,6 @@
 function Asterank3DCtrl($scope, pubsub) {
   $scope.running = true;
+  var selected_object = null
 
   $scope.Init = function() {
     asterank3d = new Asterank3D({
@@ -19,14 +20,21 @@ function Asterank3DCtrl($scope, pubsub) {
         $ls.height($ls.height() + 250);
       },
       top_object_color: 0xffffff
+      // top_object_color: 0xdda0dd
     });
   }
 
+  $scope.ResetView = function() {
+    pubsub.publish('DeselectAsteroid', [selected_object]);
+    asterank3d.resetView(true, pubsub);
+  }
+
   $scope.SunView = function() {
-    asterank3d.clearLock();
+    asterank3d.resetView(false);
   }
 
   $scope.EarthView = function() {
+    pubsub.publish('DeselectAsteroid', [selected_object]);
     asterank3d.setLock('earth');
   }
 
@@ -44,6 +52,10 @@ function Asterank3DCtrl($scope, pubsub) {
     window.location.href="http://asterank.com/3d";
   }
 
+  pubsub.subscribe('AsteroidDetailsClick', function(asteroid) {
+    selected_object = asteroid
+  });
+
   pubsub.subscribe('Lock3DView', function(asteroid) {
     if (asterank3d.isWebGLSupported()) {
       asterank3d.setLock(asteroid.full_name);
diff --git a/static/js/main/controllers/asteroid_table.js b/static/js/main/controllers/asteroid_table.js
index 1066a9d..f5ccb7b 100644
--- a/static/js/main/controllers/asteroid_table.js
+++ b/static/js/main/controllers/asteroid_table.js
@@ -77,6 +77,12 @@ function AsteroidTableCtrl($scope, $http, pubsub) {
 
   } // end UpdateRankings
 
+  // Reset asteroid selection in table and hide asteroid details
+  pubsub.subscribe('DeselectAsteroid', function(obj) {
+    $scope.selected = null;
+    pubsub.publish('AsteroidDetailsClick', [obj]);
+  });
+
   $scope.AsteroidClick = function(obj) {
     if (obj === $scope.selected) {
       // deselect
diff --git a/templates/blocks/webgl.html b/templates/blocks/webgl.html
index f3f7227..8a13ed8 100644
--- a/templates/blocks/webgl.html
+++ b/templates/blocks/webgl.html
@@ -1,6 +1,7 @@
 <div class="" ng-controller="Asterank3DCtrl" ng-init="Init()">
   <div id="webgl-controls">
     <ul>
+      <li><span ng-click="ResetView()"><i class="icon-refresh"></i> Reset</span></li>
       <li><span ng-click="SunView()"><i class="icon-star-empty"></i> Sun</span></li>
       <li><span ng-click="EarthView()"><i class="icon-home"></i> Earth</span></li>
       <li ng-show="running"><span ng-click="Pause()"><i class="icon-pause"></i> Pause</span></li>
diff --git a/templates/full3d.html b/templates/full3d.html
index fcf8617..047554a 100644
--- a/templates/full3d.html
+++ b/templates/full3d.html
@@ -56,10 +56,10 @@
     <div id="objects-of-interest-container" style="text-align:center;display:none;opacity:.7;">
       <span>Significant objects<br>&amp; estimated value</span>
       <table id="objects-of-interest">
-        <tr id="reset-selector" data-full-name="reset" style="background-color:dimgray; font-weight: bold">
+        <tr id="reset-selector" data-full-name="reset" style="background-color:#365A3E; font-weight: bold">
           <td colspan="2"><a href="#">Reset</a> (default view)</td>
         </tr>
-        <tr id="sun-selector" data-full-name="sun" style="background-color:yellowgreen; font-weight: bold">
+        <tr id="sun-selector" data-full-name="sun" style="background-color:#0DDD3B; font-weight: bold">
           <td colspan="2"><a href="#">Sun</a></td>
         </tr>
         <tr id="earth-selector" data-full-name="earth"> <!-- style="background-color:lightseagreen;" -->

From ad12a1ba94cb9d930d7f0338d57a1b40aab1d6d7 Mon Sep 17 00:00:00 2001
From: Vadym Pasko <keenon3d@gmail.com>
Date: Sun, 21 Aug 2016 21:55:34 +0300
Subject: [PATCH 3/3] Fix recall of asteroid details on a second call of
 ResetView method.

---
 static/js/main/controllers/asterank_3d.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/static/js/main/controllers/asterank_3d.js b/static/js/main/controllers/asterank_3d.js
index 43b3b5a..ff32ed6 100644
--- a/static/js/main/controllers/asterank_3d.js
+++ b/static/js/main/controllers/asterank_3d.js
@@ -1,6 +1,7 @@
 function Asterank3DCtrl($scope, pubsub) {
   $scope.running = true;
   var selected_object = null
+  var initial_object = null
 
   $scope.Init = function() {
     asterank3d = new Asterank3D({
@@ -25,8 +26,10 @@ function Asterank3DCtrl($scope, pubsub) {
   }
 
   $scope.ResetView = function() {
-    pubsub.publish('DeselectAsteroid', [selected_object]);
-    asterank3d.resetView(true, pubsub);
+    if (selected_object) {
+      pubsub.publish('DeselectAsteroid', [selected_object]);
+    }
+    asterank3d.resetView(true);
   }
 
   $scope.SunView = function() {
@@ -53,7 +56,12 @@ function Asterank3DCtrl($scope, pubsub) {
   }
 
   pubsub.subscribe('AsteroidDetailsClick', function(asteroid) {
-    selected_object = asteroid
+    if (selected_object == asteroid) {
+      selected_object = null;
+    }
+    else {
+      selected_object = asteroid;
+    }
   });
 
   pubsub.subscribe('Lock3DView', function(asteroid) {