speedtest_net 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f2bcab94d4afb99bc644a70be8578f1ee02d0e955ee666fb7c6e36af0f252b
-  data.tar.gz: 5c9c24d982b104678f851542b2a7c51a17708a488413d2b809841a1d9212e41c
+  metadata.gz: e96f1e3dfc288c7a9203f575420bc6b25d5077c8dbde6e3822851f54296fff5f
+  data.tar.gz: 8019fba56eae4047eab3ae84b6afbaa4979262e3ed59395a6394c1ad466e013c
 SHA512:
-  metadata.gz: a02a821d47348411a9aaafccb3d434bfe7d545a6e0e186b64e604fd2e45175f26067cfc72e0ca6899956dc7d2171d52de4abbd8faa7ce2bc3a817002150a6c13
-  data.tar.gz: e1cfcd400e2d6cfd84cd5dc9e15f2f97c81c471cbf2dcc6d659bb3c5859a107d1fb66746d7590b069b5fa0b5a8600f69aaf9c0e0437bcafccdf106153075cfb2
+  metadata.gz: 6bcfdd411e38e6e6a602ce61a41f32ed5f27ee1723269502e8d80cedc08a8d5ccad1bcd61874f3621287024463bce1d6466b92834a999f639f04ebae529b856a
+  data.tar.gz: d535e32474576a614709b33b67bc836cc32bf32021ee8d1a38eaf202817cacfd0e223c1f8c4d9efd7a3ce17ef3ad605fbb37832100bfcff3ae6b87905f27b9df

data/lib/geo.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 class Geo
-  RADIUS_PER_DEGREE = Math::PI / 180
-  RADIUS_METER = 6_371_000
-
-  attr_reader :lat, :long
+  RADIAN_PER_DEGREE = Math::PI / 180
+  EARTH_RADIUS = 6_371_000
 
   def initialize(lat, long)
     @lat = lat
@@ -12,17 +10,18 @@ class Geo
   end
 
   def distance(other) # rubocop:disable Metrics/AbcSize
-    delta_lat = (@lat - other.lat) * RADIUS_PER_DEGREE
-    delta_long = (@long - other.long) * RADIUS_PER_DEGREE
+    a = Math.sin(radian_lat) * Math.sin(other.radian_lat) +
+        Math.cos(radian_lat) * Math.cos(other.radian_lat) *
+        Math.cos(radian_long - other.radian_long)
 
-    lat_radius = @lat * RADIUS_PER_DEGREE
-    other_lat_radius = other.lat * RADIUS_PER_DEGREE
+    Math.acos(a) * EARTH_RADIUS
+  end
 
-    a = Math.sin(delta_lat / 2)**2 +
-        Math.cos(lat_radius) *
-        Math.cos(other_lat_radius) *
-        Math.sin(delta_long / 2)**2
+  def radian_lat
+    @lat * RADIAN_PER_DEGREE
+  end
 
-    Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) * 2 * RADIUS_METER
+  def radian_long
+    @long * RADIAN_PER_DEGREE
   end
 end

data/lib/speedtest_net/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpeedtestNet
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler