geocoder_here_maps 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faff081abf0401a8b3d654781f72b9aba1393ba7
-  data.tar.gz: 5d908beaf9814bbec2e946e6cb5d21bd7cc32db0
+  metadata.gz: 93381dfd6734e4661e3de0282bedc8c00fb7fc98
+  data.tar.gz: a8ae075605a5bb0bbc97586eaa9655d7dcd6efd4
 SHA512:
-  metadata.gz: 6c89db303948341b7b609a501566e3117f111f0ab67b33325cbbf443f389988510824a8a55bdcf9704ac24da2806672244590d0c2c9daeea16548eb1ff1aa359
-  data.tar.gz: 607dc13908e5e72ee67f8b978e2fc907a85a79d16c1632650a1920258ee14b820754697c1dc2d8e7e3fb1cf55df09d618c941337ceb0149c47dffd90be73d6d6
+  metadata.gz: 620c2318236c37f907bc3ebcb33017e3f3676f2bd3f7547540738d339fb0f836b910227f6dd9fb2a936fe7a8070c088a8443219725fae5d1a3f1c33dd7f065bf
+  data.tar.gz: 854a8f3a9c7c6d98839b04d83cc41de3150dff7979e08dc9c7c9148abaaa02761c80e98ae8dde7032942c030d327f13778c8d19f74ee540480c187a01ee325ef

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+lib/.DS_Store
+lib/geocoder/.DS_Store
+lib/geocoder/lookups/.DS_Store

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    geocoder_here_maps (0.1.0)
-      geocoder
+    geocoder_here_maps (0.2.0)
+      geocoder (~> 1.5.1)
 
 GEM
   remote: https://rubygems.org/

data/geocoder_here_maps.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency "geocoder"
+  spec.add_dependency "geocoder", "~> 1.5.1"
 end

data/lib/geocoder/lookups/concerns/here_lookup_default_methods.rb

@@ -0,0 +1,43 @@
+module Geocoder::Lookup
+  module HereLookupDefaultMethods
+    extend ActiveSupport::Concern
+
+    def handle
+      :here
+    end
+
+    def required_api_key_parts
+      ["app_id", "app_code"]
+    end
+
+    private
+
+    def query_url_here_options(query)
+      options = {
+        app_id: api_key,
+        app_code: api_code,
+        language: (query.language || configuration.language)
+      }
+    end
+
+    def api_key
+      if (a = configuration.api_key)
+        return a.first if a.is_a?(Array)
+      end
+    end
+
+    def api_code
+      if (a = configuration.api_key)
+        return a.last if a.is_a?(Array)
+      end
+    end
+
+    def domain
+      if configuration.cit
+        'cit.api.here.com'
+      else
+        'api.here.com'
+      end
+    end
+  end
+end

data/lib/geocoder/lookups/here_calculate_route.rb

@@ -0,0 +1,40 @@
+module Geocoder::Lookup
+  class HereCalculateRoute < Base
+    include HereLookupDefaultMethods
+
+    def name
+      "HereCalculateRoute"
+    end
+
+    private
+
+    def base_query_url(query)
+      "#{protocol}://route.#{domain}/routing/7.2/calculateroute.json?"
+    end
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      return [] unless doc["response"] && doc["response"]["route"]
+
+      r = doc["response"]["route"]
+
+      if r.is_a?(Array)
+        return r
+      else
+        return []
+      end
+    end
+
+    def query_url_params(query)
+      super.merge(query_url_here_options(query)).merge(
+        waypoints_hash(query.to_param)
+      )
+    end
+
+    def waypoints_hash(waypoints)
+      waypoints.each_with_object({}).with_index do |(point, hash), index|
+        hash["waypoint#{index}"] = point.join(',')
+      end
+    end
+  end
+end

data/lib/geocoder/lookups/here_suggest.rb

@@ -0,0 +1,34 @@
+module Geocoder::Lookup
+  class HereSuggest < Base
+    include HereLookupDefaultMethods
+
+    def name
+      "HereSuggest"
+    end
+
+    private
+
+    def base_query_url(query)
+      "#{protocol}://autocomplete.geocoder.#{domain}/6.2/suggest.json?"
+    end
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      return [] unless doc['suggestions']
+
+      r = doc['suggestions']
+
+      if r.is_a?(Array)
+        return r
+      else
+        return []
+      end
+    end
+
+    def query_url_params(query)
+      super.merge(query_url_here_options(query)).merge(
+        query: query.sanitized_text
+      )
+    end
+  end
+end

data/lib/geocoder/results/here_calculate_route.rb

@@ -0,0 +1,60 @@
+module Geocoder::Result
+  class HereCalculateRoute
+    # data (hash) fetched from geocoding service
+    attr_accessor :data
+
+    # true if result came from cache, false if from request to geocoding
+    # service; nil if cache is not configured
+    attr_accessor :cache_hit
+
+    ##
+    # Takes a hash of data from a parsed geocoding service response.
+    #
+    def initialize(data)
+      @data = data
+      @cache_hit = nil
+    end
+
+    def waypoint
+      @data['waypoint']
+    end
+
+    def leg
+      @data['leg']
+    end
+
+    def shape
+      @data['shape']
+    end
+
+    def maneuver
+      leg['maneuver']
+    end
+
+    def mode
+      @data['mode']
+    end
+
+    def distance
+      summary_data['distance']
+    end
+
+    def travel_time
+      summary_data['travelTime']
+    end
+
+    def traffic_time
+      summary_data['trafficTime']
+    end
+
+    def base_time
+      summary_data['baseTime']
+    end
+
+    private # ----------------------------------------------------------------
+
+    def summary_data
+      @data['summary']
+    end
+  end
+end

data/lib/{geocoder_here_maps/geocoder/results/here_autocomplete.rb → geocoder/results/here_suggest.rb}

@@ -1,5 +1,5 @@
-module GeocoderHereMaps
-  class Geocoder::Result::HereAutocomplete < Geocoder::Result::Here
+module Geocoder::Result
+  class HereSuggest < Base
     def address(format = :full)
       @data['label']
     end

data/lib/geocoder_here_maps.rb

@@ -1,12 +1,18 @@
 require 'geocoder'
 require "geocoder_here_maps/version"
-require "geocoder_here_maps/geocoder/lookups/here_autocomplete"
-require "geocoder_here_maps/geocoder/results/here_autocomplete"
+require "geocoder/lookups/concerns/here_lookup_default_methods.rb"
+require "geocoder_here_maps/here"
+
+require "geocoder/lookups/here_suggest"
+require "geocoder/results/here_suggest"
+
+require "geocoder/lookups/here_calculate_route"
+require "geocoder/results/here_calculate_route"
 
 module GeocoderHereMaps
   class << self
     def load
-      Geocoder::Lookup.street_services.push(:here_autocomplete)
+      Geocoder::Lookup.street_services += %i[here_suggest here_calculate_route]
     end
   end
 

data/lib/geocoder_here_maps/here.rb

@@ -0,0 +1,13 @@
+require "geocoder/lookups/here"
+
+module Geocoder::Lookup
+  Here.class_eval do
+    include HereLookupDefaultMethods
+
+    private
+
+    def base_query_url(query)
+      "#{protocol}://#{if query.reverse_geocode? then 'reverse.' end}geocoder.#{domain}/6.2/#{if query.reverse_geocode? then 'reverse' end}geocode.json?"
+    end
+  end
+end

data/lib/geocoder_here_maps/version.rb

@@ -1,3 +1,3 @@
 module GeocoderHereMaps
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder_here_maps
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arpit Jain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 description: 
 email:
 - arpit@bigbinary.com
@@ -86,11 +86,14 @@ files:
 - bin/console
 - bin/setup
 - geocoder_here_maps.gemspec
-- lib/.DS_Store
+- lib/geocoder/lookups/concerns/here_lookup_default_methods.rb
+- lib/geocoder/lookups/here_calculate_route.rb
+- lib/geocoder/lookups/here_suggest.rb
+- lib/geocoder/results/here_calculate_route.rb
+- lib/geocoder/results/here_suggest.rb
 - lib/geocoder_here_maps.rb
 - lib/geocoder_here_maps/.DS_Store
-- lib/geocoder_here_maps/geocoder/lookups/here_autocomplete.rb
-- lib/geocoder_here_maps/geocoder/results/here_autocomplete.rb
+- lib/geocoder_here_maps/here.rb
 - lib/geocoder_here_maps/version.rb
 homepage: ''
 licenses:

data/lib/geocoder_here_maps/geocoder/lookups/here_autocomplete.rb

@@ -1,53 +0,0 @@
-module GeocoderHereMaps
-  class Geocoder::Lookup::HereAutocomplete < Geocoder::Lookup::Here
-    def name
-      "HereAutocomplete"
-    end
-
-    def query_url(query)
-     base_query_url(query) + url_query_string(query)
-    end
-
-    private
-
-    def base_query_url(query)
-      "#{protocol}://autocomplete.geocoder.api.here.com/6.2/suggest.json?"
-    end
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      return [] unless doc['suggestions']
-
-      r = doc['suggestions']
- 
-      if r.is_a?(Array)
-        return r
-      else
-        return []
-      end
-    end
-
-    def query_url_here_options(query)
-      options = {
-        app_id: api_key,
-        app_code: api_code,
-        language: (query.language || configuration.language)
-      }
-
-      unless (country = query.options[:country]).nil?
-        options[:country] = country
-      end
-
-      unless (mapview = query.options[:bounds]).nil?
-        options[:mapview] = mapview.map{ |point| "%f,%f" % point }.join(';')
-      end
-      options
-    end
-
-    def query_url_params(query)
-      super.merge(query_url_here_options(query)).merge(
-        query: query.sanitized_text
-      )
-    end
-  end
-end