geoblacklight_sidecar_images 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7fa4e389ebc3cbdc474e0fba0f409beaae264d5ea1a756e892193880048da2
-  data.tar.gz: 46195dded5ba82f358794c853f3137204590f3b644cd9fb7d63063a6d89540f8
+  metadata.gz: 6e89b436bb5ef1c4905c614eb923397f8837fe7169095e5ec784c8631cfe04e1
+  data.tar.gz: 18b958b4b4b274ae213281220f00f8557ccc2249807799d467a09fdce33e1986
 SHA512:
-  metadata.gz: 3c99095794cb56bbe354cc8b4fe5fb5cafb60f28dc0b75994d2bf1c19f9cd73c85ae3d59c429ff8224e3d9340fa94c81eb8dd85f0f5f093ea693e25e6c2377ac
-  data.tar.gz: a0c462867882cc57784bc5aa169714b3cc2f1837dfd037aef147d6f5fe565adbc4f649628fcc4e502f3605803c3b158f3521c8a784a2d26ecb598a560caa8607
+  metadata.gz: bda9efbc7d361c8c171ff39179f63f8b7046d4aff1892c38a58d92a4cede4c6314838778a07a179809ce7c223a4996b910ba48446f6d6405e012dc3332ed9b99
+  data.tar.gz: 8b0a0b1a0e2a6a6de19b441e192656f0a224505b19f5130f998668084b3698476afbec31b55320609adca7ef16b3967f0a63a7f6b9b7dcebebcd7cb22b4b743a

data/app/assets/stylesheets/geoblacklight_sidecar_images/modules/_results.scss

@@ -2,6 +2,7 @@
 .media {
   img,span {
     min-width: 100px;
+    max-width: 100px;
     text-align: center;
   }
   span.icon.square {

data/app/services/geoblacklight_sidecar_images/image_service.rb

@@ -180,11 +180,18 @@ module GeoblacklightSidecarImages
     # from the viewer protocol, and if it's loaded, the image_url
     # method is called.
     def service_url
+
+      # Follow image_url instead
+      if gblsi_thumbnail_uri
+        return nil
+      end
+
       @service_url ||=
         begin
           return unless @document.available?
 
           protocol = @document.viewer_protocol
+
           if protocol == 'map' || protocol.nil?
             @metadata['error'] = 'Unsupported viewer protocol'
             @metadata['placeheld'] = true

data/lib/generators/geoblacklight_sidecar_images/templates/views/catalog/_index_split_default.html.erb

@@ -15,7 +15,7 @@
     <div class='media'>
       <% if document.sidecar.image.attached? %>
         <% if document.sidecar.image.variable? %>
-          <%= image_tag document.sidecar.image.variant(resize: "100x100"), {class: 'mr-3'} %>
+          <%= image_tag document.sidecar.image.variant(resize: "200"), {class: 'mr-3'} %>
         <% else %>
           <%= image_tag document.sidecar.image, {class: 'mr-3'} %>
         <% end %>

data/lib/geoblacklight_sidecar_images/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightSidecarImages
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/fixtures/files/b1g_thumbnail.json

@@ -0,0 +1,42 @@
+{
+  "geoblacklight_version": "1.0",
+  "dc_description_s": "The Illinois Environmental Protection Agency's collection of geospatial resources on their Open Data Geoportal include vehicle emissions testing locations and waste disposal sites.",
+  "layer_modified_dt": "2019-08-29T16:54:48Z",
+  "solr_geom": "ENVELOPE(-91.51308, -87.49520, 42.50848, 36.97030)",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://illinoisepaopendata-illinois-epa.opendata.arcgis.com\"}",
+  "dc_rights_s": "Public",
+  "b1g_centroid_ss": "39.73939,-89.50414",
+  "layer_geom_type_s": "Table",
+  "b1g_status_s": "Active",
+  "dct_provenance_s": "Illinois",
+  "dc_subject_sm": [
+    "State agencies geospatial data"
+  ],
+  "dct_temporal_sm": [
+    "2015-2018"
+  ],
+  "b1g_code_s": "02a-02",
+  "b1g_genre_sm": [
+    "Geospatial data"
+  ],
+  "b1g_keyword_sm": [
+    "Environment,Health,Transportation,Location"
+  ],
+  "dc_creator_sm": [
+    "Illinois Environmental Protection Agency"
+  ],
+  "dc_identifier_s": "02a-02",
+  "solr_year_i": 2015,
+  "thumbnail_path_ss": "https://www2.illinois.gov/epa/Style%20Library/SOISierra/Images/SiteLogo.png",
+  "dct_spatial_sm": [
+    "Illinois"
+  ],
+  "dc_publisher_sm": [
+    "State of Illinois"
+  ],
+  "dc_type_sm": [
+    "Collection"
+  ],
+  "dc_title_s": "Illinois EPA Open Data",
+  "layer_slug_s": "02a-02"
+}

data/spec/services/image_service_spec.rb

@@ -9,6 +9,8 @@ describe GeoblacklightSidecarImages::ImageService do
   let(:wms_imgsvc) { described_class.new(wms_document) }
   let(:thumb_document) { SolrDocument.new(json_data('umn_solr_thumb')) }
   let(:thumb_imgsvc) { described_class.new(thumb_document) }
+  let(:map_document) { SolrDocument.new(json_data('b1g_thumbnail')) }
+  let(:map_imgsvc) { described_class.new(map_document) }
 
   # @TODO: bdcbcd3e-f6db-4ee4-b7b7-d75fe35f1d92 - Michigan State - thumbnail_path_ss
 
@@ -32,6 +34,11 @@ describe GeoblacklightSidecarImages::ImageService do
     it 'returns references without a settings thumbnail field value' do
       expect(wms_imgsvc.send(:image_url)).to include 'wms'
     end
+
+    it 'returns image_url over service_url when settings thumbnail field' do
+      expect(map_imgsvc.send(:image_url)).to include 'illinois'
+      expect(map_imgsvc.send(:service_url)).to be_falsey
+    end
   end
 
   context 'when #iiif' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Eric Larson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoblacklight
@@ -316,6 +316,7 @@ files:
 - spec/fixtures/files/actual-point1.json
 - spec/fixtures/files/actual-polygon1.json
 - spec/fixtures/files/actual-raster1.json
+- spec/fixtures/files/b1g_thumbnail.json
 - spec/fixtures/files/baruch_ancestor1.json
 - spec/fixtures/files/baruch_ancestor2.json
 - spec/fixtures/files/baruch_documentation_download.json
@@ -389,6 +390,7 @@ test_files:
 - spec/fixtures/files/actual-point1.json
 - spec/fixtures/files/actual-polygon1.json
 - spec/fixtures/files/actual-raster1.json
+- spec/fixtures/files/b1g_thumbnail.json
 - spec/fixtures/files/baruch_ancestor1.json
 - spec/fixtures/files/baruch_ancestor2.json
 - spec/fixtures/files/baruch_documentation_download.json