{{/if}}
{{#if root}}
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index ea77b1530..8e95647f4 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -31,8 +31,7 @@ class PostPresenter < BasePresenter
photos: build_photos_json,
root: root,
title: title,
- address: @post.address,
- coordinates: @post.coordinates,
+ location: @post.post_location,
poll: @post.poll,
already_participated_in_poll: already_participated_in_poll,
participation: participate?,
diff --git a/config/defaults.yml b/config/defaults.yml
index 6f67eeb13..3d558d167 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -78,8 +78,9 @@ defaults:
map:
enabled: true
mapbox:
- id: 'zaziemo.mpn66kn8'
- accessToken: 'pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA'
+ enabled: false
+ id: "zaziemo.mpn66kn8"
+ access_token: "pk.eyJ1IjoiemF6aWVtbyIsImEiOiI3ODVjMzVjNmM2ZTU3YWM3YTE5YWYwMTRhODljM2M1MSJ9.-nVgyS4PLnV4m9YkvMB5wA"
privacy:
jquery_cdn: false
google_analytics_key:
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 0f7d8ec52..fb01cadd1 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -324,16 +324,21 @@ 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.
+ ## Displays the location of a post in a map. Per default we are using the map
+ ## tiles of OpenMapSurfer (http://korona.geog.uni-heidelberg.de/).
+ ## If you want to use them you only have to enable the map. You also have the
+ ## possibility to use the map tiles of https://www.mapbox.com which is probably
+ ## more reliable. There you have to create a account to get an ID and an access token which is limited. If
+ ## you want to get an unlimited account you can write an email
+ ## to team@diasporafoundation.org. Please enable mapbox and fill out your id
+ ## and access_token.
map: ##Section
- # enable: true
+ # enable: false
# mapbox:
+ # enable: false
# id: 'your.id'
- # accessToken: 'youraccesstoken'
+ # access_token: 'youraccesstoken'
## Settings potentially affecting the privacy of your users.
privacy: ## Section
diff --git a/spec/javascripts/app/views/location_stream_spec.js b/spec/javascripts/app/views/location_stream_spec.js
index 25a01b642..fe87ea478 100644
--- a/spec/javascripts/app/views/location_stream_spec.js
+++ b/spec/javascripts/app/views/location_stream_spec.js
@@ -1,38 +1,42 @@
-describe("app.views.LocationMap", function() {
+describe("app.views.LocationStream", function() {
beforeEach(function(){
this.post = factory.post();
this.view = new app.views.LocationStream({model : this.post});
+ gon.appConfig = { map: {enabled: true, mapbox: {enabled: true, id: "yourID", access_token: "yourAccessToken" }} };
});
describe("toggleMap", function() {
context("with location provided", function() {
beforeEach(function(){
this.post.set({location : factory.location()}); // set location
- this.view.render();
- console.log(this.view.$el.find(".mapContainer")[0]);
+ spec.content().html(this.view.render().el); // loads html element to the page
});
it("should contain a map container", function() {
- expect(this.view.$el[0]).toContainElement(".mapContainer");
+ expect(spec.content()).toContainElement(".mapContainer");
});
it("should initialize map", function() {
- expect(this.view.$el.find(".mapContainer")[0]).toHaveClass("empty");
+ expect($(".mapContainer")).toHaveClass("empty");
this.view.toggleMap();
- expect(this.view.$el.find(".mapContainer")[0]).not.toHaveClass("empty");
+ expect($(".mapContainer")).not.toHaveClass("empty");
});
- /*
- * does not work .. not sure why
+
it("should change display status on every click", function() {
- expect(this.view.$el.find(".mapContainer")[0]).toHaveCss({display: "block"});
this.view.toggleMap();
- expect(this.view.$el.find(".mapContainer")[0]).toHaveCss({display: "none"});
+ expect($(".mapContainer")).toHaveCss({display: "block"});
+ this.view.toggleMap();
+ expect($(".mapContainer")).toHaveCss({display: "none"});
});
- */
}),
+
context("without location provided", function() {
+ beforeEach(function(){
+ spec.content().html(this.view.render().el);
+ });
+
it("should not initialize the map", function() {
- expect(this.view.$el[0]).not.toContainElement(".mapContainer");
+ expect(spec.content()).not.toContainElement(".mapContainer");
});
});
});
diff --git a/spec/javascripts/app/views/single_post_content_view_spec.js b/spec/javascripts/app/views/single_post_content_view_spec.js
new file mode 100644
index 000000000..b38c38b78
--- /dev/null
+++ b/spec/javascripts/app/views/single_post_content_view_spec.js
@@ -0,0 +1,50 @@
+describe("app.views.SinglePostContent", function() {
+ beforeEach(function(){
+ this.post = factory.post();
+ this.view = new app.views.SinglePostContent({model : this.post});
+ gon.appConfig = { map: {enabled: true, mapbox: {enabled: true, id: "yourID", accessToken: "yourAccessToken" }} };
+ });
+
+ describe("toggleMap", function() {
+ context("with location provided", function() {
+ beforeEach(function(){
+ this.post.set({location : factory.location()}); // set location
+ spec.content().html(this.view.render().el); // loads html element to the page
+ });
+
+ it("should contain a map container", function() {
+ expect(spec.content()).toContainElement(".mapContainer");
+ });
+
+ it("should provide a small map", function() {
+ expect($(".mapContainer")).toHaveClass("small-map");
+ expect($(".mapContainer").height() < 100).toBeTruthy();
+ expect($(".mapContainer")).toBeVisible();
+ });
+
+ it("should toggle class small-map on every click", function(){
+ this.view.toggleMap();
+ expect($(".mapContainer")).not.toHaveClass("small-map");
+ this.view.toggleMap();
+ expect($(".mapContainer")).toHaveClass("small-map");
+ });
+
+ it("should change height on every click", function() {
+ this.view.toggleMap();
+ expect($(".mapContainer").height() > 100).toBeTruthy();
+ this.view.toggleMap();
+ expect($(".mapContainer").height() < 100).toBeTruthy();
+ });
+ }),
+
+ context("without location provided", function() {
+ beforeEach(function(){
+ spec.content().html(this.view.render().el);
+ });
+
+ it("should not initialize the map", function() {
+ expect(spec.content()).not.toContainElement(".mapContainer");
+ });
+ });
+ });
+});
diff --git a/spec/models/reshare_spec.rb b/spec/models/reshare_spec.rb
index 0e13aacd4..bfaff0dc6 100644
--- a/spec/models/reshare_spec.rb
+++ b/spec/models/reshare_spec.rb
@@ -292,24 +292,24 @@ describe Reshare, type: :model do
end
describe "#post_location" do
- let(:status_message) { build(:status_message, text: "This is a status_message", author: bob.person, public: true) }
- let(:reshare) { create(:reshare, root: status_message) }
+ let(:status_message) { build(:status_message, text: "This is a status_message", author: bob.person, public: true) }
+ let(:reshare) { create(:reshare, root: status_message) }
- context "with location" do
- let(:location) { build(:location) }
+ context "with location" do
+ let(:location) { build(:location) }
- it "should deliver address and coordinates" do
- status_message.location = location
- expect(reshare.post_location).to include(address: location.address, lat: location.lat, lng: location.lng)
+ it "should deliver address and coordinates" do
+ status_message.location = location
+ expect(reshare.post_location).to include(address: location.address, lat: location.lat, lng: location.lng)
+ end
end
- end
- context "without location" do
- it "should deliver empty address and coordinates" do
- expect(reshare.post_location[:address]).to be_nil
- expect(reshare.post_location[:lat]).to be_nil
- expect(reshare.post_location[:lng]).to be_nil
+ context "without location" do
+ it "should deliver empty address and coordinates" do
+ expect(reshare.post_location[:address]).to be_nil
+ expect(reshare.post_location[:lat]).to be_nil
+ expect(reshare.post_location[:lng]).to be_nil
+ end
end
end
end
-end