Caltech-IPAC · robyww · Jul 30, 2019 · Jul 11, 2019 · tgoldina · Jul 18, 2019
diff --git a/src/firefly/html/images/20x20-center-small.png b/src/firefly/html/images/20x20-center-small.png
diff --git a/src/firefly/html/images/20x20_clipboard-checked.png b/src/firefly/html/images/20x20_clipboard-checked.png
diff --git a/src/firefly/html/images/20x20_clipboard.png b/src/firefly/html/images/20x20_clipboard.png
diff --git a/src/firefly/html/test/index.html b/src/firefly/html/test/index.html
@@ -48,6 +48,9 @@ <h3>Firefly Test</h3>
     <li class="test-item"><a href="tests-chart.html">Chart Tests</a>
         <div class="test-desc">This page tests various charts. </div>
     </li>
+    <li class="test-item"><a href="test-misc.html">Misc Tests</a>
+        <div class="test-desc">This page tests small API items. </div>
+    </li>
 </ul>
 
 
@@ -112,6 +115,7 @@ <h4>To add a test to an existing page</h4>
          + indent-4     :source need to adjust for 4 indentation
          + indent-5     :source need to adjust for 5 indentation
         expected-list   :turn on normal list styling, use with ul element (firefly turns it off)
+        exclusive       :if defined on any template, display only that template (for debugging)
     </xmp>
     </div>
 

diff --git a/src/firefly/html/test/styles.css b/src/firefly/html/test/styles.css
@@ -12,7 +12,7 @@
 }
 
 .tpl {
-    --tpl-height: 300px;
+    --tpl-height: 400px;
     height: var(--tpl-height);
 }
 .tpl.xs {

diff --git a/src/firefly/html/test/template_loader.js b/src/firefly/html/test/template_loader.js
@@ -2,19 +2,22 @@
 
     window.onload = function () {
         const tests = document.getElementsByTagName('template');
-        var cnt = 1;
-        Object.values(tests).forEach(function(test) {
-            const c = test.content;
-            const expected = c.querySelector('#expected');
-            const actual = c.querySelector('#actual');
-            const scpt = c.querySelector('script');
-
-            renderTest(cnt++, expected, actual, scpt, test);
-        });
+        let cnt = 1;
+        const allTest= Object.values(tests);
+        const exclusiveTest= allTest.filter( (test) => test.className && test.className.includes('exclusive'));
+        const activeTest= exclusiveTest.length ? exclusiveTest : allTest;
+        activeTest.forEach((test) => {
+                    const c = test.content;
+                    const expected = c.querySelector('#expected');
+                    const actual = c.querySelector('#actual');
+                    const scpt = c.querySelector('script');
+                    renderTest(cnt++, expected, actual, scpt, test, Boolean(exclusiveTest.length));
+                });
     };
 
-    function renderTest(cnt, expected, actual, script, testTmpl) {
-        const title = cnt + ' - ' + testTmpl.title;
+
+    function renderTest(cnt, expected, actual, script, testTmpl, onlyUsingExclusize) {
+        const title = (onlyUsingExclusize? 'EXCLUSIVE - ' : '') + cnt + ' - ' + testTmpl.title;
         const iframe = document.createElement('iframe');
         iframe.id = 'iframe';
         iframe.src = './template.html';

diff --git a/src/firefly/html/test/test-misc.html b/src/firefly/html/test/test-misc.html
@@ -0,0 +1,101 @@
+<!doctype html>
+
+<!--
+  ~ License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
+  -->
+
+<html>
+
+<head>
+    <title>Firefly main tests</title>
+    <link rel="stylesheet" href="styles.css">
+    <script type="text/javascript" src="template_loader.js"></script>
+</head>
+
+<body>
+
+<!-- define all of your tests below -->
+
+<template title="API 2 Table / Customized HiPS" style='height: 400px' class="tpl" >
+    <div id="expected" style="position: relative" >
+        <div class="source-code indent-3" style="position: absolute; bottom: 0; left: 0">
+            - two tables, both wise catalogs
+            - Coverage display, HiPS, ALLWISE
+            - HiPS image is customized
+            - META_INFO contains
+               {CoverageHiPS: 'ivo://CDS/P/allWISE/color'}
+
+            - Testing:
+                 - click on table to center catalog
+                 - zoom in and click on rows to center
+                            if off the screen
+        </div>
+    </div>
+    <div id="actual" class="flow-h">
+        <div id="tableDiv" style='width:500px;' class="box"></div>
+        <div id="coverageDiv" style='width:500px;' class="box"></div>
+    </div>
+    <script>
+        irsaviewer_init();
+
+        onFireflyLoaded = function (firefly) {
+
+            firefly.util.image.initAutoReadout(
+                firefly.ui.DefaultApiReadout,
+                { MouseReadoutComponent:firefly.ui.PopupMouseReadoutMinimal,
+                    showThumb:false,
+                    showMag:false
+                }
+            );
+            table1Data = firefly.util.table.makeIrsaCatalogRequest('WISE catalog', 'WISE', 'allwise_p3as_psd',
+                { position: '10.68479;41.26906;EQ_J2000',
+                    SearchMethod: 'Cone',
+                    radius: 100
+                },
+                { META_INFO: {CENTER_COLUMN: 'ra;dec;EQJ2000', CatalogOverlayType: 'IRSA', CoverageHiPS: 'ivo://CDS/P/allWISE/color'}}
+            );
+
+            table2Data = firefly.util.table.makeIrsaCatalogRequest('WISE catalog', 'WISE', 'allwise_p3as_psd',
+                { position: '0;0;GAL',
+                    SearchMethod: 'Cone',
+                    radius: 200
+                },
+                { META_INFO: {CENTER_COLUMN: 'ra;dec;EQJ2000',
+                        CatalogOverlayType: 'IRSA'}}
+            );
+
+            firefly.showTable('tableDiv', table1Data,
+                { removable: true,
+                    showTitle:false,
+                    showUnits: true,
+                    showFilters: false,
+                    selectable: false,
+                    expandable: true,
+                    help_id: 'tables'
+                }
+            );
+
+            firefly.showTable('tableDiv', table2Data,
+                { removable: true,
+                    showTitle:false,
+                    showUnits: true,
+                    showFilters: false,
+                    selectable: false,
+                    expandable: true,
+                    help_id: 'tables'
+                }
+            );
+
+
+            firefly.showCoverage('coverageDiv', {gridOn:'FALSE'});
+
+        }
+    </script>
+</template>
+
+
+<!-- this is where test cases will be attached-->
+<div id="tst-container"/>
+
+
+</body>
diff --git a/src/firefly/html/test/tests-main.html b/src/firefly/html/test/tests-main.html
@@ -121,7 +121,7 @@
     </script>
 </template>
 
-<template title="Failed API Image Load" class="tpl" style="height: 260px">
+<template title="Failed API Image Load" class="tpl sm" >
     <div id="expected" >
         Image load fails. The following should happen:
 	    <ul class='expected-list'>
@@ -146,7 +146,7 @@
     </script>
 </template>
 
-<template title="Two table coverage" class="tpl" style="height: 260px">
+<template title="Two table coverage" class="tpl" >
     <div id="expected" >
         <div>Both tables cover similar area, HiPS coverage
             <ul class='expected-list'>

diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/IpacTableFromExternalTask.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/IpacTableFromExternalTask.java
@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 import static edu.caltech.ipac.firefly.data.TableServerRequest.TBL_INDEX;
 
@@ -59,7 +60,10 @@ public void prepareTableMeta(TableMeta defaults, List<DataType> columns, ServerR
                 defaults.setAttribute(p.getName(), p.getValue());
             }
         }
-        defaults.setAttribute(MetaConst.CATALOG_OVERLAY_TYPE, "TRUE");
+        Map reqMeta= ((TableServerRequest) request).getMeta();
+        if (reqMeta==null || !reqMeta.containsKey(MetaConst.CATALOG_OVERLAY_TYPE)) {
+            defaults.setAttribute(MetaConst.CATALOG_OVERLAY_TYPE, "TRUE");
+        }
     }
 
 

diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IpacTableFromSource.java b/src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IpacTableFromSource.java
@@ -36,6 +36,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
+import java.util.Map;
 
 import static edu.caltech.ipac.firefly.data.TableServerRequest.TBL_INDEX;
 import static edu.caltech.ipac.firefly.server.query.tables.IpacTableFromSource.PROC_ID;
@@ -165,7 +166,10 @@ private File getSourceFile(String source, TableServerRequest request, boolean ch
     public void prepareTableMeta(TableMeta defaults, List<DataType> columns, ServerRequest request) {
         String type = request.getParam(TBL_TYPE);
         if (type == null || type.equals(TYPE_CATALOG)) {
-            defaults.setAttribute(MetaConst.CATALOG_OVERLAY_TYPE, "TRUE");
+            Map reqMeta= ((TableServerRequest) request).getMeta();
+            if (reqMeta==null || !reqMeta.containsKey(MetaConst.CATALOG_OVERLAY_TYPE)) {
+                defaults.setAttribute(MetaConst.CATALOG_OVERLAY_TYPE, "TRUE");
+            }
         }
     }
 

diff --git a/src/firefly/js/Firefly.js b/src/firefly/js/Firefly.js
@@ -112,6 +112,7 @@ const defFireflyOptions = {
     irsaCatalogFilter: undefined,
     catalogSpacialOp: undefined,
     imageMasterSources: ['ALL'],
+    showCatalogSearchTarget: true,
     imageMasterSourcesOrder: undefined,
     workspace : { showOptions: false},
     wcsMatchType: false,

diff --git a/src/firefly/js/api/ApiBuild.js b/src/firefly/js/api/ApiBuild.js
@@ -53,6 +53,9 @@ import {buildViewerApi} from './ApiViewer.js';
 
 // CSS
 import './ApiStyle.css';
+import {startTTFeatureWatchers} from '../templates/common/ttFeatureWatchers.js';
+import {activeRowCenterDef} from '../visualize/saga/ActiveRowCenterWatcher.js';
+import {urlLinkWatcherDef} from '../visualize/saga/UrlLinkWatcher.js';
 
 
 /**
@@ -128,6 +131,7 @@ export function initApi() {
     dispatchOnAppReady(() => {
         window.onFireflyLoaded && window.onFireflyLoaded(firefly);
     });
+    startTTFeatureWatchers([urlLinkWatcherDef.id, activeRowCenterDef.id]);
     initExpandedView();
 }
 

diff --git a/src/firefly/js/core/MasterSaga.js b/src/firefly/js/core/MasterSaga.js
@@ -127,6 +127,7 @@ export function dispatchAddActionWatcher({id, actions, callback, params={}}) {
  *                                       list will force any watcher def with an id in the list to not watch
  * @param {boolean} p.stopPropagation - like excludes but if true not only watcher will be added
  * @param {boolean} p.enabled - if true this TableTypeWatcher will test and add, if false it will be skipped
+ * @param {boolean} p.allowMultiples - multiple defs of this type are allowed.
  *
  * @see TableWatchFunc
  * @see TestWatchFunc
@@ -137,10 +138,10 @@ export function dispatchAddActionWatcher({id, actions, callback, params={}}) {
  */
 export function dispatchAddTableTypeWatcherDef({id, actions, excludes= [], testTable= ()=>true,
                                              watcher, options={}, enabled= true, stopPropagation= false,
-                                             sharedData}) {
+                                             sharedData, allowMultiples}) {
     flux.process({
         type: ADD_TABLE_TYPE_WATCHER,
-        payload: {id, actions, excludes, testTable, watcher, options, enabled, stopPropagation, sharedData}
+        payload: {id, actions, excludes, testTable, watcher, options, enabled, stopPropagation, sharedData,allowMultiples}
     });
 }
 
@@ -301,6 +302,7 @@ function addTableTypeWatcherDef(def) {
     setTimeout(() => {
         if (isEmpty(getTTWatcherDefList())) initTTWatcher();
         // validate and start
+        if (!def.allowMultiples && ttWatcherDefList.find( (d) => d.id===def.id)) return;
         if (isFunction(def.watcher) && isArray(def.actions) && def.id) insertTTWatcherDef(def);
         else console.error('TableTypeWatcher: watcher, actions, and id are required.');
         retroactiveTTStart(def);

diff --git a/src/firefly/js/core/ReduxFlux.js b/src/firefly/js/core/ReduxFlux.js
@@ -39,7 +39,7 @@ import {watchExtensionActions} from '../core/messaging/ExternalAccessWatcher.js'
 
 
 //--- import drawing Layers
-import ActiveTarget from '../drawingLayers/ActiveTarget.js';
+// import ActiveTarget from '../drawingLayers/ActiveTarget.js';
 import FixedMarker from '../drawingLayers/FixedMarker.js';
 import SelectArea from '../drawingLayers/SelectArea.js';
 import DistanceTool from '../drawingLayers/DistanceTool.js';
@@ -56,6 +56,7 @@ import RegionPlot from '../drawingLayers/RegionPlot.js';
 import MarkerTool from '../drawingLayers/MarkerTool.js';
 import FootprintTool from '../drawingLayers/FootprintTool.js';
 import ImageOutline from '../drawingLayers/ImageOutline.js';
+import ImageRoot from '../drawingLayers/ImageRoot.js';
 import {showExampleDialog} from '../ui/ExampleDialog.jsx';
 import ImageLineBasedFootprint from '../drawingLayers/ImageLineBasedFootprint.js';
 
@@ -99,8 +100,8 @@ const actionCreators = new Map();
 
 
 
-const drawLayerFactory= DrawLayerFactory.makeFactory(ActiveTarget,FixedMarker, SelectArea,DistanceTool,
-                                                     PointSelection, StatsPoint, NorthUpCompass,
+const drawLayerFactory= DrawLayerFactory.makeFactory(FixedMarker, SelectArea,DistanceTool,
+                                                     PointSelection, StatsPoint, NorthUpCompass, ImageRoot,
                                                      Catalog, Artifact, WebGrid, RegionPlot,
                                                      MarkerTool, FootprintTool, HiPSGrid, HiPSMOC,
                                                      ImageOutline, ImageLineBasedFootprint);

diff --git a/src/firefly/js/data/MetaConst.js b/src/firefly/js/data/MetaConst.js
@@ -57,6 +57,9 @@ export const MetaConst = {
     /** the column name with the url or filename of the image data */
     DATA_SOURCE : 'DataSource',
 
+    /** a url for HiPS Image to use as the coverage - overrides firefly defaults */
+    COVERAGE_HIPS : 'CoverageHiPS',
+
     /** the column name with access rights info;  true if (public, 1, or true), otherwise false  */
     DATARIGHTS_COL : 'DATARIGHTS_COL',
 

diff --git a/src/firefly/js/drawingLayers/ActiveTarget.js b/src/firefly/js/drawingLayers/ActiveTarget.js
@@ -13,13 +13,14 @@ import {makeDrawingDef} from '../visualize/draw/DrawingDef.js';
 import DrawLayer, {DataTypes,ColorChangeType} from '../visualize/draw/DrawLayer.js';
 import {makeFactoryDef} from '../visualize/draw/DrawLayerFactory.js';
 import {formatPosForTextField} from '../data/form/PositionFieldDef.js';
+import {getUIComponent} from './ActiveTargetUI.jsx';
 
 const ID= 'ACTIVE_TARGET';
 const TYPE_ID= 'ACTIVE_TARGET_TYPE';
 
 
 
-const factoryDef= makeFactoryDef(TYPE_ID,creator,getDrawData,getLayerChanges,null,null);
+const factoryDef= makeFactoryDef(TYPE_ID,creator,getDrawData,getLayerChanges,null,getUIComponent);
 
 export default {factoryDef, TYPE_ID}; // every draw layer must default export with factoryDef and TYPE_ID
 

diff --git a/src/firefly/js/drawingLayers/ActiveTargetUI.jsx b/src/firefly/js/drawingLayers/ActiveTargetUI.jsx
@@ -0,0 +1,28 @@
+/*
+ * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {FixedPtControl} from './CatalogUI.jsx';
+import {primePlot} from '../visualize/PlotViewUtil';
+import {PlotAttribute} from '../visualize/WebPlot.js';
+
+
+export const getUIComponent = (drawLayer,pv) => <ActiveTargetUI drawLayer={drawLayer} pv={pv}/>;
+
+function ActiveTargetUI({pv}) {
+
+    const plot= primePlot(pv);
+    return (
+        <div>
+            <FixedPtControl wp={plot.attributes[PlotAttribute.FIXED_TARGET]} pv={pv}/>
+        </div>
+    );
+}
+
+ActiveTargetUI.propTypes= {
+    drawLayer     : PropTypes.object.isRequired,
+    pv            : PropTypes.object.isRequired
+};
+