spherical_mercator 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bd516923907417c8a6900535ae5492b8e2f028
-  data.tar.gz: 0d75745f7a75eec2b9b563af0461133d6d731831
+  metadata.gz: 2c25752283cbaf577010569270ec2ca240d97a62
+  data.tar.gz: f2aecd50cd93e790880921c098216008574f8853
 SHA512:
-  metadata.gz: c1f7eebc8eea7dfadef4006a775e45dfa40aef3c4e763dcf0a70ddd7bef8f7cfcc38778c33239413fe2f4305a51cee228e36caeabb5b858a3ca41c3e2164b277
-  data.tar.gz: 525366eebcf95f726443b684462c9e702b493e8ac6a26b14cb46e61f2b633383f6b43d08c7a05f36fa9e5d694c78eb8ede60887a516fc9f4dd1279c59af4e815
+  metadata.gz: adfdd9971e141456233f590684c200ae7577917402ca6ff31559dd8f235b3c72958ec893e166cfb67963475b2bd3dc0704bb7dfc55bcd5670719733df297ff86
+  data.tar.gz: 1109a332fad241f5eecbf619ce2fbdfea81d411584c63c809693eaba2d75b95382a6d1f8453794b03b274af4375c4a0e5f5aaa5b65817dde14e98caad5ff72e3

data/README.md

@@ -46,7 +46,7 @@ of `px`
 
 ### `bbox(x, y, zoom, tms_style, srs)`
 
-Convert tile xyz value to bbox of the form `[w, s, e, n]`
+Convert tile xyz value to bbox of the form `[west, south, east, north]`
 
 * `x` {Number} x (longitude) number.
 * `y` {Number} y (latitude) number.
@@ -54,35 +54,35 @@ Convert tile xyz value to bbox of the form `[w, s, e, n]`
 * `tms_style` {Boolean} whether to compute using tms-style. (optional, default `false`)
 * `srs` {String} projection for resulting bbox ('WGS84'|'900913'). (optional, default 'WGS84')
 
-Returns bbox array of values in form `[w, s, e, n]`.
+Returns bbox array of values in form `[west, south, east, north]`.
 
 ### `xyz(bbox, zoom, tms_style, srs)`
 
 Convert bbox to xyz bounds
 
-* `bbox` {Number} bbox in the form `[w, s, e, n]`.
+* `bbox` {Number} bbox in the form `[west, south, east, north]`.
 * `zoom` {Number} zoom.
 * `tms_style` {Boolean} whether to compute using tms-style. (optional, default `false`)
 * `srs` {String} projection of input bbox ('WGS84'|'900913'). (optional, default 'WGS84')
 
-Returns {Object} XYZ bounds containing minX, maxX, minY, maxY properties.
+Returns `Hash` object (`{...}`) for XYZ bounds containing `:minX`, `:maxX`, `:minY`, `:maxY` properties.
 
 ### `convert(bbox, to)`
 
 Convert bbox from 900913 to WGS84 or vice versa
 
-* `bbox` {Number} bbox in the form `[w, s, e, n]`.
+* `bbox` {Number} bbox in the form `[west, south, east, north]`.
 * `to` {String} projection of resulting bbox ('WGS84'|'900913'). (optional, default 'WGS84')
 
-Returns bbox array of values in form `[w, s, e, n]`.
+Returns bbox array of values in form `[west, south, east, north]`.
 
 ### `forward(lon_lat)`
 
-Convert lon, lat values to mercator x, y
+Convert lon, lat values (must be an array like `[lon, lat]`) to mercator x, y
 
 ### `inverse(xy)`
 
-Convert mercator x, y values to lon, lat
+Convert mercator x, y values (`xy` must be an array like `[x, y]`) to lon, lat
 
 ## Contributing
 

data/lib/spherical_mercator.rb

@@ -47,22 +47,46 @@ class SphericalMercator
     @zc = cache[self.size]['zc']
   end
 
+  # function isFloat(n)
+  def float?(value)
+    number = Float(value)
+    number % 1 != 0
+  rescue ArgumentError
+    false
+  end
+
   # Convert lon lat to screen pixel value
   #
   # - `ll` {Array} `[lon, lat]` array of geographic coordinates.
   # - `zoom` {Number} zoom level.
   def px(lon_lat, zoom)
-    d = @zc[zoom]
-    # JS: Math.min(Math.max(Math.sin(D2R * ll[1]), -0.9999), 0.9999);
-    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])
-    (y > @ac[zoom]) && (y = @ac[zoom])
-
-    # (x < 0) && (x = 0);
-    # (y < 0) && (y = 0);
-    [x, y]
+    if float?(zoom)
+      size = @size * (2**zoom)
+      d = size / 2
+      bc = (size / 360)
+      cc = (size / (2 * Math::PI))
+      ac = size
+      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)
+      (y > ac) && (y = ac)
+      # (x < 0) && (x = 0)
+      # (y < 0) && (y = 0)
+      [x, y]
+    else
+      d = @zc[zoom]
+      # JS: Math.min(Math.max(Math.sin(D2R * ll[1]), -0.9999), 0.9999)
+      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])
+      (y > @ac[zoom]) && (y = @ac[zoom])
+
+      # (x < 0) && (x = 0)
+      # (y < 0) && (y = 0)
+      [x, y]
+    end
   end
 
   # Convert screen pixel value to lon lat
@@ -70,10 +94,21 @@ class SphericalMercator
   # - `px` {Array} `[x, y]` array of geographic coordinates.
   # - `zoom` {Number} zoom level.
   def ll(px, zoom)
-    g = (px[1] - @zc[zoom]) / (-@cc[zoom])
-    lon = (px[0] - @zc[zoom]) / @bc[zoom]
-    lat = R2D * (2 * Math.atan(Math.exp(g)) - 0.5 * Math::PI)
-    [lon, lat]
+    if float?(zoom)
+      size = @size * (2**zoom)
+      bc = (size / 360)
+      cc = (size / (2 * Math::PI))
+      zc = size / 2
+      g = (px[1] - zc) / -cc
+      lon = (px[0] - zc) / bc
+      lat = R2D * (2 * Math.atan(Math.exp(g)) - 0.5 * Math::PI)
+      [lon, lat]
+    else
+      g = (px[1] - @zc[zoom]) / (-@cc[zoom])
+      lon = (px[0] - @zc[zoom]) / @bc[zoom]
+      lat = R2D * (2 * Math.atan(Math.exp(g)) - 0.5 * Math::PI)
+      [lon, lat]
+    end
   end
 
   # Convert tile xyz value to bbox of the form `[w, s, e, n]`

data/lib/spherical_mercator/version.rb

@@ -3,11 +3,9 @@ class SphericalMercator
     Gem::Version.new VERSION::STRING
   end
 
-  ##
-  # AlphaCard semantic versioning
   module VERSION
     # Major version number
-    MAJOR = 0
+    MAJOR = 1
     # Minor version number
     MINOR = 1
     # Smallest version number

data/spec/spherical_mercator/spherical_mercator_spec.rb

@@ -12,8 +12,12 @@ def rand_float
   rand(0.0...1.0)
 end
 
+def round(val)
+  val.to_f.round(6)
+end
+
 describe SphericalMercator do
-  let!(:sm) {SphericalMercator.new}
+  let!(:sm) { SphericalMercator.new }
 
   context '#bbox' do
     it '[0,0,0] converted to proper bbox' do
@@ -27,11 +31,11 @@ describe SphericalMercator do
 
   context '#xyz' do
     it 'World extents converted to proper tile ranges' do
-      expect(sm.xyz([-180, -85.05112877980659, 0, 0], 1, true, 'WGS84')).to eq({minX: 0, minY: 0, maxX: 0, maxY: 0})
+      expect(sm.xyz([-180, -85.05112877980659, 0, 0], 1, true, 'WGS84')).to eq({ minX: 0, minY: 0, maxX: 0, maxY: 0 })
     end
 
     it 'SW converted to proper tile ranges' do
-      expect(sm.xyz([-180, -85.05112877980659, 180, 85.0511287798066], 0, true, 'WGS84')).to eq({minX: 0, minY: 0, maxX: 0, maxY: 0})
+      expect(sm.xyz([-180, -85.05112877980659, 180, 85.0511287798066], 0, true, 'WGS84')).to eq({ minX: 0, minY: 0, maxX: 0, maxY: 0 })
     end
 
     it 'broken' do
@@ -87,11 +91,45 @@ describe SphericalMercator do
 
   context '#extents' do
     it 'Maximum extents enforced on conversion to tile ranges' do
-      expect(sm.xyz([-240, -90, 240, 90], 4, true, 'WGS84')).to eq({minX: 0, minY: 0, maxX: 15, maxY: 15})
+      expect(sm.xyz([-240, -90, 240, 90], 4, true, 'WGS84')).to eq({ minX: 0, minY: 0, maxX: 15, maxY: 15 })
     end
 
     it '' do
       expect(sm.convert([-240, -90, 240, 90], '900913')).to eq(MAX_EXTENT_MERC)
     end
   end
+
+  context '#ll' do
+    it 'LL with int zoom value converts' do
+      expect(sm.ll([200, 200], 9)).to eq([-179.45068359375, 85.00351401304403])
+    end
+
+    it 'LL with float zoom value converts' do
+      expect(sm.ll([200, 200], 8.6574)).to eq([-179.3034449476476, 84.99067388699072])
+    end
+  end
+
+  context '#pp' do
+    it 'PX with int zoom value converts' do
+      expect(sm.px([-179, 85], 9)).to eq([364, 215])
+    end
+
+    it 'PX with float zoom value converts' do
+      expect(sm.px([-179, 85], 8.6574)).to eq([287.12734093961626, 169.30444219392666])
+    end
+  end
+
+  context 'high precision float' do
+    let(:withInt) { sm.ll([200, 200], 4) }
+    let(:withFloat) { sm.ll([200, 200], 4.0000000001) }
+
+    it 'first six decimals are the same' do
+      expect(round(withInt[0])).to eq(round(withFloat[0]))
+    end
+
+
+    it 'first six decimals are the same' do
+      expect(round(withInt[1])).to eq(round(withFloat[1]))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spherical_mercator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nikita Bulai