radiant-event_map-extension 1.3.4 → 1.3.5

data/lib/grid_ref.rb

@@ -266,14 +266,27 @@ end
 
 class String
   def is_gridref?
-    self.upcase =~ /^(H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}\d{4}(NE|NW|SE|SW)?$|((H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}(\d{4}|\d{6}|\d{8}|\d{10}))$/
+    !!(self.upcase =~ /^(H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}\d{4}(NE|NW|SE|SW)?$|((H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}(\d{4}|\d{6}|\d{8}|\d{10}))$/)
+  end
+
+  def is_latlng?
+    !!(self =~ /(-?\d+\.\d+)[,\s]+(-?\d+\.\d+)/)
   end
 
   def to_latlng(options = {})
-    GridRef.new(self, options).to_latlng if self.is_gridref?
+    if is_latlng?
+      self
+    elsif is_gridref?
+      GridRef.new(self, options).to_latlng
+    end
   end
   
   def to_wgs84(options = {})
-    GridRef.new(self, options.merge(:datum => :wgs84)).to_latlng if self.is_gridref?
+    if is_latlng?
+      self
+    elsif is_gridref?
+      GridRef.new(self, options.merge(:datum => :wgs84)).to_latlng
+    end
   end
+  
 end

data/lib/mappable.rb

@@ -50,7 +50,8 @@ private
       if geocode_basis.is_gridref? && gr = GridRef.new(geocode_basis, :datum => :wgs84, :accuracy => 8) # for gps and site compatibility wgs84 is better than osgb36
         self.lat = gr.lat
         self.lng = gr.lng
-        puts "new lat/lng: #{self.lat}/#{self.lng}"
+      elsif geocode_basis.is_latlong?
+        self.lat, self.lng = geocode_basis.split(/, */)
       else
         bias = Radiant::Config['event_map.zone'] || 'uk'
         geo = Geokit::Geocoders::MultiGeocoder.geocode(location, :bias => bias)

data/lib/radiant-event_map-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventMapExtension
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
   SUMMARY = %Q{Event geocoding and map extension for Radiant CMS}
   DESCRIPTION = "Small additions to the event_calendar that geocode calendar events and display on a google map. Separated here because perhaps only of interest to a few."
   URL = "http://github.com/radiant/radiant-event_calendar-extension"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_map-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-07-18 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: geokit
@@ -80,6 +81,7 @@ files:
 - lib/tasks/event_map_extension_tasks.rake
 - public/images/map_icons/pink-dot.png
 - public/images/map_icons/shadow.png
+- radiant-event_map-extension-1.3.4.gem
 - radiant-event_map-extension.gemspec
 - Rakefile
 - README.md
@@ -87,10 +89,11 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - VERSION
+has_rdoc: true
 homepage: http://github.com/radiant/radiant-event_calendar-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_map-extension', :version => '~> 1.3.4'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_map-extension', :version => '~> 1.3.5'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Event geocoding and map extension for Radiant CMS