jtsk 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e7e547f73d42cdd5861937515fe48fe5f99eab
-  data.tar.gz: 99cc4244ea6359550256db462d0c92b2c1676f41
+  metadata.gz: 8a6dc951d53022e8f5a394254d3988d2c7dbf46b
+  data.tar.gz: d01f2dd21ce03cc0f8b8860da0e807448d84af13
 SHA512:
-  metadata.gz: 8355cde78c03fa359bf6cf1a96d07726bd0a3b36cbf0e8d985f398d61735cb1f5bbde0abe94e000ff80adaa53fc116b558d9827c8859a3bd21346ffb78651b1a
-  data.tar.gz: 55d2765c09975a7e67e0e2d3eab03e08ed65c3cf329acb0a65096edca14be0945ad5528d2e176eab36ed0aa63840bdad24c8dcb5d77acbbacea2d1a8964bf33a
+  metadata.gz: 686cfdc5c5b8eaa78e7e9ef1cbf5b565b276fe1cb020ab8bf4d419958fcbc54ad57560b8ca33667ba62e139982d69824cd81404c89cef0b8bf57ab3951a1c6ef
+  data.tar.gz: f268b20aea3db8cb08e9dee94141f7147690a6fcf2a2e1a01edc9fab9b2fa89c031b2efb921dffd9c6f8750014e7601156a69ee6f52580ea67e545f0417ebfd9

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.3.0

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'rspec', '3.0.0.beta2'
-
 # Specify your gem's dependencies in jtsk.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # JTSK  [![Build Status](https://travis-ci.org/simi/jtsk.svg?branch=master)](https://travis-ci.org/simi/jtsk)
 
-Convert from JTSK to WGS48.
+Convert from JTSK to WGS84.
 
 Based on [JTSK Converter](https://github.com/josefzamrzla/JTSK_Converter) by [@josefzamrzla](https://github.com/josefzamrzla).
 
@@ -24,7 +24,7 @@ Or install it yourself as:
 converter = JTSK::Converter.new
 x = 1043033.89
 y = 738371.58
-result = converter.to_wgs48(x, y) #=> #<struct JTSK::Wgs48Result latitude=50.092696246901404, longitude=14.482746557404647>
+result = converter.to_wgs84(x, y) #=> #<struct JTSK::Wgs84Result latitude=50.092696246901404, longitude=14.482746557404647>
 result.latitude #=> 50.092696246901404
 result.longitude #=> 14.482746557404647
 ```

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/jtsk.gemspec

@@ -8,16 +8,15 @@ Gem::Specification.new do |spec|
   spec.version       = Jtsk::VERSION
   spec.authors       = ["Josef Šimánek"]
   spec.email         = ["josef.simanek@gmail.com"]
-  spec.summary       = %q{Convert from JTSK to WGS48.}
+  spec.summary       = %q{Convert from JTSK to WGS84.}
   spec.homepage      = ""
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 3.4"
 end

data/lib/jtsk/converter.rb

@@ -2,7 +2,13 @@ module JTSK
   class Converter
     EPS = 1e-4
 
-    def to_wgs48(x, y)
+    def to_wgs48(x,y)
+      warn "to_wgs84 is deprecated and will be removed in next version. Please use to_wgs84 method."
+      result = to_wgs84(x,y)
+      JTSK::Wgs48Result.new(result.latitude, result.longitude)
+    end
+
+    def to_wgs84(x, y)
       delta = 5.0
       latitude = 49.0
       longitude = 14.0
@@ -10,28 +16,28 @@ module JTSK
 
       loop {
 
-        jtsk = self.wgs48_to_jtsk(latitude - delta, longitude - delta)
+        jtsk = self.wgs84_to_jtsk(latitude - delta, longitude - delta)
         if(jtsk.x && jtsk.y)
           v1 = self.dist_points(jtsk.x, jtsk.y, x, y)
         else
           v1 = 1e32
         end
 
-        jtsk = self.wgs48_to_jtsk(latitude - delta, longitude + delta)
+        jtsk = self.wgs84_to_jtsk(latitude - delta, longitude + delta)
         if(jtsk.x && jtsk.y)
           v2 = self.dist_points(jtsk.x, jtsk.y, x, y)
         else
           v2 = 1e32
         end
 
-        jtsk = self.wgs48_to_jtsk(latitude + delta, longitude - delta)
+        jtsk = self.wgs84_to_jtsk(latitude + delta, longitude - delta)
         if(jtsk.x && jtsk.y)
           v3 = self.dist_points(jtsk.x, jtsk.y, x, y)
         else
           v3 = 1e32
         end
 
-        jtsk = self.wgs48_to_jtsk(latitude + delta, longitude + delta)
+        jtsk = self.wgs84_to_jtsk(latitude + delta, longitude + delta)
         if(jtsk.x && jtsk.y)
           v4 = self.dist_points(jtsk.x, jtsk.y, x, y)
         else
@@ -60,23 +66,25 @@ module JTSK
 
         delta = delta * 0.55;
         steps = steps + 4.0;
- 
+
         break if (((delta < 0.00001) || steps > 1000.0));
-      } 
+      }
 
-      JTSK::Wgs48Result.new(latitude, longitude)
+      JTSK::Wgs84Result.new(latitude, longitude)
     end
 
-    def wgs48_to_jtsk(latitude, longitude)
-      if ((latitude < 40.0) || (latitude > 60.0) || (longitude < 5.0) || (longitude > 25.0)) 
+    protected
+
+    def wgs84_to_jtsk(latitude, longitude)
+      if ((latitude < 40.0) || (latitude > 60.0) || (longitude < 5.0) || (longitude > 25.0))
         JTSK::JtskResult.new(0.0, 0.0)
       else
-        bessel = self.wgs48_to_bessel(latitude, longitude);
+        bessel = self.wgs84_to_bessel(latitude, longitude);
         self.bessel_to_jtsk(bessel.latitude, bessel.longitude);
       end
     end
 
-    def wgs48_to_bessel(latitude, longitude, altitude = 0.0)
+    def wgs84_to_bessel(latitude, longitude, altitude = 0.0)
       b = deg2rad(latitude)
       l = deg2rad(longitude)
       h = altitude;
@@ -93,7 +101,7 @@ module JTSK
     end
 
     def bessel_to_jtsk(latitude, longitude)
-      a     = 6377397.15508
+      # a     = 6377397.15508
       e     = 0.081696831215303
       n     = 0.97992470462083
       rho_0 = 12310230.12797036
@@ -126,7 +134,7 @@ module JTSK
 
       eps = n * Math.atan(sinD / cosD)
       rho = rho_0 * Math.exp(-n * Math.log((1 + sinS) / cosS))
-      
+
       JTSK::JtskResult.new(rho * Math.cos(eps), rho * Math.sin(eps))
     end
 

data/lib/jtsk/result.rb

@@ -1,4 +1,6 @@
 module JTSK
+  class Wgs84Result < Struct.new(:latitude, :longitude)
+  end
   class Wgs48Result < Struct.new(:latitude, :longitude)
   end
   class BesselResult < Struct.new(:latitude, :longitude)

data/lib/jtsk/version.rb

@@ -1,3 +1,3 @@
 module Jtsk
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/jtsk/converter_spec.rb

@@ -4,7 +4,13 @@ describe JTSK::Converter do
   let(:converter) { described_class.new }
   let(:x) { 1043033.89 }
   let(:y) { 738371.58 }
-  let(:result) { converter.to_wgs48(x,y) }
+  let(:result) { converter.to_wgs84(x,y) }
+
+  it 'to_wgs48 is deprecated' do
+    expect(converter).to receive(:warn)
+    deprecated_result = converter.to_wgs48(x,y)
+    expect(deprecated_result).to be_kind_of(JTSK::Wgs48Result)
+  end
 
   it 'EPS is properly set' do
     expect(described_class::EPS).to eq(1e-4)
@@ -15,7 +21,7 @@ describe JTSK::Converter do
   end
 
   it 'result is JTSK::Result' do
-    expect(result).to be_kind_of(JTSK::Wgs48Result)
+    expect(result).to be_kind_of(JTSK::Wgs84Result)
   end
 
   context 'Club Velbloud' do

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jtsk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Josef Šimánek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: 
 email:
 - josef.simanek@gmail.com
@@ -59,12 +59,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rake
+- bin/rspec
 - jtsk.gemspec
 - lib/jtsk.rb
 - lib/jtsk/converter.rb
@@ -82,20 +85,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Convert from JTSK to WGS48.
+summary: Convert from JTSK to WGS84.
 test_files:
 - spec/jtsk/converter_spec.rb
 - spec/spec_helper.rb