Changeset 649

Timestamp:

22/02/06 16:48:40 (14 years ago)

Author:

domlowe

Message:

PointFeatures? added, but not complete

Location:

TI02-CSML/trunk/newparser

Files:

• Parser.py (modified) (5 diffs)
• test.py (modified) (1 diff)

TI02-CSML/trunk/newparser/Parser.py

@@ -76 +76 @@
     for elem in csmlFrag.getiterator():
         print str(elem.attrib)
-        #print 'hello'
     return csmlFrag
         
@@ -489 +488 @@
         return csmlFrag
 
+class AbstractDiscreteCoverage(AbstractGML):
+     #note, does not inherit directly from AbstractGML but is sufficient for CSML purposes
+    #GML AbstractDiscreteCoverage
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        AbstractGML.fromXML(self,csmlFrag)
+    def toXML(self,csmlFrag):
+        return csmlFrag
+        
+class AbstractCoverageFeature(AbstractDiscreteCoverage):
+    #CSML Abstract Coverage FT class 
+    #     AbstractCoverageFeature():
+    #       +gml:boundedBy[0..*]: AbstractFeature
+    #       +csml:_Domain
+    #       + gml:rangeSet
+    #       + gml:coverageFunction[0..*]
+    #       + parameter:om:PhenomenonPropertyType
+    def __init__(self,boundedBy=None,_Domain=None,rangeSet=None, coverageFunction=None, parameter=None, *args,**kwargs):
+        AbstractFileExtract.__init__(self,*args,**kwargs)
+        if boundedBy:
+            self.boundedBy=boundedBy
+        if _Domain:
+            self._Domain=_Domain
+        if rangeSet:
+            self.rangeSet=rangeSet
+        if coverageFunction:
+            self.coverageFunction=coverageFunction
+        if parameter:
+            self.parameter=parameter
+    def fromXML(self,csmlFrag):
+        AbstractDiscreteCoverage.fromXML(self,csmlFrag)
+        for frag in csmlFrag.getchildren():
+            if frag.tag == GML('boundedBy'):
+                #hmmm check this one is right.
+                checkArrayAttrib(self,'boundedBy')
+                self.boundedBy.append(frag.text)
+            if frag.tag == CSML('_Domain'):
+                self.PointDomain = PointDomain()
+                self.PointDomain.fromXML(frag)
+    def toXML(self,csmlFrag):
+        return csmlFrag
+
+
+
+
+class AbstractStaticCoverageFeature(AbstractCoverageFeature):
+    #CSML Abstract Static Coverage FT class 
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        AbstractCoverageFeature.fromXML(self,csmlFrag)
+    def toXML(self,csmlFrag):
+        AbstractCoverageFeature.toXML(self,csmlFrag)
+        return csmlFrag
+
+class PointDomain:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+    
+class rangeSet:
+    
+class PointFeature(AbstractStaticCoverageFeature):
+    #CSML PointFeature class
+    #       PointFeature(AbstractStaticCoverageFeatureType):
+    #      +PointDomain
+    #      +gml:rangeSet
+    #      +gml:coverageFunction[0..*]
+    #      +parameter:om:PhenomenonPropertyType
+    def __init__(self,PointDomain=None,rangeSet=None,coverageFunction=None, parameter=None):
+        if PointDomain:
+            self.PointDomain=PointDomain
+        if rangeSet:
+            self.rangeSet=rangeSet
+        if coverageFunction:
+            self.coverageFunction=coverageFunction
+        if parameter:
+            self.parameter=parameter
+    def fromXML(self,csmlFrag):
+        AbstractStaticCoverageFeature.fromXML(self,csmlFrag)
+        for frag in csmlFrag.getchildren():
+            print frag
+            if frag.tag == CSML('PointDomain'):
+                self.PointDomain = PointDomain()
+                self.PointDomain.fromXML(frag)
+            if frag.tag == GML('rangeSet'):
+               self.rangeSet=rangeSet()
+               self.rangeSet.fromXML(frag)
+            if frag.tag == GML('coverageFunction'):
+                checkArrayAttrib(self,'coverageFunction')
+                self.coverageFunction.append(frag.text)
+##        else:
+##            raise Exception('Unexpected element: "'+frag.tag+'"')
+    def toXML(self,csmlFrag):
+        csmlFrag = AbstractStaticCoverageFeature.toXML(self,csmlFrag)
+        frag = Element(CSML('PointDomain'))
+        frag.text = self.PointDomain
+        csmlFrag.append(frag)
+        return csmlFrag
+
+class ProfileFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+class GridFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+class PointSeriesFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+class ProfileSeriesFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+class GridSeriesFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+class TrajectoryFeature:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+        pass
+    def toXML(self,csmlFrag):
+        return csmlFrag
+    
 class AbstractFeature(AbstractGML):
     def __init__(self):
@@ -496 +642 @@
     def toXML(self,csmlFrag):
         return csmlFrag
+
 
 class AbstractFeatureCollection(AbstractFeature):
@@ -515 +662 @@
                 if featureFrag.tag == CSML('PointFeature'):
                     self.members.append(PointFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('ProfileFeature'):
                     self.members.append(ProfileFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('GridFeature'):
                     self.members.append(GridFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('PointSeriesFeature'):
                     self.members.append(PointSeriesFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('ProfileSeriesFeature'):
                     self.members.append(ProfileSeriesFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('GridSeriesFeature'):
                     self.members.append(GridSeriesFeature())
-                    self.members[-1].fromXML(frag)
+                    self.members[-1].fromXML(featureFrag)
                 if featureFrag.tag == CSML('TrajectoryFeature'):
                     self.members.append(TrajectoryFeature())
-                    self.members[-1].fromXML(frag)
-    def toXML(self,csmlFrag):
+                    self.members[-1].fromXML(featureFrag)
+    def toXML(self,csmlFrag):
+        AbstractFeature.toXML(self,csmlFrag)
+        #add stuff here..
+        for member in self.members:
+            if isinstance(member,PointFeature):
+                frag = Element(CSML('PointFeature'))
+                frag = PointFeature.toXML(member,frag)
+
+
         return csmlFrag
 
@@ -543 +698 @@
         pass
     def fromXML(self,csmlFrag):
-        pass
-    def toXML(self,csmlFrag):
+        AbstractFeatureCollection.fromXML(self,csmlFrag)
+    def toXML(self,csmlFrag):
+        AbstractFeatureCollection.toXML(self,csmlFrag)
         return csmlFrag
 

TI02-CSML/trunk/newparser/test.py

@@ -98 +98 @@
 setattr(ds, 'metaDataProperty', [md])
 setattr(ds, 'arrayDescriptors', nalist+nclist)
-#setattr(ds, 'NASAAmesExtract', nalist)
-#setattr(ds, 'NetCDFExtract', nclist)
 
 
-#csml = ds.toXML(Element('Dataset'))
 csml = ds.toXML()
 print parseString(tostring(csml)).toprettyxml()