Firefly-1932: Regression bug: Firefly not working with URL request time

Author: robyww

src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/ImageFileRetrieverFactory.java

@@ -41,6 +41,7 @@ public static FileRetriever getRetriever(WebPlotRequest request) {
         RequestType rType;
         if (request.containsParam(WebPlotRequest.TYPE)) {
             rType= request.getRequestType();
+            if (rType==RequestType.URL) rType= RequestType.URI;
         }
         else {
             rType= guessRequestType(request);

src/firefly/java/edu/caltech/ipac/firefly/visualize/RequestType.java

@@ -6,6 +6,5 @@
 /**
  * @author Trey Roby
 */
-public enum RequestType { SERVICE, FILE, URI, HiPS, ALL_SKY, BLANK, PROCESSOR,
-    S3_AS_LOCAL, TRY_FILE_THEN_URL, WORKSPACE }
-
+public enum RequestType { SERVICE, FILE, URI, URL, HiPS, ALL_SKY, BLANK, PROCESSOR,
+    S3_AS_LOCAL, TRY_FILE_THEN_URL, WORKSPACE }

src/firefly/js/visualize/RequestType.js

@@ -7,11 +7,12 @@ import Enum from 'enum';
 /**
  * @typedef {Object} RequestType
  * @summary web plot request type
- * @description can be 'SERVICE', 'FILE', 'URL', 'ALL_SKY', 'HiPS', 'PROCESSOR', 'TRY_FILE_THEN_URL', 'WORKSPACE', ''S3_AS_LOCAL'
+ * @description can be 'SERVICE', 'FILE', 'URI', 'URL', 'ALL_SKY', 'HiPS', 'PROCESSOR', 'TRY_FILE_THEN_URL', 'WORKSPACE', ''S3_AS_LOCAL'
  *
  * @prop SERVICE
  * @prop FILE
  * @prop URI
+ * @prop URL
  * @prop ALL_SKY
  * @prop HiPS
  * @prop PROCESSOR
@@ -24,6 +25,6 @@ import Enum from 'enum';
  */
 
 /** @type RequestType */
-export const RequestType= new Enum([ 'SERVICE', 'FILE', 'URI', 'ALL_SKY', 'HiPS',
+export const RequestType= new Enum([ 'SERVICE', 'FILE', 'URI', 'URL', 'ALL_SKY', 'HiPS',
         'PROCESSOR', 'TRY_FILE_THEN_URL', 'WORKSPACE'],
                                      { ignoreCase: true });