From 83d746285134858ac765bbd195700f9549599393 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 12 Oct 2016 12:03:10 -0700
Subject: [PATCH] Fix swapped GeoJSON settings. Resolves #3537

---
 docs/administration-guide/05-setting-permissions.md       | 2 ++
 .../admin/settings/components/SettingsCustomMaps.jsx      | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/administration-guide/05-setting-permissions.md b/docs/administration-guide/05-setting-permissions.md
index 8f0b612fdc5..a0918b25d57 100644
--- a/docs/administration-guide/05-setting-permissions.md
+++ b/docs/administration-guide/05-setting-permissions.md
@@ -59,11 +59,13 @@ If you select `Limit access` for one of your databases, your view will change to
 ![Table permissions](images/table-permissions.png)
 
 Data access levels for schemas follows the same pattern as for databases:
+
 - **Unrestricted access:** can all tables in this schema, including any tables that might get added in the future.
 - **Limited access:** can only access the tables that you explicitly select.
 - **No access:** can’t access any tables in this schema.
 
 Lastly, data access levels for tables are almost exactly the same as well:
+
 - **Unrestricted access:** can ask questions about this table and see saved questions and dashboard cards using this table.
 - **No access:** can’t ask questions about this table or see saved questions or dashboard cards using this table.
 
diff --git a/frontend/src/metabase/admin/settings/components/SettingsCustomMaps.jsx b/frontend/src/metabase/admin/settings/components/SettingsCustomMaps.jsx
index c1f82a0b467..8de4b7b60c1 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsCustomMaps.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsCustomMaps.jsx
@@ -251,15 +251,15 @@ const EditMap = ({ map, onMapChange, originalMap, geoJson, geoJsonLoading, geoJs
                 <div>
                     <SettingContainer description="Which property specifies the region’s identifier?">
                         <GeoJsonPropertySelect
-                            value={map.region_name}
-                            onChange={(value) => onMapChange({ ...map, "region_name": value })}
+                            value={map.region_key}
+                            onChange={(value) => onMapChange({ ...map, "region_key": value })}
                             geoJson={geoJson}
                         />
                     </SettingContainer>
                     <SettingContainer description="Which property specifies the region’s display name?">
                         <GeoJsonPropertySelect
-                            value={map.region_key}
-                            onChange={(value) => onMapChange({ ...map, "region_key": value })}
+                            value={map.region_name}
+                            onChange={(value) => onMapChange({ ...map, "region_name": value })}
                             geoJson={geoJson}
                         />
                     </SettingContainer>
-- 
GitLab