geodesic_wgs84 1.32.7 → 1.32.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae5e103f4963574c9c9d14020f30da27f8223b11
-  data.tar.gz: 8de4ef5f7f44b1ecec778aec3bbaf72470c1a3dd
+  metadata.gz: 8a421f900057b282fa125e757054177066471301
+  data.tar.gz: a6561306299110ffb927339ddc7ea3a436f80c35
 SHA512:
-  metadata.gz: 8333f8fad8608d24a7dfe53c96d5d95755ca56b5478c2602dd28f25f43000f0b02dc6f9a09cd2ac2a4c6402209cfd47fd9e32694c2daf32fbd406ce0919f52cf
-  data.tar.gz: 5f0c0a3bf995c8b2112291813abd59e5304bfc680583631b568651434dc6f8047bcb22e07be5dd0e6e750234c27d2fe35e8c9d617fb749c04a0e0aa24b819669
+  metadata.gz: b13512d9ae017bec057487c5af896c57bacf40b660fd44705cc311f9c55ad662596f6ad027f3bb4a918196e8a87047b0fa216d60703a387e6e47ea937256a9fb
+  data.tar.gz: 30b88b55a54ae2bf0522194968f57a786b6652a00d8789f9f21d81d32ebc6c64a3a89f64084c993626cbb426be727916a1d39be42e0837ab601be1c6b3813a90

data/Makefile

@@ -3,11 +3,24 @@
 # Makefile for building the Gem
 #
 
-all:
+all: build
+	git status
+
+rel: build
+	vim lib/geodesic_wgs84/version.rb
+	git commit -a
+	sudo gem uninstall geodesic_wgs84 --all
+	rake release
+
+install: build
+	git commit -a
+	sudo gem uninstall geodesic_wgs84 --all
+	sudo rake install
+	sudo rm -rf pkg
+
+build:
 	rake compile
 	git add ext
 	git add lib
 	git add spec
-	vim lib/geodesic_wgs84/version.rb
-	git commit -a
-	rake release
+

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -44,11 +44,10 @@ wgs84_get_value(VALUE arg)
     memcpy(buf, RSTRING_PTR(arg), RSTRING_LEN(arg));
 
     if (sscanf(buf, "%d.%d.%d,%d", &dd, &mm, &ss, &ff) == 4) {
-      dbl  = (double) dd;
-      dbl += (double) mm /    60.0;
-      dbl += (double) ss /  3600.0;
-      dbl += (double) ff / 36000.0;
-      sprintf(buf, "%.6f", dbl);
+      ff += (dd * 36000) + (mm * 600) + (ss * 10);
+      dbl = (double) ff;
+      dbl /= 36000.0;
+      sprintf(buf, "%.6lf", dbl);
     } else if (sscanf(buf, "%d,%d", &dd, &ff) == 2) {
       *strchr(buf, ',') = '.';
     }
@@ -73,55 +72,33 @@ wgs84_lat_lon(int argc, VALUE *argv, VALUE klass)
   if (argc == 2) {
     lat = wgs84_get_value(argv[0]);
     lon = wgs84_get_value(argv[1]);
-    return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
-  }
-
-  if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
+  } 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));
-    return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
-  }
-
-  if (argc == 1 && !NIL_P(tmp = rb_check_array_type(*argv))) {
+  } 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));
-    return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
+  } else {
+    rb_raise(rb_eArgError, "wrong number of arguments");
+    return Qnil;
   }
 
-  rb_raise(rb_eArgError, "wrong number of arguments");
-  return Qnil;
+  return rb_ary_new3(2L, rb_float_new(lat), rb_float_new(lon));
 }
 
 
 static void
 wgs84_make_dms(double val, char *buf)
 {
-  int tmp;
   char *ptr;
 
-  /* get degrees */
-  tmp = (int) val;
-  sprintf(buf, "%02d", tmp);
-  val -= (double) tmp;
+  sprintf(buf, "%d.", (int) trunc(val));
   ptr = buf + strlen(buf);
-
-  /* get minutes */
-  val *= 60.0;
-  tmp = (int) val;
-  sprintf(ptr, ".%02d", tmp);
-  val -= (double) tmp;
-  ptr = buf + strlen(buf);
-
-  /* get seconds */
-  val *= 60.0;
-  tmp = (int) val;
-  sprintf(ptr, ".%02d", tmp);
-  val -= (double) tmp;
+  sprintf(ptr, "%d.", (int) fmod(trunc(fabs(val) * 60.0), 60.0));
   ptr = buf + strlen(buf);
-
-  /* get tenth of seconds */
-  val *= 10.0;
-  sprintf(ptr, ",%.0f", val);
+  sprintf(ptr, "%.1lf", fmod(fabs(val) * 3600.0, 60.0));
+  if ((ptr = strchr(ptr, '.')) != NULL)
+    *ptr = ',';
 }
 
 
@@ -129,36 +106,26 @@ static VALUE
 wgs84_lat_lon_dms(int argc, VALUE *argv, VALUE klass)
 {
   double lat, lon;
-  int valid = 0;
   char lat_buf[64], lon_buf[64];
   VALUE tmp;
 
   if (argc == 2) {
     lat = wgs84_get_value(argv[0]);
     lon = wgs84_get_value(argv[1]);
-    valid = 1;
-  }
-
-  if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
+  } 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));
-    valid = 1;
-  }
-
-  if (argc == 1 && !NIL_P(tmp = rb_check_array_type(*argv))) {
+  } 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));
-    valid = 1;
-  }
-
-  if (valid == 1) {
-    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));
+  } else {
+    rb_raise(rb_eArgError, "wrong number of arguments");
+    return Qnil;
   }
 
-  rb_raise(rb_eArgError, "wrong number of arguments");
-  return Qnil;
+  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));
 }
 
 

data/lib/geodesic_wgs84/version.rb

@@ -1,3 +1,3 @@
 module GeodesicWgs84
-  VERSION = "1.32.7"
+  VERSION = "1.32.8"
 end

data/spec/geodesic_wgs84_spec.rb

@@ -7,7 +7,7 @@ class TestGeodesicWgs84 < MiniTest::Test
   end
 
   def test_lat_lon_two_doubles
-    assert_equal [1.0, 2.0], @wgs84.lat_lon(1.0, 2.0)
+    assert_equal [50.833833, 8.769333], @wgs84.lat_lon(50.833833, 8.769333)
   end
 
   def test_lat_lon_array_of_doubles
@@ -21,5 +21,61 @@ class TestGeodesicWgs84 < MiniTest::Test
   def test_lat_lon_doubles_with_comma
     assert_equal [1.0, 2.0], @wgs84.lat_lon("1,0", "2,0")
   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")
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  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)
+  end
 end
 

metadata

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