Ignore:
Timestamp:
06/02/12 16:49:57 (8 years ago)
Author:
mnagni
Message:

Imported a new DB library which fixes the MO_ObservationColleciton <--> CEDA_ObservationCollection problem

Location:
mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_aquisitionmetadata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:10 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_cellvaluepair.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19123_2005_coverages.coverages.discrete_coverages.cv_surfacevaluepair import  CV_SurfaceValuePair  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
     
    3940 
    4041        self._collection_cv_discretesolidcoverage = [] 
    41         self._collection_cv_discretepointcoverage = [] 
    42         self._collection_cv_discretecurvecoverage = [] 
     42        self._collection_cvt_discretetimeinstantcoverage = [] 
    4343        self._collection_cv_discretesurfacecoverage = [] 
    4444        self._collection_cv_discretegridpointcoverage = [] 
    45         self._collection_cvt_discretetimeinstantcoverage = [] 
     45        self._collection_cv_discretecurvecoverage = [] 
     46        self._collection_cv_discretepointcoverage = [] 
    4647        self.collection = [] 
    4748        self.value = None 
    4849        self.geometry = None 
    49         self._extension_cv_valuetriangle = [] 
    50         self._extension_cv_thiessenvaluepolygon = [] 
     50        self._extension_cv_valuecurve = [] 
    5151        self._extension_cv_valuehexagon = [] 
    5252        self._extension_cv_gridvaluecell = [] 
    53         self._extension_cv_valuecurve = [] 
     53        self._extension_cv_thiessenvaluepolygon = [] 
     54        self._extension_cv_valuetriangle = [] 
    5455        super(IF_CellValuePair, self).__init__() 
    5556 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_classificationattributetype.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19109_2005_application_schema.general_feature_model.gf_attributetype import  GF_AttributeType  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:10 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 
     
    4041        self.propertyTypeMetadata = [] 
    4142        self.valueDomain = None 
    42         self._characterizeBy_gf_spatialattributetype = [] 
    4343        self._characterizeBy_gf_locationalattributetype = [] 
    4444        self._characterizeBy_gf_thematicattributetype = [] 
    4545        self._characterizeBy_gf_metadataattributetype = [] 
     46        self._characterizeBy_gf_spatialattributetype = [] 
    4647        self._characterizeBy_gf_temporalattributetype = [] 
    4748        self._characterizeBy_if_classificationattributetype = [] 
    4849        self.featureAttributeMetadata = [] 
     50        self.memberName = None 
    4951        self.constrainedBy = [] 
    50         self.memberName = None 
    5152        self.valueType = None 
    5253        self.definition = None 
    5354        self.theGF_FeatureType = None 
    54         self.cardinality = None 
    55         self._characterize_gf_spatialattributetype = None 
    5655        self._characterize_gf_locationalattributetype = None 
    5756        self._characterize_gf_thematicattributetype = None 
    5857        self._characterize_gf_metadataattributetype = None 
     58        self._characterize_gf_spatialattributetype = None 
    5959        self._characterize_gf_temporalattributetype = None 
    6060        self._characterize_if_classificationattributetype = None 
     61        self.cardinality = None 
    6162        super(IF_ClassificationAttributeType, self).__init__() 
    6263 
     
    9495 
    9596    @property 
     97    def memberName(self): 
     98        return self._gf_attributetype.memberName 
     99 
     100    @memberName.setter 
     101    def memberName(self, value): 
     102            self._gf_attributetype.memberName = value 
     103 
     104    @property 
    96105    def constrainedBy(self): 
    97106        return self._gf_attributetype.constrainedBy 
     
    100109    def constrainedBy(self, value): 
    101110            self._gf_attributetype.constrainedBy = value 
    102  
    103     @property 
    104     def memberName(self): 
    105         return self._gf_attributetype.memberName 
    106  
    107     @memberName.setter 
    108     def memberName(self, value): 
    109             self._gf_attributetype.memberName = value 
    110111 
    111112    @property 
     
    134135 
    135136    @property 
     137    def characterize(self): 
     138        return self._gf_attributetype.characterize 
     139 
     140    @characterize.setter 
     141    def characterize(self, value): 
     142            self._gf_attributetype.characterize = value 
     143 
     144    @property 
    136145    def cardinality(self): 
    137146        return self._gf_attributetype.cardinality 
     
    141150            self._gf_attributetype.cardinality = value 
    142151 
    143     @property 
    144     def characterize(self): 
    145         return self._gf_attributetype.characterize 
    146  
    147     @characterize.setter 
    148     def characterize(self, value): 
    149             self._gf_attributetype.characterize = value 
    150  
    151152    def __key(self): 
    152         return (self.propertyTypeMetadata, self.valueDomain, self.characterizeBy, self.featureAttributeMetadata, self.constrainedBy, self.memberName, self.valueType, self.definition, self.theGF_FeatureType, self.cardinality, self.characterize) 
     153        return (self.propertyTypeMetadata, self.valueDomain, self.characterizeBy, self.featureAttributeMetadata, self.memberName, self.constrainedBy, self.valueType, self.definition, self.theGF_FeatureType, self.characterize, self.cardinality) 
    153154 
    154155    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_collection.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_collectionmetadata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_coveragedata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:39 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_dataset.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:47 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_discoverymetadata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:14 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_discretepointcoverage.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_coveragedata import  IF_CoverageData  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_discretesurfacegridcoverage.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_coveragedata import  IF_CoverageData  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:49 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_feature.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_gridcoverage.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_coveragedata import  IF_CoverageData  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_quadgriddeddata.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_gridcoverage import  IF_GridCoverage  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:49 
    2223 
    2324@author: mnagni 
     
    3839        self._if_gridcoverage = IF_GridCoverage()        
    3940 
     41        self.interpolationType = None 
    4042        self.domainExtent = [] 
    41         self.interpolationType = None 
    4243        self.commonPointRule = None 
    4344        self.rangeType = None 
     
    5657 
    5758    def __key(self): 
    58         return (self.domainExtent, self.interpolationType, self.commonPointRule, self.rangeType, self.interpolationParametersType) 
     59        return (self.interpolationType, self.domainExtent, self.commonPointRule, self.rangeType, self.interpolationParametersType) 
    5960 
    6061    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_qualitymetadata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:42 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_riemanngriddeddata.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_gridcoverage import  IF_GridCoverage  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
     
    3839        self._if_gridcoverage = IF_GridCoverage()        
    3940 
     41        self.interpolationType = None 
    4042        self.domainExtent = [] 
    41         self.interpolationType = None 
    4243        self.commonPointRule = None 
    4344        self.rangeType = None 
     
    5657 
    5758    def __key(self): 
    58         return (self.domainExtent, self.interpolationType, self.commonPointRule, self.rangeType, self.interpolationParametersType) 
     59        return (self.interpolationType, self.domainExtent, self.commonPointRule, self.rangeType, self.interpolationParametersType) 
    5960 
    6061    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_structuralmetadata.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:46 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_surface.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:41 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_tiling.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:18 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_tincoverage.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19129_2009_igcd.igcd_framework.if_coveragedata import  IF_CoverageData  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:48 
    2223 
    2324@author: mnagni 
     
    3839        self._if_coveragedata = IF_CoverageData()        
    3940 
     41        self.interpolationType = None 
    4042        self.domainExtent = [] 
    41         self.interpolationType = None 
     43        self.commonPointRule = None 
    4244        self.geometry = None 
    43         self.commonPointRule = None 
    4445        self.rangeType = None 
    4546        self.interpolationParametersType = None 
     
    5960 
    6061    def __key(self): 
    61         return (self.domainExtent, self.interpolationType, self.geometry, self.commonPointRule, self.rangeType, self.interpolationParametersType) 
     62        return (self.interpolationType, self.domainExtent, self.commonPointRule, self.geometry, self.rangeType, self.interpolationParametersType) 
    6263 
    6364    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19129_2009_igcd/igcd_framework/if_transmittal.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 
Note: See TracChangeset for help on using the changeset viewer.