From c77e79aec409f1489b17b813ae044a4cac149738 Mon Sep 17 00:00:00 2001
From: "Vadym S. Khondar" <vadym@khondar.name>
Date: Sat, 10 Sep 2016 18:53:47 +0300
Subject: [PATCH 1/2] Link objects to their descriptions in NASA Archive.

Now it shows short historical description of selected object taken from NASA Space Science Data Coordinated Archive (provided that entry exists) with direct link to the entry for additional information.
---
 web-root/index.php       | 18 ++++++++++---
 web-root/nasainfo.php    | 39 +++++++++++++++++++++++++++
 web-root/scripts/main.js | 21 ++++++++++++++-
 web-root/style.css       | 57 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 web-root/nasainfo.php

diff --git a/web-root/index.php b/web-root/index.php
index 12782e1..0a90c0e 100644
--- a/web-root/index.php
+++ b/web-root/index.php
@@ -40,7 +40,7 @@
     <div id="menu-left" class="menubar">
       <div id="search-holder" class="menu-item">
         <span class="icon-search"></span>
-        <input type="text" id="search"></input>
+        <input type="text" id="search"/>
       </div>
       <div id="menu-groups" class="menu-item">
         <div class="menu-title">Groups</div>
@@ -71,15 +71,15 @@
           <span class="box-header">Legend</span>
           <ul id="legend">
             <li>
-               <img class="dot" src="/dot-red.png"></img>
+               <img class="dot" src="/dot-red.png"/>
                Satellite
              </li>
             <li>
-              <img class="dot" src="/dot-blue.png"></img>
+              <img class="dot" src="/dot-blue.png"/>
               Rocket body
             </li>
             <li>
-              <img class="dot" src="/dot-grey.png"></img>
+              <img class="dot" src="/dot-grey.png"/>
               Debris
             </li>
           </ul>
@@ -118,6 +118,16 @@
     </div>
       <div id="search-results"></div>
     <div id="sat-hoverbox">(none)</div>
+    <div class="sat-description">
+      <div class="sat-description__header">
+        <div class="sat-description__header--left">About</div>
+        <a class="sat-description__header--right sat-description__close">X</a>
+      </div>
+      <div class="sat-description__content"></div>
+      <div class="sat-description__footer">
+        <b>Credits:</b> NASA Space Science Data Coordinated Archive
+      </div>
+    </div>
     <div id="sat-infobox">
       <div id="sat-info-title">This is a title</div>
       <div id="all-objects-link" class="link">Find all objects from this launch...</div>
diff --git a/web-root/nasainfo.php b/web-root/nasainfo.php
new file mode 100644
index 0000000..8281da7
--- /dev/null
+++ b/web-root/nasainfo.php
@@ -0,0 +1,39 @@
+<?php
+    $catalogURLTemplate = 'http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=%s';
+    $designator = htmlspecialchars($_GET['id']);
+    $redirect = filter_var($_GET['redirect'], FILTER_VALIDATE_BOOLEAN);
+
+    if ($designator) {
+        if ($redirect) {
+            header('Location: ' . sprintf($catalogURLTemplate, $designator), true, 302);
+            exit;
+        } else {
+            $catalogEntryHtml = file_get_contents(sprintf($catalogURLTemplate, $designator));
+
+            if ($catalogEntryHtml) {
+                $catalogEntryDocument = new DOMDocument();
+                if ($catalogEntryDocument->loadHTML($catalogEntryHtml)) {
+                    $xpath = new DOMXPath($catalogEntryDocument);
+
+                    $match = $xpath->query('//div[@id="contentwrapper"]//div[@class="urone"]');
+                    if ($match->length > 0) {
+                        $description = trim($match[0]->lastChild->nodeValue);
+
+                        header('Content-Type: text/json', true, 200);
+
+                        $data = array(
+                            'description' => $description
+                        );
+
+                        echo json_encode($data);
+
+                        exit;
+                    }
+                }
+            }
+        }
+    }
+
+    // fall back - if any error happened during data extraction above, return 404
+    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
+?>
diff --git a/web-root/scripts/main.js b/web-root/scripts/main.js
index 293e6bb..4096d23 100644
--- a/web-root/scripts/main.js
+++ b/web-root/scripts/main.js
@@ -244,16 +244,22 @@ $(document).ready(function() {
       initialRotation = false;
       camZoomSnappedOnSat = false;
     });
+
+  $('.sat-description__close').click(function() {
+    $('.sat-description').fadeOut();
+  });
  //   debugContext = $('#debug-canvas')[0].getContext('2d');
  //   debugImageData = debugContext.createImageData(debugContext.canvas.width, debugContext.canvas.height);
   drawLoop(); //kick off the animationFrame()s
 });
 
 function selectSat(satId) {
+  $('.sat-description').fadeOut();
+
   selectedSat = satId;
   if(satId === -1) {
     $('#sat-infobox').fadeOut();
-     orbitDisplay.clearSelectOrbit();
+    orbitDisplay.clearSelectOrbit();
   } else {
     camZoomSnappedOnSat = true;
     camAngleSnappedOnSat = true;
@@ -262,6 +268,19 @@ function selectSat(satId) {
  //   camSnapToSat(satId);
     var sat = satSet.getSat(satId);
     if(!sat) return;
+
+    var nasaInfoUrl = 'nasainfo.php?id=' + sat.intlDes;
+    $.getJSON(nasaInfoUrl, function (data){
+      var satDescription = $('.sat-description');
+      var satDescriptionContent = $('.sat-description__content', satDescription);
+      var learnMore = $('<a/>').prop('href', nasaInfoUrl + '&redirect=true').text('Learn more...');
+
+      satDescriptionContent.html(data.description);
+      satDescriptionContent.append($('<br/>'), learnMore);
+
+      satDescription.fadeIn();
+    });
+
     orbitDisplay.setSelectOrbit(satId);
     $('#sat-infobox').fadeIn();
     $('#sat-info-title').html(sat.OBJECT_NAME);
diff --git a/web-root/style.css b/web-root/style.css
index 31b7381..baeae25 100644
--- a/web-root/style.css
+++ b/web-root/style.css
@@ -100,6 +100,59 @@ ul {
   pointer-events: none;
 }
 
+.sat-description {
+  background: black;
+  border-radius: 5px;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  cursor: default;
+  color: white;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  padding: 1px;
+  margin-top: auto;
+  margin-bottom: auto;
+  display: none;
+}
+
+.sat-description__header {
+  padding: 1px;
+  border-radius: 5px;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  display: flex;
+  flex-direction: row;
+}
+
+.sat-description__header--left {
+  padding: 4px;
+  flex-grow: 1;
+}
+
+.sat-description__header--right {
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 25px;
+  height: 25px;
+  font-size: 10px;
+  border-radius: 5px;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  cursor: hand;
+  text-decoration: none;
+}
+
+.sat-description__content {
+  overflow-y: scroll;
+  padding: 9px;
+  max-width: 400px;
+  max-height: 250px;
+}
+
+.sat-description__footer {
+  font-size: 8pt;
+}
+
 #sat-infobox {
   background: black;
   cursor:default;
@@ -186,7 +239,7 @@ ul {
   font-size: 12px;
   height: 28px;
   float: right;
-  margin-right: 10  px;
+  margin-right: 10px;
 }
 
 #search {
@@ -359,4 +412,4 @@ ul {
 
 #controls-info>li {
   margin-top: 10px;
-}
\ No newline at end of file
+}

From b22f1118a7f87ae210aaa7303a96c344a5b3361a Mon Sep 17 00:00:00 2001
From: "Vadym S. Khondar" <vadym@khondar.name>
Date: Sat, 10 Sep 2016 19:38:07 +0300
Subject: [PATCH 2/2] Fix data extraction for multi-paragraph descriptions on
 NASA site.

---
 web-root/nasainfo.php    | 8 ++++++--
 web-root/scripts/main.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/web-root/nasainfo.php b/web-root/nasainfo.php
index 8281da7..2bd0650 100644
--- a/web-root/nasainfo.php
+++ b/web-root/nasainfo.php
@@ -1,6 +1,6 @@
 <?php
     $catalogURLTemplate = 'http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=%s';
-    $designator = htmlspecialchars($_GET['id']);
+    $designator = htmlspecialchars($_GET['intldes']);
     $redirect = filter_var($_GET['redirect'], FILTER_VALIDATE_BOOLEAN);
 
     if ($designator) {
@@ -17,7 +17,11 @@
 
                     $match = $xpath->query('//div[@id="contentwrapper"]//div[@class="urone"]');
                     if ($match->length > 0) {
-                        $description = trim($match[0]->lastChild->nodeValue);
+                        $description = '';
+                        $descriptionParts = $match[0]->childNodes;
+                        for ($i = 1; $i < $descriptionParts->length; ++$i) {
+                            $description .= trim($descriptionParts[$i]->nodeValue);
+                        }
 
                         header('Content-Type: text/json', true, 200);
 
diff --git a/web-root/scripts/main.js b/web-root/scripts/main.js
index 4096d23..a539e50 100644
--- a/web-root/scripts/main.js
+++ b/web-root/scripts/main.js
@@ -269,7 +269,7 @@ function selectSat(satId) {
     var sat = satSet.getSat(satId);
     if(!sat) return;
 
-    var nasaInfoUrl = 'nasainfo.php?id=' + sat.intlDes;
+    var nasaInfoUrl = 'nasainfo.php?intldes=' + sat.intlDes;
     $.getJSON(nasaInfoUrl, function (data){
       var satDescription = $('.sat-description');
       var satDescriptionContent = $('.sat-description__content', satDescription);