No events found. diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index 8bfa52ce..636e8254 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -16,7 +16,10 @@
<% if @event.lat && @event.lng %> - + <% content_for :head do -%> +<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?sensor=false" %> +<%= javascript_include_tag "map_marker" %> + <% end -%>
Lat:
@@ -36,9 +39,9 @@
};
var map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
-
- <%= render "shared/map_marker", event: @event %>
+ map_marker(map, <%= Utils.jsonify(@event.location) %>);
+
<% end %>
diff --git a/app/views/shared/_map_marker.html.erb b/app/views/shared/_map_marker.html.erb
deleted file mode 100644
index e288a591..00000000
--- a/app/views/shared/_map_marker.html.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a43a0775..51d0dc99 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -61,7 +61,7 @@ Huginn::Application.configure do
end
# Precompile additional assets (application.js.coffee.erb, application.css, and all non-JS/CSS are already added)
- config.assets.precompile += %w( diagram.js graphing.js user_credentials.js )
+ config.assets.precompile += %w( diagram.js graphing.js map_marker.js user_credentials.js )
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
diff --git a/lib/location.rb b/lib/location.rb
new file mode 100644
index 00000000..5e64cdcf
--- /dev/null
+++ b/lib/location.rb
@@ -0,0 +1,110 @@
+require 'liquid'
+
+Location = Struct.new(:lat, :lng, :radius, :speed, :course)
+
+class Location
+ include LiquidDroppable
+
+ protected :[]=
+
+ def initialize(data = {})
+ super()
+
+ case data
+ when Array
+ raise ArgumentError, 'unsupported location data' unless data.size == 2
+ self.lat, self.lng = data
+ when Hash, Location
+ data.each { |key, value|
+ case key.to_sym
+ when :lat, :latitude
+ self.lat = value
+ when :lng, :longitude
+ self.lng = value
+ when :radius
+ self.radius = value
+ when :speed
+ self.speed = value
+ when :course
+ self.course = value
+ end
+ }
+ else
+ raise ArgumentError, 'unsupported location data'
+ end
+
+ yield self if block_given?
+ end
+
+ def lat=(value)
+ self[:lat] = floatify(value) { |f|
+ if f.abs <= 90
+ f
+ else
+ raise ArgumentError, 'out of bounds'
+ end
+ }
+ end
+
+ alias latitude lat
+ alias latitude= lat=
+
+ def lng=(value)
+ self[:lng] = floatify(value) { |f|
+ if f.abs <= 180
+ f
+ else
+ raise ArgumentError, 'out of bounds'
+ end
+ }
+ end
+
+ alias longitude lng
+ alias longitude= lng=
+
+ def radius=(value)
+ self[:radius] = floatify(value) { |f| f if f >= 0 }
+ end
+
+ def speed=(value)
+ self[:speed] = floatify(value) { |f| f if f >= 0 }
+ end
+
+ def course=(value)
+ self[:course] = floatify(value) { |f| f if (0..360).cover?(f) }
+ end
+
+ def present?
+ lat && lng
+ end
+
+ def empty?
+ !present?
+ end
+
+ private
+
+ def floatify(value)
+ case value
+ when nil, ''
+ return nil
+ else
+ float = Float(value)
+ if block_given?
+ yield(float)
+ else
+ float
+ end
+ end
+ end
+end
+
+class LocationDrop
+ KEYS = Location.members.map(&:to_s).concat(%w[latitude longitude])
+
+ def before_method(key)
+ if KEYS.include?(key)
+ @object.__send__(key)
+ end
+ end
+end
diff --git a/spec/lib/location_spec.rb b/spec/lib/location_spec.rb
new file mode 100644
index 00000000..ea42fa40
--- /dev/null
+++ b/spec/lib/location_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Location do
+ let(:location) {
+ Location.new(
+ lat: BigDecimal.new('2.0'),
+ lng: BigDecimal.new('3.0'),
+ radius: 300,
+ speed: 2,
+ course: 30)
+ }
+
+ it "converts values to Float" do
+ expect(location.lat).to be_a Float
+ expect(location.lat).to eq 2.0
+ expect(location.lng).to be_a Float
+ expect(location.lng).to eq 3.0
+ expect(location.radius).to be_a Float
+ expect(location.radius).to eq 300.0
+ expect(location.speed).to be_a Float
+ expect(location.speed).to eq 2.0
+ expect(location.course).to be_a Float
+ expect(location.course).to eq 30.0
+ end
+
+ it "provides hash-style access to its properties with both symbol and string keys" do
+ expect(location[:lat]).to be_a Float
+ expect(location[:lat]).to eq 2.0
+ expect(location['lat']).to be_a Float
+ expect(location['lat']).to eq 2.0
+ end
+
+ it "does not allow hash-style assignment" do
+ expect {
+ location[:lat] = 2.0
+ }.to raise_error
+ end
+
+ it "ignores invalid values" do
+ location2 = Location.new(
+ lat: 2,
+ lng: 3,
+ radius: -1,
+ speed: -1,
+ course: -1)
+ expect(location2.radius).to be_nil
+ expect(location2.speed).to be_nil
+ expect(location2.course).to be_nil
+ end
+
+ it "considers a location empty if either latitude or longitude is missing" do
+ expect(Location.new.empty?).to be_truthy
+ expect(Location.new(lat: 2, radius: 1).present?).to be_falsy
+ expect(Location.new(lng: 3, radius: 1).present?).to be_falsy
+ end
+
+ it "is droppable" do
+ {
+ '{{location.lat}}' => '2.0',
+ '{{location.latitude}}' => '2.0',
+ '{{location.lng}}' => '3.0',
+ '{{location.longitude}}' => '3.0',
+ }.each { |template, result|
+ expect(Liquid::Template.parse(template).render('location' => location.to_liquid)).to eq(result),
+ "expected #{template.inspect} to expand to #{result.inspect}"
+ }
+ end
+end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index c2e40c03..e7fd4bb8 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -1,6 +1,50 @@
require 'spec_helper'
describe Event do
+ describe ".with_location" do
+ it "selects events with location" do
+ event = events(:bob_website_agent_event)
+ event.lat = 2
+ event.lng = 3
+ event.save!
+ Event.with_location.pluck(:id).should == [event.id]
+
+ event.lat = nil
+ event.save!
+ Event.with_location.should be_empty
+ end
+ end
+
+ describe "#location" do
+ it "returns a default hash when an event does not have a location" do
+ event = events(:bob_website_agent_event)
+ event.location.should == Location.new(
+ lat: nil,
+ lng: nil,
+ radius: 0.0,
+ speed: nil,
+ course: nil)
+ end
+
+ it "returns a hash containing location information" do
+ event = events(:bob_website_agent_event)
+ event.lat = 2
+ event.lng = 3
+ event.payload = {
+ radius: 300,
+ speed: 0.5,
+ course: 90.0,
+ }
+ event.save!
+ event.location.should == Location.new(
+ lat: 2.0,
+ lng: 3.0,
+ radius: 0.0,
+ speed: 0.5,
+ course: 90.0)
+ end
+ end
+
describe "#reemit" do
it "creates a new event identical to itself" do
events(:bob_website_agent_event).lat = 2
@@ -130,6 +174,8 @@ describe EventDrop do
'title' => 'some title',
'url' => 'http://some.site.example.org/',
}
+ @event.lat = 2
+ @event.lng = 3
@event.save!
end
@@ -166,4 +212,9 @@ describe EventDrop do
t = '{{created_at | date:"%FT%T%z" }}'
interpolate(t, @event).should eq(@event.created_at.strftime("%FT%T%z"))
end
+
+ it 'should have _location_' do
+ t = '{{_location_.lat}},{{_location_.lng}}'
+ interpolate(t, @event).should eq("2.0,3.0")
+ end
end