@wwtelescope/webclient 6.3.5 → 6.4.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# @wwtelescope/webclient 6.4.1 (2023-02-15)
+
+- Make sliders in layer properties window be initialized with the correct value
+  (#354, @Carifio24).
+
+
+# @wwtelescope/webclient 6.4.0 (2022-07-12)
+
+- Finally update this to expose all of our new datasets (@pkgw, #353)! These
+  have been managed in the [wwt-core-catalogs][wcc] repository, but not actually
+  exposed in the production webclient until now. The update required us to
+  rebuild the webclient’s precompiled search index, which took a lot of
+  infrastructural work. That is now working.
+- Fix a formatting bug that could lead to the seconds value being 60 (@Carifio24, #351).
+
+[wcc]: https://github.com/WorldWideTelescope/wwt-core-catalogs/
+
+
 # @wwtelescope/webclient 6.3.5 (2022-05-19)
 
 - index.html: load pako and uuid early for updated webgl-engine

package/README.md

@@ -20,14 +20,10 @@ JavaScript library.
 
 ## Building and Testing
 
-In order to build and test the app, you need:
-
-1. [Node.js](https://nodejs.org/), specifically the `npm` command. If you need
-   to install Node.js, use your operating system’s package manager or visit
-   [nodejs.org](https://nodejs.org/) for installation instructions.
-2. The [Grunt](https://gruntjs.com/) task runner, specifically the `grunt`
-   command. Once again, install it using your operating system’s package
-   manager or [see the Grunt website](https://gruntjs.com/getting-started).
+In order to build and test the app, you need: [Node.js](https://nodejs.org/),
+specifically the `npm` command. If you need to install Node.js, use your
+operating system’s package manager or visit [nodejs.org](https://nodejs.org/)
+for installation instructions.
 
 The first time you check out these files, run:
 
@@ -38,7 +34,7 @@ npm install
 Once that has been done, you can build the website with:
 
 ```
-grunt dist-dev
+npx grunt dist-dev
 ```
 
 This will create the app files in the `dist` subdirectory of your repository

package/app.js

@@ -24,7 +24,7 @@
 
 // Note that, unlike the other source files, this file is processed through
 // Grunt's templating system. This is done so that we can insert various
-// build-time parameters. Note also that the variables here must references to
+// build-time parameters. Note also that the variables here must be references to
 // the Grunt config object; the templating in index.html uses different
 // variables.
 
@@ -46,7 +46,7 @@ var wwt = {
     'wwtControllers',
     'ngCookies',
     'angular-intro'
-  ]).config(function($sceDelegateProvider) {
+  ]).config(function ($sceDelegateProvider) {
     $sceDelegateProvider.resourceUrlWhitelist([
       // same origin
       'self',
@@ -63,13 +63,15 @@ var wwt = {
   controllers: angular.module('wwtControllers', [])
 };
 
-$(window).on('load', function() {
+$(window).on('load', function () {
   // Load search data after everything else.
   //
-  // Historically the search data were managed in the webclient repository,
-  // but they're really a "core" asset, since they index the core WWT
-  // datasets.
+  // Historically the search data were managed in the webclient repository, but
+  // they're really a "core" asset, since they index the core WWT datasets.
+  //
+  // The JS file here sets a global `wwt.searchData` variable, which is
+  // processed in the `init()` function defined in `dataproxy/SearchData.js`.
   var scr = document.createElement('script');
-  scr.setAttribute("src", wwtlib.URLHelpers.singleton.coreStaticUrl('data/searchdata.min.js'));
+  scr.setAttribute("src", wwtlib.URLHelpers.singleton.coreStaticUrl('data/searchdata_v2.min.js'));
   document.getElementsByTagName("head")[0].appendChild(scr);
 });

package/ci/azure-deployment.yml

@@ -1,4 +1,4 @@
-# Copyright 2020-2021 the .NET Foundation
+# Copyright 2020-2023 the .NET Foundation
 # Licensed under the MIT License
 
 parameters:
@@ -85,11 +85,11 @@ jobs:
       azurePowerShellVersion: 'LatestVersion'
       scriptType: 'inlineScript'
       inline: |
-        Unpublish-AzCdnEndpointContent `
+        Clear-AzCdnEndpointContent `
           -ProfileName wwt-cdn-01 `
           -ResourceGroupName wwt-web01 `
           -EndpointName wwtweb-prod `
-          -PurgeContent '/$(WEBCLIENT_DEPLOYMENT_TAG)/*'
+          -ContentPath @('/$(WEBCLIENT_DEPLOYMENT_TAG)/*')
 
 
 # Deployment jobs that should only happen on updates to `rc`, i.e.

package/controllers/MainController.js

@@ -33,9 +33,8 @@ wwt.controllers.controller(
     '$popover',
 
     function ($scope, $rootScope, uiLibrary, $q, appState, loc, $timeout, finderScope,
-              searchDataService, places, util, hashManager, skyball, searchUtil, $modal,
-              $element, $cookies, AutohidePanels, $window, $popover)
-    {
+      searchDataService, places, util, hashManager, skyball, searchUtil, $modal,
+      $element, $cookies, AutohidePanels, $window, $popover) {
       //TODO - figure out how to clean up lame long list of dependencies injected
       var ctl;
 
@@ -136,7 +135,7 @@ wwt.controllers.controller(
       };
 
       $scope.setLookAt = function (lookAt, imageryName, noUpdate, keepCamera) {
-        if (!lookAt || !isNaN(parseInt(lookAt))){
+        if (!lookAt || !isNaN(parseInt(lookAt))) {
           lookAt = wwtlib.WWTControl.singleton.renderContext.get_backgroundImageset()._dataSetType;
           lookAt = $scope.lookTypes[lookAt];
           if ($scope.lookAt === lookAt) {
@@ -184,7 +183,7 @@ wwt.controllers.controller(
         }
       }
 
-      angular.element($window).bind('resize', function() {
+      angular.element($window).bind('resize', function () {
         $rootScope.$apply(update_window_size);
       });
 
@@ -559,7 +558,7 @@ wwt.controllers.controller(
         }
       }
 
-      var placeNameForQueryString = function(item) {
+      var placeNameForQueryString = function (item) {
         // Various "research" menus like to put an item's name into URL query
         // strings. Compute the proper (well, good-enough) representation. When
         // the name has multiple semicolon-separated identifiers, usually the
@@ -595,8 +594,8 @@ wwt.controllers.controller(
       });
 
       var finderTimer,
-          finderActive = false,
-          finderMoved = true;
+        finderActive = false,
+        finderMoved = true;
 
       $scope.showFinderScope = function (event) {
         // On Windows, right-click brings up the finder scope and control-click
@@ -646,14 +645,14 @@ wwt.controllers.controller(
           }
 
           finderTimer = setInterval(pollFinder, 400);
-          viewportChange(null, {finderMove: true});
+          viewportChange(null, { finderMove: true });
         }
       };
 
       var pollFinder = function () {
         if (checkVisibleFinderScope()) {
           if (finderMoved) {
-            viewportChange(null, {finderMove: true});
+            viewportChange(null, { finderMove: true });
             finderMoved = false;
           }
         }
@@ -734,11 +733,6 @@ wwt.controllers.controller(
         }
       };
 
-      $scope.setSurveyProperties = function () {
-        $scope.propertyItem = $scope.backgroundImagery;
-        $scope.propertyItem.isSurvey = true;
-      };
-
       $scope.setActiveItem = function (item) {
         $scope.activeItem = item;
         if (item.guid) {
@@ -749,7 +743,7 @@ wwt.controllers.controller(
           $scope.activeItem.imageSet = item.get_studyImageset();
         }
       };
-      
+
       $scope.addCatalogHiPS = function (item) {
         if (item.guid) {
           $scope.shareUrl = hashManager.setHashVal('place', item.guid, true, true);
@@ -769,7 +763,7 @@ wwt.controllers.controller(
       };
 
       $scope.setForegroundImage = function (item) {
-        if(item.isCatalogHips){
+        if (item.isCatalogHips) {
           $scope.addCatalogHiPS(item);
           return;
         }
@@ -800,7 +794,7 @@ wwt.controllers.controller(
       };
 
       $scope.setBackgroundImage = function (item) {
-        if(item.isCatalogHips){
+        if (item.isCatalogHips) {
           $scope.addCatalogHiPS(item);
           return;
         }
@@ -933,21 +927,21 @@ wwt.controllers.controller(
       $scope.playTour = function (url, edit) {
         $('.finder-scope').hide();
 
-        wwt.wc.add_tourError(function(e) {
+        wwt.wc.add_tourError(function (e) {
           util.exitFullscreen();
-          $scope.$applyAsync(function() {
+          $scope.$applyAsync(function () {
             wwt.tourPlaying = $rootScope.tourPlaying = false;
           });
           uiLibrary.showErrorMessage('There was an error loading this tour. The tour file may be damaged or inaccessible.');
-          console.warn('Tour error',$scope,e);
+          console.warn('Tour error', $scope, e);
         });
 
         wwt.wc.add_tourReady(function () {
-          console.log({ready:wwtlib.WWTControl.singleton.tourEdit});
+          console.log({ ready: wwtlib.WWTControl.singleton.tourEdit });
 
           $scope.$applyAsync(function () {
             $scope.isLoading = false;
-            $scope.activeItem = {label: 'currentTour'};
+            $scope.activeItem = { label: 'currentTour' };
             $scope.activePanel = 'currentTour';
             $scope.ribbon.tabs[1].menu['Edit Tour'] = [$scope.editTour];
           });
@@ -1009,7 +1003,7 @@ wwt.controllers.controller(
           //todo show dialog for tour properties
           $rootScope.currentTour = wwtlib.WWTControl.singleton.createTour("New Tour");
 
-          $scope.activeItem = {label: 'currentTour'};
+          $scope.activeItem = { label: 'currentTour' };
           $scope.activePanel = 'currentTour';
           $rootScope.$applyAsync(function () {
             $rootScope.editingTour = true;
@@ -1179,9 +1173,9 @@ wwt.controllers.controller(
       $scope.homePrefChange = function (isWebclient) {
         $cookies.remove('homepage');
         if (!isWebclient) {
-          $cookies.put('homepage', 'home', {expires: new Date(2050, 1, 1), path: "/"});
+          $cookies.put('homepage', 'home', { expires: new Date(2050, 1, 1), path: "/" });
         } else {
-          $cookies.put('homepage', 'webclient', {expires: new Date(2050, 1, 1), path: "/"});
+          $cookies.put('homepage', 'webclient', { expires: new Date(2050, 1, 1), path: "/" });
         }
       };
 
@@ -1227,9 +1221,9 @@ wwt.controllers.controller(
       $scope.displayXFader = function () {
         return (
           $scope.lookAt === 'Sky' &&
-            $scope.trackingObj &&
-            !$scope.tourPlaying &&
-            ($scope.trackingObj.get_backgroundImageset() != null || $scope.trackingObj.get_studyImageset() != null)
+          $scope.trackingObj &&
+          !$scope.tourPlaying &&
+          ($scope.trackingObj.get_backgroundImageset() != null || $scope.trackingObj.get_studyImageset() != null)
         );
       }
 
@@ -1294,7 +1288,7 @@ wwt.controllers.controller(
       $scope.fovClass = function () {
         return $scope.lookAt === 'Planet' || $scope.lookAt === 'Panorama' || $scope.lookAt === 'Earth' ? 'hide' :
           $scope.lookAt === 'SolarSystem' ? 'solar-system-mode fov-panel' :
-          'fov-panel';
+            'fov-panel';
       }
 
       $scope.contextPanelClass = function () {
@@ -1303,7 +1297,7 @@ wwt.controllers.controller(
           cls += ' hide';
         }
 
-        $rootScope.compressed = $scope.compressed = cls.indexOf('compressed')>0;
+        $rootScope.compressed = $scope.compressed = cls.indexOf('compressed') > 0;
         return cls;
       }
 

package/controllers/modals/DataVizController.js

@@ -52,7 +52,6 @@ wwt.controllers.controller('DataVizController', ['$scope', '$rootScope', 'Util',
       return {label: c, type: i};
     });
     l.computeDateDomainRange(0,-1);
-    console.log('compute');
     var none = {label: 'None', index: -1};
     $scope.columns.splice(0, 0, none);
     l.psType = l.get_pointScaleType();
@@ -61,12 +60,21 @@ wwt.controllers.controller('DataVizController', ['$scope', '$rootScope', 'Util',
 
   var sliders = {};
   var initExpSlider = function (sel, prop, initVal) {
-    $scope[prop] = initVal;
+    var value = $scope[prop];
+    if (value == null) {
+      value = l['get_' + prop]();
+      if (value == null) {
+        value = initVal;
+      }
+      $scope[prop] = value;
+    }
     if (sliders[prop]) {
       return;
     }
     setTimeout(function () {
       var bar = $(sel);
+      var pxValue = 4 * Math.round(Math.log2(value)) + 50;
+      bar[0].style.left = pxValue.toString() + 'px';
       var off = parseInt(bar.css('left').replace('px', ''));
       sliders[prop] = new wwt.Move({
         el: bar,

package/dataproxy/Places.js

@@ -17,8 +17,8 @@ wwt.app.factory(
       };
 
       var root,
-          rootFolders,
-          openCollectionsFolder;
+        rootFolders,
+        openCollectionsFolder;
 
       function getRoot() {
         var deferred = $q.defer();
@@ -79,8 +79,8 @@ wwt.app.factory(
             item.isPlanet = item.get_dataSetType() === 1;
           }
           if (typeof item.get_projection == 'function'
-          && typeof item.get_extension == 'function') {
-              item.isCatalogHips = item.get_projection() === 7 && item.get_extension() === ".tsv";
+            && typeof item.get_extension == 'function') {
+            item.isCatalogHips = item.get_projection() === 7 && item.get_extension() === ".tsv";
           }
 
           util.rewritePlaceUrls(item);
@@ -100,7 +100,9 @@ wwt.app.factory(
 
           root = wwt.wc.createFolder();
 
-          var url = new URL(wwt.staticAssetsPrefix + 'assets/webclient-explore-root.wtml', window.location).toString();
+          // Resolving relative to window.location helps us deal with http/https
+          // here:
+          var url = new URL(wwt.coreStaticUrlPrefix + 'wwtweb/catalog.aspx?W=explorerootweb', window.location).toString();
 
           root.loadFromUrl(url, function () {
             var collection;

package/dataproxy/SearchData.js

@@ -1,38 +1,27 @@
 wwt.app.factory(
   'SearchData',
   [
-    '$http',
     '$q',
-    '$timeout',
-    'Places',
     'Util',
 
-    function ($http, $q, $timeout, places, util) {
+    function ($q, util) {
       var api = {
         getData: getData,
         getIndex: getIndex
       };
 
       var data,
-          searchIndex = {},
-          initPromise,
-          constellations = [];
+        searchIndex = {},
+        initPromise,
+        constellations = [];
       var deferredInit = $q.defer();
-      var allDataDeferred = $q.defer();
-      var allDataPromise = (function(){return allDataDeferred.promise;})();
 
-      function getData(all) {
+      function getData() {
         var deferred = $q.defer();
 
-        if (all) {
-          allDataPromise.then(function () {
-            deferred.resolve(data);
-          });
-        } else {
-          initPromise.then(function () {
-            deferred.resolve(data);
-          });
-        }
+        initPromise.then(function () {
+          deferred.resolve(data);
+        });
 
         return deferred.promise;
       };
@@ -50,67 +39,86 @@
       var imageset_id = 100;
 
       var init = function () {
-        if (wwt.searchData) {
+        // The special `wwt.searchData` global is assigned in the JS file that
+        // the main webclient app loads asynchronously (see `app.js`).
+        if (!wwt.searchData) {
+          setTimeout(init, 333);
+        } else {
+          // searchDataIndexed is used in `factories/SearchUtil.js`.
           wwt.searchDataIndexed = [];
+
           data = wwt.searchData;
           var start = new Date();
 
           $.each(data.Constellations, function (i, item) {
-            /*if (item.name === 'SolarSystem') {
-              item.places = ssData;
-              return;
-              }*/
             constellations[i] = item.name;
 
             $.each(item.places, function (j, place) {
               var fgi = place.fgi,
-                  imgSet;
+                imgSet;
 
               if (fgi) {
                 imageset_id++;
 
+                var band_pass = (fgi.bp !== undefined) ? fgi.bp : wwtlib.BandPass.visible;
+                var projection = (fgi.pr !== undefined) ? fgi.pr : wwtlib.ProjectionType.tan;
+                var base_tile_level = (fgi.bl !== undefined) ? fgi.bl : 0;
+                var file_type = (fgi.ft !== undefined) ? fgi.ft : ".png";
+                var tile_levels = (fgi.lv !== undefined) ? fgi.lv : 4;
+                var bottoms_up = (fgi.bu !== undefined) ? fgi.bu : false;
+                var quad_tree_map = (fgi.q !== undefined) ? fgi.q : "";
+                var offset_x = (fgi.oX !== undefined) ? fgi.oX : 0;
+                var offset_y = (fgi.oY !== undefined) ? fgi.oY : 0;
+                var default_set = (fgi.ds !== undefined) ? fgi.ds : false; // "StockSet" in XML
+                var rotation = (fgi.r !== undefined) ? fgi.r : 0;
+                var width_factor = (fgi.wf !== undefined) ? fgi.wf : 2;
+
                 imgSet = wwtlib.Imageset.create(
-                  fgi.n,//name
-                  fgi.u,//url
-                  fgi.dt || 2,//datasettype -default to sky
-                  fgi.bp,//bandPass
-                  fgi.pr,//projection
-                  imageset_id,//imagesetid
-                  fgi.bl,//baseLevel
-                  fgi.lv,//levels
-                  null,//tilesize
-                  fgi.bd,//baseTileDegrees
-                  '',//extension
-                  fgi.bu,//bottomsUp
-                  fgi.q,//quadTreeTileMap,
-                  fgi.cX,//centerX
-                  fgi.cY,//centerY
-                  fgi.r,//rotation
-                  true,//sparse
-                  fgi.tu,//thumbnailUrl,
-                  fgi.ds,//defaultSet,
-                  false,//elevationModel
-                  fgi.wf,//widthFactor,
-                  fgi.oX,//offsetX
-                  fgi.oY,//offsetY
-                  fgi.ct,//creditsText
-                  fgi.cu,//creditsUrl
-                  '', '',
-                  0,//meanRadius
-                  null
+                  fgi.n, // name
+                  fgi.u, // url
+                  wwtlib.ImageSetType.sky, // data_set_type -- never changes (for now?)
+                  band_pass,
+                  projection,
+                  imageset_id, // imageset id
+                  base_tile_level,
+                  tile_levels,
+                  null, // tile_size
+                  fgi.bd, // baseTileDegrees
+                  file_type,
+                  bottoms_up,
+                  quad_tree_map,
+                  fgi.cX, // centerX
+                  fgi.cY,  // centerY
+                  rotation,
+                  true, // sparse
+                  fgi.tu, // thumbnailUrl,
+                  default_set,
+                  false, // elevationModel
+                  width_factor,
+                  offset_x,
+                  offset_y,
+                  fgi.ct, // creditsText
+                  fgi.cu, // creditsUrl
+                  '', // demUrl
+                  '', // altUrl
+                  0, // meanRadius
+                  null // referenceFrame
                 );
 
                 util.rewritePlaceUrls(imgSet);
               }
 
+              var classification = (place.c !== undefined) ? place.c : wwtlib.Classification.unidentified;
+              var zoom_factor = (place.z !== undefined) ? place.z : -1;
+
               var pl = wwtlib.Place.create(
-                place.n,//name
-                place.d,//dec
-                place.r,//ra
-                place.c,//classification
-                item.name,//constellation
-                fgi ? fgi.dt : 2,//type
-                place.z//zoomfactor
+                place.n, // name
+                place.d, // dec
+                place.r, // ra
+                classification,
+                item.name, // constellation
+                wwtlib.ImageSetType.sky, // type -- never changes (for now?)
+                zoom_factor,
               );
 
               if (imgSet) {
@@ -134,28 +142,7 @@
 
           var end = new Date();
           util.log('parsed places in ' + (end.valueOf() - start.valueOf()) + 'ms', data);
-
-          var urlbase = wwtlib.URLHelpers.singleton.coreStaticUrl('data/client_v6/');
-
-          importWtml(urlbase + 'Wise.wtml').then(function () {
-            //console.log('wise loaded');
-            importWtml(urlbase + 'Hubble.wtml').then(function () {
-              //console.log('hubble loaded');
-              importWtml(urlbase + 'ESO.wtml').then(function () {
-                //console.log('eso loaded');
-                importWtml(urlbase + 'Chandra.wtml').then(function () {
-                  //console.log('chandra loaded');
-                  importWtml(urlbase + 'Spitzer.wtml').then(function () {
-                    allDataDeferred.resolve(true);
-                  });
-                });
-              });
-            });
-          });
-
           deferredInit.resolve(data);
-        } else {
-          setTimeout(init, 333);
         }
 
         return deferredInit.promise;
@@ -194,87 +181,6 @@
         });
       };
 
-      function importWtml(wtmlPath) {
-        var deferred = $q.defer();
-
-        $.ajax({
-          url: wtmlPath + '?v=' + $('body').data('resVersion')
-        }).done(function () {
-          var wtml = $($.parseXML(arguments[0]));
-
-          wtml.find('Place').each(function (i, place) {
-            place = $(place);
-            var constellation, ra = parseFloat(place.attr('RA')), dec = parseFloat(place.attr('Dec'));
-
-            if (ra !== 0 || dec !== 0) {
-              constellation = wwtlib.Constellations.containment.findConstellationForPoint(ra, dec);
-
-              var fgi = place.find('ImageSet').length ? place.find('ImageSet') : null;
-
-              var wwtPlace = wwtlib.Place.create(
-                place.attr('Name'),
-                dec,
-                ra,
-                place.attr('DataSetType'),
-                constellation,
-                fgi ? util.getImageSetType(fgi.attr('DataSetType')) : 2, //type
-                parseFloat(place.find('ZoomLevel')) //zoomfactor
-              );
-
-              if (fgi != null) {
-                imageset_id++;
-
-                var imgset = wwtlib.Imageset.create(
-                  fgi.attr('Name'),
-                  fgi.attr('Url'),
-                  util.getImageSetType(fgi.attr('DataSetType')),
-                  fgi.attr('BandPass'),
-                  wwtlib.ProjectionType[fgi.attr('Projection').toLowerCase()],
-                  imageset_id, //imagesetid
-                  parseInt(fgi.attr('BaseTileLevel')),
-                  parseInt(fgi.attr('TileLevels')),
-                  null, //tilesize
-                  parseFloat(fgi.attr('BaseDegreesPerTile')),
-                  fgi.attr('FileType'),
-                  fgi.attr('BottomsUp') === 'True',
-                  '', //quadTreeTileMap (I need to find a wtml file that has this and check spelling of the attr)
-                  parseFloat(fgi.attr('CenterX')),
-                  parseFloat(fgi.attr('CenterY')),
-                  parseFloat(fgi.attr('Rotation')),
-                  true, //sparse
-                  fgi.find('ThumbnailUrl').text(), //thumbnailUrl,
-                  false, //defaultSet,
-                  false, //elevationModel
-                  parseFloat(fgi.attr('WidthFactor')), //widthFactor,
-                  parseFloat(fgi.attr('OffsetX')),
-                  parseFloat(fgi.attr('OffsetY')),
-                  fgi.find('Credits').text(),
-                  fgi.find('CreditsUrl').text(),
-                  '', '',
-                  0, //meanRadius
-                  null
-                );
-
-                util.rewritePlaceUrls(imgset);
-                wwtPlace.set_studyImageset(imgset);
-              }
-
-              indexPlaceNames(wwtPlace);
-
-              var cIndex = constellations.indexOf(constellation);
-              var constellationPlaces = wwt.searchData.Constellations[cIndex].places;
-              wwtPlace.guid = cIndex + '.' + constellationPlaces.length;
-              util.rewritePlaceUrls(wwtPlace);
-              constellationPlaces.push(wwtPlace);
-            }
-          });
-
-          deferred.resolve(true);
-        });
-
-        return deferred.promise;
-      }
-
       initPromise = init();
 
       return api;

package/factories/SearchUtil.js

@@ -1,4 +1,4 @@
-wwt.app.factory(
+wwt.app.factory(
   'SearchUtil',
   [
     'SearchData',
@@ -8,155 +8,133 @@
 
     function (searchDataService, $q, util, $rootScope) {
       var api = {
-	runSearch: runSearch,
-	findNearbyObjects: findNearbyObjects,
-	getPlaceById: getPlaceById
+        runSearch: runSearch,
+        findNearbyObjects: findNearbyObjects,
+        getPlaceById: getPlaceById
       }
 
       function runSearch(q) {
-	var deferred = $q.defer();
-
-	searchDataService.getIndex().then(function (d) {
-	  var searchData = wwt.searchDataIndexed;
-	  var foundPlaces = [];
-
-	  if (q.length < 2) {
-	    foundPlaces = searchData[q];
-	  } else {
-	    var subset = searchData[q.charAt(0).toLowerCase()];
-
-	    $.each(subset, function (i, place) {
-	      var names = place.get_names();
-	      var placeChosen = false;
-
-	      $.each(names, function (j, name) {
-		if (q.indexOf(' ') === -1 && name.split(' ').length > 1) {
-		  var words = name.split(' ');
-
-		  $.each(words, function (k, word) {
-		    if (word.toLowerCase().indexOf(q.toLowerCase()) === 0 && !placeChosen) {
-		      foundPlaces.push(place);
-		      placeChosen = true;
-		    }
-		  });
-		} else if (name.toLowerCase().indexOf(q.toLowerCase()) === 0 && !placeChosen) {
-		  foundPlaces.push(place);
-		  placeChosen = true;
-		}
-	      });
-	    });
-	  }
-
-	  deferred.resolve(foundPlaces.sort(sortByImagery));
-	});
-
-	return deferred.promise;
+        var deferred = $q.defer();
+
+        searchDataService.getIndex().then(function (d) {
+          var searchData = wwt.searchDataIndexed;
+          var foundPlaces = [];
+
+          if (q.length < 2) {
+            foundPlaces = searchData[q];
+          } else {
+            var subset = searchData[q.charAt(0).toLowerCase()];
+
+            $.each(subset, function (i, place) {
+              var names = place.get_names();
+              var placeChosen = false;
+
+              $.each(names, function (j, name) {
+                if (q.indexOf(' ') === -1 && name.split(' ').length > 1) {
+                  var words = name.split(' ');
+
+                  $.each(words, function (k, word) {
+                    if (word.toLowerCase().indexOf(q.toLowerCase()) === 0 && !placeChosen) {
+                      foundPlaces.push(place);
+                      placeChosen = true;
+                    }
+                  });
+                } else if (name.toLowerCase().indexOf(q.toLowerCase()) === 0 && !placeChosen) {
+                  foundPlaces.push(place);
+                  placeChosen = true;
+                }
+              });
+            });
+          }
+
+          deferred.resolve(foundPlaces.sort(sortByImagery));
+        });
+
+        return deferred.promise;
       }
 
-      var sortByImagery = function(p1, p2) {
-	return p1.fromCenter - p2.fromCenter;
+      var sortByImagery = function (p1, p2) {
+        return p1.fromCenter - p2.fromCenter;
       }
 
+      // This interface has serious issues -- the mechanism for constructing
+      // place IDs is based on indices into the search data, which are *not*
+      // things that ought to be required to stay stable over time. A different
+      // approach should be used.
       function getPlaceById(id) {
         var deferred = $q.defer();
 
-        var tryFind = function(all) {
-          var deferred2 = $q.defer();
-
-          searchDataService.getData(all).then(function (d) {
-            var constellationIndex = parseInt(id.split('.')[0]);
-            var placeIndex = parseInt(id.split('.')[1]);
-            var p = d.Constellations[constellationIndex].places[placeIndex];
-            if (p) {
-              deferred2.resolve(p);
-            }else{
-              deferred2.resolve(null);
-            }
-          });
+        searchDataService.getData(all).then(function (d) {
+          var constellationIndex = parseInt(id.split('.')[0]);
+          var placeIndex = parseInt(id.split('.')[1]);
+          var p = d.Constellations[constellationIndex].places[placeIndex];
+          deferred.resolve(p || null);
+        });
 
-          return deferred2.promise;
-        };
+        return deferred.promise;
+      }
 
-        tryFind().then(function(p) {
-          if (p) {
-            deferred.resolve(p);
-          } else {
-            console.log('wait for full');
+      function findNearbyObjects(args) {
+        var deferred = $q.defer();
 
-            tryFind(true).then(function(p) {
-              if (p) {
-                deferred.resolve(p);
-              } else {
-                deferred.reject()
+        searchDataService.getData().then(function (d) {
+          var searchData = wwt.searchData;
+
+          if ($rootScope.viewport && (args.lookAt === 'Sky' || args.lookAt === 'SolarSystem')) {
+            var ulCoords = args.singleton.getCoordinatesForScreenPoint(0, 0);
+            var corner = wwtlib.Coordinates.raDecTo3d(ulCoords.x, ulCoords.y);
+            var center = wwtlib.Coordinates.raDecTo3d($rootScope.viewport.RA, $rootScope.viewport.Dec);
+            var dist = wwtlib.Vector3d.subtractVectors(corner, center).length();
+            var constellation = args.singleton.constellation;
+            var constellationPlaces, ssPlaces;
+
+            $.each(searchData.Constellations, function (i, item) {
+              if (item.name === constellation) {
+                constellationPlaces = item.places;
+              } else if (item.name === 'SolarSystem') {
+                ssPlaces = item.places;
               }
             });
-          }
-        });
 
-        return deferred.promise;
-      }
+            if (args.lookAt === 'SolarSystem') {
+              deferred.resolve(ssPlaces);
+            }
 
-      function findNearbyObjects(args) {
-	var deferred = $q.defer();
-
-	searchDataService.getData().then(function(d) {
-	  var searchData = wwt.searchData;
-
-	  if ($rootScope.viewport && (args.lookAt === 'Sky' || args.lookAt === 'SolarSystem')) {
-	    var ulCoords = args.singleton.getCoordinatesForScreenPoint(0, 0);
-	    var corner = wwtlib.Coordinates.raDecTo3d(ulCoords.x, ulCoords.y);
-	    var center = wwtlib.Coordinates.raDecTo3d($rootScope.viewport.RA, $rootScope.viewport.Dec);
-	    var dist = wwtlib.Vector3d.subtractVectors(corner, center).length();
-	    var constellation = args.singleton.constellation;
-	    var constellationPlaces, ssPlaces;
-
-	    $.each(searchData.Constellations, function(i, item) {
-	      if (item.name === constellation) {
-		constellationPlaces = item.places;
-	      } else if (item.name === 'SolarSystem') {
-		ssPlaces = item.places;
-	      }
-	    });
-
-	    if (args.lookAt === 'SolarSystem') {
-	      deferred.resolve(ssPlaces);
-	    }
-
-	    var searchPlaces = ssPlaces.concat(constellationPlaces);
-	    var results = [];
+            var searchPlaces = ssPlaces.concat(constellationPlaces);
+            var results = [];
             var solsys = [];
             var imgsets = [];
 
-	    $.each(searchPlaces, function(i, place) {
-	      if (place && place.get_name() !== 'Earth') {
-		try {
-		  var placeDist = wwtlib.Vector3d.subtractVectors(place.get_location3d(), center);
+            $.each(searchPlaces, function (i, place) {
+              if (place && place.get_name() !== 'Earth') {
+                try {
+                  var placeDist = wwtlib.Vector3d.subtractVectors(place.get_location3d(), center);
 
-		  if (dist > placeDist.length()) {
-		    place.fromCenter = placeDist.length();
+                  if (dist > placeDist.length()) {
+                    place.fromCenter = placeDist.length();
 
-		    if (place.get_constellation() === 'SolarSystem') {
-		      solsys.push(place)
+                    if (place.get_constellation() === 'SolarSystem') {
+                      solsys.push(place)
                     } else if (place.get_studyImageset()) {
-		      imgsets.push(place);
+                      imgsets.push(place);
                     } else {
                       results.push(place);
                     }
-		  }
-		} catch (er) {
-		  util.log(er, place);
-		}
-	      }
-	    });
-
-	    solsys = solsys.sort(sortByImagery);
-	    deferred.resolve(solsys.concat(imgsets.sort(sortByImagery), results.sort(sortByImagery)));
-	  } else {
-	    deferred.resolve([]);
-	  }
-	});
-
-	return deferred.promise;
+                  }
+                } catch (er) {
+                  util.log(er, place);
+                }
+              }
+            });
+
+            solsys = solsys.sort(sortByImagery);
+            deferred.resolve(solsys.concat(imgsets.sort(sortByImagery), results.sort(sortByImagery)));
+          } else {
+            deferred.resolve([]);
+          }
+        });
+
+        return deferred.promise;
       }
 
       return api;

package/factories/Util.js

@@ -128,6 +128,22 @@
           var minutes = Math.floor(remainder);
           var seconds = (remainder - minutes) * 60;
 
+          if (isNaN(extraPrecision)) {
+            extraPrecision = 0;
+          }
+          var secondsStr = seconds.toFixed(extraPrecision);
+
+          if (secondsStr.startsWith('60')) {
+            seconds = 0;
+            secondsStr = seconds.toFixed(extraPrecision);
+            minutes += 1;
+
+            if (minutes == 60) {
+              minutes = 0;
+              hourlike += 1;
+            }
+          }
+
           values[0] = hourlike.toFixed(0);
           if (hourlike < 10) {
             values[0] = '0' + values[0];
@@ -138,11 +154,7 @@
             values[1] = '0' + values[1];
           }
 
-          if (isNaN(extraPrecision)) {
-            extraPrecision = 0;
-          }
-
-          values[2] = seconds.toFixed(extraPrecision);
+          values[2] = secondsStr;
           if (seconds < 10) {
             values[2] = '0' + values[2];
           }

package/package.json

@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/WorldWideTelescope/wwt-web-client.git"
   },
-  "version": "6.3.5"
+  "version": "6.4.1"
 }

package/assets/webclient-explore-root.wtml

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Folder Name="Collections" Group="Explorer" >
-  <Folder Name="Latest Imagery" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=vampfeeds" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=folder" />
-  <Folder Name="Constellations" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=constellations" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=constellations" />
-  <Folder Name="Solar System (Sky)" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=solarsystemsky" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=solarsystem" />
-  <Folder Name="All-Sky Surveys" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=surveys" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=aitoff" />
-  <Folder Name="HiPS Surveys" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=hips"  Group="Explorer"   Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=aitoff" />
-  <Folder Name="Spitzer Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=studiesspitzer" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=spitzer" />
-  <Folder Name="Chandra Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=studieschandra" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=chandra" />
-  <Folder Name="Hubble Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=studieshubble" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=hubble" />
-  <Folder Name="Astrophotography" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=astrophoto" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=egastrophoto" />
-  <Folder Name="SOFIA Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=sofia_studies" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=nasa_sofia" />
-  <Folder Name="Radio Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=studiesradio" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=radiostudies" />
-  <Folder Name="NOAO Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=studiesnoao" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=noao" />
-  <Folder Name="Gemini Studies" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=geministudies" Group="Explorer" Searchable="True" Type="Sky" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=geminiobservatory" />
-  <Folder Name="Messier Catalog" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=messier" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=messier" />
-  <Folder Name="Planets/Moons" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=solarsystemsphere" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=solarsystem" />
-  <Folder Name="Earth" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=earth" Group="Explorer" Type="Planet" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=earthhybrid" />
-  <Folder Name="Mars" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=marsroot&amp;v=2" Group="Explorer" Type="Planet" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=mars" />
-  <Folder Name="Panoramas" Url="http://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=panos" Group="Explorer" Thumbnail="http://www.worldwidetelescope.org/wwtweb/thumbnail.aspx?name=pano" />
-</Folder>