diff --git a/data-access/servlet/src/main/java/datasets/CutoutImpl.java b/data-access/servlet/src/main/java/datasets/CutoutImpl.java index cca2b70e0e121265bbe2d45e5a0de5d6b4a02bda..d5ff731401902ee8d83cbce1f07f25a7125258b7 100644 --- a/data-access/servlet/src/main/java/datasets/CutoutImpl.java +++ b/data-access/servlet/src/main/java/datasets/CutoutImpl.java @@ -85,8 +85,8 @@ class CutoutImpl implements Cutout if(band != null) { String specSystem = band.system.name(); - double vl = band.wavelength[0]; - double vu = band.wavelength[1]; + double vl = band.getMin(); + double vu = band.getMax(); region =region + "specsystem=" + specSystem + "&vl=" + String.valueOf(vl) + "&vu=" + String.valueOf(vu); } diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java b/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java index f81bccdcde8a4677f0c14a03cd40a75107ac3dbb..08918487d7143169942376eb3da961e2e406f2f9 100644 --- a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java +++ b/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java @@ -57,7 +57,8 @@ public class JsonEncoder j.put("system", band.system.toString()); JSONArray arr = new JSONArray(); - for(double dbl : band.wavelength) arr.add(dbl); + arr.add(band.getMin()); + arr.add(band.getMax()); j.put("interval",arr); this.obj.put("band", j); @@ -73,7 +74,8 @@ public class JsonEncoder j.put("system", time.system.toString()); JSONArray arr = new JSONArray(); - for(double dbl : time.mjdUtc) arr.add(dbl); + arr.add(time.getMin()); + arr.add(time.getMax()); j.put("interval",arr); this.obj.put("time", j); diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java b/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java index 32e6ba2abc7f500d2c4e82f8e0703d600b2f8def..c1a85f625ddfe82248fa88d22b29448b18d44abb 100644 --- a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java +++ b/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java @@ -86,15 +86,17 @@ public class JsonEncoderMerge private static JSONArray arrJBand(Band band) { JSONArray arr = new JSONArray(); - for(double dbl : band.wavelength) arr.add(dbl); + arr.add(band.getMin()); + arr.add(band.getMax()); return arr; } private static JSONArray genTimeJsonArr(Time time) { - JSONArray jarr = new JSONArray(); - for(double dbl : time.mjdUtc) jarr.add(dbl); - return jarr; + JSONArray arr = new JSONArray(); + arr.add(time.getMin()); + arr.add(time.getMax()); + return arr; } private static JSONArray genPolyLonJsonArr(Polygon polygon) diff --git a/data-access/servlet/src/main/java/webapi/ServletCutout.java b/data-access/servlet/src/main/java/webapi/ServletCutout.java index bdeb7040d9905810278acab2471d7049c93e10b9..04c57d4b8f3992a6877b7fd102842d5ab287100e 100644 --- a/data-access/servlet/src/main/java/webapi/ServletCutout.java +++ b/data-access/servlet/src/main/java/webapi/ServletCutout.java @@ -105,9 +105,9 @@ public class ServletCutout extends javax.servlet.http.HttpServlet Resolver rsl = new ResolverFromId(); rsl.resolve(id); - // if(pos != null) pos.setSystem(Pos.System.valueOf(DEFAULT_SKY_SYSTEM)); - if(band != null) band.setSystem(Band.System.valueOf(DEFAULT_SPEC_SYSTEM)); - if(time != null) time.setSystem(Time.System.valueOf(DEFAULT_TIME_SYSTEM)); + // if(pos != null) pos.setSystem(DEFAULT_SKY_SYSTEM); + if(band != null) band.setSystem(DEFAULT_SPEC_SYSTEM); + if(time != null) time.setSystem(DEFAULT_TIME_SYSTEM); cutout.doStream(rsl.relPathname(), rsl.hdunum(), pos, band, time, pol, respOutputStream); } @@ -153,9 +153,9 @@ public class ServletCutout extends javax.servlet.http.HttpServlet final String DEFAULT_TIME_SYSTEM = "MJD_UTC"; // FIXME take from confif file - if(pos != null) pos.setSystem(Pos.System.valueOf(DEFAULT_SKY_SYSTEM)); - if(band != null) band.setSystem(Band.System.valueOf(DEFAULT_SPEC_SYSTEM)); - if(time != null) time.setSystem(Time.System.valueOf(DEFAULT_TIME_SYSTEM)); + if(pos != null) pos.setSystem(DEFAULT_SKY_SYSTEM); + if(band != null) band.setSystem(DEFAULT_SPEC_SYSTEM); + if(time != null) time.setSystem(DEFAULT_TIME_SYSTEM); CutResult cutResult = cutout.doFile(relPathname, hdunum, pos, band, time, pol, false, null); diff --git a/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java b/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java index 9ccfc544d58bbe7d19929c835657de60b060065e..1da707c98f36333c3ed1fa778a922adb22d18a04 100644 --- a/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java +++ b/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java @@ -84,8 +84,8 @@ public final class XmlSerializer if(coord.band != null) { - xml.append("<vl>" + String.valueOf(coord.band.wavelength[0]) +"</vl>"); - xml.append("<vu>" + String.valueOf(coord.band.wavelength[1]) +"</vu>"); + xml.append("<vl>" + String.valueOf(coord.band.getMin()) +"</vl>"); + xml.append("<vu>" + String.valueOf(coord.band.getMax()) +"</vu>"); xml.append("<vtype>" + coord.specSystem + "</vtype>"); } diff --git a/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar b/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar index 9ba5160584a847c38f4cae9a2732f69845e30032..edd31c5773f5ab0d4a04df802e5dbbf951bc0218 100644 Binary files a/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar and b/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar differ