catalog upload does a better job at guessing ra and dec columns.

Author: loitly

src/firefly/java/edu/caltech/ipac/firefly/server/query/UserCatalogQuery.java

@@ -15,6 +15,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * @author tatianag
@@ -34,6 +35,9 @@ public class UserCatalogQuery extends DynQueryProcessor {
             "starid"        // PCRS
     };
 
+    private static Pattern raP = Pattern.compile("(^|[-_ ])ra($|[^\\p{Alpha}])");
+    private static Pattern decP = Pattern.compile("(^|[-_ ])dec($|[^\\p{Alpha}])");
+
 
 
     protected File loadDynDataFile(TableServerRequest req) throws IOException, DataAccessException {
@@ -56,22 +60,11 @@ public void prepareTableMeta(TableMeta meta, List<DataType> columns, ServerReque
 
 
     public static void addCatalogMeta(TableMeta meta, List<DataType> columns, ServerRequest request) {
-        TableMeta.LonLatColumns llc;
-
-        String lonCol = null, latCol = null;
-        for (DataType col : columns) {
-            if (col.getKeyName().equalsIgnoreCase(RA)) lonCol = col.getKeyName();
-            if (col.getKeyName().equalsIgnoreCase(DEC)) latCol = col.getKeyName();
 
 
-            if (!StringUtils.isEmpty(lonCol) && !StringUtils.isEmpty(latCol)) {
-                llc = new TableMeta.LonLatColumns(lonCol, latCol, CoordinateSys.EQ_J2000);
-                meta.setLonLatColumnAttr(MetaConst.CATALOG_COORD_COLS, llc);
-                break;
-            }
-        }
-        boolean catalogDataFound= (lonCol!=null && latCol!=null);
-        if (catalogDataFound) {
+        TableMeta.LonLatColumns llc = findLonLatCols(columns, (TableServerRequest) request);
+        if (llc != null) {
+            meta.setLonLatColumnAttr(MetaConst.CATALOG_COORD_COLS, llc);
             meta.setAttribute(MetaConst.CATALOG_OVERLAY_TYPE, "USER");
             meta.setAttribute(MetaConst.DATA_PRIMARY, "False");
         }
@@ -80,6 +73,26 @@ public static void addCatalogMeta(TableMeta meta, List<DataType> columns, Server
         if (name != null) meta.setAttribute(MetaConst.CATALOG_TARGET_COL_NAME, name);
     }
 
+    private static TableMeta.LonLatColumns findLonLatCols(List<DataType> columns, TableServerRequest request) {
+        String lonCol = null, latCol = null;
+        TableMeta.LonLatColumns llc = TableMeta.LonLatColumns.parse(request.getMeta(MetaConst.CATALOG_COORD_COLS));
+        if (llc == null) {
+            // guess best ra/dec columns
+            for (DataType col : columns) {
+                String cname = col.getKeyName();
+                if (cname.equalsIgnoreCase(RA)) lonCol = cname;
+                if (cname.equalsIgnoreCase(DEC)) latCol = cname;
+
+                if (lonCol == null && raP.matcher(cname).find()) lonCol = cname;
+                if (latCol == null && decP.matcher(cname).find()) latCol = cname;
+            }
+            if (lonCol != null && latCol != null) {
+                llc = new TableMeta.LonLatColumns(lonCol, latCol, CoordinateSys.EQ_J2000);
+            }
+        }
+        return llc;
+    }
+
     private static String findTargetName(List<DataType> columns) {
         String cname;
         String finalName = null;

src/firefly/js/visualize/ui/CatalogSelectViewPanel.jsx

@@ -123,15 +123,14 @@ function doCatalog(request) {
     var tReq = {};
     if (request.spatial === SpatialMethod.get('Multi-Object').value) {
         var filename = request.fileUpload;
-        // export function makeIrsaCatalogRequest(title, project, catalog, use='catalog_overlay', params={}, options={}, tbl_id=uniqueTblId()) {
+        var radius = conesize;
         tReq = makeIrsaCatalogRequest(title, request.project, request.cattable, {
             filename,
             radius,
             SearchMethod: request.spatial,
             RequestedDataSet: request.catalog
         });
     } else {
-        const id = 'GatorQuery';
         title += ` (${request.spatial}`;
         if (request.spatial === SpatialMethod.Box.value || request.spatial === SpatialMethod.Cone.value || request.spatial === SpatialMethod.Elliptical.value) {
             title += ':' + conesize + '\'\'';
@@ -242,8 +241,7 @@ function doVoSearch(request) {
 
 function doLoadTable(request) {
     var tReq = makeTblRequest('userCatalogFromFile', 'Table Upload', {
-        filePath: request.fileUpload,
-        use: 'catalog_overlay'
+        filePath: request.fileUpload
     });
     dispatchTableSearch(tReq);
 }