dvb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3159471c200d6268c8f84cb9d423a0fcb187962
-  data.tar.gz: f72c473dc742eaa89d36685c342c3adbe313bb42
+  metadata.gz: ddd265ca2116093196f9fe128013800e1b0635f1
+  data.tar.gz: f6b1382293357803a65b1b586537b78fec89326d
 SHA512:
-  metadata.gz: 499459ef0d22a61cdbb841da3e2275048cef45d058e4a87bc75b38b34e6fef54ee90db347174f7532862367d568954626d17c7a241a74993dcd951d67b7a29b4
-  data.tar.gz: 0301755bd30a18969cf831908d095ae7808004c52538f817e911d4fe184b7ee393a8795eb7e3f7f5732b8756bbd8f01fa68e9d7f82c64c248363d397a790fec0
+  metadata.gz: 044a90608b3519ff5f9da371d34f73678506ce7a4677ef5c3a23a9d123f65b0507cb0087c3bbdf8ddbf7663e8ca324e36e89f0549366f92f7bfd020d4183318a
+  data.tar.gz: 5fa81b0b095b1233f32cc46485b4a8bb3b28c95a8f4562f210eb4baa2bf1e96a1009659a93142486643511b3ab2567df1db4629bdaee45aaa179bc37175bd23a

data/dvb.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
+  spec.add_runtime_dependency 'geokit', '~> 1.10'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/dvb/find.rb

@@ -6,13 +6,18 @@ module DVB
       search_str.downcase!
       (stop.name.downcase.include?(search_str) || stop.search_str.downcase.include?(search_str)) && stop.region == region
     end
-    # Would theoretically make sense, if priority values weren't so weird...
+    # The following would theoretically make sense, if priority values weren't so weird...
     # all_stops.sort_by { |s| s.priority }.reverse
   end
 
-  # def self.find_near(lat, lng, radius = 500)
-  #   [lat, lng]
-  # end
+  def self.find_near(lat, lng, radius = 500)
+    # Unfortunately some stops (exactly 100 of 4480) don't have location data associated with them
+    # Filtering those out here, as they're not relevant for location-based searching
+    all_stops = load_local_stops.reject { |s| s.lat.nil? || s.lng.nil? }
+    all_stops.select do |stop|
+      DVB::distance_between(stop.lat, stop.lng, lat, lng) <= radius
+    end
+  end
 
   def self.load_local_stops
     path = File.expand_path(File.dirname(__FILE__)) + '/VVOStops.json'
@@ -34,7 +39,9 @@ module DVB
     end
 
     def self.with_str_hash(h)
-      Stop.new(h['id'], h['latitude'].to_f, h['longitude'].to_f, h['name'], h['priority'].to_i, h['region'], h['searchstring'], h['tarif_zones'])
+      lat = h['latitude'] == '999.999999' ? nil : h['latitude'].to_f
+      lng = h['longitude'] == '999.999999' ? nil : h['longitude'].to_f
+      Stop.new(h['id'], lat, lng, h['name'], h['priority'].to_i, h['region'], h['searchstring'], h['tarif_zones'])
     end
 
     def coords

data/lib/dvb/utils.rb

@@ -1,3 +1,6 @@
+require 'geokit'
+Geokit::default_units = :kms
+
 module DVB
 
   def self.parse_mode(mode)
@@ -68,6 +71,13 @@ module DVB
     }
   end
 
+  def self.distance_between(lat1, lng1, lat2, lng2)
+    point1 = Geokit::LatLng.new(lat1, lng1)
+    point2 = Geokit::LatLng.new(lat2, lng2)
+
+    point1.distance_to(point2) * 1000
+  end
+
 end
 
 class String

data/lib/dvb/version.rb

@@ -1,3 +1,3 @@
 module DVB
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dvb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kilian Koeltzsch
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: geokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement