Skip to content

Commit 5a70943

Browse files
author
stephanie
committed
fix naming of result objects to be consistant
1 parent c7e2a0c commit 5a70943

File tree

1 file changed

+66
-58
lines changed

1 file changed

+66
-58
lines changed

‎odm2api/ODM2/models.py‎

Lines changed: 66 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,10 +1523,10 @@ class PointCoverageResults(Results):
15231523
TimeAggregationInterval = Column('timeaggregationinterval', Float(53), nullable=False)
15241524
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', Integer, nullable=False)
15251525

1526-
XUnitObj = relationship(Units, primaryjoin='PointCoverageResults.IntendedXSpacingUnitsID == Units.UnitsID')
1527-
YUnitObj = relationship(Units, primaryjoin='PointCoverageResults.IntendedYSpacingUnitsID == Units.UnitsID')
1526+
IntendedXSpacingUnitsObj = relationship(Units, primaryjoin='PointCoverageResults.IntendedXSpacingUnitsID == Units.UnitsID')
1527+
IntendedYSpacingUnitsObj = relationship(Units, primaryjoin='PointCoverageResults.IntendedYSpacingUnitsID == Units.UnitsID')
15281528
SpatialReferenceObj = relationship(SpatialReferences)
1529-
ZUnitObj = relationship(Units, primaryjoin='PointCoverageResults.ZLocationUnitsID == Units.UnitsID')
1529+
ZLocationUnitsObj = relationship(Units, primaryjoin='PointCoverageResults.ZLocationUnitsID == Units.UnitsID')
15301530
# ResultObj = relationship(Results, primaryjoin='PointCoverageResults.ResultID == Results.ResultID')
15311531
__mapper_args__ = {'polymorphic_identity':'Point coverage'}
15321532

@@ -1549,11 +1549,11 @@ class ProfileResults(Results):
15491549
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
15501550
nullable=False, index=True)
15511551

1552-
TimeUnitObj = relationship(Units, primaryjoin='ProfileResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1553-
ZUnitObj = relationship(Units, primaryjoin='ProfileResults.IntendedZSpacingUnitsID == Units.UnitsID')
1552+
IntendedTimeSpacingUnitsObj = relationship(Units, primaryjoin='ProfileResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1553+
IntendedZSpacingUnitsObj = relationship(Units, primaryjoin='ProfileResults.IntendedZSpacingUnitsID == Units.UnitsID')
15541554
SpatialReferenceObj = relationship(SpatialReferences)
1555-
XUnitObj = relationship(Units, primaryjoin='ProfileResults.XLocationUnitsID == Units.UnitsID')
1556-
YUnitObj = relationship(Units, primaryjoin='ProfileResults.YLocationUnitsID == Units.UnitsID')
1555+
XLocationUnitsObj = relationship(Units, primaryjoin='ProfileResults.XLocationUnitsID == Units.UnitsID')
1556+
YLocationUnitsObj = relationship(Units, primaryjoin='ProfileResults.YLocationUnitsID == Units.UnitsID')
15571557
# ResultObj = relationship(Results, primaryjoin='ProfileResults.ResultID == Results.ResultID')
15581558
__mapper_args__ = {'polymorphic_identity':'Profile Coverage'}
15591559

@@ -1564,15 +1564,19 @@ class CategoricalResults(Results):
15641564

15651565
ResultID = Column('resultid', ForeignKey(Results.ResultID), primary_key=True)
15661566
XLocation = Column('xlocation', Float(53))
1567-
XLocationUnitsID = Column('xlocationunitsid', Integer)
1567+
XLocationUnitsID = Column('xlocationunitsid', Integer, ForeignKey(Units.UnitsID))
15681568
YLocation = Column('ylocation', Float(53))
1569-
YLocationUnitsID = Column('ylocationunitsid', Integer)
1569+
YLocationUnitsID = Column('ylocationunitsid', Integer, ForeignKey(Units.UnitsID))
15701570
ZLocation = Column('zlocation', Float(53))
1571-
ZLocationUnitsID = Column('zlocationunitsid', Integer)
1571+
ZLocationUnitsID = Column('zlocationunitsid', Integer, ForeignKey(Units.UnitsID))
15721572
SpatialReferenceID = Column('spatialreferenceid', ForeignKey(SpatialReferences.SpatialReferenceID))
15731573
QualityCodeCV = Column('qualitycodecv', ForeignKey(CVQualityCode.Name), nullable=False, index=True)
15741574

15751575
SpatialReferenceObj = relationship(SpatialReferences)
1576+
XLocationUnitsObj = relationship(Units, primaryjoin='CategoricalResults.XLocationUnitsID == Units.UnitsID')
1577+
YLocationUnitsObj = relationship(Units, primaryjoin='CategoricalResults.YLocationUnitsID == Units.UnitsID')
1578+
ZLocationUnitsObj = relationship(Units, primaryjoin='CategoricalResults.ZLocationUnitsID == Units.UnitsID')
1579+
15761580
# ResultObj = relationship(Results, primaryjoin='CategoricalResults.ResultID == Results.ResultID')
15771581
__mapper_args__ = {'polymorphic_identity':'Category coverage'}
15781582

@@ -1592,10 +1596,10 @@ class TransectResults(Results):
15921596
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
15931597
nullable=False, index=True)
15941598

1595-
TimeUnitObj = relationship(Units, primaryjoin='TransectResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1596-
TransectUnitObj = relationship(Units, primaryjoin='TransectResults.IntendedTransectSpacingUnitsID == Units.UnitsID')
1599+
IntendedTimeSpacingUnitsObj = relationship(Units, primaryjoin='TransectResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1600+
IntendedTransectSpacingUnitsObj = relationship(Units, primaryjoin='TransectResults.IntendedTransectSpacingUnitsID == Units.UnitsID')
15971601
SpatialReferenceObj = relationship(SpatialReferences)
1598-
ZUnitObj = relationship(Units, primaryjoin='TransectResults.ZLocationUnitsID == Units.UnitsID')
1602+
ZLocationUnitsObj = relationship(Units, primaryjoin='TransectResults.ZLocationUnitsID == Units.UnitsID')
15991603
# ResultObj = relationship(Results, primaryjoin='TransectResults.ResultID == Results.ResultID')
16001604
__mapper_args__ = {'polymorphic_identity':'Transect Coverage'}
16011605

@@ -1617,11 +1621,11 @@ class SpectraResults(Results):
16171621
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
16181622
nullable=False, index=True)
16191623

1620-
WaveUnitObj = relationship(Units, primaryjoin='SpectraResults.IntendedWavelengthSpacingUnitsID == Units.UnitsID')
1624+
IntendedWavelengthSpacingUnitsObj = relationship(Units, primaryjoin='SpectraResults.IntendedWavelengthSpacingUnitsID == Units.UnitsID')
16211625
SpatialReferenceObj = relationship(SpatialReferences)
1622-
XUnitObj = relationship(Units, primaryjoin='SpectraResults.XLocationUnitsID == Units.UnitsID')
1623-
YUnitObj = relationship(Units, primaryjoin='SpectraResults.YLocationUnitsID == Units.UnitsID')
1624-
ZUnitObj = relationship(Units, primaryjoin='SpectraResults.ZLocationUnitsID == Units.UnitsID')
1626+
XLocationUnitsObj = relationship(Units, primaryjoin='SpectraResults.XLocationUnitsID == Units.UnitsID')
1627+
YLocationUnitsObj = relationship(Units, primaryjoin='SpectraResults.YLocationUnitsID == Units.UnitsID')
1628+
ZLocationUnitsObj = relationship(Units, primaryjoin='SpectraResults.ZLocationUnitsID == Units.UnitsID')
16251629
# ResultObj = relationship(Results, primaryjoin='SpectraResults.ResultID == Results.ResultID')
16261630
__mapper_args__ = {'polymorphic_identity':'Spectra coverage'}
16271631

@@ -1653,12 +1657,11 @@ class TimeSeriesResults(Results):
16531657
# ResultObj = relationship(Results, primaryjoin='TimeSeriesResults.ResultID == Results.ResultID')
16541658
__mapper_args__ = {'polymorphic_identity':'Time series coverage'}
16551659

1656-
def __repr__(self):
1657-
return "<TimeSeriesResult('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')>" % \
1658-
( self.FeatureActionID, self.ProcessingLevelID, self.VariableID, self.ProcessinglevelID,
1659-
self.self.XLocation, self.YLocation,
1660-
self.ResultTypeCV,
1661-
self.IntendedTimeSpacing, self.AggregationStatisticCV)
1660+
# def __repr__(self):
1661+
# return "<TimeSeriesResults('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')>" % \
1662+
# ( self.FeatureActionID, self.ProcessingLevelID, self.VariableID,
1663+
# self.self.XLocation, self.YLocation, self.ResultTypeCV,
1664+
# self.IntendedTimeSpacing, self.AggregationStatisticCV)
16621665

16631666

16641667
class SectionResults(Results):
@@ -1678,11 +1681,11 @@ class SectionResults(Results):
16781681
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
16791682
nullable=False, index=True)
16801683

1681-
TimeUnitObj = relationship(Units, primaryjoin='SectionResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1682-
XUnitObj = relationship(Units, primaryjoin='SectionResults.IntendedXSpacingUnitsID == Units.UnitsID')
1683-
ZUnitObj = relationship(Units, primaryjoin='SectionResults.IntendedZSpacingUnitsID == Units.UnitsID')
1684+
IntendedTimeSpacingUnitsObj = relationship(Units, primaryjoin='SectionResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1685+
IntendedXSpacingUnitsObj = relationship(Units, primaryjoin='SectionResults.IntendedXSpacingUnitsID == Units.UnitsID')
1686+
IntendedZSpacingUnitsObj = relationship(Units, primaryjoin='SectionResults.IntendedZSpacingUnitsID == Units.UnitsID')
16841687
SpatialReferenceObj = relationship(SpatialReferences)
1685-
YUnitObj = relationship(Units, primaryjoin='SectionResults.YLocationUnitsID == Units.UnitsID')
1688+
YLocationUnitsObj = relationship(Units, primaryjoin='SectionResults.YLocationUnitsID == Units.UnitsID')
16861689
# ResultObj = relationship(Results, primaryjoin='SectionResults.ResultID == Results.ResultID')
16871690
__mapper_args__ = {'polymorphic_identity':'Section coverage'}
16881691

@@ -1700,8 +1703,8 @@ class TrajectoryResults(Results):
17001703
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
17011704
nullable=False, index=True)
17021705

1703-
TimeUnitObj = relationship(Units, primaryjoin='TrajectoryResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1704-
TrajectoryUnitObj = relationship(Units,
1706+
IntendedTimeSpacingUnitsObj = relationship(Units, primaryjoin='TrajectoryResults.IntendedTimeSpacingUnitsID == Units.UnitsID')
1707+
IntendedTrajectorySpacingUnitsObj = relationship(Units,
17051708
primaryjoin='TrajectoryResults.IntendedTrajectorySpacingUnitsID == Units.UnitsID')
17061709
SpatialReferenceObj = relationship(SpatialReferences)
17071710
# ResultObj = relationship(Results, primaryjoin='TrajectoryResults.ResultID == Results.ResultID')
@@ -1729,7 +1732,7 @@ class MeasurementResults(Results):
17291732
nullable=False)
17301733

17311734
SpatialReferenceObj = relationship(SpatialReferences)
1732-
TimeUnitObj = relationship(Units, primaryjoin='MeasurementResults.TimeAggregationIntervalUnitsID == Units.UnitsID')
1735+
TimeAggregationIntervalUnitsObj = relationship(Units, primaryjoin='MeasurementResults.TimeAggregationIntervalUnitsID == Units.UnitsID')
17331736
XLocationUnitsObj = relationship(Units, primaryjoin='MeasurementResults.XLocationUnitsID == Units.UnitsID')
17341737
YLocationUnitsObj = relationship(Units, primaryjoin='MeasurementResults.YLocationUnitsID == Units.UnitsID')
17351738
ZLocationUnitsObj = relationship(Units, primaryjoin='MeasurementResults.ZLocationUnitsID == Units.UnitsID')
@@ -1753,7 +1756,7 @@ class CategoricalResultValues(Base):
17531756
ValueDateTime = Column('valuedatetime', DateTime, nullable=False)
17541757
ValueDateTimeUTCOffset = Column('valuedatetimeutcoffset', Integer, nullable=False)
17551758

1756-
CategoricalResultObj = relationship(CategoricalResults)
1759+
ResultObj = relationship(CategoricalResults)
17571760

17581761

17591762
class MeasurementResultValues(Base):
@@ -1766,7 +1769,7 @@ class MeasurementResultValues(Base):
17661769
ValueDateTime = Column('valuedatetime', DateTime, nullable=False)
17671770
ValueDateTimeUTCOffset = Column('valuedatetimeutcoffset', Integer, nullable=False)
17681771

1769-
MeasurementResultObj = relationship(MeasurementResults)
1772+
ResultObj = relationship(MeasurementResults)
17701773

17711774
def __repr__(self):
17721775
return "<MeasValues('%s', '%s', '%s')>" % (self.DataValue, self.ValueDateTime, self.ResultID)
@@ -1788,9 +1791,9 @@ class PointCoverageResultValues(Base):
17881791
CensorCodeCV = Column('censorcodecv', ForeignKey(CVCensorCode.Name), nullable=False, index=True)
17891792
QualityCodeCV = Column('qualitycodecv', ForeignKey(CVQualityCode.Name), nullable=False, index=True)
17901793

1791-
PointCoverageResultObj = relationship(PointCoverageResults)
1792-
XUnitObj = relationship(Units, primaryjoin='PointCoverageResultValues.XLocationUnitsID == Units.UnitsID')
1793-
YUnitObj = relationship(Units, primaryjoin='PointCoverageResultValues.YLocationUnitsID == Units.UnitsID')
1794+
ResultObj = relationship(PointCoverageResults)
1795+
XLocationUnitsObj = relationship(Units, primaryjoin='PointCoverageResultValues.XLocationUnitsID == Units.UnitsID')
1796+
YLocationUnitsobj = relationship(Units, primaryjoin='PointCoverageResultValues.YLocationUnitsID == Units.UnitsID')
17941797

17951798

17961799
class ProfileResultValues(Base):
@@ -1811,9 +1814,9 @@ class ProfileResultValues(Base):
18111814
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID),
18121815
nullable=False)
18131816

1814-
ProfileResultObj = relationship(ProfileResults)
1815-
TimeUnitObj = relationship(Units, primaryjoin='ProfileResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1816-
ZUnitObj = relationship(Units, primaryjoin='ProfileResultValues.ZLocationUnitsID == Units.UnitsID')
1817+
ResultObj = relationship(ProfileResults)
1818+
TimeAggregationIntervalUnitsObj = relationship(Units, primaryjoin='ProfileResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1819+
ZLocationUnitsObj = relationship(Units, primaryjoin='ProfileResultValues.ZLocationUnitsID == Units.UnitsID')
18171820

18181821

18191822
class SectionResultValues(Base):
@@ -1839,10 +1842,10 @@ class SectionResultValues(Base):
18391842
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID),
18401843
nullable=False)
18411844

1842-
SectionResultObj = relationship(SectionResults)
1843-
TimeUnitObj = relationship(Units, primaryjoin='SectionResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1844-
XUnitObj = relationship(Units, primaryjoin='SectionResultValues.XLocationUnitsID == Units.UnitsID')
1845-
ZUnitObj = relationship(Units, primaryjoin='SectionResultValues.ZLocationUnitsID == Units.UnitsID')
1845+
ResultObj = relationship(SectionResults)
1846+
TimeAggregationIntervalUnitsObj = relationship(Units, primaryjoin='SectionResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1847+
XLocationUnitsObj = relationship(Units, primaryjoin='SectionResultValues.XLocationUnitsID == Units.UnitsID')
1848+
ZLocationUnitsObj = relationship(Units, primaryjoin='SectionResultValues.ZLocationUnitsID == Units.UnitsID')
18461849

18471850

18481851
class SpectraResultValues(Base):
@@ -1863,9 +1866,9 @@ class SpectraResultValues(Base):
18631866
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID),
18641867
nullable=False)
18651868

1866-
SpectraResultObj = relationship(SpectraResults)
1867-
TimeUnitObj = relationship(Units, primaryjoin='SpectraResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1868-
WavelengthUnitObj = relationship(Units, primaryjoin='SpectraResultValues.WavelengthUnitsID == Units.UnitsID')
1869+
ResultObj = relationship(SpectraResults)
1870+
TimeAggregationIntervalUnitsObj = relationship(Units, primaryjoin='SpectraResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1871+
WavelengthUnitsObj = relationship(Units, primaryjoin='SpectraResultValues.WavelengthUnitsID == Units.UnitsID')
18691872

18701873

18711874
class TimeSeriesResultValues(Base):
@@ -1883,8 +1886,8 @@ class TimeSeriesResultValues(Base):
18831886
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID),
18841887
nullable=False)
18851888

1886-
TimeSeriesResultObj = relationship(TimeSeriesResults)
1887-
TimeUnitObj = relationship(Units)
1889+
ResultObj = relationship(TimeSeriesResults)
1890+
TimeAggregationIntervalUnitsObj = relationship(Units)
18881891

18891892
def get_columns(self):
18901893
return ["ValueID", "ResultID", "DataValue", "ValueDateTime", "ValueDateTimeUTCOffset",
@@ -1924,12 +1927,12 @@ class TrajectoryResultValues(Base):
19241927
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID),
19251928
nullable=False)
19261929

1927-
TrajectoryResultObj = relationship(TrajectoryResults)
1928-
TimeUnitObj = relationship(Units,
1930+
ResultObj = relationship(TrajectoryResults)
1931+
TimeAggregationIntervalUnitsObj = relationship(Units,
19291932
primaryjoin='TrajectoryResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1930-
XUnitObj = relationship(Units, primaryjoin='TrajectoryResultValues.XLocationUnitsID == Units.UnitsID')
1931-
YUnitObj = relationship(Units, primaryjoin='TrajectoryResultValues.YLocationUnitsID == Units.UnitsID')
1932-
ZUnitObj = relationship(Units, primaryjoin='TrajectoryResultValues.ZLocationUnitsID == Units.UnitsID')
1933+
XLocationUnitsObj = relationship(Units, primaryjoin='TrajectoryResultValues.XLocationUnitsID == Units.UnitsID')
1934+
YLocationUnitsObj = relationship(Units, primaryjoin='TrajectoryResultValues.YLocationUnitsID == Units.UnitsID')
1935+
ZLocationUnitsObj = relationship(Units, primaryjoin='TrajectoryResultValues.ZLocationUnitsID == Units.UnitsID')
19331936

19341937

19351938
class TransectResultValues(Base):
@@ -1942,20 +1945,25 @@ class TransectResultValues(Base):
19421945
ValueDateTime = Column('valuedatetime', DateTime, nullable=False)
19431946
ValueDateTimeUTCOffset = Column('valuedatetimeutcoffset', DateTime, nullable=False)
19441947
XLocation = Column('xlocation', Float(53), nullable=False)
1945-
XLocationUnitsID = Column('xlocationunitsid', Integer, nullable=False)
1948+
XLocationUnitsID = Column('xlocationunitsid', ForeignKey(Units.UnitsID), nullable=False)
19461949
YLocation = Column('ylocation', Float(53), nullable=False)
1947-
YLocationUnitsID = Column('ylocationunitsid', Integer, nullable=False)
1950+
YLocationUnitsID = Column('ylocationunitsid', ForeignKey(Units.UnitsID), nullable=False)
19481951
TransectDistance = Column('transectdistance', Float(53), nullable=False)
19491952
TransectDistanceAggregationInterval = Column('transectdistanceaggregationinterval', Float(53), nullable=False)
1950-
TransectDistanceUnitsID = Column('transectdistanceunitsid', Integer, nullable=False)
1953+
TransectDistanceUnitsID = Column('transectdistanceunitsid', ForeignKey(Units.UnitsID), nullable=False)
19511954
CensorCodeCV = Column('censorcodecv', ForeignKey(CVCensorCode.Name), nullable=False, index=True)
19521955
QualityCodeCV = Column('qualitycodecv', ForeignKey(CVQualityCode.Name), nullable=False, index=True)
19531956
AggregationStatisticCV = Column('aggregationstatisticcv', ForeignKey(CVAggregationStatistic.Name),
19541957
nullable=False, index=True)
19551958
TimeAggregationInterval = Column('timeaggregationinterval', Float(53), nullable=False)
1956-
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', Integer, nullable=False)
1957-
1958-
TransectResultObj = relationship(TransectResults)
1959+
TimeAggregationIntervalUnitsID = Column('timeaggregationintervalunitsid', ForeignKey(Units.UnitsID), nullable=False)
1960+
1961+
ResultObj = relationship(TransectResults)
1962+
TimeAggregationIntervalUnitsObj = relationship(Units,
1963+
primaryjoin='TransectResultValues.TimeAggregationIntervalUnitsID == Units.UnitsID')
1964+
XLocationUnitsObj = relationship(Units, primaryjoin='TransectResultValues.XLocationUnitsID == Units.UnitsID')
1965+
YLocationUnitsObj = relationship(Units, primaryjoin='TransectResultValues.YLocationUnitsID == Units.UnitsID')
1966+
TransectDistanceUnitsObj = relationship(Units, primaryjoin='TransectResultValues.TransectDistanceUnitsID == Units.UnitsID')
19591967

19601968

19611969
class CategoricalResultValueAnnotations(Base):

0 commit comments

Comments
 (0)