Revert "INT-1610 Disable maps feature via minimally invasive change (#434)"

This reverts commit 7ceca62.

Author: kangas

src/app/models/preferences.js

@@ -250,11 +250,6 @@ var Preferences = Model.extend(storageMixin, {
    * returns either true or false
    */
   isFeatureEnabled: function(feature) {
-    // INT-1610 force maps off until we have a MapBox commercial license
-    if (feature === 'enableMaps') {
-      return false;
-    }
-
     // master network switch overwrites all network related features
     if (['enableMaps', 'trackErrors', 'enableFeedbackPanel',
       'trackUsageStatistics', 'autoUpdates'].indexOf(feature) !== -1) {

src/app/network-optin/index.jade

@@ -13,12 +13,11 @@
                 span Enable Product Feedback Tool
               p.option-description Enables a tool for sending feedback or talking to our Product and Development teams directly from Compass.
 
-            // INT-1610 force maps off until we have a MapBox commercial license
-            //- li
-            //-   label
-            //-     input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox')
-            //-     span Enable Geographic Visualizations
-            //-   p.option-description Allow Compass to make requests to a 3rd party mapping service.
+            li
+              label
+                input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox')
+                span Enable Geographic Visualizations
+              p.option-description Allow Compass to make requests to a 3rd party mapping service.
 
             li
               label

src/app/network-optin/index.js

@@ -17,8 +17,8 @@ var NetworkOptInView = View.extend({
     trackErrors: ['boolean', true, true],
     enableFeedbackPanel: ['boolean', true, true],
     trackUsageStatistics: ['boolean', true, true],
-    autoUpdates: ['boolean', true, true]
-    // enableMaps: ['boolean', true, true]
+    autoUpdates: ['boolean', true, true],
+    enableMaps: ['boolean', true, true]
   },
   session: {
     preferences: 'state',
@@ -53,12 +53,11 @@ var NetworkOptInView = View.extend({
       hook: 'usage-stats-checkbox',
       name: 'checked'
     },
-    // INT-1610 force maps off until we have a MapBox commercial license
-    // enableMaps: {
-    //   type: 'booleanAttribute',
-    //   hook: 'enable-maps-checkbox',
-    //   name: 'checked'
-    // },
+    enableMaps: {
+      type: 'booleanAttribute',
+      hook: 'enable-maps-checkbox',
+      name: 'checked'
+    },
     buttonTitle: {
       hook: 'start-button'
     }