kisyo 0.1.0 → 0.1.1

data/lib/kisyo/location.rb

@@ -1,28 +1,30 @@
 require 'csv'
+require 'geocoder'
 
 module Kisyo
   class Location
     attr_reader :prefecture_id, :block_id
 
+    def self.distance(lat1, lng1, lat2, lng2)
+      Geocoder::Calculations.distance_between([lat1, lng1], [lat2, lng2])
+    end
+
     def self.dms_to_degrees(d, m, s = 0)
       d + m / 60.0 + s / 3600.0
     end
 
     def self.nearest(lat, lng)
-      CSV.open(File.dirname(__FILE__) + '/../blocks.csv') do |csv|
-        distances =
-          csv.map do |row|
-            la = dms_to_degrees(row[5].to_f, row[6].to_f)
-            ln = dms_to_degrees(row[7].to_f, row[8].to_f)
+      distances =
+        BLOCKS.map do |block|
+          la = dms_to_degrees(block[3].to_f, block[4].to_f)
+          ln = dms_to_degrees(block[5].to_f, block[6].to_f)
 
-            [Math.sqrt((lat - la)**2 + (lng - ln)**2), row]
-          end
+          [distance(lat, lng, la, ln), block]
+        end
 
-        distance = distances.min_by { |(dist, _)| dist }
-        row = distance[1]
+      block = distances.min_by { |(dist, _)| dist }[1]
 
-        new(row[3], row[4])
-      end
+      new(block[1], block[2])
     end
 
     def initialize(prefecture_id, block_id)

data/lib/kisyo/version.rb

@@ -1,3 +1,3 @@
 module Kisyo
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/kisyo.rb

@@ -1,9 +1,10 @@
-require "kisyo/error"
-require "kisyo/location"
-require "kisyo/cache"
-require "kisyo/daily"
-require "kisyo/elements/day"
-require "kisyo/version"
+require 'kisyo/error'
+require 'kisyo/blocks'
+require 'kisyo/location'
+require 'kisyo/cache'
+require 'kisyo/daily'
+require 'kisyo/elements/day'
+require 'kisyo/version'
 
 module Kisyo
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kisyo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - youpy
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +94,8 @@ files:
 - README.md
 - Rakefile
 - kisyo.gemspec
-- lib/blocks.csv
 - lib/kisyo.rb
+- lib/kisyo/blocks.rb
 - lib/kisyo/cache.rb
 - lib/kisyo/daily.rb
 - lib/kisyo/elements/day.rb