spherical_mercator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c25752283cbaf577010569270ec2ca240d97a62
-  data.tar.gz: f2aecd50cd93e790880921c098216008574f8853
+SHA256:
+  metadata.gz: 665ccb30651f974478815cbfc896ee76d310c99c9bf270378c2078033bb4da0c
+  data.tar.gz: 8406e7fa6f88d8812e6ccd355a1ccbf67a805fb8a74665ac28a1a0945b0b6eb7
 SHA512:
-  metadata.gz: adfdd9971e141456233f590684c200ae7577917402ca6ff31559dd8f235b3c72958ec893e166cfb67963475b2bd3dc0704bb7dfc55bcd5670719733df297ff86
-  data.tar.gz: 1109a332fad241f5eecbf619ce2fbdfea81d411584c63c809693eaba2d75b95382a6d1f8453794b03b274af4375c4a0e5f5aaa5b65817dde14e98caad5ff72e3
+  metadata.gz: f3e834ae96fce835a4965040e1dd8696241d7222db5e275c4f61c7eec59b28cbec8e4f7a3a90e73b51e66ab0ca7bb6b1c9fda5396040bb84fa877d4574288cc5
+  data.tar.gz: 4e7a044bc20704dcf933dcd87ebfc5a1fcac1077fe2ac9ed1812d61d682a81f292d5ef020fe39850ca52a0a76d41fb67855065cd3eb8347c32c86bd792a1cab4

data/.travis.yml

@@ -3,10 +3,11 @@ before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
 script: "rake spec"
 rvm:
-  - 2.0.0
-  - 2.2.4
-  - 2.3.3
-  - 2.4.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - jruby-9.0.5.0
   - jruby-9.1.5.0
   - jruby-9.1.6.0

data/README.md

@@ -1,7 +1,6 @@
 # Ruby port of Mapbox Spherical Mercator
 [![Gem Version](https://badge.fury.io/rb/spherical_mercator.svg)](http://badge.fury.io/rb/spherical_mercator)
 [![Build Status](https://travis-ci.org/nbulaj/spherical_mercator.svg?branch=master)](https://travis-ci.org/nbulaj/spherical_mercator)
-[![Dependency Status](https://gemnasium.com/nbulaj/spherical_mercator.svg)](https://gemnasium.com/nbulaj/spherical_mercator)
 [![Coverage Status](https://coveralls.io/repos/github/nbulaj/spherical_mercator/badge.svg)](https://coveralls.io/github/nbulaj/spherical_mercator)
 [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg)](#license)
 
@@ -32,6 +31,8 @@ Some datatypes are assumed to be arrays: `ll` is `[lon, lat]`, `xy` and `px` are
 ```ruby
 # By default, precomputes up to z30
 mercator = SphericalMercator.new(size: 256)
+# Whether to round pixel values at integer zoom levels. Defaults to true.
+mercator = SphericalMercator.new(round: false)
 ```
 
 ### `px(lon_lat, zoom)`
@@ -39,6 +40,8 @@ mercator = SphericalMercator.new(size: 256)
 Convert lon, lat to screen pixel x, y from 0, 0 origin, at a certain zoom level.
 The inverse of `ll`
 
+Screen pixel values are rounded, unless the zoom level is a floating point value. To disable rounding on integer zoom levels, specify `round: false` when creating the SphericalMercator.
+
 ### `ll(px, zoom)`
 
 Convert screen pixel value to lon, lat, at a certain zoom level. The inverse

data/lib/spherical_mercator.rb

@@ -1,7 +1,10 @@
 require 'spherical_mercator/version'
 
 class SphericalMercator
+  
   attr_reader :options
+  attr_accessor :size, :round
+
   # Closures including constants and other precalculated values.
 
   EPSLN = 1.0e-10
@@ -11,7 +14,7 @@ class SphericalMercator
   A = 6_378_137.0
   MAX_EXTENT = 20_037_508.342_789_244
 
-  attr_accessor :size, :cache
+  attr_accessor :cache
 
   attr_accessor :ac, :bc, :cc, :zc
 
@@ -22,6 +25,8 @@ class SphericalMercator
     @options = opts || {}
 
     self.size = (options[:size] || 256).to_f
+    # Whether to round output values for integer zoom levels. Defaults to true.
+    self.round = (options[:round].nil?) ? true : options[:round]
 
     if cache[size].nil?
       size = self.size
@@ -60,7 +65,7 @@ class SphericalMercator
   # - `ll` {Array} `[lon, lat]` array of geographic coordinates.
   # - `zoom` {Number} zoom level.
   def px(lon_lat, zoom)
-    if float?(zoom)
+    if float?(zoom) || !self.round
       size = @size * (2**zoom)
       d = size / 2
       bc = (size / 360)

data/lib/spherical_mercator/version.rb

@@ -9,7 +9,7 @@ class SphericalMercator
     # Minor version number
     MINOR = 1
     # Smallest version number
-    TINY  = 0
+    TINY  = 1
 
     # Full version number
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

data/spec/spherical_mercator/spherical_mercator_spec.rb

@@ -18,6 +18,7 @@ end
 
 describe SphericalMercator do
   let!(:sm) { SphericalMercator.new }
+  let!(:sm_round) { SphericalMercator.new(round: false) }
 
   context '#bbox' do
     it '[0,0,0] converted to proper bbox' do
@@ -117,6 +118,10 @@ describe SphericalMercator do
     it 'PX with float zoom value converts' do
       expect(sm.px([-179, 85], 8.6574)).to eq([287.12734093961626, 169.30444219392666])
     end
+  
+    it 'PX with forced rounding' do
+      expect(sm_round.px([-179, 85], 9)).to eq([364.0888888888876, 214.68476683766494])
+    end
   end
 
   context 'high precision float' do

data/spherical_mercator.gemspec

@@ -5,7 +5,6 @@ require 'spherical_mercator/version'
 Gem::Specification.new do |gem|
   gem.name = 'spherical_mercator'
   gem.version = SphericalMercator.gem_version
-  gem.date = '2017-10-03'
   gem.summary = 'Spherical Mercator math in Ruby'
   gem.description = 'Spherical Mercator provides projection math for converting between mercator' \
                     'meters, screen pixels (of 256x256 or configurable-size tiles), and latitude/longitude'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spherical_mercator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Spherical Mercator math in Ruby