From 4a786d998f46bb421110b377282e498e00a3b3b5 Mon Sep 17 00:00:00 2001
From: Markus Birth <mbirth@gmail.com>
Date: Sun, 4 Sep 2016 21:22:15 +0200
Subject: [PATCH] Split tweet template into includes.

---
 _graph_templates/colours.txt                  |  2 +-
 .../includes/hourly_rain_sum_dual.xml         | 23 +++++++++++
 _graph_templates/tweet.png.xml                | 39 +------------------
 3 files changed, 26 insertions(+), 38 deletions(-)
 create mode 100644 _graph_templates/includes/hourly_rain_sum_dual.xml

diff --git a/_graph_templates/colours.txt b/_graph_templates/colours.txt
index 0c40349..6b03fa3 100644
--- a/_graph_templates/colours.txt
+++ b/_graph_templates/colours.txt
@@ -5,8 +5,8 @@ rgb "#b71c1c" - Day max. temp. (Red 900)
 rgb "#607d8b" - Night temperature (Blue-Grey 500)
 rgb "#263238" - Night min. temp. (Blue-Grey 900)
 rgb "#2196f3" - Rain (Blue 500)
+rgb "#283593" - Rain overall (Indigo 800)
 
 Untested:
 rgb "#ba68c8" - Dewpoint (Purple 300)
 rgb "#4caf50" - Wind (Green 500)
-
diff --git a/_graph_templates/includes/hourly_rain_sum_dual.xml b/_graph_templates/includes/hourly_rain_sum_dual.xml
new file mode 100644
index 0000000..d836e0f
--- /dev/null
+++ b/_graph_templates/includes/hourly_rain_sum_dual.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <plot>
+    <bmargin>1.6</bmargin>
+    <title>Niederschlag (㎜)</title>
+    <yrange>0, 6</yrange>
+    <y2range>0, 30</y2range>
+    <ylabel>stündl.</ylabel>
+    <y2label>gesamt</y2label>
+    <source>hourly</source>
+    <subplot>
+      <colour>rgb "#2196F3"</colour>
+      <style>box</style>
+      <xcalc>data['idx'].replace(minute=30, second=0)</xcalc>
+      <ycalc>data['rain']</ycalc>
+      <title>stündl.</title>
+    </subplot>
+    <subplot>
+      <colour>rgb "#283593"</colour>
+      <axes>x1y2</axes>
+      <ycalc>data['rain'] + last_ycalc</ycalc>
+      <title>gesamt</title>
+    </subplot>
+  </plot>
diff --git a/_graph_templates/tweet.png.xml b/_graph_templates/tweet.png.xml
index 98cc299..23bc5c9 100644
--- a/_graph_templates/tweet.png.xml
+++ b/_graph_templates/tweet.png.xml
@@ -9,41 +9,6 @@
   <xformat>%H%M</xformat>
   <xlabel></xlabel>
   <dateformat></dateformat>
-  <plot>
-    <bmargin>1</bmargin>
-    <yrange>-10, 35</yrange>
-    <source>raw</source>
-    <subplot>
-      <colour>1</colour>
-      <title>Temperatur (℃)</title>
-      <ycalc>data['temp_out']</ycalc>
-    </subplot>
-    <subplot>
-      <colour>3</colour>
-      <ycalc>dew_point(data['temp_out'], data['hum_out'])</ycalc>
-      <title>Taupunkt (℃)</title>
-    </subplot>
-  </plot>
-  <plot>
-    <bmargin>1.6</bmargin>
-    <title>Niederschlag (㎜)</title>
-    <yrange>0, 6</yrange>
-    <y2range>0, 30</y2range>
-    <ylabel>stündl.</ylabel>
-    <y2label>gesamt</y2label>
-    <source>hourly</source>
-    <subplot>
-      <colour>5</colour>
-      <style>box</style>
-      <xcalc>data['idx'].replace(minute=30, second=0)</xcalc>
-      <ycalc>data['rain']</ycalc>
-      <title>stündl.</title>
-    </subplot>
-    <subplot>
-      <colour>3</colour>
-      <axes>x1y2</axes>
-      <ycalc>data['rain'] + last_ycalc</ycalc>
-      <title>gesamt</title>
-    </subplot>
-  </plot>
+  <xi:include href="includes/raw_temp_dew_line.xml" parse="xml" />
+  <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" />
 </graph>