Changeset 658

Timestamp:

28/02/06 17:20:04 (14 years ago)

Author:

domlowe

Message:

more work on rangeset

File:

• TI02-CSML/trunk/newparser/Parser.py (modified) (7 diffs)

TI02-CSML/trunk/newparser/Parser.py

@@ -665 +665 @@
             self.verticalAngle=verticalAngle
     def fromXML(self, csmlFrag):
-         for frag in csmlFrag.getchildren():
+        for frag in csmlFrag.getchildren():
             if frag.tag==GML('horizontalAngle'):
                 self.horizontalAngle=frag.text
+                if frag.attrib.has_key('uom'):
+                    self.uom_H=frag.attrib['uom']
             elif frag.tag==GML('verticalAngle'):
                 self.verticalAngle=frag.text
+                if frag.attrib.has_key('uom'):
+                    self.uom_V=frag.attrib['uom']
     def toXML(self,csmlFrag):
          if hasattr(self,'horizontalAngle'):
             frag = Element(GML('horizontalAngle'))
             frag.text=self.horizontalAngle
-            csmlFrag.append(frag)
+            if hasattr(self,'uom_H'):
+                frag.attrib['uom'] = self.uom_H
+            csmlFrag.append(frag)
+            
          if hasattr(self,'verticalAngle'):
             frag = Element(GML('verticalAngle'))
             frag.text=self.verticalAngle
+            if hasattr(self,'uom_V'):
+                frag.attrib['uom'] = self.uom_V
             csmlFrag.append(frag)
         
@@ -732 +741 @@
             if frag.tag==CSML('direction'):
                 self.direction=direction()
-                direction.fromXML(self.direction,csmlFrag)
+                direction.fromXML(self.direction,frag)
     def toXML(self, csmlFrag):
         Position.toXML(self,csmlFrag)
@@ -770 +779 @@
             csmlFrag.append(frag)
         return csmlFrag
-        
+
+class valueComponents:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+#         for frag in csmlFrag.getchildren():
+#                 if frag.tag == GML('measure'):
+#                     checkArrayAttrib(self,'members')
+#                     self.members.append(....)
+#                     self.members[-1].fromXML(frag)
+        pass
+    def toXML(self, csmlFrag):
+        return csmlFrag
+
+class CompositeValue:
+    def __init__(self):
+        pass
+    def fromXML(self,csmlFrag):
+          for frag in csmlFrag.getchildren():
+            if frag.tag == GML('valueComponents'):
+                self.valueComponents=valueComponents()
+                valueComponents.fromXML(self.valueComponents,frag) 
+    def toXML(self, csmlFrag):
+        if hasattr(self,'valueComponents'):
+            frag=Element(GML('valueComponents'))
+            valueComponents.toXML(self.valueComponents,frag)
+            csmlFrag.append(frag)
+        return csmlFrag
+    
+class rangeParameters:
+    def __init__(self, CompositeValue=None):
+        if CompositeValue:
+            self.CompositeValue=CompositeValue
+    def fromXML(self,csmlFrag):
+        for frag in csmlFrag.getchildren():
+            if frag.tag == GML('CompositeValue'):
+                self.CompositeValue=CompositeValue()
+                CompositeValue.fromXML(self.CompositeValue,frag) 
+    def toXML(self,csmlFrag):
+        if hasattr(self,'CompositeValue'):
+            frag=Element(GML('CompositeValue'))
+            CompositeValue.toXML(self.CompositeValue,frag)
+            csmlFrag.append(frag)
+        return csmlFrag
+    
+class DataBlock:
+    #class GML DataBlock
+    
+    #DataBlock()
+    #+gml:rangeParameters
+    def __init__(self,rangeParameters=None):
+        if rangeParameters:
+            self.rangeParameters=rangeParameters
+    def fromXML(self,csmlFrag):
+        for frag in csmlFrag.getchildren():
+            if frag.tag == GML('rangeParameters'):
+                self.rangeParameters=rangeParameters()
+                rangeParameters.fromXML(self.rangeParameters,frag)
+    def toXML(self,csmlFrag):
+        if hasattr(self, 'rangeParameters'):
+            frag=Element(GML('rangeParameters'))
+            rangeParameters.toXML(self.rangeParameters, frag)
+            csmlFrag.append(frag)
+        return csmlFrag
+    
+
+    #class GML DataBlock
 class rangeSet:
-    def __init__(self,QuantityList=None, uom=None):
+#class GML rangeSet
+
+        # rangeSet()
+        # +gml:ValueArray
+        # +gml:_ScalarValueList
+        # +gml:DataBlock
+        # +gml:File
+    #class GML rangeSet
+    def __init__(self,QuantityList=None, DataBlock=None):
         if QuantityList:
             self.QuantityList=QuantityList
-        if uom:
-            self.uom=uom
+        if DataBlock:
+            self.DataBlock=DataBlock
     def fromXML(self,csmlFrag):
         for frag in csmlFrag.getchildren():
@@ -783 +866 @@
                 if frag.attrib.has_key('uom'):
                     self.uom = frag.attrib['uom']
+            if frag.tag==GML('DataBlock'):
+                self.DataBlock=DataBlock()
+                DataBlock.fromXML(self.DataBlock, frag)
     def toXML(self, csmlFrag):
         if hasattr(self,'QuantityList'):
@@ -789 +875 @@
             if hasattr(self,'uom'):
                 frag.attrib['uom'] = self.uom
+            csmlFrag.append(frag)
+        if hasattr(self,'DataBlock'):
+            frag=Element(GML('DataBlock'))
+            DataBlock.toXML(self.DataBlock,frag)
             csmlFrag.append(frag)
         return csmlFrag
@@ -816 +906 @@
              Position.toXML(self.Position,frag)
              csmlFrag.append(frag)
-        if hasattr(self,'Trajectory'):
+        elif hasattr(self,'Trajectory'):
              frag = Element(CSML('Trajectory'))
              Trajectory.toXML(self.Trajectory,frag)
              csmlFrag.append(frag)
+        elif hasattr(self,'OrientedPosition'):
+             frag = Element(CSML('OrientedPosition'))
+             OrientedPosition.toXML(self.OrientedPosition,frag)
+             csmlFrag.append(frag)
+        elif hasattr(self,'OrientedTrajectory'):
+             frag = Element(CSML('OrientedTrajectory'))
+             OrientedTrajectory.toXML(self.OrientedTrajectory,frag)
+             csmlFrag.append(frag)
         return csmlFrag
 
@@ -826 +924 @@
         pass
     def fromXML(self,csmlFrag):
-        pass
-    def toXML(self,csmlFrag):
+        for frag in csmlFrag.getchildren():
+            if frag.tag==CSML('DirectPositionList'):
+                self.DirectPositionList=frag.text
+                if frag.attrib.has_key('srsName'):
+                    self.srsName=frag.attrib['srsName']
+            elif frag.tag == CSML('Grid'):
+                self.Grid=Grid()
+                self.Grid.fromXML(frag)
+    def toXML(self,csmlFrag):
+        if hasattr(self,'DirectPositionList'):
+             frag = Element(CSML('DirectPositionList'))
+             frag.text=self.DirectPositionList
+             if hasattr(self, 'srsName'):
+                 frag.attrib['srsName']=self.srsName
+             csmlFrag.append(frag)
+        elif hasattr(self,'Grid'):
+             frag = Element(CSML('Grid'))
+             Grid.toXML(self.Grid,frag)
+             csmlFrag.append(frag)
         return csmlFrag