Changeset 1297

Timestamp:

13/07/06 12:44:48 (13 years ago)

Author:

domlowe

Message:

Consolidated CSMLdocBuilder.py with CSMLDocument. Began removing csml and netcdf creation from subsetting operation, as that was only ever an alpha hack

Location:

TI02-CSML/trunk/parser

Files:

• API/CSMLDocument.py (modified) (2 diffs)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• CSMLdocBuilder.py (deleted)
• parser_extra.py (modified) (2 diffs)

TI02-CSML/trunk/parser/API/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
 
 class CSMLDocument:
-    def makeGridSeries(self,domain,rangeSet,datasetID=None,featureID=None):
+    def __init__(self,docID, docMetaDataProperty):
+        '''
+        docID = gml:id of Dataset element
+        docMetaDataProperty = gml:metaDataProperty of Dataset element  #hmm may need to allow a list here.
+        '''
+        #initialise a new document
+        #Create an Empty Dataset & FeatureCollection
+        self.ds = Dataset()
+        self.fc=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.href=docMetaDataProperty
+        else: 
+            mdp.text = [docMetaDataProperty]
+        self.ds.metaDataProperty= [mdp]
+        #set the id
+        self.ds.id=docID
+        self.dm=[] #empty list to hold definition members (e.g. UnitDefinitions)
+        self.fm=[] #empty list to hold feature members (e.g. GridFeatures, PointFeatures)
+        self.ad=[] #empty list to hold array descriptors (e.g. NetCDFExtract)
+        #the dataset is now initialised. now you can add features/defintions/arraydescriptors
+        #using the methods supplied.
+        #when finished building CSML objects call the consolidate method to return the document.       
+        
+       #separate build classes for each feature type
+    def addPointFeature(self, id, description,domainReference,rangeSet, parameter):
+        #TO DO- this needs revising in line with addGridSeriesFeature
+        """ addPointFeature
+        domainReference = Position type
+        rangeSet = quantityList type, 
+        parameter = Phenomenon type
+        """
+        feat=PointFeature()
+        feat.id=id
+        feat.description=Description(description)
+        
+        #Add the domain to the feature
+        p=Position()
+        p.srsName =domainReference[0]
+        p.axisLabels=domainReference[1]
+        p.uomLabels = domainReference[2]
+        p.location=domainReference[3]
+        p.time=domainReference[4]
+        ptd=PointDomain()
+        ptd.domainReference=p
+        feat.domain=ptd
+        
+        #Add the rangeSet to the feature
+        rs=RangeSet()
+        rs.quantityList=MeasureOrNullList(uom=rangeSet[0],val = rangeSet[1])
+        feat.rangeSet=rs
+        
+        #Add the parameter to the feature
+        feat.parameter=Phenomenon(href=parameter) 
+        
+        self.fm.append(feat)
+    def addProfileFeature(self):
+        pass
+
+    def addGridFeature(self):
+        pass
+            
+    def addPointSeriesFeature(self):
+        pass
+            
+    def addProfileSeriesFeature(self):
+        pass
+
+    def addGridSeriesFeature(self,domain,rangeSet,datasetID=None,featureID=None,description=None):
         fms=[] #empty featureMembers list
         feat=Parser.GridSeriesFeature()
@@ -9 +82 @@
             feat.id= featureID
         else:
-            feat.id='testfeature'
-        feat.description=Parser.Description('???')
+            feat.id='No ID'
+        if description:
+            feat.description=Parser.Description(description)
+        else:
+            feat.description=Parser.Description('No Description')
         feat.domain=domain
         feat.rangeSet=rangeSet
-        fms.append(feat)
-        fc=Parser.FeatureCollection(members=fms)
-        #Create an Empty Dataset
-        ds = Parser.Dataset()
-        #Set objects as attributes of dataset
-        if datasetID:
-            ds.id=datasetID
-        else:
-            ds.id='testdataset'
-        ds.featureCollection=fc
-        #call the toXML method of the Dataset object:
-        csml = ds.toXML()
+        self.fm.append(feat)
+                        
+    def addTrajectoryFeature(self):
+        pass
+
+    def addFileExtract(self,extractType, id, variableName=None,arraySize=None,fileName=None):
+        #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()
+        if extractType=='NASAAmesExtract':
+            ex=NASAAmesExtract() 
+        if extractType=='GRIBExtract':
+            ex=GRIBExtract() 
+        if extractType=='PPExtract':
+            ex=PPExtract() 
+        ex.id =id
+        if arraySize:
+            ex.arraySize=[arraySize]
+        if fileName:
+            ex.fileName=fileName
+        if variableName:
+            ex.variableName=variableName
+        self.ad.append(ex)
+
+
+    def removeFileExtract(self):
+        #not implemented yet
+        pass
+        
+    def removeFeature(self,featureID):
+        #not implemented yet.
+        pass
+    def addDefintion(self):
+        #not implemented yet. - may need separate methods for different defintion types?
+        pass
+    
+    def removeDefintion(self):
+        #not implemented yet.
+        pass
+    
+    def setBoundingEnvelope(self,lowerCorner,upperCorner,timePosition1,timePosition2):
+        #set the bounding box envelope of the feature collection.
+        etp = EnvelopeWithTimePeriod()
+        etp.lowerCorner=lowerCorner
+        etp.upperCorner=upperCorner
+        etp.timePosition=timePosition1
+        etp.timePosition2=timePosition2
+        self.fc.boundedBy=etp
+
+        
+        
+    def consolidate(self):
+        #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()
+        #parse and pretty print the result
         strCSML=parser_extra.PrettyPrint(csml)
         strCSML=parser_extra.removeInlineNS(strCSML)

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

@@ -135 +135 @@
 
     #### write csml document ##### -move this to the csmldocument module?
-    subsetCSML=CSMLDocument()
-    subsetCSML=subsetCSML.makeGridSeries(domain,rangeSet)
+    csmldoc=CSMLDocument("mydoc", "mymetadata")
+    csmldoc.addGridSeriesFeature(domain,rangeSet,datasetID="A",featureID="B",description="C")
+    csmldoc=csmldoc.consolidate()
     output=open(pathToSubsetCSML,'w')
-    output.write(subsetCSML)
+    output.write(csmldoc)
     output.close()
 

TI02-CSML/trunk/parser/parser_extra.py

@@ -9 +9 @@
 import sys
 import elementtree.ElementTree as etree
-
+import string
 
 #some xml/string manipulation functions. may as well go in this file for now:
@@ -64 +64 @@
         csmlstring=csmlstring.replace('ns1:', '')  #the rest of the ns1s are CSML namespaces... due to the way it has been parsed.        
         return csmlstring
+
+
+def isURI(uri):
+    """ a very simple function to test if a string is a uri 
+    if ;// appears in the first 12 characters it is probably a uri """
+    #TODO - a decent uri check!    
+    result = False
+    if string.find(uri[:12], '://') != -1:
+        result = True
+    return result