geoblacklight 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 623646febc134a8ecd4c02ceaf7f4d745918f1e1e2356f4814b17d0a511a9e0b
-  data.tar.gz: 1ca956025bd1cebcd15f8745a60a6155a193f669dd02fcd9e097b7d5daa66ed7
+  metadata.gz: a28549818bf0d50f6b33cbd98d38114aaf16ec00312f918fa5fefa1f34bd9738
+  data.tar.gz: e10e36e4b8ff2b46b2fb7970427399f5785eb55c7d96ecc94c44422c2dac45f4
 SHA512:
-  metadata.gz: ec59a0e309a167f37d2d0bff83e13498879b94827d711145c91bd05f3abd24616bd31c78f39ace056ad660c10512f1166f5d03919ad89f1214c2febe405838e2
-  data.tar.gz: 8260fb2cfb48040bda8a1d6394c3d88bc339eec409e08096c713cddb0eb17ef92e5e9599a5d43a784ce6287dd69af7e7c6836b66e331deaa2dff58f4f012df9f
+  metadata.gz: fbfdb636de0b0e68a33e53f3b72d60ac761fb7ecaafda00c75cde0893d6da2b8fbd803fa9831a7bd35fd21e5e9512d14adf318bad02420268237b7d08d0c9ea0
+  data.tar.gz: 4078a2f0c54fbe377f36271932c939185741f7655252168b6a403f9073ed8388a202061d32e8a1db839d3445a5680949710d3a9670c2e888a68b51d581c84f01

data/.github/workflows/ruby.yml

@@ -27,8 +27,11 @@ jobs:
       with:
         ruby-version: 2.7
 
+    - name: Install bundler
+      run: gem install bundler -v 2.1.1
+
     - name: Install dependencies
-      run: bundle install
+      run: bundle _2.1.1_ install
 
     - name: Download coverage artifacts
       uses: actions/download-artifact@v2
@@ -43,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
+        ruby: [2.7, '3.0']
     steps:
     - uses: actions/checkout@v2
 
@@ -55,8 +58,13 @@ jobs:
     - name: Create Solr container
       run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
 
+    - name: Install bundler
+      run: gem install bundler -v 2.1.1
+
     - name: Install dependencies
-      run: bundle install
+      run: bundle _2.1.1_ install
+      env:
+        rails_version: 7.0.1
 
     - name: Load config into solr
       run: |
@@ -68,6 +76,7 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
+        rails_version: 7.0.1
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
         SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
 
@@ -77,7 +86,7 @@ jobs:
         name: coverage
         path: coverage/
 
-  test_rails6_0:
+  test_rails6_1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -93,45 +102,13 @@ jobs:
     - name: Create Solr container
       run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
 
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 6.0.3.4
-
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.0.3.4
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
-
-  test_rails5_2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.6]
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-
-    - name: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
+    - name: Install bundler
+      run: gem install bundler -v 2.1.1
 
     - name: Install dependencies
-      run: bundle install
+      run: bundle _2.1.1_ install
       env:
-        RAILS_VERSION: 5.2.6
+        RAILS_VERSION: 6.1.4.4
 
     - name: Load config into solr
       run: |
@@ -143,6 +120,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 5.2.6
+        RAILS_VERSION: 6.1.4.4
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
         SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core

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

@@ -4,7 +4,7 @@ GeoBlacklight.Viewer.Tms = GeoBlacklight.Viewer.Wms.extend({
 
   addPreviewLayer: function() {
     var _this = this;
-    var wmtsLayer = L.tileLayer(this.data.url);
-    this.overlay.addLayer(wmtsLayer);
+    var tmsLayer = L.tileLayer(this.data.url, { tms: true });
+    this.overlay.addLayer(tmsLayer);
   }
 });

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

@@ -0,0 +1,10 @@
+//= 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/config/locales/geoblacklight.en.yml

@@ -65,6 +65,7 @@ en:
       services: 'Web services'
       services_close: 'Close'
       tms: 'Tile Map Service'
+      xyz: 'XYZ Tiles'
     relations:
       ancestor: 'Source Datasets'
       descendant: 'Derived Datasets'

data/lib/generators/geoblacklight/templates/settings.yml

@@ -77,6 +77,7 @@ WEBSERVICES_SHOWN:
   - 'wms'
   - 'tms'
   - 'wfs'
+  - 'xyz'
   - 'iiif'
   - 'feature_layer'
   - 'tiled_map_layer'

data/lib/geoblacklight/constants.rb

@@ -16,7 +16,9 @@ module Geoblacklight
       wcs: 'http://www.opengis.net/def/serviceType/ogc/wcs',
       wfs: 'http://www.opengis.net/def/serviceType/ogc/wfs',
       wms: 'http://www.opengis.net/def/serviceType/ogc/wms',
+      wmts: 'http://www.opengis.net/def/serviceType/ogc/wmts',
       tms: 'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification',
+      xyz: 'https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames',
       hgl: 'http://schema.org/DownloadAction',
       feature_layer: 'urn:x-esri:serviceType:ArcGIS#FeatureLayer',
       tiled_map_layer: 'urn:x-esri:serviceType:ArcGIS#TiledMapLayer',

data/lib/geoblacklight/item_viewer.rb

@@ -51,8 +51,12 @@ module Geoblacklight
       @references.tms
     end
 
+    def xyz
+      @references.xyz
+    end
+
     def viewer_preference
-      [oembed, index_map, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, index_map, xyz, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
        image_map_layer, feature_layer].compact.map(&:to_hash).first
     end
   end

data/lib/geoblacklight/version.rb

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

data/solr/conf/solrconfig.xml

@@ -70,9 +70,9 @@
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <query>
     <maxBooleanClauses>1024</maxBooleanClauses>
-    <filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
+    <filterCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <queryResultCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
+    <documentCache class="solr.CaffeineCache" size="512" initialSize="512" autowarmCount="0" async="true"/>
     <enableLazyFieldLoading>true</enableLazyFieldLoading>
     <queryResultWindowSize>20</queryResultWindowSize>
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>

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: 6)
+    expect(page).to have_css('.document', count: 7)
     expect(page).to have_css('#map')
   end
 

data/spec/features/tms_spec.rb

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

data/spec/features/web_services_modal_spec.rb

@@ -23,4 +23,15 @@ feature 'web services tools' do
       expect(page).not_to have_css 'li.web_services a', text: 'Web services'
     end
   end
+  feature 'when xyz tile reference is provided', js: true do
+    scenario 'shows up in tools' do
+      visit solr_document_path '6f47b103-9955-4bbe-a364-387039623106-xyz'
+      expect(page).to have_css 'li.web_services a', text: 'Web services'
+      click_link 'Web services'
+      within '.modal-body' do
+        expect(page).to have_css 'label', text: 'XYZ Tiles'
+        expect(page).to have_css 'input[value="https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png"]'
+      end
+    end
+  end
 end

data/spec/features/xyz_spec.rb

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

data/spec/fixtures/solr_documents/tms.json

@@ -1,11 +1,11 @@
 {
   "dc_identifier_s": "6f47b103-9955-4bbe-a364-387039623106",
-  "dc_title_s": "Quaternary Fault and Fold Database of the United States",
+  "dc_title_s": "Quaternary Fault and Fold Database of the United States (TMS)",
   "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_slug_s": "6f47b103-9955-4bbe-a364-387039623106-tms",
   "layer_geom_type_s": "Polyline",
   "dc_format_s": "Shapefile",
   "dc_language_s": "English",

data/spec/fixtures/solr_documents/xyz.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 (XYZ)",
+  "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.openstreetmap.org/wiki/Slippy_map_tilenames\":\"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-xyz",
+  "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"
+}

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -496,6 +496,7 @@ files:
 - 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/xyz.js
 - app/assets/stylesheets/geoblacklight/geoblacklight.scss
 - app/assets/stylesheets/geoblacklight/modules/_base.scss
 - app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
@@ -701,6 +702,7 @@ files:
 - spec/features/suppressed_records_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
+- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
 - spec/fixtures/mods/fb897vt9938.mods
@@ -747,6 +749,7 @@ files:
 - 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/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
@@ -823,7 +826,7 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -838,8 +841,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
@@ -882,6 +885,7 @@ test_files:
 - spec/features/suppressed_records_spec.rb
 - spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
+- spec/features/xyz_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
 - spec/fixtures/mods/fb897vt9938.mods
@@ -928,6 +932,7 @@ test_files:
 - 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/xyz.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb