.gitignore
@@ -357,6 +357,19 @@
<td><img src="http://chart.apis.google.com/chart?chl=head&chs=300x200&cht=gom&chds=0,10&chd=t:5.0" width="300" height="200" /></td>
</tr>
+ <tr>
+ <th colspan="2">Map chart</th>
+ <tr>
+ <td><pre>{% chart %}
+ {% chart-size "440x220" %}
+ {% chart-type "map" %}
+ {% chart-map-area "usa" %}
+ {% chart-map-data mapdata %}
+ {% chart-colors "fffffff" "ff0000" "0000ff" %}
+{% endchart %}</pre></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=440x220&cht=t&chtm=usa&chld=KSCAMN&chco=fffffff,ff0000,0000ff&chd=e:AA..gA" width="440" height="220" /></td>
+ </tr>
+
</tbody>
</table>
</body>
docs/examples.html
@@ -337,4 +337,17 @@ Google-o-meter chart, with data scaling
{% chart-data-scale "0,10" %}
{% chart-data "5" %}
{% endchart %}
+
+Map chart
+---------
+
+::
+
+ {% chart %}
+ {% chart-size "440x220" %}
+ {% chart-type "map" %}
+ {% chart-map-area "usa" %}
+ {% chart-map-data mapdata %}
+ {% chart-colors "fffffff" "ff0000" "0000ff" %}
+ {% endchart %}
docs/examples.txt
@@ -19,6 +19,7 @@ def render_examples():
'data3' : [i**2 for i in range(20, 0, -1)],
'data4' : [sin(i/5.0)*5 for i in range(100)],
'venn' : [100, 80, 60, 30, 30, 30, 10],
+ 'mapdata': {'KS': 0, 'CA': 100, "MN": 50},
}
examples = []
source = Path(__file__).parent.child("examples.txt").read_file()
docs/render-examples.py
@@ -100,6 +100,9 @@ class Chart(object):
return s
def url(self):
+ if self.options.get('cht', None) == 't':
+ self.datasets.append(self.options.pop("_mapdata"))
+
# Figure out the chart's data range
if not self.datarange:
maxvalue = max(max(d) for d in self.datasets if d)
@@ -266,6 +269,7 @@ def chart_type(arg):
* 'pie-3d'
* 'venn'
* 'scatter'
+ * 'map'
"""
types = {
@@ -283,6 +287,7 @@ def chart_type(arg):
'venn': 'v',
'scatter': 's',
'google-o-meter': 'gom',
+ 'map': 't',
}
return {"cht": types.get(arg, arg)}
@@ -415,6 +420,22 @@ def chart_markers(dataset_index, iterable):
return {"chm": smart_join("|", markers)}
+@option("chart-map-area")
+def chart_map_area(where):
+ return {'chtm': where}
+
+@option("chart-map-data")
+def chart_map_data(data):
+ place_list = []
+ value_list = []
+ for (k, v) in data.items():
+ place_list.append(k)
+ value_list.append(v)
+ return {
+ "chld": smart_join("", *place_list),
+ "_mapdata": value_list
+ }
+
#
# {% axis %}
#
templatetags/charts.py
f5310391610aa229c8bb583fe36f30703a558c47
Jacob Kaplan-Moss
jacob@jacobian.org
http://github.com/jacobian/django-googlecharts/commit/9c0002f0d42e8334e32adab0386b6bbf814461b6
9c0002f0d42e8334e32adab0386b6bbf814461b6
2008-10-21T10:00:08-07:00
2008-10-21T10:00:08-07:00
Added support for map type.
09be56e8792a755554bad0efba95ce4a59bea798
Jacob Kaplan-Moss
jacob@jacobian.org