Changeset 4107

Timestamp:

Dec 20, 2006, 3:53:24 PM (18 years ago)

Author:

duncan

Message:

load .xya using geospatial

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -18 +18 @@
      argmax, allclose, take, reshape
 from anuga.utilities.numerical_tools import ensure_numeric, is_scalar
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 class Quantity:
@@ -219 +220 @@
 
         filename:
-          Name of a .pts file containing data points and attributes for
+          Name of a points file containing data points and attributes for
           use with fit_interpolate.fit.
 
@@ -718 +719 @@
                              verbose = False,
                              use_cache = False):
-        """Set quantity based on arbitrary points in .pts file
+        """Set quantity based on arbitrary points in a points file
         using attribute_name selects name of attribute
         present in file.
@@ -736 +737 @@
         # FIXME (Ole): This function should really return a
         # Geospatial_data object.
-        points_dict = import_points_file(filename)
-        points = points_dict['pointlist']
-        attributes = points_dict['attributelist']
-
-        if attribute_name is None:
-            names = attributes.keys()
-            attribute_name = names[0]
-
-        msg = 'Attribute_name must be a text string'
-        assert type(attribute_name) == StringType, msg
+        geospatial_data = Geospatial_data(filename)
+        
+        #points_dict = import_points_file(filename)
+        #points_dict['pointlist'] = None
+        #points_dict['attributelist'] = None
+        #points = points_dict['pointlist']
+        #attributes = points_dict['attributelist']
+
+
+        #Take care of georeferencing
+        # this doesn't do anything....
+        #if points_dict.has_key('geo_reference') and \
+        #       points_dict['geo_reference'] is not None:
+        #    data_georef = points_dict['geo_reference']
+        #else:
+        #    data_georef = None
+            
+        # if there is no attribute name, use the 1st key?
+        # This isn't so good..., if there is more than 1 key
+        # since it will not always be the 1 column
+        # or anything predictable...        
+
+        #if attribute_name is None:
+        #    names = attributes.keys()
+        #    attribute_name = names[0]
+
+        #msg = 'Attribute_name must be a text string'
+        #assert type(attribute_name) == StringType, msg
 
 
@@ -758 +777 @@
         #          %(attribute_name, filename)
         #    raise msg
-
-
-        #Take care of georeferencing
-        if points_dict.has_key('geo_reference') and \
-               points_dict['geo_reference'] is not None:
-            data_georef = points_dict['geo_reference']
-        else:
-            data_georef = None
-
-
-
+        
         #Call underlying method for geospatial data
-        geospatial_data = points_dictionary2geospatial_data(points_dict)
-        geospatial_data.set_default_attribute_name(attribute_name)
+        #geospatial_data = points_dictionary2geospatial_data(points_dict)
+        # geospatial_data.set_default_attribute_name(attribute_name)
 
         self.set_values_from_geospatial_data(geospatial_data,