refinements to config-basemap branch

cleanup
geoblacklight · Apr 27, 2015 · 8b8052c · 8b8052c
1 parent 8519623
commit 8b8052c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/app/assets/javascripts/geoblacklight/basemaps.js b/app/assets/javascripts/geoblacklight/basemaps.js
@@ -0,0 +1,26 @@
+// basemaps
+
+GeoBlacklight.Basemaps = {
+  darkMatter: L.tileLayer(
+    'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
+      maxZoom: 18,
+      worldCopyJump: true
+    }
+  ),
+  mapquest: L.tileLayer(
+    'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png" alt="">',
+      maxZoom: 18,
+      worldCopyJump: true,
+      subdomains: '1234' // see http://developer.mapquest.com/web/products/open/map
+    }
+  ),
+  positron: L.tileLayer(
+    'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
+      maxZoom: 18,
+      worldCopyJump: true
+    }
+  )
+};
diff --git a/app/assets/javascripts/geoblacklight/viewers/map.js b/app/assets/javascripts/geoblacklight/viewers/map.js
@@ -1,40 +1,15 @@
 //= require geoblacklight/viewers/viewer
 
 GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
-
+  
   options: {
     /**
     * Initial bounds of map
     * @type {L.LatLngBounds}
     */
     bbox: [[-80, -195], [80, 185]]
   },
-
-  basemap: {
-    darkMatter: L.tileLayer(
-      'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
-        maxZoom: 18,
-        worldCopyJump: true
-      }
-    ),
-    mapquest: L.tileLayer(
-      'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png" alt="">',
-        maxZoom: 18,
-        worldCopyJump: true,
-        subdomains: '1234' // see http://developer.mapquest.com/web/products/open/map
-      }
-    ),
-    positron: L.tileLayer(
-      'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>',
-        maxZoom: 18,
-        worldCopyJump: true
-      }
-    )
-  },
-
+
   overlay: L.layerGroup(),
 
   load: function() {
@@ -77,7 +52,7 @@ GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
   selectBasemap: function() {
     var _this = this;
     if (_this.data.basemap) {
-      return _this.basemap[_this.data.basemap];
+      return GeoBlacklight.Basemaps[_this.data.basemap];
     } else {
       return _this.basemap.mapquest;
     }

diff --git a/lib/generators/geoblacklight/templates/geoblacklight.js b/lib/generators/geoblacklight/templates/geoblacklight.js
@@ -1,4 +1,5 @@
 //= require geoblacklight/geoblacklight
+//= require geoblacklight/basemaps
 //= require geoblacklight/viewers
 //= require geoblacklight/modules
 //= require geoblacklight/downloaders