svn commit: r1566132 - /incubator/climate/trunk/ocw-ui/backend/processing.py

[jo...@apache.org]

Author: joyce
Date: Sat Feb  8 21:00:30 2014
New Revision: 1566132

URL: http://svn.apache.org/r1566132
Log:
CLIMATE-332 - Fix import error and update helper documentation in processing

Modified:
    incubator/climate/trunk/ocw-ui/backend/processing.py

Modified: incubator/climate/trunk/ocw-ui/backend/processing.py
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/ocw-ui/backend/processing.py?rev=1566132&r1=1566131&r2=1566132&view=diff
==============================================================================
--- incubator/climate/trunk/ocw-ui/backend/processing.py (original)
+++ incubator/climate/trunk/ocw-ui/backend/processing.py Sat Feb  8 21:00:30 2014
@@ -30,6 +30,8 @@ import ocw.dataset_processor as dsp
 from ocw.evaluation import Evaluation
 import ocw.metrics as metrics
 
+import numpy as np
+
 processing_app = Bottle()
 
 @processing_app.route('/run_evaluation/')
@@ -285,8 +287,6 @@ def _calculate_new_latlon_bins(eval_boun
     :param eval_bounds: The time and lat/lon bounds for the evaluation.
         Must be of the form:
         {
-            'start_time': request.query.start_time,
-            'end_time': request.query.end_time,
             'lat_min': request.query.lat_min,
             'lat_max': request.query.lat_max,
             'lon_min': request.query.lon_min,
@@ -302,8 +302,8 @@ def _calculate_new_latlon_bins(eval_boun
 
     :returns: The new lat/lon value lists as a tuple of the form (new_lats, new_lons)
     '''
-    new_lats = np.arange(eval_bounds['min_lat'], eval_bounds['max_lat'], lat_grid_step)
-    new_lons = np.arange(eval_bounds['min_lon'], eval_bounds['max_lon'], lon_grid_step)
+    new_lats = np.arange(eval_bounds['lat_min'], eval_bounds['lat_max'], lat_grid_step)
+    new_lons = np.arange(eval_bounds['lon_min'], eval_bounds['lon_max'], lon_grid_step)
     return (new_lats, new_lons)
 
 def _load_metrics(metric_names):