geodesic_wgs84 1.32.11 → 1.32.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfc25463144c1a96d0c3a050c5e512d8d743302
-  data.tar.gz: 2fd502d57cda6615775e9a847b4aad6e57594f13
+  metadata.gz: 99b89d9bb56862dd37c16b95c46ddef1bd69267f
+  data.tar.gz: 08d962eaf9b23f25e0d55212bbbae2f31b746a3c
 SHA512:
-  metadata.gz: 15dcdedbf79c9b7d81b67c0f50d68809bbd45b7fa5cb9017c2752729256be898a9a6fe1384500fc3a2e7e5673b4e22324fe9fe57fc796c495fcd8538e58e6472
-  data.tar.gz: bd48201cfdbf377474f587b81d1399b54e93d2696b8b33976644973ea4d6870fc79bb4a3538bc8173d498938a0e3e1d48a05b2f699e90e37c6c18fe3ff2ce19e
+  metadata.gz: 6c36c98c1bef95b54a2b5fef593c75ef59cf04e02ca89d3768fab87fc643dce5b651f074e4c59d1bcff7f20057090128d8c0138375ba62869aff7f7f193794dd
+  data.tar.gz: 419cc35d4f3d48e858ddd1070859421c02b21a40c0babc9bd0c2fcdb71a8f5a7562abaf2b6f59a1bc80548c37326936e46f81cdd4e4fadee05ef56a302a5937c

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -107,45 +107,24 @@ wgs84_lat_lon(int argc, VALUE *argv, VALUE klass)
   if (argc == 2) {
     lat = wgs84_get_value(argv[0]);
     lon = wgs84_get_value(argv[1]);
-  } else if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
-    lat = wgs84_get_value(rb_ary_entry(*argv, 0));
-    lon = wgs84_get_value(rb_ary_entry(*argv, 1));
-  } else if (argc == 1 && !NIL_P(tmp = rb_check_array_type(*argv))) {
-    lat = wgs84_get_value(rb_ary_entry(tmp, 0));
-    lon = wgs84_get_value(rb_ary_entry(tmp, 1));
-  } else {
+    return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
+  }
+
+  if (argc != 1) {
     rb_raise(rb_eArgError, "wrong number of arguments");
     return Qnil;
   }
 
-  return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
-}
-
-
-static VALUE
-wgs84_lat_lon_dms(int argc, VALUE *argv, VALUE klass)
-{
-  double lat, lon;
-  char lat_buf[64], lon_buf[64];
-  VALUE tmp;
-
-  if (argc == 2) {
-    lat = wgs84_get_value(argv[0]);
-    lon = wgs84_get_value(argv[1]);
-  } else if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
+  if (TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
     lat = wgs84_get_value(rb_ary_entry(*argv, 0));
     lon = wgs84_get_value(rb_ary_entry(*argv, 1));
-  } else if (argc == 1 && !NIL_P(tmp = rb_check_array_type(*argv))) {
-    lat = wgs84_get_value(rb_ary_entry(tmp, 0));
-    lon = wgs84_get_value(rb_ary_entry(tmp, 1));
-  } else {
-    rb_raise(rb_eArgError, "wrong number of arguments");
-    return Qnil;
+    return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
   }
 
-  wgs84_make_dms(lat, lat_buf);
-  wgs84_make_dms(lon, lon_buf);
-  return rb_ary_new3(2L, rb_str_new2(lat_buf), rb_str_new2(lon_buf));
+  tmp = rb_funcall(*argv, rb_intern("to_lat_lon"), 0);
+  lat = wgs84_get_value(rb_ary_entry(tmp, 0));
+  lon = wgs84_get_value(rb_ary_entry(tmp, 1));
+  return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
 }
 
 
@@ -281,7 +260,6 @@ Init_geodesic_wgs84(void)
   rb_define_method(cWGS84, "as_deg",      wgs84_as_deg,        1);
   rb_define_method(cWGS84, "as_dms",      wgs84_as_dms,        1);
   rb_define_method(cWGS84, "lat_lon",     wgs84_lat_lon,      -1);
-  rb_define_method(cWGS84, "lat_lon_dms", wgs84_lat_lon_dms,  -1);
   rb_define_method(cWGS84, "distance",    wgs84_distance,     -1);
   rb_define_method(cWGS84, "average",     wgs84_average,       2);
   rb_define_method(cWGS84, "center",      wgs84_center,        2);

data/lib/geodesic_wgs84/version.rb

@@ -1,3 +1,3 @@
 module GeodesicWgs84
-  VERSION = "1.32.11"
+  VERSION = "1.32.12"
 end

data/spec/geodesic_wgs84_spec.rb

@@ -10,15 +10,15 @@ class TestGeodesicWgs84 < MiniTest::Test
     assert_equal 50.833833, @wgs84.as_deg(50.833833)
   end
 
-  def test_dms_as_deg
+  def test_as_deg
     assert_equal 50.833833, @wgs84.as_deg("50 50 01.8")
   end
 
-  def test_deg_as_dms
+  def test_deg_as
     assert_equal "50 50 1.8", @wgs84.as_dms(50.833833)
   end
 
-  def test_dms_as_dms
+  def test_as
     assert_equal "50 50 1.8", @wgs84.as_dms("50 50 01.8")
   end
 
@@ -34,60 +34,56 @@ class TestGeodesicWgs84 < MiniTest::Test
     assert_equal [3.5, 4.123], @wgs84.lat_lon(["3.5", "4.123"])
   end
 
-  def test_lat_lon_dms_string
-    assert_equal ["50 50 1.8", "8 46 9.6"], @wgs84.lat_lon_dms("50 50 01.8", "08 46 09.6")
+  def test_lat_lon_alsfeld
+    assert_equal [50.751778, 9.251861], @wgs84.lat_lon("50 45 6.4", "9 15 6.7")
   end
 
-  def test_lat_lon_dms_alsfeld
-    assert_equal ["50 45 6.4", "9 15 6.7"], @wgs84.lat_lon_dms(50.751778, 9.251861)
+  def test_lat_lon_vilbel
+    assert_equal [50.192028, 8.734722], @wgs84.lat_lon("50 11 31.3", "8 44 5.0")
   end
 
-  def test_lat_lon_dms_vilbel
-    assert_equal ["50 11 31.3", "8 44 5.0"], @wgs84.lat_lon_dms(50.192028, 8.734722)
+  def test_lat_lon_butzbach
+    assert_equal [50.427417, 8.680056], @wgs84.lat_lon("50 25 38.7", "8 40 48.2")
   end
 
-  def test_lat_lon_dms_butzbach
-    assert_equal ["50 25 38.7", "8 40 48.2"], @wgs84.lat_lon_dms(50.427417, 8.680056)
+  def test_lat_lon_gilserberg
+    assert_equal [50.946111, 9.070972], @wgs84.lat_lon("50 56 46.0", "9 4 15.5")
   end
 
-  def test_lat_lon_dms_gilserberg
-    assert_equal ["50 56 46.0", "9 4 15.5"], @wgs84.lat_lon_dms(50.946111, 9.070972)
+  def test_lat_lon_gruenberg
+    assert_equal [50.609694, 8.904167], @wgs84.lat_lon("50 36 34.9", "8 54 15.0")
   end
 
-  def test_lat_lon_dms_gruenberg
-    assert_equal ["50 36 34.9", "8 54 15.0"], @wgs84.lat_lon_dms(50.609694, 8.904167)
+  def test_lat_lon_haiger
+    assert_equal [50.761806, 8.156833], @wgs84.lat_lon("50 45 42.5", "8 9 24.6")
   end
 
-  def test_lat_lon_dms_haiger
-    assert_equal ["50 45 42.5", "8 9 24.6"], @wgs84.lat_lon_dms(50.761806, 8.156833)
+  def test_lat_lon_herborn
+    assert_equal [50.670333, 8.258556], @wgs84.lat_lon("50 40 13.2", "8 15 30.8")
   end
 
-  def test_lat_lon_dms_herborn
-    assert_equal ["50 40 13.2", "8 15 30.8"], @wgs84.lat_lon_dms(50.670333, 8.258556)
+  def test_lat_lon_homberg
+    assert_equal [50.743639, 9.019222], @wgs84.lat_lon("50 44 37.1", "9 1 9.2")
   end
 
-  def test_lat_lon_dms_homberg
-    assert_equal ["50 44 37.1", "9 1 9.2"], @wgs84.lat_lon_dms(50.743639, 9.019222)
+  def test_lat_lon_limburg
+    assert_equal [50.405778, 8.082222], @wgs84.lat_lon("50 24 20.8", "8 4 56.0")
   end
 
-  def test_lat_lon_dms_limburg
-    assert_equal ["50 24 20.8", "8 4 56.0"], @wgs84.lat_lon_dms(50.405778, 8.082222)
+  def test_lat_lon_marburg
+    assert_equal [50.833833, 8.769333], @wgs84.lat_lon("50 50 1.8", "8 46 9.6")
   end
 
-  def test_lat_lon_dms_marburg
-    assert_equal ["50 50 1.8", "8 46 9.6"], @wgs84.lat_lon_dms(50.833833, 8.769333)
+  def test_lat_lon_pohlheim
+    assert_equal [50.536833, 8.7125], @wgs84.lat_lon("50 32 12.6", "8 42 45.0")
   end
 
-  def test_lat_lon_dms_pohlheim
-    assert_equal ["50 32 12.6", "8 42 45.0"], @wgs84.lat_lon_dms(50.536833, 8.7125)
+  def test_lat_lon_siegen
+    assert_equal [50.853028, 8.000667], @wgs84.lat_lon("50 51 10.9", "8 0 2.4")
   end
 
-  def test_lat_lon_dms_siegen
-    assert_equal ["50 51 10.9", "8 0 2.4"], @wgs84.lat_lon_dms(50.853028, 8.000667)
-  end
-
-  def test_lat_lon_dms_wetzlar
-    assert_equal ["50 33 13.6", "8 29 32.2"], @wgs84.lat_lon_dms(50.553778, 8.492278)
+  def test_lat_lon_wetzlar
+    assert_equal [50.553778, 8.492278], @wgs84.lat_lon("50 33 13.6", "8 29 32.2")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geodesic_wgs84
 version: !ruby/object:Gem::Version
-  version: 1.32.11
+  version: 1.32.12
 platform: ruby
 authors:
 - Volker Wiegand