From c2ddc309305a0a9198a6317ebd4f91c78adac694 Mon Sep 17 00:00:00 2001
From: loi <loi@ipac.caltech.edu>
Date: Tue, 9 Aug 2016 11:25:16 -0700
Subject: [PATCH] DM-7155: Filtering from image is wrong on sorted tables.

---
 src/firefly/js/drawingLayers/Catalog.js         | 4 +++-
 src/firefly/js/visualize/saga/CatalogWatcher.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/firefly/js/drawingLayers/Catalog.js b/src/firefly/js/drawingLayers/Catalog.js
index f9bc4e92f8..283441d689 100644
--- a/src/firefly/js/drawingLayers/Catalog.js
+++ b/src/firefly/js/drawingLayers/Catalog.js
@@ -365,7 +365,9 @@ function doFilter(dl,p,sel) {
         console.log(idxs);
     }
     else {
-        const idxs= getSelectedPts(sel, p, dl.drawData.data);
+        const rowidIdx= findColIdx(dl.tableData.columns,'ROWID');
+        var idxs= getSelectedPts(sel, p, dl.drawData.data);
+        idxs = rowidIdx < 0 ? idxs : idxs.map( (idx) => get(dl,`tableData.data[${idx}][${rowidIdx}]`) );
         filter= `IN (${idxs.toString()})`;
         // filterInfoCls.setFilter(filter);
         filterInfoCls.setFilter('ROWID', filter);
diff --git a/src/firefly/js/visualize/saga/CatalogWatcher.js b/src/firefly/js/visualize/saga/CatalogWatcher.js
index aeab67c46a..ed83718299 100644
--- a/src/firefly/js/visualize/saga/CatalogWatcher.js
+++ b/src/firefly/js/visualize/saga/CatalogWatcher.js
@@ -102,7 +102,7 @@ function handleCatalogUpdate(tbl_id) {
     const params= {
         startIdx : 0,
         pageSize : 1000000,
-        inclCols : `${columns.lonCol},${columns.latCol}`
+        inclCols : `${columns.lonCol},${columns.latCol},ROWID`
     };
 
     var dataTooBigForSelection= false;