stanford-mods 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a21780e0eb52230a1237022dbe52133a6ffcfb3e
-  data.tar.gz: 46e8908da12e2fb68a00410a5b634d2f63752249
+  metadata.gz: 821295322c2777baac42e0142a690a24b44cf931
+  data.tar.gz: 0134f68110a263ddedf3fb9fec7439bedbbad6dd
 SHA512:
-  metadata.gz: 73883c77e8c2dde788468eafa93c55e8e9aa19f4bfd61d259439fb08592b180ebc870fe706075fb0722e8970769101ac397ec4740c31bc3a45c54a6aa19585e5
-  data.tar.gz: 59afb90817a8252a3e9a1d696f7d289dc1874ab3d7ad89bd9fb4cb9800ffc5a4f614e8ed72258cd50edea8fab436d6096931b18b73207688d2c943608496cc16
+  metadata.gz: d9976025d220435fc45c4f97901bba4ef506b5e0f3c503b3fb377f3a6a10f4bb74239802abf66fb407c23a121b4339451511485ca94cd06fa620ddec8223fa92
+  data.tar.gz: 758b2840f7bb52959d4bf5ffceb0e9d281325ff5adcf848176535aa9b2a81f98386bfdfbcc03374c8b1622b99b3bb01184e38cb66ef460c95187a8272c9ff0cf

data/lib/stanford-mods/geo_spatial.rb

@@ -25,20 +25,20 @@ module Stanford
       private
 
       def coord_to_bbox(coord)
-        matches = coord.match %r{\A(?<lat>[EW].+--.+)\s*/\s*(?<lng>[NS].+--.+)\Z}
+        matches = coord.match %r{\A(?<lat>[EW].+-+.+)\s*/\s*(?<lng>[NS].+-+.+)\Z}
         return unless matches
 
-        min_x, max_x = matches['lat'].split('--').map { |x| coord_to_decimal(x) }
-        max_y, min_y = matches['lng'].split('--').map { |y| coord_to_decimal(y) }
+        min_x, max_x = matches['lat'].split(/-+/).map { |x| coord_to_decimal(x) }.minmax
+        min_y, max_y = matches['lng'].split(/-+/).map { |y| coord_to_decimal(y) }.minmax
 
-        "#{min_x} #{min_y} #{max_x} #{max_y}" if valid_bbox?(min_x, max_x, max_y, min_y)
+        "#{min_x} #{min_y} #{max_x} #{max_y}" if valid_bbox?(min_x, max_x, min_y, max_y)
       end
 
       def coord_to_decimal(point)
-        regex = /(?<dir>[NESW])\s*(?<deg>\d+)°(?:(?<min>\d+)[ʹ'])?(?:(?<sec>\d+)[ʺ"])?/
+        regex = /(?<dir>[NESW])\s*(?<deg>\d+)[°⁰º](?:(?<min>\d+)[ʹ'])?(?:(?<sec>\d+)[ʺ"])?/
         match = regex.match(point)
 
-        return Float::NAN unless match
+        return Float::INFINITY unless match
 
         dec = match['deg'].to_i
         dec += match['min'].to_f / 60
@@ -48,7 +48,7 @@ module Stanford
         dec
       end
 
-      def valid_bbox?(min_x, max_x, max_y, min_y)
+      def valid_bbox?(min_x, max_x, min_y, max_y)
         range_x = -180.0..180.0
         range_y = -90.0..90.0
 

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "1.3.2"
+    VERSION = "1.3.3"
   end
 end

data/spec/geo_spatial_spec.rb

@@ -72,8 +72,16 @@ describe "Cartographic coordinates" do
         ['-123.38777777777779 38.29805555555556 -122.52277777777778 39.399166666666666'],
       %(E 10°03'00"--E 12°58'00"/N 45°00'00"--N 41°46'00") =>
         ['10.05 41.766666666666666 12.966666666666667 45.0'],
+      %(E 8°41'-E 12°21'/N 46°04'-N 44°23') =>
+        ['8.683333333333334 44.38333333333333 12.35 46.06666666666667'],
+      %((E17°--E11°/N14°--N18°).) =>
+        ['11.0 14.0 17.0 18.0'], # coordinates need to be reordered
+      %((W 170⁰--E 55⁰/N 40⁰--S 36⁰).) =>
+        ['-170.0 -36.0 55.0 40.0'], # superscript 0 is almost a degree character..
       %(W80°--E100°/N487°--S42°) =>
         [], # N487 is out of bounds for the bounding box
+      %((W 0°-W 0°/S 90°---S 90°)) =>
+        ['-0.0 -90.0 -0.0 -90.0'], # one dash, two dashes, three dashes.. what's the difference?
       %(W 650--W 100/N 700--N 550) =>
         [] # missing degree character, and all coordinates are out of bounds.
     }.each do |value, expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Naomi Dushay