Commit 84cf03b4 authored by Robert Butora's avatar Robert Butora
Browse files

cutout: makes POS optional (volib updated 0.9.8: NONE enum removed instead... 

cutout: makes POS optional (volib updated 0.9.8: NONE enum removed instead parsers return null if not found in input)
parent 1dc0d2ea

data-access/engine/src/common/src/ast_frameset.cpp

+484 −481
Original line number Diff line number Diff line
@@ -964,8 +964,10 @@ overlap_ranges ast::frameset::overlap(coordinates coord) 
   log_bounds("XX BOUNDS header: ", naxes, low, up);





   /* overwrite bounds for sky-axis and spec axis if given by coord input */

   /* overwrite bounds for sky- spec- time- pol-axis if given by coord */



   if(m_has_skyframe && (coord.skysys != skysystem::NONE))

	{

		int ix_lon = m_sky_lon_axis - 1; //astGetI(m_hdr_fs,"LonAxis") - 1;

		int ix_lat = m_sky_lat_axis - 1; //astGetI(m_hdr_fs,"LatAxis") - 1;

													//if ( !astOK )
@@ -980,6 +982,7 @@ overlap_ranges ast::frameset::overlap(coordinates coord) 
		low[ix_lat] = D2R * (coord.lat_deg - coord.dlat_deg/2.0);

		up[ix_lon]  = D2R * (coord.lon_deg + coord.dlon_deg/2.0); 

		up[ix_lat]  = D2R * (coord.lat_deg + coord.dlat_deg/2.0);

	}



	vector<double_xy> pix_ranges;

data-access/servlet/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
          <dependency>

                  <groupId>vo</groupId>

                  <artifactId>vlkb-volib</artifactId>

                  <version>0.9.7</version>

                  <version>0.9.8</version>

          </dependency>



          <!-- dependency>

data-access/servlet/src/main/java/common/Coord.java

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ class Coord 


   String skySystem;  // FIXME enum ICRS | GALACTIC

   String shape = "CIRCLE";      // FIXME enum CIRCLE | RECT | POLYGON   FIXME replace RECT -> RANGE

   String specSystem; // FIXME enum VELO_LSRK | WAVE_Barycentric | NONE

   String specSystem; // FIXME enum VELO_LSRK | WAVE_Barycentric



   Pos  pos;

   Band band;

data-access/servlet/src/main/java/common/json/JsonEncoder.java

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ public class JsonEncoder 




   // NOTE: implementation of NULL: do not put into json

   // (alternatively could put JSON.NULL as "pos" value or use pos.system.NONE)



   public void add(Pos pos)

   {