geoblacklight 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab9ad53c121ecb11786eda411ef17204fc5583f0509163d1d67410d71c200a4
-  data.tar.gz: 5e42344b9e36065ff2fd1e3016d660dd16e0c96c76926a2fd7dc46cbea2839a0
+  metadata.gz: 4021ce4380619064571c6145cf452e1096dad3f6961202a0b921cd979c2343ed
+  data.tar.gz: aa8c3ccd3014fe2b881118ac476d59c800fec65936d9acf135c10c7174a3ccc4
 SHA512:
-  metadata.gz: 3eccb9b116840387fbcb0fa90b5f54026804b15ecee88d02732dc24cf39295c51ffc9b434f6a92c0c2d090265ea59a9d554a96b5d58ea350fbfb258bf4eea6c2
-  data.tar.gz: 6f1506bcd876c7977f717a6bbd04a7abc4aad119bb76051bce22c984f10376649aa2f11a3c36000d001e94c63c10207fe8abc9e4f3dcb87fae184e9b355dce76
+  metadata.gz: 843bf563f8093e054e41ce5d3557d6144453a486aec7500f42eac3a9faa41adee5ad55afb1d2c5736f3257c6242eb9ba5d0bd0631627393875226051ac37f674
+  data.tar.gz: 744948cad3dcf288fb3e2506ec70deec999c7a7a6c820f71bea5cbeacdfa4b54b6f709b0c55c0cfc3f6debdeaa13b3d4142eaac0adb26a5bd683fdf0185c6349

data/.github/workflows/ruby.yml

@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7]
+        ruby: [2.7, 3.0]
     steps:
     - uses: actions/checkout@v2
 
@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5]
+        ruby: [2.6]
     steps:
     - uses: actions/checkout@v2
 
@@ -133,10 +133,10 @@ jobs:
     - name: Install dependencies
       run: bundle install
       env:
-        RAILS_VERSION: 5.2.4.2
+        RAILS_VERSION: 5.2.6
 
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 5.2.4.2
+        RAILS_VERSION: 5.2.6
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'

data/app/helpers/geoblacklight_helper.rb

@@ -280,7 +280,7 @@ module GeoblacklightHelper
     icon_name = icon if icon_name.blank?
     icon_options = {}
     icon_options = { classes: 'svg_tooltip' } if Settings.USE_GEOM_FOR_RELATIONS_ICON
-    geoblacklight_icon(icon_name, icon_options)
+    geoblacklight_icon(icon_name, **icon_options)
   end
 
   ## Returns the data-map attribute value used as the JS map selector

data/lib/geoblacklight/geometry.rb

@@ -17,8 +17,9 @@ module Geoblacklight
     def geojson
       obj = factory.parse_wkt(geometry_as_wkt)
       RGeo::GeoJSON.encode(obj).to_json
-    rescue RGeo::Error::ParseError
-      ''
+    rescue StandardError
+      Geoblacklight.logger.warn "Geometry is not valid: #{geom}"
+      default_extent
     end
 
     # Generate a wsen bounding box from the geometry
@@ -36,11 +37,25 @@ module Geoblacklight
       maxy = bbox.coordinates[0][2][1]
       "#{minx}, #{miny}, #{maxx}, #{maxy}"
     rescue RGeo::Error::ParseError
-      ''
+      Geoblacklight.logger.warn "Error parsing geometry: #{geom}"
+      default_extent
     end
 
     private
 
+    # Default extent as GeoJSON
+    # @return [String]
+    def default_extent
+      {
+        'type' => 'Polygon',
+        'coordinates' => [
+          [
+            [-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]
+          ]
+        ]
+      }.to_json
+    end
+
     # Convert WKT ENVELOPE string to WKT POLYGON string
     # @return [String]
     def envelope_to_polygon

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -5,6 +5,7 @@ describe Geoblacklight::Geometry do
   let(:wkt_geom) { 'MULTIPOLYGON(((-180 81.66, -180 -12.93, -168.35 -12.93, -168.35 81.66, -180 81.66)), ((180 81.66, 25 81.66, 25 -12.93, 180 -12.93, 180 81.66)))' }
   let(:envelope_geom) { 'ENVELOPE(25, -168.35, 81.66, -12.93)' }
   let(:invalid_geom) { 'INVALID' }
+  let(:non_polygon_geom) { 'ENVELOPE(130, 130, 33, 33)' }
 
   describe '#geojson' do
     context 'with standard WKT geometry' do
@@ -20,8 +21,18 @@ describe Geoblacklight::Geometry do
     end
 
     context 'with an invalid geometry' do
-      it 'returns an empty string' do
-        expect(described_class.new(invalid_geom).geojson).to eq ''
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(invalid_geom).geojson).to include('coordinates', '-180.0,90.0')
+      end
+    end
+
+    context 'with a non-polygon geometry' do
+      before do
+        allow(RGeo::GeoJSON).to receive(:encode).and_raise(RGeo::Error::InvalidGeometry)
+      end
+
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(non_polygon_geom).geojson).to include('coordinates', '-180.0,90.0')
       end
     end
   end
@@ -40,8 +51,8 @@ describe Geoblacklight::Geometry do
     end
 
     context 'with an invalid geometry' do
-      it 'returns an empty string' do
-        expect(described_class.new(invalid_geom).bounding_box).to eq ''
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(invalid_geom).bounding_box).to include('coordinates', '-180.0,90.0')
       end
     end
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -809,7 +809,7 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -824,8 +824,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files: