spherical_mercator 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665ccb30651f974478815cbfc896ee76d310c99c9bf270378c2078033bb4da0c
-  data.tar.gz: 8406e7fa6f88d8812e6ccd355a1ccbf67a805fb8a74665ac28a1a0945b0b6eb7
+  metadata.gz: 3dbf43b62894c3f78d1428ca447dcbfed50177cd5d0a42c960bbd3083d908990
+  data.tar.gz: d0426320d9ad903a88ea1bcac75d799940290766e070a7ae7491cd44a774d193
 SHA512:
-  metadata.gz: f3e834ae96fce835a4965040e1dd8696241d7222db5e275c4f61c7eec59b28cbec8e4f7a3a90e73b51e66ab0ca7bb6b1c9fda5396040bb84fa877d4574288cc5
-  data.tar.gz: 4e7a044bc20704dcf933dcd87ebfc5a1fcac1077fe2ac9ed1812d61d682a81f292d5ef020fe39850ca52a0a76d41fb67855065cd3eb8347c32c86bd792a1cab4
+  metadata.gz: 783046478b7cfc59ce43d505da9283b1f179b56b4876a65886658a447f64125f066389a63f0ca322ef7837801cf2fd1f307e616c458a1f8374647000fbb28486
+  data.tar.gz: beb53639950ecf4a1a2619bb8d66b1fd34a96e37da1fb0055d7fadc1692343cbde9e91fce02a075e05e290858adc348239098436a59ed7789f4dadcbab37df71

data/.travis.yml

@@ -8,11 +8,12 @@ rvm:
   - 2.6
   - 2.7
   - 3.0
-  - jruby-9.0.5.0
   - jruby-9.1.5.0
   - jruby-9.1.6.0
+  - truffleruby
   - ruby-head
 env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: truffleruby

data/lib/spherical_mercator/version.rb

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

data/lib/spherical_mercator.rb

@@ -3,7 +3,7 @@ require 'spherical_mercator/version'
 class SphericalMercator
   
   attr_reader :options
-  attr_accessor :size, :round
+  attr_accessor :size, :round, :expansion
 
   # Closures including constants and other precalculated values.
 
@@ -25,6 +25,7 @@ class SphericalMercator
     @options = opts || {}
 
     self.size = (options[:size] || 256).to_f
+    self.expansion = (options[:antimeridian] == true) ? 2 : 1
     # Whether to round output values for integer zoom levels. Defaults to true.
     self.round = (options[:round].nil?) ? true : options[:round]
 
@@ -74,7 +75,7 @@ class SphericalMercator
       f = [[Math.sin(D2R * lon_lat[1]), -0.9999].max, 0.9999].min
       x = d + lon_lat[0] * bc
       y = d + 0.5 * Math.log((1 + f) / (1 - f)) * -cc
-      (x > ac) && (x = ac)
+      (x > ac * self.expansion) && (x = ac * self.expansion)
       (y > ac) && (y = ac)
       # (x < 0) && (x = 0)
       # (y < 0) && (y = 0)
@@ -85,7 +86,7 @@ class SphericalMercator
       f = [[Math.sin(D2R * lon_lat[1]), -0.9999].max, 0.9999].min
       x = (d + lon_lat[0] * @bc[zoom]).round
       y = (d + 0.5 * Math.log((1 + f) / (1 - f)) * (-@cc[zoom])).round
-      (x > @ac[zoom]) && (x = @ac[zoom])
+      (x > @ac[zoom] * self.expansion) && (x = @ac[zoom] * self.expansion)
       (y > @ac[zoom]) && (y = @ac[zoom])
 
       # (x < 0) && (x = 0)

data/spec/spherical_mercator/spherical_mercator_spec.rb

@@ -19,6 +19,7 @@ end
 describe SphericalMercator do
   let!(:sm) { SphericalMercator.new }
   let!(:sm_round) { SphericalMercator.new(round: false) }
+  let!(:antiM) { SphericalMercator.new(antimeridian: true) }
 
   context '#bbox' do
     it '[0,0,0] converted to proper bbox' do
@@ -122,6 +123,22 @@ describe SphericalMercator do
     it 'PX with forced rounding' do
       expect(sm_round.px([-179, 85], 9)).to eq([364.0888888888876, 214.68476683766494])
     end
+
+    it 'Clamps PX by default when lon >180' do
+      expect(sm.px([250, 3], 4)).to eq([4096, 2014])
+    end
+
+    it 'PX with lon > 180 converts when antimeridian=true' do
+      expect(antiM.px([250, 3], 4)).to eq([4892, 2014])
+    end
+
+    it 'PX for lon 360 and antimeridian=true' do
+      expect(antiM.px([400, 3], 4)).to eq([6599, 2014])
+    end
+
+    it 'Clamps PX when lon >360 and antimeridian=true' do
+      expect(antiM.px([400, 3], 4)).to eq([6599, 2014])
+    end
   end
 
   context 'high precision float' do

metadata

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