Permalink
Browse files

Merge commit 'jacob/master'

Conflicts:

	googlecharts/templatetags/charts.py
  • Loading branch information...
2 parents ecbe582 + 9bbb63d commit ed742f0b41813e617fb3c6aaea054ba830077b4c @chrisdrackett chrisdrackett committed Jan 20, 2009
View
@@ -0,0 +1 @@
+*.pyc
View
@@ -357,6 +357,19 @@
<td><img src="http://chart.apis.google.com/chart?chl=head&amp;chs=300x200&amp;cht=gom&amp;chds=0,10&amp;chd=t:5.0" width="300" height="200" /></td>
</tr>
+ <tr>
+ <th colspan="2">Map chart</th>
+ <tr>
+ <td><pre>{% chart %}
+ {% chart-size &quot;440x220&quot; %}
+ {% chart-type &quot;map&quot; %}
+ {% chart-map-area &quot;usa&quot; %}
+ {% chart-map-data mapdata %}
+ {% chart-colors &quot;ffffff&quot; &quot;ff0000&quot; &quot;0000ff&quot; %}
+{% endchart %}</pre></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=440x220&amp;cht=t&amp;chtm=usa&amp;chld=KSCAMN&amp;chco=ffffff,ff0000,0000ff&amp;chd=e:AA..gA" width="440" height="220" /></td>
+ </tr>
+
</tbody>
</table>
</body>
View
@@ -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 "ffffff" "ff0000" "0000ff" %}
+ {% endchart %}
View
@@ -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()
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit ed742f0

Please sign in to comment.