Changeset 1864


Ignore:
Timestamp:
14/12/06 14:43:49 (13 years ago)
Author:
domlowe
Message:

added PointSeriesCoverage and TimeSeriesDomain

Location:
TI02-CSML/branches/CSML2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI02-CSML/branches/CSML2/csParser.py

    r1863 r1864  
    409409        children={'pointDomain':[CSML('PointDomain'),'PointDomain' ,CSML('pointDomain') ], 'rangeSet':[GML('rangeSet'), 'RangeSet'],'coverageFunction':[GML('coverageFunction'),'csString']} 
    410410        addchildren(self,children) 
     411         
     412class TimeSeriesDomain(AbstractGML, csElement): 
     413    def __init__(self, **kwargs): 
     414        AbstractGML.__init__(self,**kwargs) 
     415        children={'time':[CSML('time'), 'csString']} 
     416        addchildren(self,children) 
     417         
     418 
     419class PointSeriesCoverage(AbstractDiscreteCoverage, csElement): 
     420    def __init__(self, **kwargs): 
     421        AbstractDiscreteCoverage.__init__(self,**kwargs) 
     422        children={'pointSeriesDomain':[CSML('TimeSeriesDomain'),'TimeSeriesDomain' ,CSML('pointSeriesDomain') ], 'rangeSet':[GML('rangeSet'), 'RangeSet'],'coverageFunction':[GML('coverageFunction'),'csString']} 
     423        addchildren(self,children) 
     424 
    411425 
    412426class GridSeriesDomain(ReferenceableGrid, DomainSet, csElement): 
     
    440454        children={'time':[CSML('time'), 'csString'], 'value':[CSML('MultiPointCoverage'), 'MultiPointCoverage', CSML('value')], 'parameter':[CSML('parameter'), 'Phenomenon']} 
    441455        addchildren(self,children) 
     456 
    442457 
    443458class PointSeriesFeature(AbstractFeature, csElement): 
     
    529544    def __init__(self,**kwargs): 
    530545        AbstractFeatureCollection.__init__(self,**kwargs) 
    531         children={'members':[[CSML('GridFeature'), CSML('GridSeriesFeature'),CSML('PointFeature'),CSML('AlternatePointFeature')], 'AbstractFeature', GML('featureMembers')]} 
     546        children={'members':[[CSML('GridFeature'), CSML('GridSeriesFeature'),CSML('PointFeature'),CSML('PointSeriesFeature'),CSML('AlternatePointFeature')], 'AbstractFeature', GML('featureMembers')]} 
    532547        addchildren(self,children) 
    533548    def _getSubstitutionType(self,tag): 
     
    538553        elif tag==CSML('PointFeature'): 
    539554            return 'PointFeature' 
     555        elif tag==CSML('PointSeriesFeature'): 
     556            return 'PointSeriesFeature' 
    540557        elif tag==CSML('AlternatePointFeature'): 
    541558            return 'AlternatePointFeature' 
     
    544561        if typename== 'GridFeature': 
    545562            return CSML('GridFeature') 
     563        elif typename == 'GridSeriesFeature': 
     564            return CSML('GridSeriesFeature') 
     565        elif typename == 'PointSeriesFeature': 
     566            return CSML('PointSeriesFeature') 
    546567        elif typename == 'PointFeature': 
    547568            return CSML('PointFeature') 
  • TI02-CSML/branches/CSML2/test.xml

    r1863 r1864  
    239239                </parameter> 
    240240        </AlternatePointFeature> 
    241         --> 
    242241        <GridSeriesFeature> 
    243242            <value> 
     
    308307            </parameter> 
    309308        </GridSeriesFeature> 
    310  
     309        --> 
     310        <PointSeriesFeature> 
     311            <value> 
     312                <PointSeriesCoverage gml:id="ID003"> 
     313                    <pointSeriesDomain> 
     314                        <TimeSeriesDomain gml:id="ID005"> 
     315                            <time>2006-03 2006-05-04 2006-05-04T18:13:51.0Z 2006</time> 
     316                        </TimeSeriesDomain> 
     317                    </pointSeriesDomain> 
     318                    <gml:rangeSet> 
     319                        <gml:DataBlock> 
     320                            <gml:rangeParameters> 
     321                            </gml:rangeParameters> 
     322                            <gml:doubleOrNilReasonTupleList>http://www.oxygenxml.com/ template unknown unknown 3.14159E0 template withheld 3.14159E0 other:00 template other:00 inapplicable template</gml:doubleOrNilReasonTupleList> 
     323                        </gml:DataBlock> 
     324                    </gml:rangeSet> 
     325                </PointSeriesCoverage> 
     326            </value> 
     327            <parameter> 
     328                <swe:Phenomenon gml:id="ID007"> 
     329                    <gml:identifier codeSpace="http://www.oxygenxml.com/">identifier0</gml:identifier> 
     330                </swe:Phenomenon> 
     331            </parameter> 
     332        </PointSeriesFeature> 
     333         
    311334        </gml:featureMembers> 
    312335        </gml:FeatureCollection> 
Note: See TracChangeset for help on using the changeset viewer.