Merge pull request #1 from Vizzuality/master

google's update

README.md

@@ -27,7 +27,10 @@ The tool is intended to be use directly online (still pending the final URL) so
    * Go to the src folder cd `src`
    * Run it using the following script: `tools/start`. Leave the window open, the application should be running.
 6. Create an initial report
-   * Open a new Terminal window, leaving the other open, and run `curl -d '' "http://localhost:8080/_ah/cmd/create_report?year=2011&month=7&day=15"`
+   * Open a new Terminal window, leaving the other open,
+   * Initialize fusion tables: curl "http://localhost:8080/_ah/cmd/fusion_tables_names"
+   * Create an unclosed report curl -d '' "http://localhost:8080/_ah/cmd/create_report?year=2011&month=7&day=15"
+   * If you'd like, create an closed report curl -d '' "http://localhost:8080/_ah/cmd/create_report?year=2011&month=8&day=15&fyear=2011&fmonth=9&fday=15&assetid=SAD_VALIDATED/SAD_2010_05"
 7. Start using the app.
    * You should now be able to go to http://localhost:8080 and start using the application locally.
    * When loggin in dont forget to set yourself as admin.

src/application/api.py

@@ -14,6 +14,8 @@
 from flask import jsonify, request, abort, Response
 from app import app
 import settings
+from report_types import ReportType, CSVReportType, KMLReportType
+from kml import path_to_kml
 
 from models import Area, Note, Report, StatsStore, FustionTablesNames
 from ee import NDFI, EELandsat, Stats
@@ -43,11 +45,11 @@
 RegionStatsAPI.add_urls(app, '/api/v0/report/<report_id>/stats')
 RegionStatsAPI.add_custom_url(app, '/api/v0/stats/polygon', 'polygon', methods=('POST',))
 
-
 #TODO: this function needs a huge refactor
-@app.route('/api/v0/stats/<table>/<zone>')
+@app.route('/api/v0/stats/<table>/<format>/<zone>')
+@app.route('/api/v0/stats/<table>/<format>')
 @app.route('/api/v0/stats/<table>')
-def stats(table, zone=None):
+def stats(table, zone=None, format="csv"):
 
     reports = request.args.get('reports', None)
     if not reports:
@@ -57,67 +59,33 @@ def stats(table, zone=None):
     except ValueError:
         logging.error("bad format for report id")
         abort(400)
+
+    this_report = ReportType.factory(format)
+    this_report.init(zone)
+    this_report.write_header()
 
-    f = StringIO()
-    csv_file = csv.writer(f)
+    logging.info("table id is %s ", table) 
+    logging.info("and we see %s ", FustionTablesNames.all().filter('table_id =', table).fetch(1))
+    logging.info("and zone %s ", zone)
+    logging.info("and format %s ", format)
 
-    table_names = FustionTablesNames.all().filter('table_id =', table).fetch(1)[0].as_dict()
+    reports = [Report.get_by_id(x) for x in reports]
+    for r in reports:
+        if not r:
+            logging.error("report not found")
+            abort(404)
+
+        stats = this_report.get_stats(r, table)
 
-    # return the stats for each zone
-    if not zone:
-        csv_file.writerow(('report_id', 'start_date', 'end_date','zone_id', 'deforested', 'degraded'))
-        reports = [Report.get_by_id(x) for x in reports]
-        for r in reports:
-            if not r:
-                logging.error("report not found")
-                abort(404)
-            st = StatsStore.get_for_report(str(r.key()))
-            if not st:
-                logging.error("no stats for report")
-                abort(404)
-            stats = st.for_table(table)
-            for s in stats:
-                name = table_names.get(s['id'], s['id'])
-                csv_file.writerow((str(r.key().id()),
-                        r.start.isoformat(),
-                        r.end.isoformat(),
-                        name,
-                        s['def'],
-                        s['deg']))
-
-    else:
-        csv_file.writerow(('report_id', 'start_date', 'end_date', 'deforested', 'degraded'))
-        reports = [Report.get_by_id(x) for x in reports]
-        for r in reports:
-            if not r:
-                abort(404)
-            report_id = str(r.key())
-            st = StatsStore.get_for_report(report_id)
-
-            if not st:
-                logging.error("no cached stats for %s" % report_id)
-                abort(404)
-
-            stats = st.table_accum(table, zone)
-            if not stats:
-                logging.error("no stats for %s" % report_id)
-                abort(404)
-
-            csv_file.writerow((str(r.key().id()),
-                    r.start.isoformat(),
-                    r.end.isoformat(),
-                    stats['def'],
-                stats['deg']))
-
-    return Response(f.getvalue(),
-            headers={
-                "Content-Disposition": "attachment; filename=\"report_%s.csv\"" % table
-            },
-            mimetype='text/csv')
-
-
-@app.route('/api/v0/stats/polygon/csv')
-def polygon_stats_csv():
+        for s in stats:
+            this_report.write_row(r, s, table)
+
+    this_report.write_footer()
+    return this_report.response("report_%s" % table)
+
+
+@app.route('/api/v0/stats/polygon/<format>')
+def polygon_stats(format=None):
     reports = request.args.get('reports', None)
     if not reports:
         abort(400)
@@ -132,30 +100,27 @@ def polygon_stats_csv():
     except ValueError:
         logging.error("can't find some report")
         abort(404)
+
     #TODO: test if polygon is ccw
     # exchange lat, lon -> lon, lat
     polygon = json.loads(request.args.get('polygon', None))
+    polygon.append(polygon[0])
     if not polygon:
         abort(404)
     ee = Stats()
     normalized_poly = [(coord[1], coord[0]) for coord in polygon]
     stats = ee.get_stats_for_polygon([(str(r.key().id()), r.assetid) for r in reports], [normalized_poly])
+
+    this_report = ReportType.factory(format)
+    this_report.init("custom polygon")
     try:
-        f = StringIO()
-        csv_file = csv.writer(f)
-        csv_file.writerow(('report_id', 'start_date', 'end_date', 'deforested', 'degraded'))
+        this_report.write_header()
         for i,s in enumerate(stats):
             r = reports[i]
-            csv_file.writerow((str(r.key().id()),
-                    r.start.isoformat(),
-                    r.end.isoformat(),
-                    s['def'],
-                    s['deg']))
-        return Response(f.getvalue(),
-                headers={
-                    "Content-Disposition": "attachment; filename=\"polygon.csv\""
-                },
-                mimetype='text/csv')
+            this_report.write_row(r, s, None, path_to_kml([polygon]))
+
+        this_report.write_footer()
+        return this_report.response("report_polygon")
     except (KeyError, ValueError, IndexError):
         abort(404)
 

src/application/commands.py

@@ -229,7 +229,7 @@ def update_total_stats_for_report(report_id):
     r = Report.get(Key(report_id))
     stats = StatsStore.get_for_report(report_id)
     if stats:
-        s = stats.table_accum(tables_map['Legal Amazon'])
+        s = stats.table_accum(tables_map['Legal Amazon'])[0]
         logging.info("stats for %s" % s)
         if s:
             r.degradation = s['deg']