Changeset 903 for TI02-CSML

Timestamp:

09/05/06 12:11:01 (14 years ago)

Author:

domlowe

Message:

class for gml:SRSInformation attribute group added, also gml:DirectPosition

File:

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

TI02-CSML/trunk/newparser/Parser.py

@@ -101 +101 @@
     MetaDataProperty:
     +href: URI
+    +text: str
     """
-    def __init__(self,href=None):
+    def __init__(self,href=None, texts=None):
         if href:
             self.href = href
+        if texts:
+            self.texts=texts
     def fromXML(self,csmlFrag):
         if csmlFrag.attrib.has_key(XLINK('href')):
              self.href = csmlFrag.attrib[XLINK('href')]
+        for frag in csmlFrag.getchildren():
+            if frag.tag == CSML('text'):
+                checkArrayAttrib(self,'texts')
+                self.texts.append(frag.text)
     def toXML(self,csmlFrag):
         if hasattr(self,'href'):
             csmlFrag.attrib[XLINK('href')] = self.href
+        if hasattr(self,'texts'):
+            for txt in self.texts:
+                frag = Element(CSML('text'))
+                frag.text=txt
+                csmlFrag.append(frag)
         return csmlFrag
 
@@ -222 +234 @@
                 csmlFrag.attrib['srsDimension']= self.srsDimension
             return csmlFrag
+
+class SRSInformationGroup:
+# class to represeent gml:SRSInformationGroup
+# class SRSReferenceGroup:
+#     +uomLabels[0...]:NCNameList
+#     +axisLabels[0...]:NCNameList
+    def __init__(self,uomLabels=None,axisLabels=None):
+        if uomLabels:
+            self.uomLabels=uomLabels
+        if axisLabels:
+            self.axisLabels=axisLabels
+    def fromXML(self,csmlFrag):
+        if csmlFrag.attrib.has_key('uomLabels'):
+            self.uomLabels=csmlFrag.attrib['uomLabels']
+        if csmlFrag.attrib.has_key('axisLabels'):
+            self.axisLabels=csmlFrag.attrib['axisLabels']
+    def toXML(self,csmlFrag):
+            if hasattr(self,'axisLabels'):
+                csmlFrag.attrib['axisLabels']= self.axisLabels
+            if hasattr(self,'uomLabels'):
+                csmlFrag.attrib['uomLabels']= self.uomLabels
+            return csmlFrag
+    
 class AssociationAttributeGroup:
     '''Class to represent gml:AssociationAttributeGroup which is based on the xlink 'simplelink' attribute group (not implemented)
@@ -274 +309 @@
         return csmlFrag
     
-            
+class DirectPosition(SRSReferenceGroup,SRSInformationGroup):
+    def __init__(self,vals='',*args,**kwargs):
+        SRSReferenceGroup.__init__(self,*args,**kwargs)
+        SRSInformationGroup.__init__(self,*args,**kwargs)
+        if vals:
+            self.vals=vals
+    def fromXML(self,csmlFrag):
+        SRSReferenceGroup.fromXML(self,csmlFrag)
+        SRSInformationGroup.fromXML(self,csmlFrag)
+        self.vals=csmlFrag.text
+    def toXML(self,csmlFrag):
+        SRSReferenceGroup.toXML(self,csmlFrag)
+        SRSInformationGroup.toXML(self,csmlFrag)
+        if hasattr(self,'vals'):
+            csmlFrag.text=self.vals
+        return csmlFrag
+        
 class Definition(AbstractGML):
     #Class Definition(AbstractGML), restricts AbstractGML
@@ -1666 +1717 @@
         return csmlFrag
 
-class DirectPositionList(AssociationAttributeGroup, SRSReferenceGroup):
+class DirectPositionList(AssociationAttributeGroup, SRSReferenceGroup,SRSInformationGroup):
     #class representing a DirectPositionList
     def __init__(self, order=None, vals=None,*args,**kwargs):
@@ -1675 +1726 @@
         AssociationAttributeGroup.__init__(self,*args,**kwargs)
         SRSReferenceGroup.__init__(self,*args,**kwargs)
+        SRSInformationGroup.__init__(self,*args,**kwargs)
     def fromXML(self,csmlFrag):
         AssociationAttributeGroup.fromXML(self,csmlFrag)
         SRSReferenceGroup.fromXML(self,csmlFrag)
+        SRSInformationGroup.fromXML(self,csmlFrag)        
         self.vals=csmlFrag.text
         if csmlFrag.attrib.has_key('order'):
@@ -1684 +1737 @@
         AssociationAttributeGroup.toXML(self,csmlFrag)
         SRSReferenceGroup.toXML(self,csmlFrag)
+        SRSInformationGroup.toXML(self,csmlFrag)
         csmlFrag.text=self.vals
         if hasattr(self,'order'):
@@ -1910 +1964 @@
     # CSML EnvelopeWithTimePeriod class
     # EnvelopeWithTimePeriod():
-        # +gml:lowerCorner
-        # +gml:upperCorner
+        # +gml:lowerCorner:DirectPosition
+        # +gml:upperCorner:DirectPosition
         # +gml:timePosition [2] ?
         
@@ -1931 +1985 @@
                 self.srsName=frag.attrib['srsName']
             if frag.tag == GML('lowerCorner'):
-                self.lowerCorner=frag.text
+                #self.lowerCorner=frag.text
+                self.lowerCorner=DirectPosition()
+                DirectPosition.fromXML(self.lowerCorner, frag)
             if frag.tag == GML('upperCorner'):
-                self.upperCorner=frag.text
+                #self.upperCorner=frag.text
+                self.upperCorner=DirectPosition()
+                DirectPosition.fromXML(self.upperCorner, frag)
             if frag.tag == GML('timePosition'):
                 if hasattr(self, 'timePosition'):
@@ -1944 +2002 @@
         if hasattr(self,'lowerCorner'):
             frag=Element(GML('lowerCorner'))
-            frag.text=self.lowerCorner
+           # frag.text=self.lowerCorner
+            DirectPosition.toXML(self.lowerCorner,frag)
             csmlFrag.append(frag)
         if hasattr(self,'upperCorner'):
             frag=Element(GML('upperCorner'))
-            frag.text=self.upperCorner
+            #frag.text=self.upperCorner
+            DirectPosition.toXML(self.upperCorner,frag)
             csmlFrag.append(frag)
         if hasattr(self,'timePosition'):