geoblacklight 3.4.0 → 3.7.0

data/lib/geoblacklight/constants.rb

@@ -16,7 +16,10 @@ 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',
+      tilejson: 'https://github.com/mapbox/tilejson-spec',
+      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/engine.rb

@@ -16,8 +16,10 @@ module Geoblacklight
     # GeoblacklightHelper is needed by all helpers, so we inject it
     # into action view base here.
     initializer 'geoblacklight.helpers' do
-      ActionView::Base.send :include, GeoblacklightHelper
-      ActionView::Base.send :include, CartoHelper
+      config.after_initialize do
+        ActionView::Base.send :include, GeoblacklightHelper
+        ActionView::Base.send :include, CartoHelper
+      end
     end
 
     config.to_prepare do

data/lib/geoblacklight/item_viewer.rb

@@ -51,8 +51,20 @@ module Geoblacklight
       @references.tms
     end
 
+    def xyz
+      @references.xyz
+    end
+
+    def tilejson
+      @references.tilejson
+    end
+
+    def wmts
+      @references.wmts
+    end
+
     def viewer_preference
-      [oembed, index_map, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, index_map, tilejson, xyz, wmts, 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.7.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/home_page_spec.rb

@@ -21,9 +21,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     expect(page).to have_css '.category-block', count: 4
     expect(page).to have_css '.home-facet-link', count: 36
     expect(page).to have_css 'a.more_facets_link', count: 4
-    click_link 'Elevation'
+    click_link 'Transportation'
     expect(page).to have_css '.filter-name', text: 'Subject'
-    expect(page).to have_css '.filter-value', text: 'Elevation'
+    expect(page).to have_css '.filter-value', text: 'Transportation'
   end
   scenario 'map should be visible' do
     within '#main-container' do

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/tilejson_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'tilejson layer' do
+  before do
+    WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
+  end
+
+  after do
+    WebMock.allow_net_connect!
+  end
+
+  scenario 'displays tilejson layer', js: true do
+    # Mock tilejson manifest url
+    stub_request(:get, 'https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248')
+      .to_return(status: 200, body: read_fixture('manifests/tilejson.json'))
+
+    visit solr_document_path('princeton-fk4544658v-tilejson')
+    expect(page).to have_css '.leaflet-control-zoom', visible: :visible
+    expect(page).to have_css "img[src*='https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
+  end
+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,37 @@ 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
+  feature 'when wmts tile reference is provided', js: true do
+    scenario 'shows up in tools' do
+      visit solr_document_path 'princeton-fk4544658v-wmts'
+      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: 'Web Map Tile Service'
+        expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248"]'
+      end
+    end
+  end
+  feature 'when tilejson reference is provided', js: true do
+    scenario 'shows up in tools' do
+      visit solr_document_path 'princeton-fk4544658v-tilejson'
+      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: 'TileJSON Document'
+        expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248"]'
+      end
+    end
+  end
 end

data/spec/features/wmts_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'wmts layer' do
+  before do
+    WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
+  end
+
+  after do
+    WebMock.allow_net_connect!
+  end
+
+  context 'when referencing a WMTSCapabilities document with a single layer' do
+    scenario 'displays the layer', js: true do
+      # Mock wmts manifest url
+      stub_request(:get, 'https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248')
+        .to_return(status: 200, body: read_fixture('manifests/wmts-single.xml'))
+
+      visit solr_document_path('princeton-fk4544658v-wmts')
+      expect(page).to have_css '.leaflet-control-zoom', visible: :visible
+      expect(page).to have_css "img[src*='map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
+    end
+  end
+  context 'when referencing a WMTSCapabilities document with a multiple layers' do
+    scenario 'displays the layer referenced in the layer_id field', js: true do
+      # Mock wmts manifest url
+      stub_request(:get, 'https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml')
+        .to_return(status: 200, body: read_fixture('manifests/wmts-multiple.xml'))
+      visit solr_document_path('princeton-fk4db9hn29')
+      expect(page).to have_css '.leaflet-control-zoom', visible: :visible
+      expect(page).to have_css "img[src*='http://maps1.wien.gv.at/wmts/lb2016/farbe/google3857']"
+    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/manifests/tilejson.json

@@ -0,0 +1,21 @@
+{
+    "tilejson": "2.2.0",
+    "version": "1.0.0",
+    "scheme": "xyz",
+    "tiles": [
+        "https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&rescale=0%2C255"
+    ],
+    "minzoom": 8,
+    "maxzoom": 13,
+    "bounds": [
+        19.22222222200001,
+        39.74997750505241,
+        29.356941715411907,
+        43.083333000050004
+    ],
+    "center": [
+        24.28958196870596,
+        41.41665525255121,
+        8
+    ]
+}