From 57f7b4da95ff5c2d7fae013e39e4c79b000892bd Mon Sep 17 00:00:00 2001
From: Antoine Abt <antoine@abt.im>
Date: Mon, 29 May 2017 14:31:08 +0200
Subject: [PATCH 1/2] Add category for UF, WF & AP

---
 ...08766e4541_add_category_for_urban_flood.py | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 alembic/versions/8f08766e4541_add_category_for_urban_flood.py

diff --git a/alembic/versions/8f08766e4541_add_category_for_urban_flood.py b/alembic/versions/8f08766e4541_add_category_for_urban_flood.py
new file mode 100644
index 00000000..7e9772e2
--- /dev/null
+++ b/alembic/versions/8f08766e4541_add_category_for_urban_flood.py
@@ -0,0 +1,48 @@
+"""Add category for Urban Flood, Wild Fire & Air Pollution
+
+Revision ID: 8f08766e4541
+Revises: 2a26a7ae26a0
+Create Date: 2017-05-29 12:24:46.523502
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '8f08766e4541'
+down_revision = '2a26a7ae26a0'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+from thinkhazard.models import HazardType, HazardCategory, HazardLevel
+
+hazardtype = HazardType.__table__
+hazardlevel = HazardLevel.__table__
+hazardcategory = HazardCategory.__table__
+
+def upgrade(engine_name):
+
+    for htype in ['UF', 'WF', 'AP']:
+        for level in ['VLO', 'LOW', 'MED', 'HIG']:
+            op.execute(hazardcategory.insert().values(
+                hazardtype_id=sa.select(
+                    [hazardtype.c.id],
+                    hazardtype.c.mnemonic==op.inline_literal(htype)
+                ),
+                hazardlevel_id=sa.select(
+                    [hazardlevel.c.id],
+                    hazardlevel.c.mnemonic==op.inline_literal(level)
+                ),
+                general_recommendation=op.inline_literal(
+                    'General recommendation for %s %s' % (htype, level))
+            ))
+
+
+def downgrade(engine_name):
+    for htype in ['UF', 'WF', 'AP']:
+        op.execute(hazardcategory.delete().where(
+            hazardcategory.c.hazardtype_id==sa.select(
+                [hazardtype.c.id],
+                hazardtype.c.mnemonic==op.inline_literal(htype)
+            )
+        ))

From 9b83adc0156198cc7a2657dce2fb252e8626a8d6 Mon Sep 17 00:00:00 2001
From: Antoine Abt <antoine@abt.im>
Date: Mon, 29 May 2017 15:45:42 +0200
Subject: [PATCH 2/2] TEMP fix for unavailable download

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f79250a7..0cc681d8 100644
--- a/Makefile
+++ b/Makefile
@@ -262,7 +262,7 @@ thinkhazard/static/build/%.css: $(LESS_FILES) .build/node_modules.timestamp
 		-e 's#{{WSGISCRIPT_ADMIN}}#$(abspath .build/thinkhazard_admin-$*.wsgi)#' $< > $@
 
 .build/wkhtmltox:
-	curl -o- http://download.gna.org/wkhtmltopdf/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz | tar -xvJ
+	wget https://github.com/DM87/yocaza/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && tar -xv -f wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
 	mv wkhtmltox .build
 
 .PRECIOUS: node_modules/font-awesome/fonts/fontawesome-webfont.%