Changeset 3297

Timestamp:

Jul 10, 2006, 4:22:33 PM (17 years ago)

Author:

duncan

Message:

in geospatial_data.py let data_points be lats and longs

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (4 diffs)
• test_geospatial_data.py (modified) (1 diff)

inundation/geospatial_data/geospatial_data.py

@@ -23 +23 @@
                  latitudes = None,
                  longitudes = None,
+                 points_are_lats_longs = False,
                  verbose = False):
 
@@ -105 +106 @@
                 raise ValueError, msg
             file_name = None
-            if latitudes is not None or longitudes is not None:
+            if latitudes is not None or longitudes is not None or \
+                   points_are_lats_longs:
                 data_points, geo_reference =  \
                              self._set_using_lat_long(latitudes=latitudes,
-                                                  longitudes=longitudes,
-                                                  geo_reference=geo_reference,
-                                                  data_points=data_points)
+                                  longitudes=longitudes,
+                                  geo_reference=geo_reference,
+                                  data_points=data_points,
+                                  points_are_lats_longs=points_are_lats_longs)
             self.check_data_points(data_points)
             self.set_attributes(attributes)
@@ -202 +205 @@
                             longitudes,
                             geo_reference,
-                            data_points):
+                            data_points,
+                            points_are_lats_longs):
         if geo_reference is not None:
             msg = """A georeference is specified yet latitude and longitude are also specified!"""
             raise ValueError, msg
-         
-        if data_points is not None:
+        if data_points is not None and not points_are_lats_longs:
             msg = """Data points are specified yet latitude and longitude are also specified!"""
+            raise ValueError, msg
+        
+        if points_are_lats_longs:
+            if data_points is None:
+                msg = """Data points are not specified !"""
+                raise ValueError, msg
+            lats_longs = ensure_numeric(data_points)
+            latitudes = lats_longs[:,0:1]
+            longitudes = lats_longs[:,1:]
+            
+        if latitudes is None and longitudes is None:
+            msg = """Latitudes and Longitudes are not."""
             raise ValueError, msg
         
@@ -216 +231 @@
         
         if longitudes is None:
-            msg = """latitudes are specified yet longitudes aren't!"""
+            msg = """Latitudes are specified yet longitudes aren't!"""
             raise ValueError, msg
         

inundation/geospatial_data/test_geospatial_data.py

@@ -1302 +1302 @@
         else:
             self.failUnless(0 ==1,  'Error not thrown error!')
-            
+
+    def test_lat_long2(self):
+        lat_gong = degminsec2decimal_degrees(-34,30,0.)
+        lon_gong = degminsec2decimal_degrees(150,55,0.)
+        
+        lat_2 = degminsec2decimal_degrees(-34,00,0.)
+        lon_2 = degminsec2decimal_degrees(150,00,0.)
+        
+        points = [[lat_gong, lon_gong], [lat_2, lon_2]]
+        gsd = Geospatial_data(data_points=points, points_are_lats_longs=True)
+
+        points = gsd.get_data_points(absolute=True)
+        
+        assert allclose(points[0][0], 308728.009)
+        assert allclose(points[0][1], 6180432.601)
+        assert allclose(points[1][0],  222908.705)
+        assert allclose(points[1][1], 6233785.284)
+        self.failUnless(gsd.get_geo_reference().get_zone() == 56,
+                        'Bad zone error!')
+
+        try:
+            results = Geospatial_data(points_are_lats_longs=True)
+        except ValueError:
+            pass
+        else:
+            self.failUnless(0 ==1,  'Error not thrown error!')
+
 if __name__ == "__main__":