geodesic_wgs84 1.32.2 → 1.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b5d1d30c466c4e1b8d77c9645649268131e195
-  data.tar.gz: 1775ce204604bcdab8baa51ae991905313cdad12
+  metadata.gz: 90a78279305f35055e74cf98c9d092cbbaa84d59
+  data.tar.gz: 3c09f9207ec20c580b3c2f9fd1a956797795493e
 SHA512:
-  metadata.gz: 386432a02f9aa2b593d8ac22d5ed97d0ef07be8fc2d6697024a01c4d3f5d8e6bff557ae5efdc97fa903e4209b0a6fae044d49a13a0c5ccbe7efa2c82d172e02b
-  data.tar.gz: 144cd6983cc835a2367362774579d2a18235d94cd3727db49d6e3e3e98d958d46049527ea7b2e7b30e8976e5d88c3bdd3459c779c78b643554160933c86028db
+  metadata.gz: ff785a2b23d03ed5daaf4035f8df9d2af0870b337e264823eed1ed7233b19bac22cc715401f25cfe6c3fd05083cfa05b053519f73a41cbcf355c6b2e5950b720
+  data.tar.gz: 57fde099670b5800730eeefd86a423065508a8a4a2321f08d097bee11f64f98df20c9cf73a222a0f43bc66f4eeaa701f9f1c99cd3b9f3aa2fcddb80fb082393a

data/README.md

@@ -33,12 +33,17 @@ Or install it yourself as:
 
 ## Sample Usage
 
+The representation of a DMS (degree minute second) format is 'dd.mm.ss,f'
+where f means tenth of seconds (fraction).
+
     require 'geodesic_wgs84'
 
     wgs84 = Wgs84.new
 
     wgs84.lat_lon ...
 
+    wgs84.lat_lon_dms ...
+
     wgs84.distance ...
 
     wgs84.average ...

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -5,6 +5,9 @@
  */
 
 #include <ruby.h>
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
 #include "geodesic.h"
 
 
@@ -41,9 +44,11 @@ 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) {
-      // Round number to 6 digits
-      dbl = ((double) dd + ((((double) mm * 600.0) + ((double) ss * 10.0) + (double) ff) / 36000.0)) * 1000000.0;
-      return round(dbl) / 1000000.0;
+      dbl  = (double) dd;
+      dbl += (double) mm /    60.0;
+      dbl += (double) ss /  3600.0;
+      dbl += (double) ff / 36000.0;
+      return dbl;
     }
 
     if (sscanf(buf, "%d.%d", &dd, &ff) == 2) {
@@ -91,6 +96,68 @@ wgs84_lat_lon(int argc, VALUE *argv, VALUE klass)
 }
 
 
+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;
+  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;
+  ptr = buf + strlen(buf);
+
+  /* get tenth of seconds */
+  val *= 10.0;
+  sprintf(ptr, ",%.0f", val);
+}
+
+
+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]);
+    return rb_ary_new3(2L, rb_str_new2(lat_buf), rb_str_new2(lon_buf));
+  }
+
+  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_str_new2(lat_buf), rb_str_new2(lon_buf));
+  }
+
+  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_str_new2(lat_buf), rb_str_new2(lon_buf));
+  }
+
+  rb_raise(rb_eArgError, "wrong number of arguments");
+  return Qnil;
+}
+
+
 static VALUE
 wgs84_distance(int argc, VALUE *argv, VALUE klass)
 {
@@ -219,10 +286,11 @@ void
 Init_geodesic_wgs84(void)
 {
   cWGS84 = rb_define_class("Wgs84", rb_cObject);
-  rb_define_method(cWGS84, "initialize", wgs84_init,      0);
-  rb_define_method(cWGS84, "lat_lon",    wgs84_lat_lon,  -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);
+  rb_define_method(cWGS84, "initialize",  wgs84_init,      0);
+  rb_define_method(cWGS84, "lat_lon",     wgs84_lat_lon,  -1);
+  rb_define_method(cWGS84, "lat_lon_dms", wgs84_lat_lon,  -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.2"
+  VERSION = "1.32.3"
 end

metadata

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