Shift the API to unify the plots.

Antoine Goutenoir
1 parent 4c862b54
Showing 3 changed files with 17 additions and 4 deletions Show diff stats
.travis.yml
VERSION
flaskr/controllers/main_controller.py
@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "pypy"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: make test
-0.1.0-1-g9621b8a
+0.2.0-1-gcae7d69
@@ -91,7 +91,7 @@ def estimate():
         return redirect(url_for(
             endpoint=".consult_estimation",
             public_id=estimation.public_id,
-            format='html'
+            extension='html'
         ))
         # return render_template("estimate-debrief.html", form=form)
  
@@ -320,9 +320,10 @@ def compute():  # process the queue of estimation requests
         cities_mean = [cities_mean_dict[k] for k in cities_mean_dict.keys()]
         cities_mean = sorted(cities_mean, key=lambda c: c['footprint'])
  
-        _results['mean_footprint'] = {
+        _results['mean_footprint'] = {  # DEPRECATED?
             'cities': cities_mean
         }
+        _results['cities'] = cities_mean
  
         _results['total'] = total  # DEPRECATED
         _results['footprint'] = total
@@ -422,7 +423,8 @@ def consult_estimation(public_id, extension):
         else:
             return render_template(
                 "estimation.html",
-                estimation=estimation
+                estimation=estimation,
+                estimation_output=estimation.get_output_dict(),
             )
  
     elif extension in ['yaml', 'yml']: