Merge pull request #514 from mojodna/extract-basemaps

Extract basemap config

app/static/app/js/classes/Basemaps.js

@@ -0,0 +1,27 @@
+export default [
+  {
+    attribution: "Map data: © Google Maps",
+    subdomains: ["mt0", "mt1", "mt2", "mt3"],
+    maxZoom: 21,
+    minZoom: 0,
+    label: "Google Maps Hybrid",
+    url: "//{s}.google.com/vt/lyrs=s,h&x={x}&y={y}&z={z}"
+  },
+  {
+    attribution:
+      "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community",
+    maxZoom: 21,
+    minZoom: 0,
+    label: "ESRI Satellite",
+    url:
+      "//server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
+  },
+  {
+    attribution:
+      '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+    maxZoom: 21,
+    minZoom: 0,
+    label: "OSM Mapnik",
+    url: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+  }
+];

app/static/app/js/components/Map.jsx

@@ -14,6 +14,7 @@ import ShareButton from './ShareButton';
 import AssetDownloads from '../classes/AssetDownloads';
 import PropTypes from 'prop-types';
 import PluginsAPI from '../classes/plugins/API';
+import Basemaps from '../classes/Basemaps';
 import update from 'immutability-helper';
 
 class Map extends React.Component {
@@ -194,27 +195,20 @@ class Map extends React.Component {
     }).addTo(this.map);
 
     if (showBackground) {
-      this.basemaps = {
+      this.basemaps = Basemaps.map((src, idx) => {
-        "Google Maps Hybrid": L.tileLayer('//{s}.google.com/vt/lyrs=s,h&x={x}&y={y}&z={z}', {
+        const { url, ...props } = src;
-            attribution: 'Map data: © Google Maps',
+        const layer = L.tileLayer(url, props);
-            subdomains: ['mt0','mt1','mt2','mt3'],
+
-            maxZoom: 21,
+        if (idx === 0) {
-            minZoom: 0,
+          layer.addTo(this.map);
-            label: 'Google Maps Hybrid'
+        }
-        }).addTo(this.map),
+
-        "ESRI Satellite": L.tileLayer('//server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
+        return [props.label, layer];
-            attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community',
+      }).reduce((acc, [k, v]) => {
-            maxZoom: 21,
+        acc[k] = v;
-            minZoom: 0,
+
-            label: 'ESRI Satellite'  // optional label used for tooltip
+        return acc;
-        }),
+      });
-        "OSM Mapnik": L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
-            maxZoom: 21,
-            minZoom: 0,
-            label: 'OSM Mapnik'  // optional label used for tooltip
-        })
-      };
     }
 
     this.autolayers = Leaflet.control.autolayers({