From c87a1407347aeba1a2f229efedb0c555a4042033 Mon Sep 17 00:00:00 2001
From: Caahlo <54531195+Caahlo@users.noreply.github.com>
Date: Mon, 18 Nov 2019 19:13:53 +0100
Subject: [PATCH] add Switzerland to country selection (#8592)

add Switzerland to country selection and document Swiss cantons as regions
---
 docs/visualization.rst                   | 58 ++++++++++++++++++++++++
 superset/assets/src/explore/controls.jsx |  1 +
 2 files changed, 59 insertions(+)

diff --git a/docs/visualization.rst b/docs/visualization.rst
index 4352b7130..501234521 100644
--- a/docs/visualization.rst
+++ b/docs/visualization.rst
@@ -1308,6 +1308,64 @@ List of Countries
 |ES-MU6 |                      Murcia |
 +-------+-----------------------------+
 
+* Switzerland
+
++-------+-----------------------------+
+|ISO    | Name of region              |
++=======+=============================+
+|CH-AG  |                      Aargau |
++-------+-----------------------------+
+|CH-AR  |      Appenzell Ausserrhoden |
++-------+-----------------------------+
+|CH-AI  |       Appenzell Innerrhoden |
++-------+-----------------------------+
+|CH-BL  |            Basel-Landschaft |
++-------+-----------------------------+
+|CH-BS  |                 Basel-Stadt |
++-------+-----------------------------+
+|CH-BE  |                        Bern |
++-------+-----------------------------+
+|CH-FR  |                    Freiburg |
++-------+-----------------------------+
+|CH-GE  |                        Genf |
++-------+-----------------------------+
+|CH-GL  |                      Glarus |
++-------+-----------------------------+
+|CH-GR  |                  Graubünden |
++-------+-----------------------------+
+|CH-JU  |                        Jura |
++-------+-----------------------------+
+|CH-LU  |                      Luzern |
++-------+-----------------------------+
+|CH-NE  |                   Neuenburg |
++-------+-----------------------------+
+|CH-NW  |                   Nidwalden |
++-------+-----------------------------+
+|CH-OW  |                    Obwalden |
++-------+-----------------------------+
+|CH-SH  |                Schaffhausen |
++-------+-----------------------------+
+|CH-SZ  |                      Schwyz |
++-------+-----------------------------+
+|CH-SO  |                   Solothurn |
++-------+-----------------------------+
+|CH-SG  |                  St. Gallen |
++-------+-----------------------------+
+|CH-TI  |                      Tessin |
++-------+-----------------------------+
+|CH-TG  |                     Thurgau |
++-------+-----------------------------+
+|CH-UR  |                         Uri |
++-------+-----------------------------+
+|CH-VD  |                       Waadt |
++-------+-----------------------------+
+|CH-VS  |                      Wallis |
++-------+-----------------------------+
+|CH-ZG  |                         Zug |
++-------+-----------------------------+
+|CH-ZH  |                      Zürich |
++-------+-----------------------------+
+
 * Uk
 
 +-------+------------------------------+
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 94db55576..56265ce0d 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -583,6 +583,7 @@ export const controls = {
       'Russia',
       'Singapore',
       'Spain',
+      'Switzerland',
       'Thailand',
       'Timorleste',
       'Uk',