INTEGRALSWRQ-158: tests updated, target search with resolver

Author: jespinosaar

astroquery/esa/integral/__init__.py

@@ -10,8 +10,7 @@
 
 from astropy import config as _config
 
-
-ISLA_DOMAIN = 'https://isla.esac.esa.int/tap/'
+ISLA_DOMAIN = 'https://isladev.esac.esa.int/tap-dev/'
 ISLA_TAP_URL = ISLA_DOMAIN + 'tap'
 
 
@@ -24,7 +23,10 @@ class Conf(_config.ConfigNamespace):
     ISLA_LOGIN_SERVER = _config.ConfigItem(ISLA_DOMAIN + 'login', "ISLA Login Server")
     ISLA_LOGOUT_SERVER = _config.ConfigItem(ISLA_DOMAIN + 'logout', "ISLA Logout Server")
     ISLA_SERVLET = _config.ConfigItem(ISLA_TAP_URL + "/sync/?PHASE=RUN",
-                                      "ISLA Servlet Request")
+                                      "ISLA Sync Request")
+    ISLA_TARGET_RESOLVER = _config.ConfigItem(ISLA_DOMAIN + "servlet/target-resolver?TARGET_NAME={}"
+                                                             "&RESOLVER_TYPE={}&FORMAT=json",
+                                              "ISLA Target Resolver Request")
 
     ISLA_INSTRUMENT_BAND_QUERY = _config.ConfigItem('select i.name as instrument, b."name" as band, '
                                                     'i.instrument_oid, b.band_oid from ila.instrument i join '
@@ -39,6 +41,10 @@ class Conf(_config.ConfigNamespace):
                                                "ila.v_cat_source src where "
                                                "src.name ilike '%{}%' order by src.name asc",
                                                "ISLA Target Condition")
+    ISLA_CONE_TARGET_CONDITION = _config.ConfigItem("select distinct src.name, src.ra, src.dec, "
+                                                    "src.source_id from ila.v_cat_source src where "
+                                                    "1=CONTAINS(POINT('ICRS',src.ra,src.dec),CIRCLE('ICRS',{},{},{}))",
+                                                    "ISLA Target Condition")
     ISLA_COORDINATE_CONDITION = _config.ConfigItem("1=CONTAINS(POINT('ICRS',ra,dec),CIRCLE('ICRS',{},{},{}))",
                                                    "ISLA Coordinate Condition")
     TIMEOUT = 60