From dcefc1c730c86a44d150f792a86a037b690b007a Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Mon, 7 Nov 2016 16:00:16 -0800
Subject: [PATCH] Misc map settings tweaks

---
 .../admin/settings/components/widgets/CustomGeoJSONWidget.jsx   | 2 +-
 frontend/src/metabase/admin/settings/selectors.js               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
index 6ba37a48a26..6169537e4dc 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
@@ -259,7 +259,7 @@ const EditMap = ({ map, onMapChange, originalMap, geoJson, geoJsonLoading, geoJs
                         value={map.url}
                         onChange={(e) => onMapChange({ ...map, "url": e.target.value })}
                     />
-                    <button className={cx("Button ml1", { "Button--primary" : !geoJson })} onClick={onLoadGeoJson}>{geoJson ? "Refresh" : "Load"}</button>
+                    <button className={cx("Button ml1", { "Button--primary" : !geoJson, disabled: !map.url })} onClick={onLoadGeoJson}>{geoJson ? "Refresh" : "Load"}</button>
                 </div>
             </SettingContainer>
             <div className={cx({ "disabled": !geoJson })}>
diff --git a/frontend/src/metabase/admin/settings/selectors.js b/frontend/src/metabase/admin/settings/selectors.js
index 8c2e3710ef7..a20887db9e2 100644
--- a/frontend/src/metabase/admin/settings/selectors.js
+++ b/frontend/src/metabase/admin/settings/selectors.js
@@ -153,6 +153,7 @@ const SECTIONS = [
             {
                 key: "map-tile-server-url",
                 display_name: "Map tile server URL",
+                note: "Metabase uses OpenStreetMaps by default.",
                 type: "string"
             },
             {
-- 
GitLab