Satellite view added

Gruntfile.js

@@ -86,11 +86,17 @@ module.exports = function(grunt) {
         src: '*',
         dest: 'dist/img/'
       },
-      leafletimages: {
+      // leafletimages: { We don't use default marker
+      //   expand: true,
+      //   cwd: 'vendor/leaflet/images/',
+      //   src: '*',
+      //   dest: 'dist/img/leaflet/'
+      // },
+      leafletcssimages: {
         expand: true,
         cwd: 'vendor/leaflet/images/',
-        src: '*',
-        dest: 'dist/img/leaflet/'
+        src: 'layers*',
+        dest: 'dist/css/images/'
       },
       cordova_www: {
         expand: true,
@@ -197,7 +203,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('cordova', ['default', 'copy:cordova_www', 'copy:cordova_override_debug']);
 
-  grunt.registerTask('copy-app', ['copy:apphtml', 'copy:appimages', 'copy:libimages', 'copy:leafletimages']);
+  grunt.registerTask('copy-app', ['copy:apphtml', 'copy:appimages', 'copy:libimages', 'copy:leafletcssimages']);
   grunt.registerTask('default', ['browserify', 'seeds', 'concat', 'copy-app', 'handlebars', 'manifest']);
 
   grunt.registerTask('deploy_demo', ['default', 'shell:deploy_demo']);

app/js/map/baseLayers.coffee

@@ -0,0 +1,13 @@
+
+
+exports.createOSMLayer = ->
+  mapquestUrl = 'http://{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png'
+  subDomains = ['otile1','otile2','otile3','otile4']
+  mapquestAttrib = 'Data, imagery and map information provided by <a href="http://open.mapquest.co.uk" target="_blank">MapQuest</a>, <a href="http://www.openstreetmap.org/" target="_blank">OpenStreetMap</a> and contributors.'
+  return new L.TileLayer(mapquestUrl, {maxZoom: 18, attribution: mapquestAttrib, subdomains: subDomains})
+
+exports.createSatelliteLayer = ->
+  mapquestUrl = 'http://{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png'
+  subDomains = ['otile1','otile2','otile3','otile4']
+  mapquestAttrib = 'Data, imagery and map information provided by <a href="http://open.mapquest.co.uk" target="_blank">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency'
+  return new L.TileLayer(mapquestUrl, {maxZoom: 18, attribution: mapquestAttrib, subdomains: subDomains})

app/js/pages/SourceMapPage.coffee

@@ -3,6 +3,7 @@ Page = require "../Page"
 SourceDisplay = require '../map/SourcesLayer' # TODO
 LocationDisplay = require '../map/LocationDisplay'
 ContextMenu = require '../map/ContextMenu'
+baseLayers = require '../map/baseLayers'
 
 # Map of water sources. Options include:
 # initialGeo: Geometry to zoom to. Point only supported.
@@ -21,8 +22,17 @@ class SourceMapPage extends Page
     # Recalculate on resize
     $(window).on('resize', @resizeMap)
 
-    # Setup map tiles
-    setupMapTiles().addTo(@map)
+    # Setup base layers
+    osmLayer = baseLayers.createOSMLayer()
+    satelliteLayer = baseLayers.createSatelliteLayer()
+
+    osmLayer.addTo(@map)
+    baseLayers = 
+      "OpenStreetMap": osmLayer
+      "Satellite": satelliteLayer
+
+    # Create layer control
+    L.control.layers(baseLayers).addTo(@map)
 
     # Setup marker display when map is loaded
     @map.whenReady =>