Merge pull request #199 from azavea/feature/no_daily_indicators

Remove raw daily indicators
azavea · Dec 30, 2016 · eaec024 · eaec024
2 parents 7fd6b0b + e0fc75b
commit eaec024
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/django/climate_change_api/indicators/indicators.py b/django/climate_change_api/indicators/indicators.py
@@ -7,9 +7,8 @@
 from .abstract_indicators import (Indicator, CountIndicator, BasetempIndicatorMixin,
                                   YearlyMaxConsecutiveDaysIndicator, YearlySequenceIndicator)
 from .params import DegreeDayIndicatorParams, Percentile1IndicatorParams, Percentile99IndicatorParams
-from .unit_converters import (TemperatureUnitsMixin, PrecipUnitsMixin, PrecipRateUnitsMixin,
-                              DaysUnitsMixin, CountUnitsMixin, TemperatureDeltaUnitsMixin,
-                              SECONDS_PER_DAY)
+from .unit_converters import (TemperatureUnitsMixin, PrecipUnitsMixin, DaysUnitsMixin,
+                              CountUnitsMixin, TemperatureDeltaUnitsMixin, SECONDS_PER_DAY)
 
 
 ##########################
@@ -177,30 +176,6 @@ def aggregate(self):
         return super(HeatWaveDurationIndex, self).aggregate()
 
 
-##########################
-# Raw value indicators
-
-class LowTemperature(TemperatureUnitsMixin, Indicator):
-    label = 'Low Temperature'
-    description = ('Daily low temperature')
-    valid_aggregations = ('daily',)
-    variables = ('tasmin',)
-
-
-class HighTemperature(TemperatureUnitsMixin, Indicator):
-    label = 'High Temperature'
-    description = ('Daily high temperature')
-    valid_aggregations = ('daily',)
-    variables = ('tasmax',)
-
-
-class Precipitation(PrecipRateUnitsMixin, Indicator):
-    label = 'Precipitation'
-    description = ('Daily precipitation')
-    valid_aggregations = ('daily',)
-    variables = ('pr',)
-
-
 def list_available_indicators():
     """ List the defined class members of this module as the available indicators """
     class_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)

diff --git a/django/climate_change_api/indicators/tests/test_indicators.py b/django/climate_change_api/indicators/tests/test_indicators.py
@@ -76,8 +76,8 @@ def test_unit_conversion(self):
 
 
 class DailyHighTemperatureTestCase(TemperatureIndicatorTests, TestCase):
-    indicator_class = indicators.HighTemperature
-    indicator_name = 'high_temperature'
+    indicator_class = indicators.AverageHighTemperature
+    indicator_name = 'average_high_temperature'
     time_aggregation = 'daily'
     units = 'K'
     test_indicator_rcp85_equals = {'2000-01-01': {'avg': 35.0, 'max': 40.0, 'min': 30.0}}