Merge pull request #24 from leiyangleon/other_MISC_fixes

other MISC fixes for L8 production

geo_autoRIFT/geogrid/Geogrid.py

@@ -63,15 +63,35 @@ def geogrid(self):
         ##Create and set parameters
         self.setState()
 
+        ##check parameters
+        self.checkState()
+
         ##Run
         geogrid.geogrid_Py(self._geogrid)
+        self.get_center_latlon()
 
         ##Get parameters
         self.getState()
 
         ##Clean up
         self.finalize()
 
+    def get_center_latlon(self):
+        '''
+        Get center lat/lon of the image.
+        '''
+        from osgeo import gdal
+        self.epsg = 4326
+        self.determineBbox()
+        if gdal.__version__[0] == '2':
+            self.cen_lat = (self._ylim[0] + self._ylim[1]) / 2
+            self.cen_lon = (self._xlim[0] + self._xlim[1]) / 2
+        else:
+            self.cen_lon = (self._ylim[0] + self._ylim[1]) / 2
+            self.cen_lat = (self._xlim[0] + self._xlim[1]) / 2
+        print("Scene-center lat/lon: " + str(self.cen_lat) + "  " + str(self.cen_lon))
+
+
     def getProjectionSystem(self):
         '''
         Testing with Greenland.
@@ -291,6 +311,13 @@ def setState(self):
         self._orbit  = self.orbit.exportToC()
         geogrid.setOrbit_Py(self._geogrid, self._orbit)
 
+    def checkState(self):
+        '''
+        Create C object and populate.
+        '''
+        if self.repeatTime < 0:
+            raise Exception('Input image 1 must be older than input image 2')
+
     def finalize(self):
         '''
         Clean up all the C pointers.

geo_autoRIFT/geogrid/GeogridOptical.py

@@ -53,11 +53,30 @@ def runGeogrid(self):
 
         ###Determine extent of data needed
         bbox = self.determineBbox()
-
+
+        ##check parameters
+        self.checkState()
 
         ##Run
         self.geogrid()
-
+        self.get_center_latlon()
+
+    def get_center_latlon(self):
+        '''
+        Get center lat/lon of the image.
+        '''
+        from osgeo import gdal
+        self.epsgDem = 4326
+        self.epsgDat = self.getProjectionSystem(self.dat1name)
+        self.determineBbox()
+        if gdal.__version__[0] == '2':
+            self.cen_lat = (self._ylim[0] + self._ylim[1]) / 2
+            self.cen_lon = (self._xlim[0] + self._xlim[1]) / 2
+        else:
+            self.cen_lon = (self._ylim[0] + self._ylim[1]) / 2
+            self.cen_lat = (self._xlim[0] + self._xlim[1]) / 2
+        print("Scene-center lat/lon: " + str(self.cen_lat) + "  " + str(self.cen_lon))
+
 
     def getProjectionSystem(self, filename):
         '''
@@ -147,7 +166,12 @@ def determineBbox(self, zrange=[-200,4000]):
         self._ylim = [np.min(xyzs[:,1]), np.max(xyzs[:,1])]
 
 
-
+    def checkState(self):
+        '''
+        Create C object and populate.
+        '''
+        if self.repeatTime < 0:
+            raise Exception('Input image 1 must be older than input image 2')
 
 
 

testGeogridOptical.py

@@ -148,7 +148,7 @@ def runGeogrid(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, c
     d0 = date(np.int(info.time[0:4]),np.int(info.time[4:6]),np.int(info.time[6:8]))
     d1 = date(np.int(info1.time[0:4]),np.int(info1.time[4:6]),np.int(info1.time[6:8]))
     date_dt_base = d1 - d0
-    obj.repeatTime = np.abs(date_dt_base.total_seconds())
+    obj.repeatTime = date_dt_base.total_seconds()
 #    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
     obj.numberOfLines = info.numberOfLines
     obj.numberOfSamples = info.numberOfSamples
@@ -196,6 +196,8 @@ def runGeogrid(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, c
         'epsg': kwargs.get('epsg'),
         'XPixelSize': obj.X_res,
         'YPixelSize': obj.Y_res,
+        'cen_lat': obj.cen_lat,
+        'cen_lon': obj.cen_lon,
     }
 
     return run_info

testGeogrid_ISCE.py

@@ -264,6 +264,8 @@ def runGeogrid(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, c
         'epsg': kwargs.get('epsg'),
         'XPixelSize': obj.X_res,
         'YPixelSize': obj.Y_res,
+        'cen_lat': obj.cen_lat,
+        'cen_lon': obj.cen_lon,
     }
 
     return run_info
@@ -292,7 +294,7 @@ def runGeogridOptical(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, cs
     d0 = date(np.int(info.time[0:4]),np.int(info.time[4:6]),np.int(info.time[6:8]))
     d1 = date(np.int(info1.time[0:4]),np.int(info1.time[4:6]),np.int(info1.time[6:8]))
     date_dt_base = d1 - d0
-    obj.repeatTime = np.abs(date_dt_base.total_seconds())
+    obj.repeatTime = date_dt_base.total_seconds()
 #    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
     obj.numberOfLines = info.numberOfLines
     obj.numberOfSamples = info.numberOfSamples
@@ -340,6 +342,8 @@ def runGeogridOptical(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, cs
         'epsg': kwargs.get('epsg'),
         'XPixelSize': obj.X_res,
         'YPixelSize': obj.Y_res,
+        'cen_lat': obj.cen_lat,
+        'cen_lon': obj.cen_lon,
     }
 
     return run_info