diff --git a/urbansim/server/urbansimd.py b/urbansim/server/urbansimd.py index 8f4aff42..e80adc36 100644 --- a/urbansim/server/urbansimd.py +++ b/urbansim/server/urbansimd.py @@ -253,8 +253,12 @@ def resp(): @route('/report_data/', method="GET") def return_data(item): + recs = None + config = None + template = None + def isChart(i): - return True + return "chart" in i if isChart(item): config = open(os.path.join(misc.charts_dir(), item)).read() @@ -266,12 +270,12 @@ def chart_type(c): if chart_type(item) == "bar-chart": recs = get_chart_data(config) template = """ -

%s

+

%s

""" % (config['desc'], item, item[:-5], config['groupby'], config['metric']) - # ids wouldnt work without [:-5] - s = simplejson.dumps( - {'template': template, 'data': [{'key': '', 'values': recs}]}, - use_decimal=True - ) - print "response: %s\n" % s - return jsonp(request, s) + # ids wouldn't not work without the [:-5] + else: # map + config = open(os.path.join(misc.maps_dir(), item)).read() + config = json.loads(config) + recs = get_chart_data(config) + template = """ +

%s

+
+
+ """ % (config['desc'], item) + + s = simplejson.dumps( + {'template': template, 'data': [{'key': '', 'values': recs}], + 'config': config}, + use_decimal=True + ) + print "response: %s\n" % s + return jsonp(request, s) @route('/datasets')