oeffi 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f420b59f39bbc0005e425ba0a0b71c38c63accc
-  data.tar.gz: 9300f45fad0bab262246a61c10e1388cd82589e3
+  metadata.gz: 0a5861852dafeed82d4598d63240b3f45c3801a9
+  data.tar.gz: 1b39b7fc533929aff3ce3de6f45c32605ff4bdb7
 SHA512:
-  metadata.gz: 97ebb54ebe9890ebd821d14ecd01e563e0261773cf5560e826ceb16480d5ad34646b8c0191706e4225097a7bd576cc2dcc8d2615eacb219abd4b8d349a1c41c9
-  data.tar.gz: 57ee51f58bc6a78da19ac8d43c7b68f4b7b5fb8a74bf5559d9b36de93c32dc3ab3c5c5068e449ae2de76538d58f9dddad68d69ac0256a5c41c7e9b23f83f2f02
+  metadata.gz: 3ecd37b3ab7c96796c429d0fb7d36db59ce57958b3f2c3c95ff06723956235836cde10a3ee08d13e4ea5f7cccbe2a0fddb07aa182242d115962867f2164b3c4f
+  data.tar.gz: c16e675f20c1219da2f45bbe76cccae57673009284a727264a2f8eed1685ee90eb6920b372ea62efb33a69a43fe36e11c19928dfa46facc64bcf7f012a8fb2d9

data/lib/oeffi.rb

@@ -13,8 +13,8 @@ module Oeffi
       yield(configuration)
     end
 
-    def autocomplete(string="")
-      Oeffi::AutocompleteQuery.new(string).perform
+    def autocomplete(string="", location={})
+      Oeffi::AutocompleteQuery.new(string, location[:lat], location[:lon]).perform
     end
 
     def find_trips(opts)

data/lib/oeffi/locations.rb

@@ -1,8 +1,11 @@
 java_import "de.schildbach.pte.dto.Location"
+require "geokit"
+require "pry"
 
 module Locations
   class Location
-    attr_accessor :id, :type, :name, :lat, :lon
+    attr_accessor :id, :type, :name, :lat, :lon, :loc
+    alias_method :distance_to!, :loc=
     STATION = 0
     ADDRESS = 1
     POI     = 2
@@ -21,7 +24,18 @@ module Locations
       [:id, :type, :name, :lat, :lon].each do |sym|
         hash[sym] = self.send sym
       end
+      unless @lat.nil? or @loc.nil?
+        hash[:distance_to] = distance_to
+      end
       return hash
     end
+
+    def distance_to
+      return 0 unless @lat > 0 and @lon > 0
+      return 0 unless @loc[:lat] > 0 and @loc[:lon] > 0
+      from = Geokit::LatLng.new @lat, @lon
+      to   = Geokit::LatLng.new loc[:lat], loc[:lon]
+      (from.distance_to to, unit: :km) * 1000
+    end
   end
 end

data/lib/oeffi/queries.rb

@@ -5,6 +5,7 @@ module Queries
   include Locations
   include Trips
   class Query
+    attr :lat, :lon
     def perform(method, args)
       Oeffi.provider.send(method, *args)
     end
@@ -12,14 +13,20 @@ module Queries
 
   class AutocompleteQuery < Query
     attr_accessor :string
-    def initialize(string)
+    def initialize(string, lat=nil, lon=nil)
       @string = string
+      @lat    = lat
+      @lon    = lon
     end
 
     def perform
       result = super :autocompleteStations, [@string]
       result.to_a.map do |station|
-        Locations::Location.new(station).as_json
+        location = Locations::Location.new(station)
+        unless @lat.nil? or @lon.nil?
+          location.distance_to!({lat: @lat, lon: @lon})
+        end
+        location.as_json
       end
     end
   end

data/lib/oeffi/version.rb

@@ -1,3 +1,3 @@
 module Oeffi
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/oeffi.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "geokit"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/location_spec.rb

@@ -11,4 +11,11 @@ describe Location do
 
     result[:id].should equal 13000
   end
+
+  it "should be able to tell the distance to a certain point" do
+    jLocation = Java::DeSchildbachPteDto::Location.new Java::DeSchildbachPteDto::LocationType::STATION, 51344352, 12380712
+    location = Locations::Location.new jLocation
+    location.distance_to!({lat: 51.3394580, :lon => 12.3745350})
+    location.distance_to.should be_within(100).of 500
+  end
 end

data/spec/oeffi_spec.rb

@@ -37,6 +37,14 @@ describe "Oeffi module" do
         station.should be_a Hash
       end
     end
+
+    it "should be able to tell the distance to a station when autocompleting" do
+      result = Oeffi::autocomplete("Leipzig", {:lat => 51.3394580, :lon => 12.3745350})
+      result.should be_an Array
+      result.each do |station|
+        station[:distance_to].should_not be_nil
+      end
+    end
   end
 
   describe "Trip finding" do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oeffi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Florian Kraft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: geokit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement