Changeset 1487

Timestamp:

06/09/06 10:31:55 (13 years ago)

Author:

domlowe

Message:

more changes related to module reorganisation

Location:

TI02-CSML/trunk

Files:

• csml/API/__init__.py (modified) (2 diffs)
• csml/API/ops_GridSeriesFeature.py (modified) (3 diffs)
• csml/csmllibs/csmldocument.py (modified) (9 diffs)
• netCDFWriter.py (moved) (moved from TI02-CSML/trunk/csml/csmllibs/NetCDFWriter.py)

TI02-CSML/trunk/csml/API/__init__.py

@@ -1 +1 @@
 ''' __init__.py  '''
-
-#import dataiface from scanner
-import os, sys
-# currentPath=os.getcwd() 
-# scannerPath=os.sep.join(currentPath.split(os.sep)[:-1]) + '/Scanner'
-# sys.path.append(scannerPath) #append the parser path to sys.path 
-# try:
-#     import csmllibs.csmldataiface as csmldataiface
-# except:
-#     print 'Could not import CSML data interface. '
-#     sys.exit()
-#     
-# try:
-#     import csmllibs.csmltime as csmltime
-# except:
-#     print 'Could not import csmltime. '
-#     sys.exit()
 
 
@@ -33 +16 @@
 import ops_GridSeriesFeature
 import ops_TrajectoryFeature
-import CSMLDocument
+
 
 

TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

@@ -4 +4 @@
 import csml.parser
 import csml.csmllibs.csmltime
-import csml.csmllibs.csmlDocument
+import csml.csmllibs.csmldocument
 import csml.API.ops_AbstractFeature
+import csml.csmllibs.netCDFWriter
 
 
@@ -177 +178 @@
 
     #### write csml document ##### 
-    csmldoc=csml.csmllibs.csmlDocument.CSMLDocument("mydoc", "mymetadata")
+    csmldoc=csml.csmllibs.csmldocument.CSMLDocument("mydoc", "mymetadata")
     csmldoc.addGridSeriesFeature(domain,rangeSet,datasetID="A",featureID="B",description="C")
     csmldoc=csmldoc.consolidate()
@@ -185 +186 @@
 
     ### write netcdf using NCWriter class (wraps cdms) ###
-    nc=NetCDFWriter.NCwriter(pathToSubsetNetCDF)
+    nc=csml.csmllibs.netCDFWriter.NCwriter(pathToSubsetNetCDF)
     floatTimes=[]
     for time in self.times:

TI02-CSML/trunk/csml/csmllibs/csmldocument.py

@@ -1 +1 @@
 ''' CSMLDocument.py - simple implementation to return a CSML document containing a single type of feature'''
-# from API import *
-# from Parser import *
-# import parser_extra
+
+import csml.parser
+import csml.parser_extra
 
 class CSMLDocument(object):
@@ -12 +12 @@
         #initialise a new document
         #Create an Empty Dataset & FeatureCollection
-        self.ds = Dataset()
-        self.fc=FeatureCollection()
+        self.ds = csml.parser.Dataset()
+        self.fc=csml.parser.FeatureCollection()
         #Set attributes of dataset
         #if docMetaDataProperty is a URI, set it as href attribute if MetaDataProperty instance,
         #else set it as a text attribute of a MetaDataProperty instance.
-        mdp=MetaDataProperty()
-        if parser_extra.isURI(docMetaDataProperty):
+        mdp=csml.parser.MetaDataProperty()
+        if csml.parser_extra.isURI(docMetaDataProperty):
             mdp.href=docMetaDataProperty
         else: 
@@ -40 +40 @@
         parameter = Phenomenon type
         """
-        feat=PointFeature()
+        feat=csml.parser.PointFeature()
         feat.id=id
-        feat.description=Description(description)
+        feat.description=csml.parser.Description(description)
         
         #Add the domain to the feature
-        p=Position()
+        p=csml.parser.Position()
         p.srsName =domainReference[0]
         p.axisLabels=domainReference[1]
@@ -51 +51 @@
         p.location=domainReference[3]
         p.time=domainReference[4]
-        ptd=PointDomain()
+        ptd=csml.parser.PointDomain()
         ptd.domainReference=p
         feat.domain=ptd
         
         #Add the rangeSet to the feature
-        rs=RangeSet()
-        rs.quantityList=MeasureOrNullList(uom=rangeSet[0],val = rangeSet[1])
+        rs=csml.parser.RangeSet()
+        rs.quantityList=csml.parser.MeasureOrNullList(uom=rangeSet[0],val = rangeSet[1])
         feat.rangeSet=rs
         
         #Add the parameter to the feature
-        feat.parameter=Phenomenon(href=parameter) 
+        feat.parameter=csml.parser.Phenomenon(href=parameter) 
         
         self.fm.append(feat)
@@ -78 +78 @@
     def addGridSeriesFeature(self,domain,rangeSet,datasetID=None,featureID=None,description=None):
         fms=[] #empty featureMembers list
-        feat=Parser.GridSeriesFeature()
+        feat=csml.parser.GridSeriesFeature()
         if featureID:
             feat.id= featureID
@@ -84 +84 @@
             feat.id='No ID'
         if description:
-            feat.description=Parser.Description(description)
+            feat.description=csml.parser.Description(description)
         else:
-            feat.description=Parser.Description('No Description')
+            feat.description=csml.parser.Description('No Description')
         feat.domain=domain
         feat.rangeSet=rangeSet
@@ -97 +97 @@
         #handles the addition of file extract classes (can probably get away with one method for all types of extracts for now)
         if extractType=='NetCDFExtract':
-            ex=NetCDFExtract()
+            ex=csml.parser.NetCDFExtract()
         if extractType=='NASAAmesExtract':
-            ex=NASAAmesExtract() 
+            ex=csml.parser.NASAAmesExtract() 
         if extractType=='GRIBExtract':
-            ex=GRIBExtract() 
+            ex=csml.parser.GRIBExtract() 
         if extractType=='PPExtract':
-            ex=PPExtract() 
+            ex=csml.parser.PPExtract() 
         ex.id =id
         if arraySize:
@@ -131 +131 @@
     def setBoundingEnvelope(self,lowerCorner,upperCorner,timePosition1,timePosition2):
         #set the bounding box envelope of the feature collection.
-        etp = EnvelopeWithTimePeriod()
+        etp = csml.parser.EnvelopeWithTimePeriod()
         etp.lowerCorner=lowerCorner
         etp.upperCorner=upperCorner
@@ -143 +143 @@
         #when you have finished building the document, need to consolidate it and return a CSML document (string)
         self.ds.arrayDescriptors=self.ad
-        self.ds.featureCollection=FeatureCollection(members=self.fm)
-        csml=self.ds.toXML()
+        self.ds.featureCollection=csml.parser.FeatureCollection(members=self.fm)
+        csmlout=self.ds.toXML()
         #parse and pretty print the result
-        strCSML=parser_extra.PrettyPrint(csml)
-        strCSML=parser_extra.removeInlineNS(strCSML)
+        strCSML=csml.parser_extra.PrettyPrint(csmlout)
+        strCSML=csml.parser_extra.removeInlineNS(strCSML)
         return strCSML