geoblacklight 3.7.0 → 4.0.0.pre.alpha

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
-  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(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a KmzDownload object with specific options' do

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload 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.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a ShapefileDownload object with specific options' do

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("#{Settings.FIELDS.UNIQUE_KEY}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
+  let(:document) { SolrDocument.new("#{Settings.FIELDS.ID}": '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/references_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Geoblacklight::References do
   let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:file_format_field) { Settings.FIELDS.FILE_FORMAT }
+  let(:file_format_field) { Settings.FIELDS.FORMAT }
   let(:typical_ogp_shapefile) do
     described_class.new(
       SolrDocument.new(
@@ -135,7 +135,7 @@ describe Geoblacklight::References do
       let(:settings_klass) { class_double('Settings').as_stubbed_const }
       before do
         allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
-        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FILE_FORMAT: 'dc_format_s')
+        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dc_format_s')
       end
       it 'is ordered by the configuration' do
         expect(complex_shapefile.shown_metadata_refs.first.type.to_s).to eq 'iso19139'

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 describe Geoblacklight::Relation::Ancestors do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:ancestors) { described_class.new('nyu_2451_34502', repository) }
-  let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
+  let(:ancestors) { described_class.new('nyu_2451_34502', Settings.FIELDS.SOURCE, repository) }
+  let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
 
   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=#{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])
+      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
     end
   end
 

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 describe Geoblacklight::Relation::Descendants do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:descendants) { described_class.new('nyu_2451_34636', repository) }
-  let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
+  let(:descendants) { described_class.new('nyu_2451_34636', Settings.FIELDS.SOURCE, repository) }
+  let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
 
   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, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE])
+      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
     end
   end
 

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

@@ -11,34 +11,49 @@ describe Geoblacklight::Relation::RelationResponse do
     end
   end
 
-  describe '#ancestors' do
+  describe '#method_missing' do
     it 'returns a hash of ancestor documents' do
-      expect(relation_resp.ancestors).to include('numFound')
-      expect(relation_resp.ancestors).to include('docs')
+      expect(relation_resp.SOURCE_ANCESTORS).to include('numFound')
+      expect(relation_resp.SOURCE_ANCESTORS).to include('docs')
     end
-  end
 
-  describe '#descendants' do
     it 'returns a hash of descendant documents' do
-      expect(relation_resp.ancestors).to include('numFound')
-      expect(relation_resp.ancestors).to include('docs')
+      expect(relation_resp.SOURCE_DESCENDANTS).to include('numFound')
+      expect(relation_resp.SOURCE_DESCENDANTS).to include('docs')
+    end
+
+    it 'raises no method error' do
+      expect { relation_resp.FAIL }.to raise_error NoMethodError
     end
   end
 
-  describe '#empty?' do
-    it 'returns false if document has ancestors or descendants' do
-      expect(relation_resp.empty?).to be false
+  describe '#respond_to_missing?' do
+    it 'returns true for configured relationships' do
+      Settings.RELATIONSHIPS_SHOWN.each_key do |key|
+        expect(relation_resp).to respond_to(key)
+      end
     end
-    it 'returns true if document has neither ancestors nor descendants' do
-      expect(empty_relation_resp.empty?).to be true
+
+    it 'returns false for non-configured options' do
+      expect(relation_resp).not_to respond_to('fail')
     end
+  end
 
-    context 'with a layer slug containing a colon' do
-      let(:empty_relation_resp) { described_class.new('uva-Norfolk:police_point', repository) }
+  describe '#query_type' do
+    it 'fails for a bad query type request' do
+      Settings.add_source!({
+                             RELATIONSHIPS_SHOWN: {
+                               BAD: {
+                                 field: 'dct_source_sm',
+                                 query_type: 'bad_query_type',
+                                 icon: 'pagelines-brands',
+                                 label: 'geoblacklight.relations.ancestor'
+                               }
+                             }
+                           })
+      Settings.reload!
 
-      it 'returns true if document has neither ancestors nor descendants' do
-        expect(empty_relation_resp.empty?).to be true
-      end
+      expect { relation_resp.BAD }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/models/concerns/geoblacklight/solr_document_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }
-  let(:rights_field) { Settings.FIELDS.RIGHTS }
-  let(:provenance_field) { Settings.FIELDS.PROVENANCE }
+  let(:rights_field) { Settings.FIELDS.ACCESS_RIGHTS }
+  let(:provider_field) { Settings.FIELDS.PROVIDER }
   let(:references_field) { Settings.FIELDS.REFERENCES }
   describe '#available?' do
     let(:document_attributes) { {} }
@@ -80,7 +80,7 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#same_institution?' do
     describe 'within the same institution' do
-      let(:document_attributes) { { provenance_field => 'STANFORD' } }
+      let(:document_attributes) { { provider_field => 'STANFORD' } }
       it 'is true' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_truthy
@@ -91,7 +91,7 @@ describe Geoblacklight::SolrDocument do
       end
     end
     describe 'within a different institution' do
-      let(:document_attributes) { { provenance_field => 'MIT' } }
+      let(:document_attributes) { { provider_field => 'MIT' } }
       it 'is false' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_falsey

data/spec/spec_helper.rb

@@ -30,10 +30,6 @@ require 'capybara/rspec'
 require 'selenium-webdriver'
 require 'webdrivers'
 
-# Setup webmock for specific tests
-require 'webmock/rspec'
-WebMock.allow_net_connect!
-
 Capybara.register_driver(:headless_chrome) do |app|
   Capybara::Selenium::Driver.load_selenium
   browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_results_pagination', type: :view do
+describe 'catalog/_results_pagination.html.erb', type: :view do
   it 'will have a #pagination wrapping div' do
     allow(view).to receive_messages(show_pagination?: false)
     render

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_show_downloads', type: :view do
+describe 'catalog/_show_downloads.html.erb', type: :view do
   context 'document is downloadable' do
     let(:document) { instance_double(SolrDocument) }
     before do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0.pre.alpha
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -355,20 +355,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
 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
@@ -507,12 +493,9 @@ 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/tilejson.js
 - app/assets/javascripts/geoblacklight/viewers/tms.js
 - app/assets/javascripts/geoblacklight/viewers/viewer.js
 - app/assets/javascripts/geoblacklight/viewers/wms.js
-- app/assets/javascripts/geoblacklight/viewers/wmts.js
-- app/assets/javascripts/geoblacklight/viewers/xyz.js
 - app/assets/stylesheets/geoblacklight/geoblacklight.scss
 - app/assets/stylesheets/geoblacklight/modules/_base.scss
 - app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
@@ -588,14 +571,12 @@ files:
 - app/views/catalog/metadata/_missing.html.erb
 - app/views/catalog/web_services.html.erb
 - app/views/download/hgl.html.erb
-- app/views/relation/_ancestors.html.erb
-- app/views/relation/_descendants.html.erb
+- app/views/relation/_relations.html.erb
 - 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/new_gbl_settings_defaults_3_4.yml
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
@@ -611,6 +592,7 @@ files:
 - lib/generators/geoblacklight/templates/assets/geoblacklight.js
 - lib/generators/geoblacklight/templates/catalog_controller.rb
 - lib/generators/geoblacklight/templates/package.json
+- lib/generators/geoblacklight/templates/settings.gbl_v1.yml
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/webpacker.yml
 - lib/generators/geoblacklight/webpacker_generator.rb
@@ -652,15 +634,8 @@ files:
 - lib/geoblacklight/wms_layer/feature_info_response.rb
 - lib/tasks/geoblacklight.rake
 - package.json
-- schema/format-values.md
-- schema/geoblacklight-schema-deprecated.md
-- schema/geoblacklight-schema.json
-- schema/geoblacklight-schema.md
-- schema/geometry-type-values.md
-- schema/references.md
-- schema/schema-commentary.md
-- schema/subjects.md
-- schema/type-values.md
+- schema/geoblacklight-schema-1.0.json
+- schema/geoblacklight-schema-aardvark.json
 - setupJest.js
 - solr/conf/_rest_managed.json
 - solr/conf/admin-extra.html
@@ -716,16 +691,10 @@ files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
-- spec/features/tilejson_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
-- spec/features/wmts_spec.rb
-- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
-- spec/fixtures/manifests/tilejson.json
-- spec/fixtures/manifests/wmts-multiple.xml
-- spec/fixtures/manifests/wmts-single.xml
 - spec/fixtures/mods/fb897vt9938.mods
 - spec/fixtures/mods/stanford-cg357zz0321.mods
 - spec/fixtures/solr_documents/README.md
@@ -733,6 +702,7 @@ files:
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json
 - spec/fixtures/solr_documents/actual-raster1.json
+- spec/fixtures/solr_documents/all-relationships.json
 - spec/fixtures/solr_documents/baruch_ancestor1.json
 - spec/fixtures/solr_documents/baruch_ancestor2.json
 - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -750,10 +720,10 @@ files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
-- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
-- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
-- spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/metadata_no_geom.json
+- spec/fixtures/solr_documents/metadata_no_provider.json
 - spec/fixtures/solr_documents/multiple-downloads.json
+- spec/fixtures/solr_documents/no_locn_geometry.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -765,15 +735,12 @@ 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/tilejson.json
+- spec/fixtures/solr_documents/the-related-record.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
 - spec/fixtures/solr_documents/uva_slug_colon.json
-- spec/fixtures/solr_documents/wmts-multiple.json
-- spec/fixtures/solr_documents/wmts-single-layer.json
-- spec/fixtures/solr_documents/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -850,7 +817,7 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -865,8 +832,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
@@ -907,16 +874,10 @@ test_files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
-- spec/features/tilejson_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
-- spec/features/wmts_spec.rb
-- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
-- spec/fixtures/manifests/tilejson.json
-- spec/fixtures/manifests/wmts-multiple.xml
-- spec/fixtures/manifests/wmts-single.xml
 - spec/fixtures/mods/fb897vt9938.mods
 - spec/fixtures/mods/stanford-cg357zz0321.mods
 - spec/fixtures/solr_documents/README.md
@@ -924,6 +885,7 @@ test_files:
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json
 - spec/fixtures/solr_documents/actual-raster1.json
+- spec/fixtures/solr_documents/all-relationships.json
 - spec/fixtures/solr_documents/baruch_ancestor1.json
 - spec/fixtures/solr_documents/baruch_ancestor2.json
 - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -941,10 +903,10 @@ test_files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
-- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
-- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
-- spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/metadata_no_geom.json
+- spec/fixtures/solr_documents/metadata_no_provider.json
 - spec/fixtures/solr_documents/multiple-downloads.json
+- spec/fixtures/solr_documents/no_locn_geometry.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -956,15 +918,12 @@ 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/tilejson.json
+- spec/fixtures/solr_documents/the-related-record.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
 - spec/fixtures/solr_documents/uva_slug_colon.json
-- spec/fixtures/solr_documents/wmts-multiple.json
-- spec/fixtures/solr_documents/wmts-single-layer.json
-- spec/fixtures/solr_documents/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb

data/app/assets/javascripts/geoblacklight/viewers/tilejson.js

@@ -1,33 +0,0 @@
-//= require geoblacklight/viewers/wms
-
-GeoBlacklight.Viewer.Tilejson = GeoBlacklight.Viewer.Wms.extend({
-
-  addPreviewLayer: function() {
-    var _this = this;
-    fetch(this.data.url).then(function(response) {
-      if (!response.ok) {
-          throw new Error("Unable to fetch tile.json document");
-      }
-      return response.json();
-    }).then(function(tilejson) {
-      var bounds = _this.getBounds(tilejson),
-          options = bounds ? { bounds: bounds } : {},
-          url = tilejson.tiles[0],
-          tileJsonLayer = L.tileLayer(url, options);
-      _this.overlay.addLayer(tileJsonLayer);
-    }).catch(function(error) {
-      console.debug(error);
-    });
-  },
-
-  getBounds: function(doc) {
-    // Get the bounds from the document, if they exist, and
-    // convert to a Leaflet latlngBounds object
-    var bounds = doc.bounds;
-    if(bounds) {
-      var corner1 = L.latLng(bounds[1], bounds[0]),
-          corner2 = L.latLng(bounds[3], bounds[2]);
-      return L.latLngBounds(corner1, corner2);
-    }
-  }
-});

data/app/assets/javascripts/geoblacklight/viewers/wmts.js

@@ -1,85 +0,0 @@
-//= require geoblacklight/viewers/wms
-
-GeoBlacklight.Viewer.Wmts = GeoBlacklight.Viewer.Wms.extend({
-
-  addPreviewLayer: function() {
-    var _this = this;
-    fetch(this.data.url).then(function(response) {
-      if (!response.ok) {
-          throw new Error("Unable to fetch WMTSCapabilities document");
-      }
-      return response.text();
-    }).then(function(wmtsCapabilities) {
-      var tileInfo = _this.parseCapabilities(wmtsCapabilities),
-          options = tileInfo.bounds ? { bounds: tileInfo.bounds } : {},
-          tileLayer = L.tileLayer(tileInfo.url, options);
-      _this.overlay.addLayer(tileLayer);
-    }).catch(function(error) {
-      console.debug(error);
-    });
-  },
-
-  parseCapabilities: function(wmtsCapabilities) {
-    var parser = new DOMParser(),
-        doc = parser.parseFromString(wmtsCapabilities, "application/xml"),
-        layers = doc.getElementsByTagName("Layer"),
-        selectedLayer = this.findLayer(layers),
-        resourceElement = selectedLayer.getElementsByTagName("ResourceURL")[0];
-
-    // Generate URL with Leaflet.TileLayer URL template formatting
-    var tileURL = resourceElement.getAttribute("template")
-      .replace("{Style}", this.getStyle(selectedLayer))
-      .replace("{TileMatrixSet}", this.getTileMatrixSet(selectedLayer))
-      .replace("TileMatrix", "z")
-      .replace("TileCol","x")
-      .replace("TileRow","y");
-
-    return { url: tileURL, bounds: this.getBounds(selectedLayer) };
-  },
-
-  findLayer: function(layers) {
-    if (layers.length === 1) {
-      // If there is only one layer in the document, return it
-      return layers[0];
-    } else {
-      // Search each layer for an identifier that matches the
-      // layerId and return it
-      for (i = 0; i < layers.length; i++) {
-        var ids = layers[i].getElementsByTagName("ows:Identifier");
-        for(x = 0; x < ids.length; x++) {
-          if (ids[x].textContent === this.data.layerId) {
-            return layers[i];
-          }
-        }
-      }
-    }
-  },
-
-  getStyle: function(layer) {
-    var styleElement = layer.getElementsByTagName("Style")[0];
-    if(styleElement) {
-      return styleElement.getElementsByTagName("ows:Identifier")[0].textContent;
-    }
-  },
-
-  getTileMatrixSet: function(layer) {
-    var tileMatrixElement = layer.getElementsByTagName("TileMatrixSet")[0];
-    if(tileMatrixElement) {
-      return tileMatrixElement.textContent;
-    }
-  },
-
-  getBounds: function(layer) {
-    // Get the layer's lower corner and upper corner values,
-    // if they exist, and convert to a Leaflet latlngBounds object
-    var lcElement = layer.getElementsByTagName("ows:LowerCorner")[0],
-        ucElement = layer.getElementsByTagName("ows:UpperCorner")[0];
-    if(lcElement && ucElement) {
-      var lc = lcElement.textContent.split(" "),
-          uc = ucElement.textContent.split(" "),
-          corner1 = L.latLng(lc[1], lc[0]),
-          corner2 = L.latLng(uc[1], uc[0]);
-      return L.latLngBounds(corner1, corner2);
-    }
-  }
-});

data/app/assets/javascripts/geoblacklight/viewers/xyz.js

@@ -1,10 +0,0 @@
-//= require geoblacklight/viewers/wms
-
-GeoBlacklight.Viewer.Xyz = GeoBlacklight.Viewer.Wms.extend({
-
-  addPreviewLayer: function() {
-    var _this = this;
-    var xyzLayer = L.tileLayer(this.data.url);
-    this.overlay.addLayer(xyzLayer);
-  }
-});

data/app/views/relation/_ancestors.html.erb

@@ -1,8 +0,0 @@
-<% @relations.ancestors['docs'].each do |ancestor| %>
-  <li class="list-group-item border-bottom-0">
-    <%= link_to solr_document_path(ancestor[Settings.FIELDS.UNIQUE_KEY]) do %>
-      <%= relations_icon(ancestor, 'pagelines-brands') %>
-      <%= ancestor[Settings.FIELDS.TITLE] %>
-    <% end %>
-  </li>
-<% end %>

data/app/views/relation/_descendants.html.erb

@@ -1,15 +0,0 @@
-<% @relations.descendants['docs'][0..2].each do |descendant| %>
-  <li class="list-group-item border-bottom-0">
-    <%= link_to solr_document_path(descendant[Settings.FIELDS.UNIQUE_KEY]) do %>
-      <%= relations_icon(descendant, 'leaf') %>
-      <%= descendant[Settings.FIELDS.TITLE] %>
-    <% end %>
-  </li>
-<% end %>
-<% unless (@relations.descendants['numFound'].to_i <= 3) %>
-  <li class="list-group-item border-bottom-0">
-    <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.link_id]}}) do %>
-      <%= t('geoblacklight.relations.browse_all', count: @relations.descendants['numFound']) %>
-    <% end %>
-  </li>
-<% end %>

data/config/initializers/new_gbl_settings_defaults_3_3.yml

@@ -1,10 +0,0 @@
-# New GeoBlacklight v3.3 Solr field mappings
-FIELDS:
-  :IDENTIFIER: 'dc_identifier_s'
-  :LANGUAGE: 'dc_language_s'
-  :LAYER_MODIFIED: 'layer_modified_dt'
-  :OVERLAP_FIELD: 'solr_bboxtype'
-  :SOURCE: 'dc_source_sm'
-  :SUPPRESSED: 'suppressed_b'
-  :TYPE: 'dc_type_s'
-  :UNIQUE_KEY: 'layer_slug_s'