stanford-mods 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78de4ef412a944f30348ca304d532bc275806ee4
-  data.tar.gz: 3127f3b4e900620d2a130292733957bdb63a685a
+  metadata.gz: a21780e0eb52230a1237022dbe52133a6ffcfb3e
+  data.tar.gz: 46e8908da12e2fb68a00410a5b634d2f63752249
 SHA512:
-  metadata.gz: 9d65a7dc751eaff5edc2238935a469c32d1c25d5e3965464e4c56c7019a3f865c4103025188a767e56fd58c01b772a6485945c07e81a6ceeff4b133e1878d4d0
-  data.tar.gz: abf7f4068718169e8afcc61accb4d652c90b18ec8caa1eb7bf0f08740386b39dbbb14a962e00831bbb14a1b211e1eba05b18fb03e804d1ab0be887aec788b086
+  metadata.gz: 73883c77e8c2dde788468eafa93c55e8e9aa19f4bfd61d259439fb08592b180ebc870fe706075fb0722e8970769101ac397ec4740c31bc3a45c54a6aa19585e5
+  data.tar.gz: 59afb90817a8252a3e9a1d696f7d289dc1874ab3d7ad89bd9fb4cb9800ffc5a4f614e8ed72258cd50edea8fab436d6096931b18b73207688d2c943608496cc16

data/lib/stanford-mods/geo_spatial.rb

@@ -2,50 +2,58 @@
 require 'logger'
 require 'mods'
 
-# NON-SearchWorks specific wranglings of MODS cartographics metadata
 module Stanford
   module Mods
-
+    # NON-SearchWorks specific wranglings of MODS cartographics metadata
     class Record < ::Mods::Record
-
       def coordinates
         Array(@mods_ng_xml.subject.cartographics.coordinates).map(&:text)
       end
 
       def point_bbox
         coordinates.map do |n|
-          matches = n.match(/^\(([^)]+)\)\.?$/)
-          next unless matches
-          coord_to_bbox(matches[1])
+          matches = n.match(/^\(?([^)]+)\)?\.?$/)
+
+          if matches
+            coord_to_bbox(matches[1])
+          else
+            coord_to_bbox(n)
+          end
         end.compact
       end
 
       private
 
       def coord_to_bbox(coord)
-        matches = coord.match %r{(?<lat>.+--.+)\s*/\s*(?<lng>.+--.+)}
+        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} #{min_y} #{max_x} #{max_y}"
+        "#{min_x} #{min_y} #{max_x} #{max_y}" if valid_bbox?(min_x, max_x, max_y, min_y)
       end
 
       def coord_to_decimal(point)
-        regex = /(?<dir>[NESW])\s*(?<deg>\d+)°(?:(?<sec>\d+)ʹ)?/
+        regex = /(?<dir>[NESW])\s*(?<deg>\d+)°(?:(?<min>\d+)[ʹ'])?(?:(?<sec>\d+)[ʺ"])?/
         match = regex.match(point)
 
-        return unless match
-
-        dec = 0
+        return Float::NAN unless match
 
-        dec += match['deg'].to_i
-        dec += match['sec'].to_f / 60
+        dec = match['deg'].to_i
+        dec += match['min'].to_f / 60
+        dec += match['sec'].to_f / 60 / 60
         dec = -1 * dec if match['dir'] == 'W' || match['dir'] == 'S'
 
         dec
       end
+
+      def valid_bbox?(min_x, max_x, max_y, min_y)
+        range_x = -180.0..180.0
+        range_y = -90.0..90.0
+
+        range_x.include?(min_x) && range_x.include?(max_x) && range_y.include?(min_y) && range_y.include?(max_y)
+      end
     end # class Record
   end # Module Mods
 end # Module Stanford

data/lib/stanford-mods/version.rb

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

data/spec/geo_spatial_spec.rb

@@ -66,6 +66,36 @@ describe "Cartographic coordinates" do
       smods_rec.from_str(with_coords)
       expect(smods_rec.point_bbox).to eq(["-16.0 -15.0 28.0 13.0"])
     end
-  end
 
+    {
+      %((W 123°23ʹ16ʺ--W 122°31ʹ22ʺ/N 39°23ʹ57ʺ--N 38°17ʹ53ʺ)) =>
+        ['-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'],
+      %(W80°--E100°/N487°--S42°) =>
+        [], # N487 is out of bounds for the bounding box
+      %(W 650--W 100/N 700--N 550) =>
+        [] # missing degree character, and all coordinates are out of bounds.
+    }.each do |value, expected|
+      describe 'data mappings' do
+        let(:mods) do
+          <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <subject>
+                <cartographics>
+                  <coordinates>#{value}</coordinates>
+                </cartographics>
+              </subject>
+            </mods>
+          EOF
+        end
+
+        let(:smods_rec) { Stanford::Mods::Record.new.from_str(mods) }
+
+        it 'maps to the right bounding box' do
+          expect(smods_rec.point_bbox).to eq expected
+        end
+      end
+    end
+  end
 end # describe Cartographic coordinates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods