Changeset 4535 for anuga_core/source/anuga/geospatial_data/geospatial_data.py

Timestamp:

Jun 6, 2007, 5:27:22 PM (17 years ago)

Author:

duncan

Message:

getting fit 2 mesh file going again

File:

• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (4 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -24 +24 @@
 from anuga.utilities.anuga_exceptions import ANUGAError
 from anuga.config import points_file_block_line_size as MAX_READ_LINES    
+
+DEFAULT_ATTRIBUTE = 'elevation'
 
 class Geospatial_data:
@@ -53 +55 @@
         of lists (or arrays) of length M. In the latter case the keys
         in the dictionary represent the attribute names, in the former
-        the attribute will get the default name "attribute".
+        the attribute will get the default name "elevation".
         
         geo_reference: Object representing the origin of the data
@@ -208 +210 @@
         if not isinstance(attributes, DictType):
             #Convert single attribute into dictionary
-            attributes = {'attribute': attributes}
+            attributes = {DEFAULT_ATTRIBUTE: attributes}
 
         #Check input attributes    
@@ -514 +516 @@
         attributes = {}
         if file_name[-4:]== ".xya":
-            msg = 'Text file format is moving to comma seperated .txt files.'
-            warn(msg, DeprecationWarning) 
+            # Maybe not phase-out, so we can load in geo-ref info
+            #msg = 'Text file format is moving to comma seperated .txt files.'
+            #warn(msg, DeprecationWarning) 
             try:
                 if delimiter == None: