mapbox-sdk 2.0.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0484d85c89aade2922c0a0d43b3d3d61c74db5f
-  data.tar.gz: 0a9304ae7755bbb5121bc237f61b915cdd35596c
+SHA256:
+  metadata.gz: 672927337ebb6e2225839694318310798e63a8f4cc64100d96a67d67a2cde23e
+  data.tar.gz: 4fea4ca533cf9e8b6b9ff7118e2abffe36ff8d9b72758adabc21391e279dead0
 SHA512:
-  metadata.gz: 2664c0e47fc458b1933b3476d7902edbb965613b5326f308b77e07be56f16e5ba2c3193b0abd4ec365e6538e7c7e2db3e7860320a8110f7c23bcfe5c9dad93a4
-  data.tar.gz: 68f8963b09a9f1b00c76778a79751467ff1d1c636c5454ef6aa934a3124f0daed07e54c6b540f8a151edbcbe0600324936f7a74088e3a9fd3a2d74590aa29995
+  metadata.gz: 8a271a83fcb6f562421aceb5c45c0d66bef03fe6d59ef171f3d325936dd9cd01a935e29fd51404a40e39b59d5a9b43d40c9f1fd1d48054d7befff0588e66a43e
+  data.tar.gz: a016890aca123c692ec7a72b03cb3bf7395551c958775affde6feed96ad7d25428aa108118cc99615463d94049a1fec7d2b97f814054a6b2bdab9025b81dca75

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+ - 2.5.1
+install:
+ - bundle install
+script: 
+ - bundle exec ruby -Itest test/all_tests.rb
+after_success:
+  - coveralls

data/CHANGELOG.md

@@ -0,0 +1,45 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [2.3.2] - 2020-11-23
+### Changed
+- Fixed URI.encode obsolete warnings in Ruby 2.7
+  
+## [2.3.1] - 2020-11-07
+### Changed
+- Update to restclient 2.1.0
+
+## [2.3.0] - 2019-01-16
+### Added
+- Matrix endpoint, docs, and tests
+- Map Matching endpoint, docs, and tests
+- Optimization endpoint, docs, and tests
+
+### Changed
+
+### Removed
+
+## [2.2.0] - 2018-12-14
+### Added
+- Selection of directions profiles
+- Isochrone endpoint
+- New README/docs folder and organization
+
+### Changed
+- Update to restclient 2.0
+- Parameters to requests for directions
+
+### Removed
+
+## [2.1.0] - 2018-06-07
+### Added
+- Added CHANGELOG.md
+- Added Tilequery endpoint
+
+### Changed
+- Updated documentation links in README
+
+### Removed

data/Gemfile

@@ -3,7 +3,11 @@ gemspec
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9.3')
   gem 'i18n', '< 0.7'
-  gem 'rest-client', '~> 1.6.8'
-  gem 'activesupport', '~> 3.2'
+  gem 'rest-client', '~> 2.1.0'
+  gem "activesupport", ">= 4.1.11"
   gem 'rake', '10.1.0'
 end
+
+group :development, :test do
+  gem "coveralls", :require => false
+end

data/README.md

@@ -1,3 +1,5 @@
+[![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-sdk-rb/badge.svg?branch=master)](https://coveralls.io/github/mapbox/mapbox-sdk-rb?branch=master)
+
 # mapbox-sdk-ruby
 
 The `mapbox-sdk` gem. A ruby interface to [Mapbox APIs](https://www.mapbox.com/developers/api/).
@@ -10,35 +12,29 @@ gem install mapbox-sdk
 
 ## Services
 
-* [Geocoding](https://www.mapbox.com/developers/api/geocoding/)
+* [Geocoding](https://docs.mapbox.com/api/search/) [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/geocoding.md)]
   * Forward (place names ⇢  longitude, latitude)
   * Reverse (longitude, latitude ⇢ place names)
-* [Directions](https://www.mapbox.com/developers/api/directions/)
+* [Directions](https://docs.mapbox.com/api/navigation/#directions): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/directions.md)]
+  * Profiles for driving, driving-traffic, walking, and cycling
+* [Tilequery](https://docs.mapbox.com/api/maps/#tilequery): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/tilequery.md)]
+* [Isochrone](https://docs.mapbox.com/api/navigation/#isochrone): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/isochrone.md)]
   * Profiles for driving, walking, and cycling
+* [Matrix](https://docs.mapbox.com/api/navigation/#matrix): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/matrix.md)]
+  * Profiles for driving, driving-traffic, walking, and cycling
+* [Map Matching](https://docs.mapbox.com/api/navigation/#map-matching): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/mapmatching.md)]
+  * Profiles for driving, driving-traffic, walking, and cycling
+* [Optimization](https://docs.mapbox.com/api/navigation/#optimization): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/optimization.md)]
+  * Profiles for driving, driving-traffic, walking, and cycling
+
+## Testing
+
+You'll need to [create an access token](https://account.mapbox.com/access-tokens/create) in order to run tests.
 
-## Example
-
-```rb
-require "mapbox-sdk"
-Mapbox.access_token = "YOUR_ACCESS_TOKEN"
-
-# Reverse geocoding
-placenames = Mapbox::Geocoder.geocode_reverse({
-  "latitude" => 38,
-  "longitude" => -100
-})
-
-# Forward geocoding with optional proximity parameter
-places = Mapbox::Geocoder.geocode_forward("Chester, NJ", {:proximity => {:longitude => -74.6968, :latitude => 40.7843}})
-
-# Directions
-drivingDirections = Mapbox::Directions.directions([{
-  "longitude" => -100,
-  "latitude" => 38
-}, {
-  "longitude" => -90,
-  "latitude" => 38
-}])
+Then you can run the entire test suite with the following command:
+
+```
+MapboxAccessToken=<YOUR_ACCESS_TOKEN> bundle exec ruby -Itest test/all_tests.rb
 ```
 
 Heavily influenced by Stripe's Ruby client, and includes its MIT license.

data/docs/directions.md

@@ -0,0 +1,31 @@
+# Directions
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+# Driving directions with required profile parameter.
+drivingDirections = Mapbox::Directions.directions([{
+  "longitude" => -100,
+  "latitude" => 38
+}, {
+  "longitude" => -90,
+  "latitude" => 38
+  }], "driving")
+
+# To provide query parameters to the Directions API, such as `geometries`, `language` or `steps`, add those in a Hash as third parameter (find the full list of parameters (here)[https://www.mapbox.com/api-documentation/navigation/#retrieve-directions]).
+
+# For instance, to use the `geometries` and `voice_instructions` parameter:
+drivingDirections = Mapbox::Directions.directions([{
+  "longitude" => -100,
+  "latitude" => 38
+}, {
+  "longitude" => -90,
+  "latitude" => 38
+  }], "driving", {
+    geometries: "geojson",
+    voice_instructions: true
+  })
+
+# In the above example, you can substitute `driving` for `driving-traffic`, `cycling` or `walking`. For more, [check out the documentation](https://www.mapbox.com/api-documentation/navigation/#directions).
+```

data/docs/geocoding.md

@@ -0,0 +1,15 @@
+# Geocoding
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+# Reverse geocoding
+placenames = Mapbox::Geocoder.geocode_reverse({
+  "latitude": 38,
+  "longitude": -100
+})
+
+# Forward geocoding with optional proximity parameter
+places = Mapbox::Geocoder.geocode_forward("Chester, NJ", {:proximity => {:longitude => -74.6968, :latitude => 40.7843}})
+```

data/docs/isochrone.md

@@ -0,0 +1,11 @@
+# Isochrone
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+isochrone = Mapbox::Isochrone.isochrone("walking", "-118.22258,33.99038", {contours_minutes: [5,10,15]})
+
+# You must include the contours_minutes parameter, as well as a profile (walking, driving, cycling) and the center point coordinate.
+# Optional parameters are contours_colors, polygons, denoise, and generalize. See more on the API documentation page.
+```

data/docs/mapmatching.md

@@ -0,0 +1,43 @@
+# Map Matching
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+# Snap fuzzy, inaccurate GPS or phone traces to the road and path network with required profile parameter.
+matching = Mapbox::MapMatching.map_matching([{
+  "longitude" => -117.17282,
+  "latitude" => 32.71204
+}, {
+  "longitude" => -117.17288,
+  "latitude" => 32.71225
+}, {
+  "longitude" => -117.17293,
+  "latitude" => 32.71244
+  },{
+  "longitude" => -117.17292,
+  "latitude" => 32.71256
+  }], "driving")
+
+# To provide query parameters to the Matrix API, such as `annotations`, `approaches` or `sources`, add those in a Hash as third parameter (find the full list of parameters (here)[https://www.mapbox.com/api-documentation/navigation/#matrix]).
+
+# For instance, to use the `geometries` and `voice_instructions` parameter:
+matching = Mapbox::MapMatching.map_matching([{
+  "longitude" => -117.17282,
+  "latitude" => 32.71204
+}, {
+  "longitude" => -117.17288,
+  "latitude" => 32.71225
+}, {
+  "longitude" => -117.17293,
+  "latitude" => 32.71244
+  },{
+  "longitude" => -117.17292,
+  "latitude" => 32.71256
+  }], "driving", {
+    annotations: ["duration", "distance", "speed"],
+    approaches: ["curb","curb","curb","curb"]
+  })
+
+# In the above example, you can substitute `driving` for `driving-traffic`, `cycling` or `walking`. For more, [check out the documentation](https://docs.mapbox.com/api/navigation/#map-matching).
+```

data/docs/matrix.md

@@ -0,0 +1,38 @@
+# Matrix
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+# Return travel times between many points, passing in the required profile parameter.
+matrix = Mapbox::Matrix.matrix([{
+  "longitude" => -122.42,
+  "latitude" => 37.78
+}, {
+  "longitude" => -122.45,
+  "latitude" => 37.91
+}, {
+ "longitude" => -122.48,
+  "latitude" => 37.73
+  }], "walking")
+
+# To provide query parameters to the Matrix API, such as `annotations`, `approaches` or `sources`, add those in a Hash as third parameter (find the full list of parameters (here)[https://www.mapbox.com/api-documentation/navigation/#matrix]).
+
+# For instance, to use the `annotations`, `approaches`, and `destinations` parameters:
+matrix = Mapbox::Matrix.matrix([{
+  "longitude" => -122.42,
+  "latitude" => 37.78
+}, {
+  "longitude" => -122.45,
+  "latitude" => 37.91
+}, {
+ "longitude" => -122.48,
+  "latitude" => 37.73
+  }], "cycling", {
+    annotations: ["duration", "distance"],
+    approaches: ["curb","","curb"],
+    destinations: [0,1]
+  })
+
+# In the above example, you can substitute `driving` for `driving-traffic`, `cycling` or `walking`. For more, [check out the documentation](https://www.mapbox.com/api-documentation/navigation/#matrix).
+```

data/docs/optimization.md

@@ -0,0 +1,52 @@
+# Optimization
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+# Returns a duration-optimized route between coordinates with required profile parameter.
+optimization = Mapbox::Optimization.optimization([{
+  "longitude" => -122.42,
+  "latitude" => 37.78
+}, {
+  "longitude" => -122.45,
+  "latitude" => 37.91
+}, {
+ "longitude" => -122.48,
+  "latitude" => 37.73
+  }], "walking")
+
+# To provide query parameters to the Matrix API, such as `annotations`, `approaches` or `sources`, add those in a Hash as third parameter (find the full list of parameters (here)[https://www.mapbox.com/api-documentation/navigation/#matrix]).
+
+# For instance, to use the `annotations`, `approaches`, and `overview` parameters:
+optimization = Mapbox::Optimization.optimization([{
+  "longitude" => -122.42,
+  "latitude" => 37.78
+}, {
+  "longitude" => -122.45,
+  "latitude" => 37.91
+}, {
+ "longitude" => -122.48,
+  "latitude" => 37.73
+  }], "cycling", {
+    annotations: ["duration", "distance"],
+    approaches: ["curb","curb","curb"],
+    overview: "false"
+  })
+
+# The bearings param works a bit differently. Here's an example, leaving the second bearing blank with an additional `;` character (you must include the same number of bearings as waypoints, per the docs):
+optimization = Mapbox::Optimization.optimization([{
+  "longitude" => -122.42,
+  "latitude" => 37.78
+}, {
+  "longitude" => -122.45,
+  "latitude" => 37.91
+}, {
+ "longitude" => -122.48,
+  "latitude" => 37.73
+  }], "driving", {
+    bearings: "45,90;;90,1"
+  })
+
+# In the above example, you can substitute `driving` for `driving-traffic`, `cycling` or `walking`. For more, [check out the documentation](https://docs.mapbox.com/api/navigation/#optimization).
+```

data/docs/tilequery.md

@@ -0,0 +1,12 @@
+# Tilequery
+
+```rb
+require "mapbox-sdk"
+Mapbox.access_token = "YOUR_ACCESS_TOKEN"
+
+tilequery = Mapbox::Tilequery.tilequery(mapid, {location}, radius, limit)
+
+# Example: tilequery = Mapbox::Tilequery.tilequery("mapbox.mapbox-streets-v7", {"longitude" => -100, "latitude" => 38}, 0, 1)
+# `Radius` refers to the approximate distance in meters to query for features. Defaults to  0 if left blank. Has no upper bound. Required for queries against point and line data. 
+# `Limit` refers to the number of features between  1 - 50 to return. Defaults to  5 if left blank.
+```

data/lib/mapbox.rb

@@ -33,7 +33,7 @@ module Mapbox
     case method.to_s.downcase.to_sym
     when :get, :head, :delete
       # Make params into GET parameters
-      url += "#{URI.parse(url).query ? '&' : '?'}#{uri_encode(params)}" if params && params.any?
+      url += "#{URI.parse(url).query ? '&' : '?'}#{URI.encode_www_form(params)}" if params && params.any?
       payload = nil
     end
 
@@ -78,7 +78,7 @@ module Mapbox
   end
 
   def self.url_encode(key)
-    URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+    URI.encode_www_form_component(key.to_s)
   end
 
   def self.execute_request(opts)
@@ -180,3 +180,8 @@ end
 # services
 require 'mapbox/geocoder'
 require 'mapbox/directions'
+require 'mapbox/tilequery'
+require 'mapbox/isochrone'
+require 'mapbox/matrix'
+require 'mapbox/map_matching'
+require 'mapbox/optimization'

data/lib/mapbox/directions.rb

@@ -1,16 +1,59 @@
-require 'rest-client'
-require 'json'
-
 module Mapbox
   class Directions
     include Mapbox::APIOperations::Request
     extend Mapbox::HashUtils
-    def self.directions(waypoints, profile='mapbox.driving')
+
+    def self.assemble_params(options={})
+      alternatives = options[:alternatives]
+      annotations = options[:annotations]
+      approaches = options[:approaches]
+      banner_instructions = options[:banner_instructions]
+      bearings = options[:bearings]
+      continue_straight = options[:continue_straight]
+      exclude = options[:exclude]
+      geometries = options[:geometries]
+      language = options[:language]
+      overview = options[:overview]
+      radiuses = options[:radiuses]
+      roundabout_exits = options[:roundabout_exits]
+      steps = options[:steps]
+      voice_instructions = options[:voice_instructions]
+      voice_units = options[:voice_units]
+      waypoint_names = options[:waypoint_names]
+      
+      params = ''
+      opts = options.select { |key, value| key != :approaches && key != :bearings && key != :radiuses && key != :waypoint_names  }
+      if opts.length > 0
+        params += "#{params.length > 0 ? '&' : '?'}#{URI.encode_www_form(opts)}"
+      end
+
+      if approaches  then
+        params += "#{params.length > 0 ? '&' : '?'}approaches=#{approaches.join(';')}"
+      end
+
+      if bearings then
+        params += "#{params.length > 0 ? '&' : '?'}bearings=#{bearings.map {|p| bearings.join ','}.join ';'}"
+      end
+
+      if radiuses then
+        params += "#{params.length > 0 ? '&' : '?'}radiuses=#{radiuses.join ';'}"
+      end
+
+      if waypoint_names then
+        params += "#{params.length > 0 ? '&' : '?'}waypoint_names=#{waypoint_names.join ';'}"
+      end
+
+      return params
+    end
+
+    def self.directions(waypoints, profile, options={})
       formatted_waypoints = waypoints.map {|p| xy_from_hash(p).join ','}.join ';'
+      params = self.assemble_params(options)
+      
       return request(
-        :get,
-        "/v4/directions/#{profile}/#{formatted_waypoints}.json",
-        nil)
+          :get,
+          "/directions/v5/mapbox/#{profile}/#{formatted_waypoints}.json#{params}",
+          nil)
     end
   end
-end
+end

data/lib/mapbox/geocoder.rb

@@ -7,11 +7,12 @@ module Mapbox
     include Mapbox::APIOperations::Request
     extend Mapbox::HashUtils
 
-    def self.geocode_forward(query, options={}, dataset='mapbox.places')
+    def self.assemble_params(options={})
       proximity = options[:proximity]
       bbox = options[:bbox]
+      types = options[:types]
       params = ''
-      opts = options.select { |key, value| key != :proximity && key != :bbox}
+      opts = options.select { |key, value| key != :proximity && key != :bbox && key != :types}
       if opts.length > 0
         params += "#{params.length > 0 ? '&' : '?'}#{URI.encode_www_form(opts)}"
       end
@@ -25,19 +26,32 @@ module Mapbox
       if bbox then
         params += "#{params.length > 0 ? '&' : '?'}bbox=#{bbox.join('%2C')}"
       end
+
+      if types then
+        params += "#{params.length > 0 ? '&' : '?'}types=#{types.join('%2C')}"
+      end
+
+      return params
+    end
+
+    def self.geocode_forward(query, options={}, dataset='mapbox.places')
+      params = self.assemble_params(options)
+
       return request(
         :get,
-        "/geocoding/v5/#{dataset}/#{URI.escape(query)}.json#{params}",
+        "/geocoding/v5/#{dataset}/#{URI.encode_www_form_component(query)}.json#{params}",
         nil)
     end
 
-    def self.geocode_reverse(location, dataset='mapbox.places')
+    def self.geocode_reverse(location, options={}, dataset='mapbox.places')
       location[:longitude] = location[:longitude].round(5)
       location[:latitude] = location[:latitude].round(5)
 
+      params = self.assemble_params(options)
+
       return request(
         :get,
-        "/geocoding/v5/#{dataset}/#{xy_from_hash(location).join(',')}.json",
+        "/geocoding/v5/#{dataset}/#{xy_from_hash(location).join(',')}.json#{params}",
         nil)
     end
   end

data/lib/mapbox/isochrone.rb

@@ -0,0 +1,35 @@
+module Mapbox
+  class Isochrone
+    include Mapbox::APIOperations::Request
+
+    def self.assemble_params(options={})
+      contours_minutes = options[:contours_minutes]
+      contours_colors = options[:contours_colors]
+      
+      params = ''
+      opts = options.select { |key, value| key != :contours_minutes && key != :contours_colors }
+      if opts.length > 0
+        params += "#{params.length > 0 ? '&' : '?'}#{URI.encode_www_form(opts)}"
+      end
+
+      if contours_minutes  then
+        params += "#{params.length > 0 ? '&' : '?'}contours_minutes=#{contours_minutes.join(',')}"
+      end
+
+      if contours_colors then
+        params += "#{params.length > 0 ? '&' : '?'}contours_colors=#{contours_colors.join(',')}"
+      end
+
+      return params
+    end
+
+    def self.isochrone(profile, coordinates, options={})
+      params = self.assemble_params(options)
+      
+      return request(
+          :get,
+          "/isochrone/v1/mapbox/#{profile}/#{coordinates}#{params}",
+          nil)
+    end
+  end
+end

data/lib/mapbox/map_matching.rb

@@ -0,0 +1,57 @@
+module Mapbox
+  class MapMatching
+    include Mapbox::APIOperations::Request
+    extend Mapbox::HashUtils
+
+    def self.assemble_params(options={})
+      annotations = options[:annotations]
+      approaches = options[:approaches]
+      radiuses = options[:radiuses]
+      timestamps = options[:timestamps]
+      waypoint_names = options[:waypoint_names]
+      waypoints = options[:waypoints]
+      
+      params = ''
+      opts = options.select { |key, value| key != :annotations && key != :approaches && key != :radiuses && key != :timestamps && key != :waypoint_names && key != :waypoints  }
+      if opts.length > 0
+        params += "#{params.length > 0 ? '&' : '?'}#{URI.encode_www_form(opts)}"
+      end
+
+      if annotations  then
+        params += "#{params.length > 0 ? '&' : '?'}annotations=#{annotations.join(',')}"
+      end
+
+      if approaches  then
+        params += "#{params.length > 0 ? '&' : '?'}approaches=#{approaches.join(';')}"
+      end
+
+      if radiuses then
+        params += "#{params.length > 0 ? '&' : '?'}radiuses=#{radiuses.join ';'}"
+      end
+
+      if timestamps then
+        params += "#{params.length > 0 ? '&' : '?'}timestamps=#{timestamps.join ';'}"
+      end
+
+      if waypoint_names then
+        params += "#{params.length > 0 ? '&' : '?'}waypoint_names=#{waypoint_names.join ';'}"
+      end
+
+      if waypoints then
+        params += "#{params.length > 0 ? '&' : '?'}waypoints=#{waypoints.join ';'}"
+      end
+
+      return params
+    end
+
+    def self.map_matching(waypoints, profile, options={})
+      formatted_waypoints = waypoints.map {|p| xy_from_hash(p).join ','}.join ';'
+      params = self.assemble_params(options)
+      
+      return request(
+          :get,
+          "/matching/v5/mapbox/#{profile}/#{formatted_waypoints}.json#{params}",
+          nil)
+    end
+  end
+end

data/lib/mapbox/matrix.rb

@@ -0,0 +1,32 @@
+module Mapbox
+  class Matrix
+    include Mapbox::APIOperations::Request
+    extend Mapbox::HashUtils
+
+    def self.assemble_params(options={})
+      opts = options.dup
+
+      self.joinArrayParam(opts, :destinations)
+      self.joinArrayParam(opts, :annotations, ',')
+      self.joinArrayParam(opts, :approaches)
+      self.joinArrayParam(opts, :sources)
+
+      return "?#{URI.encode_www_form(opts)}"
+    end
+
+    def self.joinArrayParam(opts, name, joinSymbol = ';')
+      if opts[name].kind_of?(Array)
+        opts[name] = opts[name].join(joinSymbol)
+      end
+    end
+
+    def self.matrix(waypoints, profile, options={})
+      formatted_waypoints = waypoints.map {|p| xy_from_hash(p).join ','}.join ';'
+      params = self.assemble_params(options)
+      return request(
+          :get,
+          "/directions-matrix/v1/mapbox/#{profile}/#{formatted_waypoints}.json#{params}",
+          nil)
+    end
+  end
+end

data/lib/mapbox/optimization.rb

@@ -0,0 +1,47 @@
+module Mapbox
+  class Optimization
+    include Mapbox::APIOperations::Request
+    extend Mapbox::HashUtils
+
+    def self.assemble_params(options={})
+      annotations = options[:annotations]
+      approaches = options[:approaches]
+      distributions = options[:distributions]
+      radiuses = options[:radiuses]
+      
+      params = ''
+      opts = options.select { |key, value| key != :annotations && key != :approaches && key != :distributions && key != :radiuses }
+      if opts.length > 0
+        params += "#{params.length > 0 ? '&' : '?'}#{URI.encode_www_form(opts)}"
+      end
+
+      if annotations  then
+        params += "#{params.length > 0 ? '&' : '?'}annotations=#{annotations.join(',')}"
+      end
+
+      if approaches  then
+        params += "#{params.length > 0 ? '&' : '?'}approaches=#{approaches.join(';')}"
+      end
+
+      if distributions  then
+        params += "#{params.length > 0 ? '&' : '?'}distributions=#{distributions.join(';')}"
+      end
+
+      if radiuses then
+        params += "#{params.length > 0 ? '&' : '?'}radiuses=#{radiuses.join(';')}"
+      end
+
+      return params
+    end
+
+    def self.optimization(waypoints, profile, options={})
+      formatted_waypoints = waypoints.map {|p| xy_from_hash(p).join ','}.join ';'
+      params = self.assemble_params(options)
+      
+      return request(
+          :get,
+          "/optimized-trips/v1/mapbox/#{profile}/#{formatted_waypoints}.json#{params}",
+          nil)
+    end
+  end
+end

data/lib/mapbox/tilequery.rb

@@ -0,0 +1,15 @@
+module Mapbox
+  class Tilequery
+    include Mapbox::APIOperations::Request
+    extend Mapbox::HashUtils
+
+    def self.tilequery(mapid, location, radius, limit)
+      lon = location['longitude'].round(5)
+      lat = location['latitude'].round(5)
+      return request(
+        :get,
+        "/v4/#{mapid}/tilequery/#{lon},#{lat}.json?radius=#{radius}&limit=#{limit}",
+        nil)
+    end
+  end
+end

data/mapbox-sdk.gemspec

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 spec = Gem::Specification.new do |s|
   s.name = 'mapbox-sdk'
-  s.version = '2.0.0'
+  s.version = '2.3.2'
   s.summary = 'Ruby bindings for the Mapbox API'
   s.description = ''
   s.authors = ['Tom MacWright']
@@ -10,8 +10,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'https://mapbox.com/developers'
   s.license = 'MIT'
 
-  s.add_dependency('rest-client', '~> 1.4')
-  s.add_dependency('json', '~> 1.8.1')
+  s.add_dependency('rest-client', '~> 2.1.0')
 
   s.add_development_dependency('mocha', '~> 0.13.2')
   s.add_development_dependency('shoulda', '~> 3.4.0')

data/test/all_tests.rb

@@ -0,0 +1,4 @@
+require 'coveralls'
+Coveralls.wear!
+
+Dir[File.dirname(File.absolute_path(__FILE__)) + '/**/*_test.rb'].each {|file| require file }

data/test/directions_test.rb

@@ -16,7 +16,9 @@ module Mapbox
           :longitude => -90,
           :latitude => 38
         }
-      ])
+      ], "cycling", {
+        geometries: "geojson"
+      })
       assert result
     end
   end

data/test/geocoding_test.rb

@@ -39,6 +39,13 @@ module Mapbox
       assert Mapbox.request_opts[:url].include? '?country=ca';
     end
 
+    should "#geocode_forward (include types param)" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Geocoder.geocode_forward("Washington", {:types => ['poi.landmark', 'address'], :foo_key => "foo_val", :bar_key => "bar_val"})
+      assert result
+      assert Mapbox.request_opts[:url].include? '?foo_key=foo_val&bar_key=bar_val&types=poi.landmark%2Caddress';
+    end
+
     should "#geocode_reverse" do
       Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_reverse({

data/test/isochrone_test.rb

@@ -0,0 +1,15 @@
+require 'mapbox'
+require 'test/unit'
+require 'mocha/setup'
+require 'shoulda'
+
+module Mapbox
+  class IsochroneTest < Test::Unit::TestCase
+    should "#isochrone" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Isochrone.isochrone(
+        "walking", "-118.22258,33.99038", {contours_minutes: [5,10,15]})
+      assert result
+    end
+  end
+end

data/test/map_matching_test.rb

@@ -0,0 +1,46 @@
+require 'mapbox'
+require 'test/unit'
+require 'mocha/setup'
+require 'shoulda'
+
+module Mapbox
+  class MapMatchingTest < Test::Unit::TestCase
+    should "#map match with just coordinates and profile" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::MapMatching.map_matching([{
+        "longitude" => -117.17282,
+        "latitude" => 32.71204
+      }, {
+        "longitude" => -117.17288,
+        "latitude" => 32.71225
+      }, {
+        "longitude" => -117.17293,
+        "latitude" => 32.71244
+        },{
+        "longitude" => -117.17292,
+        "latitude" => 32.71256
+        }], "driving")
+      assert result
+    end
+    should "#map match with optional params" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::MapMatching.map_matching([{
+        "longitude" => -117.17282,
+        "latitude" => 32.71204
+      }, {
+        "longitude" => -117.17288,
+        "latitude" => 32.71225
+      }, {
+       "longitude" => -117.17293,
+        "latitude" => 32.71244
+      }, {
+       "longitude" => -117.17292,
+        "latitude" => 32.71256
+        }], "driving", {
+          annotations: ["duration", "distance", "speed"],
+          approaches: ["curb","curb","curb","curb"]
+        })
+      assert result
+    end
+  end
+end

data/test/matrix_test.rb

@@ -0,0 +1,40 @@
+require 'mapbox'
+require 'test/unit'
+require 'mocha/setup'
+require 'shoulda'
+
+module Mapbox
+  class MatrixTest < Test::Unit::TestCase
+    should "#matrix with just coordinates and profile" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Matrix.matrix([{
+        "longitude" => -122.42,
+        "latitude" => 37.78
+      }, {
+        "longitude" => -122.45,
+        "latitude" => 37.91
+      }, {
+       "longitude" => -122.48,
+        "latitude" => 37.73
+        }], "driving")
+      assert result
+    end
+    should "#matrix with optional params" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Matrix.matrix([{
+        "longitude" => -122.42,
+        "latitude" => 37.78
+      }, {
+        "longitude" => -122.45,
+        "latitude" => 37.91
+      }, {
+       "longitude" => -122.48,
+        "latitude" => 37.73
+        }], "cycling", {
+          annotations: ["duration", "distance"],
+          approaches: ["curb","curb","curb"]
+        })
+      assert result
+    end
+  end
+end

data/test/optimization_test.rb

@@ -0,0 +1,56 @@
+require 'mapbox'
+require 'test/unit'
+require 'mocha/setup'
+require 'shoulda'
+
+module Mapbox
+  class MatrixTest < Test::Unit::TestCase
+    should "#optimization with just coordinates and profile" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Optimization.optimization([{
+        "longitude" => -122.42,
+        "latitude" => 37.78
+      }, {
+        "longitude" => -122.45,
+        "latitude" => 37.91
+      }, {
+       "longitude" => -122.48,
+        "latitude" => 37.73
+        }], "walking")
+      assert result
+    end
+    should "#optimization with optional params" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Optimization.optimization([{
+        "longitude" => -122.42,
+        "latitude" => 37.78
+      }, {
+        "longitude" => -122.45,
+        "latitude" => 37.91
+      }, {
+       "longitude" => -122.48,
+        "latitude" => 37.73
+        }], "cycling", {
+          annotations: ["duration", "distance"],
+          approaches: ["curb","curb","curb"]
+        })
+      assert result
+    end
+    should "#optimization with an empty bearing" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Optimization.optimization([{
+        "longitude" => -122.42,
+        "latitude" => 37.78
+      }, {
+        "longitude" => -122.45,
+        "latitude" => 37.91
+      }, {
+       "longitude" => -122.48,
+        "latitude" => 37.73
+        }], "driving", {
+          bearings: "45,90;;90,1"
+        })
+      assert result
+    end
+  end
+end

data/test/tilequery_test.rb

@@ -0,0 +1,15 @@
+require 'mapbox'
+require 'test/unit'
+require 'mocha/setup'
+require 'shoulda'
+
+module Mapbox
+  class TilequeryTest < Test::Unit::TestCase
+    should "#tilequery" do
+      Mapbox.access_token = ENV["MapboxAccessToken"]
+      result = Mapbox::Tilequery.tilequery(
+        "mapbox.mapbox-streets-v7", {"longitude" => -122.42901, "latitude" => 37.80633}, 5, 10)
+      assert result
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mapbox-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Tom MacWright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -101,21 +87,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- docs/directions.md
+- docs/geocoding.md
+- docs/isochrone.md
+- docs/mapmatching.md
+- docs/matrix.md
+- docs/optimization.md
+- docs/tilequery.md
 - lib/mapbox-sdk.rb
 - lib/mapbox.rb
 - lib/mapbox/api_operations.rb
 - lib/mapbox/authentication_error.rb
 - lib/mapbox/directions.rb
 - lib/mapbox/geocoder.rb
+- lib/mapbox/isochrone.rb
+- lib/mapbox/map_matching.rb
+- lib/mapbox/matrix.rb
+- lib/mapbox/optimization.rb
+- lib/mapbox/tilequery.rb
 - mapbox-sdk.gemspec
+- test/all_tests.rb
 - test/directions_test.rb
 - test/geocoding_test.rb
+- test/isochrone_test.rb
+- test/map_matching_test.rb
 - test/mapbox_test.rb
+- test/matrix_test.rb
+- test/optimization_test.rb
+- test/tilequery_test.rb
 homepage: https://mapbox.com/developers
 licenses:
 - MIT
@@ -135,12 +141,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Mapbox API
 test_files:
+- test/all_tests.rb
 - test/directions_test.rb
 - test/geocoding_test.rb
+- test/isochrone_test.rb
+- test/map_matching_test.rb
 - test/mapbox_test.rb
+- test/matrix_test.rb
+- test/optimization_test.rb
+- test/tilequery_test.rb

data/Gemfile.lock

@@ -1,64 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mapbox (1.0.0)
-      json (~> 1.8.1)
-      rest-client (~> 1.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    bourne (1.5.0)
-      mocha (>= 0.13.2, < 0.15)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    metaclass (0.0.4)
-    mime-types (2.6.1)
-    minitest (5.7.0)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    netrc (0.10.3)
-    power_assert (0.2.4)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.2.1)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    test-unit (3.1.2)
-      power_assert
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mapbox!
-  mocha (~> 0.13.2)
-  rake
-  shoulda (~> 3.4.0)
-  test-unit
-
-BUNDLED WITH
-   1.10.6