diff --git a/index.html b/index.html
index 4f7fcc8..e4112c1 100644
--- a/index.html
+++ b/index.html
@@ -120,6 +120,13 @@
tempgraphs[tempgraphs.length-1].id = "tempscale";
humidgraphs[humidgraphs.length-1].id = "humidscale";
+ humidgraphs.push(
+ {"type": "column", "valueField": "rainfall",
+ "fixedColumnWidth": 1,
+ "fillColors": colorss,
+ "title": "降水量(三田)", "valueAxis": "v2",
+ "balloonText": "降水量 [[value]]mm" });
+
var tempchart= AmCharts.makeChart("tempdiv", {
"type": "serial",
"dataProvider": data,
@@ -134,7 +141,10 @@
fillAlpha: 0.1,
lineAlpha: 0
}]
- }],
+ }, {
+ id: 'v2',
+ position: "right",
+ }],
"chartScrollbar": {
"autoGridCount": true,
"graph": "tempscale",
@@ -243,7 +253,12 @@
inside: true,
fillAlpha: 0.1,
lineAlpha: 0
- }]}],
+ }]}, {
+ id: 'v2',
+ axisAlpha: 0,
+ labelsEnabled: false,
+ maximum:100,
+ }],
"listeners": [{
"event": "zoomed",
"method": syncZoom
diff --git a/merge.py b/merge.py
index d1d313c..25f0965 100755
--- a/merge.py
+++ b/merge.py
@@ -25,7 +25,7 @@
tmp=filter(lambda x: x["datetime"] >= frm_s and x["datetime"] <= to_s, r1)
if tmp == []: continue
result+=(tmp)
- r1 = csv.DictReader(lzma.LZMAFile("JMA.csv.xz"), fieldnames=["datetime", "temp-jma", "humid-jma"])
+ r1 = csv.DictReader(lzma.LZMAFile("JMA.csv.xz"), fieldnames=["datetime", "temp-jma", "humid-jma", "rainfall"])
tmp=filter(lambda x: x["datetime"] >= frm_s and x["datetime"] <= to_s, r1)
result += (tmp)