nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

outsource map credentials

Browse source 
and allow podmin to enable and disable the feature
(#5813)
This commit is contained in:
zaziemo 2015-08-20 12:00:21 +02:00 committed by realtin
parent 6716b4c175
commit e5cc8dff0e
5 changed files with 57 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/assets/javascripts/app/views/location_stream.js
View file

@ -7,35 +7,37 @@ app.views.LocationStream = app.views.Content.extend({
templateName: "status-message-location",
toggleMap: function () {
var mapContainer = this.$el.find(".mapContainer");
if (gon.appConfig.map.enabled){
var mapContainer = this.$el.find(".mapContainer");
if (mapContainer.hasClass("empty")) {
var location = this.model.get("location");
mapContainer.css("height", "150px");
if (mapContainer.hasClass("empty")) {
var location = this.model.get("location");
mapContainer.css("height", "150px");
if (location.lat) {
var tileLayerSource = "https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}";
var map = L.map(mapContainer[0]).setView([location.lat, location.lng], 16);
var attribution = "Map data &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors, " +
"<a href='http://creativecommons.org/licenses/by-sa/2.0/''>CC-BY-SA</a>, " +
"Imagery © <a href='http://mapbox.com'>Mapbox</a>";
if (location.lat) {
var tileLayerSource = "https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}";
var map = L.map(mapContainer[0]).setView([location.lat, location.lng], 16);
var attribution = "Map data &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors, " +
"<a href='http://creativecommons.org/licenses/by-sa/2.0/''>CC-BY-SA</a>, " +
"Imagery © <a href='http://mapbox.com'>Mapbox</a>";
L.tileLayer(tileLayerSource, {
attribution: attribution,
maxZoom: 18,
id: "zaziemo.mpn66kn8",
accessToken: "pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA"
}).addTo(map);
L.tileLayer(tileLayerSource, {
attribution: attribution,
maxZoom: 18,
id: gon.appConfig.map.mapbox.id,
accessToken: gon.appConfig.map.mapbox.accessToken
}).addTo(map);
var markerOnMap = L.marker(location).addTo(map);
mapContainer.removeClass("empty");
return map;
}
} else {
if (mapContainer.css("display") === "none") {
mapContainer.css("display", "block");
} else {
mapContainer.css("display", "none");
var markerOnMap = L.marker(location).addTo(map);
mapContainer.removeClass("empty");
return map;
}
} else {
if (mapContainer.css("display") === "none") {
mapContainer.css("display", "block");
} else {
mapContainer.css("display", "none");
}
}
}
}

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

@ -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",
accessToken: "pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA"
id: gon.appConfig.map.mapbox.id,
accessToken: gon.appConfig.map.mapbox.accessToken
}).addTo(map);
// set mapContainer size to a smaller preview size
@ -56,16 +56,18 @@ app.views.SinglePostContent = app.views.Base.extend({
// put marker on map
var markerOnMap = L.marker(location).addTo(map);
return map;
};
};
},
toggleMap: function () {
if (this.$el.find(".mapContainer").css("height") === "75px") {
this.$el.find(".mapContainer").css("height", "200px");
this.$el.find(".leaflet-control-zoom").css("display", "block");
} else {
this.$el.find(".mapContainer").css("height", "75px");
this.$el.find(".leaflet-control-zoom").css("display", "none");
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");
} else {
this.$el.find(".mapContainer").css("height", "75px");
this.$el.find(".leaflet-control-zoom").css("display", "none");
}
}
},

3
app/controllers/application_controller.rb
View file

@ -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

5
config/defaults.yml
View file

@ -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:

11
config/diaspora.yml.example
View file

@ -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