glw 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aae675ed2dc09d49a31cea98d0372c1f127a3ac
-  data.tar.gz: 0a5884c14ea61823d18b51de0d0aaa19090b9d53
+  metadata.gz: 0bdbbfb78dda24bd5a804415c774b09409abad81
+  data.tar.gz: fb70b89fd9182a4da1d2473a353f5bd0328659c4
 SHA512:
-  metadata.gz: a3aaa05b445ebb7cc31bf5c89c5baf35ed205fac71183e7723f3e31c6cfb9578874d9a6e33af6252fe412f4fce774e67d7516677b755b810f40d5c5348012863
-  data.tar.gz: 1e98d7a561a5b978dbe9fbb1685d22d59e6d883cbae219e2c077382851b0cbecaf1f97dc3095bf4bb346d33460d20456f97e15e6842e2488ceade1d55ccb2815
+  metadata.gz: 14fcfe53fa01ef10a7975208a18df05afe9315d664987e92e27bb3510c688124d2d225e3de31e3d471635bbabc490f762a4eca8e42f1cf4af84f6881d7bb7da1
+  data.tar.gz: 6c51ba4c6446641d110e76a72fa1081b82975fc3295acf3b4bb9bced7dc5c872326e996d4a6cf6665c349cf2b09d1c2da4f77fe3dba2f1852e143eb205b1679b

data/lib/glw.rb

@@ -5,21 +5,31 @@
 
 require 'geocoder'
 require 'geodesic'
+require 'recordx_sqlite'
 
 
 class Glw
 
-  def initialize()
+  def initialize(dbfile='glw.db')
+    
     Geocoder.configure(:timeout => 3)
+    
+    @coordinates = RecordxSqlite.new(dbfile, 
+      table: {coordinates: {coordinates: '', place_id: ''}})
+
+    fields = %i(place_id address city coordinates country postal_code route
+          street_number types)
+    h = fields.inject({}) {|r, x| r.merge(x => '') }
+    @places = RecordxSqlite.new(dbfile, table: {places: h})    
+    
   end
 
   def locate(lat, lon)
 
-    s = "%s, %s" % [lat, lon]
-    r = Geocoder.search s
+    loc = search lat, lon
 
     p1 = Geodesic::Position.new(lat, lon)
-    place = Geodesic::Position.new(*r[0].coordinates)
+    place = Geodesic::Position.new(*loc.coordinates)
 
     d = Geodesic::dist_haversine(place.lat, place.lon, p1.lat, p1.lon).round(3)
     b = Geodesic::bearing(place.lat, place.lon, p1.lat, p1.lon).round
@@ -27,12 +37,63 @@ class Glw
     fields = %i(address city coordinates country postal_code route
        street_number types)
 
-    h = fields.inject({}) do |hash, x|
-      hash.merge(x => r[0].method(x).call)
-    end
-
+    h = fields.inject({}) {|hash, x| hash.merge(x => loc.method(x).call) }
     h.merge({relative_distance: d, relative_bearing: b})
+
   end
+  
+  private
+  
+  def search(lat, lon)
+
+    # search the database using the coordinates
+
+    lat_lon =  "%s, %s" % [lat.round(5), lon.round(5)]
+
+    sql = "SELECT * 
+FROM places INNER JOIN coordinates ON coordinates.place_id = places.place_id
+WHERE coordinates.coordinates like '#{lat_lon}'"
+
+    found = @coordinates.query sql
+
+    if found.any? then
+
+      r = OpenStruct.new(found.first.to_h)
+      r.coordinates = r.coordinates.split(', ').map(&:to_f)
+      r.types = r.types.split
+      r.freeze
+
+    else
+
+      r = Geocoder.search "%s, %s" % [lat, lon]  
+
+      # Add the place_id and place details in the *place* table if the 
+      # place_id isn't already in the table.
+      
+      place = @places.find r[0].place_id            
+      
+      if !place then
+        
+        fields = %i(place_id address city country postal_code route
+          street_number )
+
+        h = fields.inject({}) {|hash, x| hash.merge(x => r[0].method(x).call) }
+        h.merge!({coordinates: r[0].coordinates.join(', ')})
+        h.merge!({types: r[0].types.join(' ')})
+
+        @places.create  h
+        place = OpenStruct.new(h).freeze
+
+      end
+
+      # If the entry isn't found, add the coordinates and the place_id
+      # into the *coordinates* table. 
+      
+      @coordinates.create coordinates: lat_lon, place_id: place.place_id
+      r[0]
+
+    end
+  end  
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glw
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   VjRGNrP/e8DzppPHs0UL/CzbWYLyfrBZUJpbNIFlzu6g62M1vkvpzwoC12eXHyET
   uLwQN+MzhB3/YA==
   -----END CERTIFICATE-----
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: recordx_sqlite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,6 +123,6 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: 'A wrapper for the geocoder gem to returns the place name and more for a
-  given longitude and latitude. #gps #geolocation'
+summary: 'A wrapper for the geocoder gem to return the place name and more for a given
+  longitude and latitude. #gps #geolocation'
 test_files: []