geoblacklight 3.2.0 → 3.3.0

data/spec/controllers/catalog_controller_spec.rb

@@ -72,12 +72,12 @@ describe CatalogController, type: :controller do
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
       expect(response_values).to include 'geoblacklight_version' => '1.0'
-      expect(response_values).to include 'dc_title_s' => '100 Foot Grid Cambridge MA 2004'
-      expect(response_values).to include 'dc_identifier_s' => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
-      expect(response_values).to include 'dc_rights_s' => 'Public'
-      expect(response_values).to include 'dct_provenance_s' => 'Tufts'
-      expect(response_values).to include 'layer_slug_s' => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include 'solr_geom' => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
+      expect(response_values).to include Settings.FIELDS.TITLE => '100 Foot Grid Cambridge MA 2004'
+      expect(response_values).to include Settings.FIELDS.IDENTIFIER => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
+      expect(response_values).to include Settings.FIELDS.RIGHTS => 'Public'
+      expect(response_values).to include Settings.FIELDS.PROVENANCE => 'Tufts'
+      expect(response_values).to include Settings.FIELDS.UNIQUE_KEY => 'tufts-cambridgegrid100-04'
+      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
     end
   end
 end

data/spec/features/download_layer_spec.rb

@@ -41,7 +41,7 @@ feature 'Download layer' do
   end
   scenario 'clicking jpg download button should redirect to external image' do
     visit solr_document_path('princeton-02870w62c')
-    expect(page).to have_css("a.btn.btn-default[href='https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/full/full/0/default.jpg']", text: 'Original JPG')
+    expect(page).to have_css("a.btn.btn-default[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: 'Original JPG')
   end
   scenario 'options should be available under toggle' do
     visit solr_document_path('mit-f6rqs4ucovjk2')

data/spec/features/relations_spec.rb

@@ -16,7 +16,7 @@ feature 'Display related documents' do
     visit relations_solr_document_path('nyu_2451_34635', format: 'json')
     response = JSON.parse(page.body)
     expect(response['ancestors']['numFound']).to eq 0
-    expect(response['descendants']['docs'].first['layer_slug_s']).to eq 'nyu_2451_34502'
+    expect(response['descendants']['docs'].first[Settings.FIELDS.UNIQUE_KEY]).to eq 'nyu_2451_34502'
     expect(response['current_doc']).to eq 'nyu_2451_34635'
   end
 

data/spec/features/search_results_overlap_ratio_spec.rb

@@ -8,7 +8,7 @@ feature 'spatial search results overlap ratio' do
     # BBox param is the US upper midwest and Canada, roughly centered on the state of Minnesota
     visit search_catalog_path(
       bbox: '-103.196521 39.21962 -84.431873 53.63497',
-      'f[dct_provenance_s][]': 'Minnesota'
+      "f[#{Settings.FIELDS.PROVENANCE}][]": 'Minnesota'
     )
 
     # MN State result
@@ -30,7 +30,7 @@ feature 'spatial search results overlap ratio' do
     # BBox param is the center to western edge of New York state and Canada, roughly centered on Lake Ontario
     visit search_catalog_path(
       bbox: '-83.750499 40.41709 -74.368175 47.963663',
-      'f[dct_provenance_s][]': 'Cornell'
+      "f[#{Settings.FIELDS.PROVENANCE}][]": 'Cornell'
     )
 
     # NY State result

data/spec/features/split_view.html.erb_spec.rb

@@ -10,7 +10,7 @@ feature 'Index view', js: true do
   scenario 'should have documents and map on page' do
     visit search_catalog_path(f: { Settings.FIELDS.PROVENANCE => ['Stanford'] })
     expect(page).to have_css('#documents')
-    expect(page).to have_css('.document', count: 5)
+    expect(page).to have_css('.document', count: 6)
     expect(page).to have_css('#map')
   end
 

data/spec/features/tms_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'tms layer' do
+  scenario 'displays tms layer', js: true do
+    visit solr_document_path('6f47b103-9955-4bbe-a364-387039623106')
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css "img[src*='earthquake.usgs.gov']"
+  end
+end

data/spec/fixtures/solr_documents/public_iiif_princeton.json

@@ -16,7 +16,7 @@
     "Rogers, Henry Darwin",
     "Pownall, Thomas"
   ],
-  "dct_references_s": "{\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\",\"http://schema.org/thumbnailUrl\":\"https://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/full/50,/0/default.jpg\",\"http://iiif.io/api/image\":\"https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/info.json\"}",
+  "dct_references_s": "{\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\",\"http://schema.org/thumbnailUrl\":\"https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/!200,150/0/default.jpg\",\"http://iiif.io/api/image\":\"https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json\"}",
   "dct_spatial_sm": [
     "New York (State)",
     "New Jersey",

data/spec/fixtures/solr_documents/tms.json

@@ -0,0 +1,29 @@
+{
+  "dc_identifier_s": "6f47b103-9955-4bbe-a364-387039623106",
+  "dc_title_s": "Quaternary Fault and Fold Database of the United States",
+  "dc_description_s": "Quaternary Fault and Fold Database of the United States",
+  "dc_rights_s": "Public",
+  "dct_provenance_s": "Stanford",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}",
+  "layer_slug_s": "6f47b103-9955-4bbe-a364-387039623106",
+  "layer_geom_type_s": "Polyline",
+  "dc_format_s": "Shapefile",
+  "dc_language_s": "English",
+  "dc_type_s": "Dataset",
+  "dc_publisher_s": "Geological Survey (U.S.)",
+  "dc_subject_sm": [
+    "Earthquakes",
+    "Faults"
+  ],
+  "dct_issued_s": "2020",
+  "dct_temporal_sm": [
+    "2020"
+  ],
+  "dct_spatial_sm": [
+    "Earth (Planet)",
+    "North America"
+  ],
+  "solr_geom": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)",
+  "solr_year_i": 2020,
+  "geoblacklight_version": "1.0"
+}

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -346,12 +346,12 @@ describe GeoblacklightHelper, type: :helper do
       end
 
       it 'renders a goemetry type as the icon' do
-        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
         expect(html.title.strip).to eq 'Polygon'
       end
 
       it 'has the svg_tooltip class so that the Bootstrap tooltip is applied' do
-        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
         expect(html).to have_css('.blacklight-icons.svg_tooltip')
       end
     end
@@ -362,14 +362,40 @@ describe GeoblacklightHelper, type: :helper do
       end
 
       it 'renders the provided icon' do
-        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
         expect(html.title.strip).to eq 'Leaf'
       end
 
       it 'does not have the svg_tooltip class' do
-        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
         expect(html).not_to have_css('.blacklight-icons.svg_tooltip')
       end
     end
   end
+
+  describe '#results_js_map_selector' do
+    context 'viewing bookmarks' do
+      let(:controller_name) { 'bookmarks' }
+
+      it 'returns bookmarks data-map selector' do
+        expect(results_js_map_selector(controller_name)).to eq 'bookmarks'
+      end
+    end
+
+    context 'viewing catalog results' do
+      let(:controller_name) { 'catalog' }
+
+      it 'returns index data-map selector' do
+        expect(results_js_map_selector(controller_name)).to eq 'index'
+      end
+    end
+
+    context 'calling outside of intended scope' do
+      let(:controller_name) { 'outside' }
+
+      it 'returns default data-map value' do
+        expect(results_js_map_selector(controller_name)).to eq 'index'
+      end
+    end
+  end
 end

data/spec/javascripts/geoblacklight_spec.js

@@ -1,5 +1,3 @@
-//= require geoblacklight
-
 describe('GeoBlacklight', function() {
   describe('loads and makes available libraries', function() {
     it('Leaflet is defined', function() {
@@ -9,9 +7,5 @@ describe('GeoBlacklight', function() {
     it('History.js is defined', function() {
       expect(History).toBeDefined();
     });
-
-    it('MetadataDownloadButton is defined', function() {
-      expect(GeoBlacklight.MetadataDownloadButton).toBeDefined();
-    });
   });
 });

data/spec/javascripts/metadata_download_button_spec.js

@@ -1,11 +1,13 @@
-//= require geoblacklight
+const MetadataDownloadButton = require('../../app/assets/javascripts/geoblacklight/modules/metadata_download_button');
 
 describe('MetadataDownloadButton', function() {
   describe('initialize', function() {
-    fixture.set('<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>');
+    beforeEach(() => {
+      document.body.innerHTML = '<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>';
+    });
 
     it('creates a new instance and sets the download button @href value', function() {
-      var button = new GeoBlacklight.MetadataDownloadButton('#foo');
+      var button = new MetadataDownloadButton('#foo');
       expect(button.$el.attr('id')).toBe('foo');
       expect(button.$download.attr('id')).toBe('bar');
       expect(button.$download.attr('href')).toBe('http://testdomain');

data/spec/javascripts/util_spec.js

@@ -1,11 +1,9 @@
-//= require geoblacklight
-
-'use strict';
+const Util = require('../../app/assets/javascripts/geoblacklight/modules/util');
 
 describe('GeoBlacklight.Util', function() {
   describe('linkify', function() {
     it('returns a linkified string', function() {
-      expect(GeoBlacklight.Util.linkify('http://www.example.com'))
+      expect(Util.linkify('http://www.example.com'))
         .toEqual("<a href='http://www.example.com'>http://www.example.com</a>");
     });
   });

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.UNIQUE_KEY => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a KmzDownload object with specific options' do
@@ -10,7 +10,7 @@ describe Geoblacklight::KmzDownload do
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/vnd.google-earth.kmz'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
-      expect(options[:request_params][:bbox]).to eq '-180, -90, 180, 90'
+      expect(options[:request_params][:bbox]).to eq '-180.0, -90.0, 180.0, 90.0'
     end
     it 'merges custom options' do
       download = described_class.new(document, timeout: 33)

data/spec/lib/geoblacklight/download_spec.rb

@@ -7,7 +7,7 @@ describe Geoblacklight::Download do
   let(:faraday_connection) { instance_double(Faraday::Connection) }
   let(:faraday_response) { instance_double(Faraday::Response) }
   let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
+  let(:document) { SolrDocument.new("#{Settings.FIELDS.UNIQUE_KEY}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
 
   describe '#initialize' do

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+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' }
+
+  describe '#geojson' do
+    context 'with standard WKT geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(wkt_geom).geojson).to include('MultiPolygon', 'coordinates', '[[[[-180.0,81.66]')
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(envelope_geom).geojson).to include('Polygon', 'coordinates', '[[[25.0,81.66]')
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns an empty string' do
+        expect(described_class.new(invalid_geom).geojson).to eq ''
+      end
+    end
+  end
+
+  describe '#bounding_box' do
+    context 'with standard WKT geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(wkt_geom).bounding_box).to eq '-180.0, -12.93, 180.0, 81.66'
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(envelope_geom).bounding_box).to eq '-168.35, -12.93, 25.0, 81.66'
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns an empty string' do
+        expect(described_class.new(invalid_geom).bounding_box).to eq ''
+      end
+    end
+  end
+end

data/spec/lib/geoblacklight/item_viewer_spec.rb

@@ -26,6 +26,18 @@ describe Geoblacklight::ItemViewer do
         expect(item_viewer.viewer_preference).to eq wms: 'http://www.example.com/wms'
       end
     end
+    describe 'for tms reference' do
+      let(:document_attributes) do
+        {
+          references_field => {
+            'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification' => 'http://www.example.com/tms'
+          }.to_json
+        }
+      end
+      it 'tms if tms is present' do
+        expect(item_viewer.viewer_preference).to eq tms: 'http://www.example.com/tms'
+      end
+    end
     describe 'for iiif only reference' do
       let(:document_attributes) do
         {

data/spec/lib/geoblacklight/references_spec.rb

@@ -76,7 +76,7 @@ describe Geoblacklight::References do
         file_format_field => 'Raster',
         references_field => {
           'http://schema.org/url' => 'http://arks.princeton.edu/ark:/88435/02870w62c',
-          'http://iiif.io/api/image' => 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
+          'http://iiif.io/api/image' => 'https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json'
         }.to_json
       )
     )

data/spec/lib/geoblacklight/relation/ancestors_spec.rb

@@ -8,7 +8,7 @@ describe Geoblacklight::Relation::Ancestors do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding ancestor documents' do
-      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.UNIQUE_KEY}}#{Settings.FIELDS.UNIQUE_KEY}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
     end
   end
 

data/spec/lib/geoblacklight/relation/descendants_spec.rb

@@ -8,7 +8,7 @@ describe Geoblacklight::Relation::Descendants do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding descendant documents' do
-      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
     end
   end
 

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,2 @@
 gem 'sprockets', '< 4'
+gem 'view_component', '!= 2.26.0'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -14,8 +14,6 @@ class TestAppGenerator < Rails::Generators::Base
 
   def add_gems
     gem 'blacklight'
-    gem 'teaspoon'
-    gem 'teaspoon-jasmine'
     gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
     Bundler.with_clean_env do
       run 'bundle install'
@@ -42,9 +40,4 @@ class TestAppGenerator < Rails::Generators::Base
     FileUtils.mkdir_p 'spec/fixtures/metadata'
     directory 'metadata', 'spec/fixtures/metadata'
   end
-
-  def install_teaspoon
-    # Implicit copy of GeoBlacklight checked-in teaspoon_env.rb
-    copy_file '../teaspoon_env.rb', 'spec/teaspoon_env.rb'
-  end
 end

data/spec/views/catalog/_document_split.html.erb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_index_split.html.erb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/template.rb

@@ -2,6 +2,7 @@
 gem 'blacklight', '~> 7.0'
 gem 'geoblacklight', '~> 3.0'
 gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
+gem 'sprockets', '< 4.0' # Use sprockets less than 4.0, let webpacker users set this up themselves
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,6 +159,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rgeo-geojson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +286,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bixby
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+- !ruby/object:Gem::Dependency
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,47 +314,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: teaspoon
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 description: GeoBlacklight provides a world-class discovery platform for geospatial
   (GIS) holdings. It is an open collaborative project aiming to build off of the successes
   of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal
@@ -341,8 +369,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -419,6 +447,7 @@ files:
 - app/assets/images/blacklight/uva.svg
 - app/assets/images/blacklight/web_services.svg
 - app/assets/images/blacklight/wisconsin.svg
+- app/assets/images/favicon.ico
 - app/assets/javascripts/geoblacklight/basemaps.js
 - app/assets/javascripts/geoblacklight/controls.js
 - app/assets/javascripts/geoblacklight/controls/opacity.js
@@ -427,6 +456,7 @@ files:
 - app/assets/javascripts/geoblacklight/downloaders/hgl_downloader.js
 - app/assets/javascripts/geoblacklight/geoblacklight.js
 - app/assets/javascripts/geoblacklight/modules.js
+- app/assets/javascripts/geoblacklight/modules/bookmarks.js
 - app/assets/javascripts/geoblacklight/modules/download.js
 - app/assets/javascripts/geoblacklight/modules/geosearch.js
 - app/assets/javascripts/geoblacklight/modules/help_text.js
@@ -451,6 +481,7 @@ files:
 - app/assets/javascripts/geoblacklight/viewers/index_map.js
 - app/assets/javascripts/geoblacklight/viewers/map.js
 - app/assets/javascripts/geoblacklight/viewers/oembed.js
+- app/assets/javascripts/geoblacklight/viewers/tms.js
 - app/assets/javascripts/geoblacklight/viewers/viewer.js
 - app/assets/javascripts/geoblacklight/viewers/wms.js
 - app/assets/stylesheets/geoblacklight/geoblacklight.scss
@@ -533,10 +564,13 @@ files:
 - app/views/relation/index.html.erb
 - app/views/relation/index.json.jbuilder
 - app/views/shared/_header_navbar.html.erb
+- babel.config.json
 - bin/coverage.rb
+- config/initializers/new_gbl_settings_defaults_3_3.yml
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
 - geoblacklight.gemspec
+- jest.config.js
 - lib/generators/geoblacklight/assets_generator.rb
 - lib/generators/geoblacklight/install_generator.rb
 - lib/generators/geoblacklight/templates/Procfile
@@ -563,6 +597,7 @@ files:
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
 - lib/geoblacklight/geoblacklight_helper_behavior.rb
+- lib/geoblacklight/geometry.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
 - lib/geoblacklight/metadata/base.rb
@@ -597,6 +632,7 @@ files:
 - schema/schema-commentary.md
 - schema/subjects.md
 - schema/type-values.md
+- setupJest.js
 - solr/conf/_rest_managed.json
 - solr/conf/admin-extra.html
 - solr/conf/core.properties
@@ -614,6 +650,7 @@ files:
 - solr/conf/xslt/example_atom.xsl
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -649,6 +686,7 @@ files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -691,6 +729,7 @@ files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
@@ -698,13 +737,10 @@ files:
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
-- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -713,6 +749,7 @@ files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -742,7 +779,6 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html
@@ -788,11 +824,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -828,6 +865,7 @@ test_files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -870,6 +908,7 @@ test_files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
@@ -877,13 +916,10 @@ test_files:
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
-- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -892,6 +928,7 @@ test_files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -921,7 +958,6 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html