outsource map credentials

and allow podmin to enable and disable the feature
(#5813)

app/assets/javascripts/app/views/location_stream.js

@@ -7,6 +7,7 @@ app.views.LocationStream = app.views.Content.extend({
   templateName: "status-message-location",
 
   toggleMap: function () {
+    if (gon.appConfig.map.enabled){
       var mapContainer = this.$el.find(".mapContainer");
 
       if (mapContainer.hasClass("empty")) {
@@ -23,8 +24,8 @@ app.views.LocationStream = app.views.Content.extend({
           L.tileLayer(tileLayerSource, {
             attribution:  attribution,
             maxZoom: 18,
-          id: "zaziemo.mpn66kn8",
+            id: gon.appConfig.map.mapbox.id,
-          accessToken: "pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA"
+            accessToken: gon.appConfig.map.mapbox.accessToken
           }).addTo(map);
 
           var markerOnMap = L.marker(location).addTo(map);
@@ -39,5 +40,6 @@ app.views.LocationStream = app.views.Content.extend({
           }
         }
       }
+    }
 });
 // @license-end

app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js

@@ -27,7 +27,7 @@ app.views.SinglePostContent = app.views.Base.extend({
   },
 
   map : function(){
-    if (this.$el.find(".mapContainer")){
+    if (this.$el.find(".mapContainer")&&gon.appConfig.map.enabled){
 
       // find and set height of mapContainer to max size of the container
       // which is necessary to have all necessary tiles prerendered
@@ -45,8 +45,8 @@ app.views.SinglePostContent = app.views.Base.extend({
       L.tileLayer(tileLayerSource, {
         attribution:  attribution,
         maxZoom: 18,
-        id: "zaziemo.mpn66kn8",
+        id: gon.appConfig.map.mapbox.id,
-        accessToken: "pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA"
+        accessToken: gon.appConfig.map.mapbox.accessToken
       }).addTo(map);
 
       // set mapContainer size to a smaller preview size
@@ -60,6 +60,7 @@ app.views.SinglePostContent = app.views.Base.extend({
   },
 
   toggleMap: function () {
+    if (gon.appConfig.map.enabled){
       if (this.$el.find(".mapContainer").css("height") === "75px") {
         this.$el.find(".mapContainer").css("height", "200px");
         this.$el.find(".leaflet-control-zoom").css("display", "block");
@@ -67,6 +68,7 @@ app.views.SinglePostContent = app.views.Base.extend({
           this.$el.find(".mapContainer").css("height", "75px");
           this.$el.find(".leaflet-control-zoom").css("display", "none");
       }
+    }
   },
 
   presenter : function() {

app/controllers/application_controller.rb

@@ -145,7 +145,8 @@ class ApplicationController < ActionController::Base
   def gon_set_appconfig
     gon.push(appConfig: {
                chat:     {enabled: AppConfig.chat.enabled?},
-               settings: {podname: AppConfig.settings.pod_name}
+               settings: {podname: AppConfig.settings.pod_name},
+               map:      {enabled: AppConfig.map.enabled?, mapbox: AppConfig.map.mapbox}
              })
   end
 

config/defaults.yml

@@ -75,6 +75,11 @@ defaults:
       log:
         file: 'log/vines.log'
         level: 'info'
+  map:
+    enabled: true
+    mapbox:
+      id: 'zaziemo.mpn66kn8'
+      accessToken: 'pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA'
   privacy:
     jquery_cdn: false
     google_analytics_key:

config/diaspora.yml.example

@@ -324,6 +324,17 @@ configuration: ## Section
         ## The debug level logs all XML sent and received by the server.
         #level: 'info'
 
+  ## Displaying location of posts in a map. We are using the map tiles of
+  ## https://www.mapbox.com. There you have to create a account to get and ID
+  ## and an access token. If you want to use this feature you can write an email
+  ## to team@diasporafoundation.org and you'll get an unlimited and free account.
+  map: ##Section
+
+  # enable: true
+  # mapbox:
+    # id: 'your.id'
+    # accessToken: 'youraccesstoken'
+
   ## Settings potentially affecting the privacy of your users.
   privacy: ## Section