From 6aba6fef7007e56abd844271fc0066115956188a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bora=CC=81ros?= Date: Tue, 4 Jun 2013 18:57:46 +0200 Subject: [PATCH] autoupdate legend --- Makefile | 4 +++- data/.gitignore | 1 + data/legend.html | 33 --------------------------------- data/legend_melnik.html | 27 --------------------------- data/legend_usti.html | 33 --------------------------------- index.haml | 2 +- 6 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 data/legend.html delete mode 100644 data/legend_melnik.html delete mode 100644 data/legend_usti.html diff --git a/Makefile b/Makefile index e93510f..f84c4cd 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ VODAIMG1=http://hydro.chmi.cz/hpps/tmp/img/big/$(STATION)_H.png VODAIMG2=http://hydro.chmi.cz/hpps/tmp/img/big/$(STATION)_Q.png VODATMP=/tmp/voda.html VODAXPATH=//table[@class="stdstationtbl"]/./tr[3]//table/tr[position()>1] +VODALEGENDXPATH=//table[@class="stdstationtbl"]/./tr[2]/td/table/./tr[1]/td/table/./tr VODANAMESXPATH=//table[@class="stdstationtbl"]/./tr[1]//table/./tr[2]/td/text() # option #2 @@ -32,8 +33,9 @@ wget '$(VODAIMG1)' -O data/stav_$(STATION).png_; \ wget '$(VODAIMG2)' -O data/prutok_$(STATION).png_; \ wget '$(VODAURL)' -O - | $(XMLLINT) --encode utf8 - > $(VODATMP); \ $(XMLLINT) --xpath '$(VODAXPATH)' $(VODATMP) > data/table_$(STATION).html_; \ +$(XMLLINT) --xpath '$(VODALEGENDXPATH)' $(VODATMP) > data/legend_$(STATION).html_; \ $(XMLLINT) --xpath '$(VODANAMESXPATH)' $(VODATMP) > data/name_$(STATION).html_; \ -$(foreach FILE,stav_$(STATION).png prutok_$(STATION).png table_$(STATION).html name_$(STATION).html,mv -v data/$(FILE)_ data/$(FILE);) \ +$(foreach FILE,stav_$(STATION).png prutok_$(STATION).png table_$(STATION).html name_$(STATION).html legend_$(STATION).html,mv -v data/$(FILE)_ data/$(FILE);) \ rm $(VODATMP); all: index.html doprava.html pomoc.html kontakty.html diff --git a/data/.gitignore b/data/.gitignore index 2558209..8791729 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -4,3 +4,4 @@ prutok*.png stav*.png table*.html name*.html +legend*.html diff --git a/data/legend.html b/data/legend.html deleted file mode 100644 index 2e3e2fd..0000000 --- a/data/legend.html +++ /dev/null @@ -1,33 +0,0 @@ - -Limity pro stupně povodňové aktivity - - -1. stupeň -Q = 450 [m3s-1] -/ -1.SPA (bdělost) - - -2. stupeň -Q = 1000 [m3s-1] -/ -2.SPA (pohotovost) - - -3. stupeň -Q = 1500 [m3s-1] -/ -3.SPA (ohrožení) - - -3. stupeň -Q = 3440 [m3s-1] -/ -3.SPA (extrémní povodeň) - - -sucho -Q = 27.9 [m3s-1] -/ - - diff --git a/data/legend_melnik.html b/data/legend_melnik.html deleted file mode 100644 index dcff8ed..0000000 --- a/data/legend_melnik.html +++ /dev/null @@ -1,27 +0,0 @@ - -Limity pro stupně povodňové aktivity - - -1. stupeň -H = 400 [cm] -/ -1.SPA (bdělost) - - -2. stupeň -H = 500 [cm] -/ -2.SPA (pohotovost) - - -3. stupeň -H = 550 [cm] -/ -3.SPA (ohrožení) - - -3. stupeň -H = 855 [cm] -/ -3.SPA (extrémní povodeň) - diff --git a/data/legend_usti.html b/data/legend_usti.html deleted file mode 100644 index d49701f..0000000 --- a/data/legend_usti.html +++ /dev/null @@ -1,33 +0,0 @@ - -Limity pro stupně povodňové aktivity - - -1. stupeň -H = 450 [cm] -/ -1.SPA (bdělost) - - -2. stupeň -H = 530 [cm] -/ -2.SPA (pohotovost) - - -3. stupeň -H = 600 [cm] -/ -3.SPA (ohrožení) - - -3. stupeň -H = 1082 [cm] -/ -3.SPA (extrémní povodeň) - - -sucho -H = 116 [cm] -/ - - diff --git a/index.haml b/index.haml index 87968b9..dba7b30 100644 --- a/index.haml +++ b/index.haml @@ -36,7 +36,7 @@ %img(src="data/prutok_#{station}.png") %td(style="padding: 16px;") %table#legend24h(style="margin: 16px;") - =File.read("data/legend.html") + =File.read("data/legend_#{station}.html") %table#table24h %tr %th datum a čas