slight modifications to iiif-viewer pull request

app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -10,7 +10,7 @@
    * @param {String} bbox Space-separated string of sw-lng sw-lat ne-lng ne-lat
    * @return {L.LatLngBounds} Converted Leaflet LatLngBounds object
    */
-   L.bboxToBounds = function(bbox) {
+  L.bboxToBounds = function(bbox) {
     bbox = bbox.split(' ');
     if (bbox.length === 4) {
       return L.latLngBounds([[bbox[1], bbox[0]], [bbox[3], bbox[2]]]);
@@ -38,4 +38,4 @@
 
   global.GeoBlacklight = GeoBlacklight;
 
-}(this);
+}(this);

app/assets/javascripts/geoblacklight/modules/home.js

@@ -1,22 +1,15 @@
-Blacklight.onLoad(function () {
+Blacklight.onLoad(function() {
   $('[data-map="home"]').each(function(i, element) {
-    var options = {
-    /**
-    * Initial bounds of map
-    * @type {L.LatLngBounds}
-    */
-    bbox: [[-85, -180], [85, 180]]
-    };
 
-    var geoblacklight = new GeoBlacklight.Viewer.Leaflet(this, options),
+    var geoblacklight = new GeoBlacklight.Viewer.Leaflet(this),
         data = $(this).data();
     geoblacklight.map.addControl(L.control.geosearch({
       baseUrl: data.catalogPath,
       dynamic: false,
       searcher: function() {
-      window.location.href = this.getSearchUrl();
+        window.location.href = this.getSearchUrl();
       },
       staticButton: '<a class="btn btn-primary">Search Here</a>'
     }));
   });
-});
+});

app/assets/javascripts/geoblacklight/modules/item.js

@@ -5,16 +5,15 @@ Blacklight.onLoad(function() {
     var viewerName = $(element).data().protocol;
     viewerName = viewerName.charAt(0).toUpperCase() + viewerName.substring(1);
 
-    // get new viewer instance from modulejs and pass in element
+    // get new viewer instance and pass in element
     try {
-      var viewer = new window["GeoBlacklight"]["Viewer"][viewerName](element); 
-      // viewer.load();
-    } catch(err) {
+      var viewer = new window['GeoBlacklight']['Viewer'][viewerName](element);
+    } catch (err) {
       console.info('Error loading viewer');
-    };
+    }
   });
 
   $('.truncate-abstract').readmore({
-   maxHeight: 60
+    maxHeight: 60
   });
-});
+});

app/assets/javascripts/geoblacklight/viewers/iiif.js

@@ -3,9 +3,9 @@
 
 GeoBlacklight.Viewer.Iiif = GeoBlacklight.Viewer.extend({
   load: function() {
-    this.osd_config = {
+    this.osdConfig = {
       id: this.element.id,
-      prefixUrl: "/assets/osd/",
+      prefixUrl: '/assets/osd/',
       preserveViewport: true,
       showNavigator:  false,
       visibilityRatio: 1,
@@ -14,15 +14,15 @@ GeoBlacklight.Viewer.Iiif = GeoBlacklight.Viewer.extend({
     };
 
     this.adjustLayout();
-    OpenSeadragon(this.osd_config);
+    OpenSeadragon(this.osdConfig);
   },
 
   adjustLayout: function() {
 
     // hide attribute table
-    $("#table-container").hide();
+    $('#table-container').hide();
 
     // expand viewer element
     $(this.element).parent().attr('class', 'col-md-12');
   }
-});
+});

app/assets/javascripts/geoblacklight/viewers/leaflet.js

@@ -1,12 +1,21 @@
 //= require geoblacklight/viewers/viewer.js
 
 GeoBlacklight.Viewer.Leaflet = GeoBlacklight.Viewer.extend({
+
+  options: {
+    /**
+    * Initial bounds of map
+    * @type {L.LatLngBounds}
+    */
+    bbox: [[-85, -180], [85, 180]]
+  },
+
   basemap: L.tileLayer(
     'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
-    attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">',
-    maxZoom: 18,
-    worldCopyJump: true,
-    subdomains: '1234' // see http://developer.mapquest.com/web/products/open/map
+      attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">',
+      maxZoom: 18,
+      worldCopyJump: true,
+      subdomains: '1234' // see http://developer.mapquest.com/web/products/open/map
     }
   ),
 
@@ -16,7 +25,9 @@ GeoBlacklight.Viewer.Leaflet = GeoBlacklight.Viewer.extend({
     this.map = L.map(this.element).fitBounds(this.options.bbox);
     this.map.addLayer(this.basemap);
     this.map.addLayer(this.overlay);
-    this.addBoundsOverlay(this.options.bbox);
+    if (this.data.map !== 'index') {
+      this.addBoundsOverlay(this.options.bbox);
+    }
   },
 
   /**
@@ -40,4 +51,4 @@ GeoBlacklight.Viewer.Leaflet = GeoBlacklight.Viewer.extend({
   removeBoundsOverlay: function() {
     this.overlay.clearLayers();
   }
-});
+});

app/assets/javascripts/geoblacklight/viewers/viewer.js

@@ -1,5 +1,5 @@
- // base viewer
- GeoBlacklight.Viewer = L.Class.extend({
+// base viewer
+GeoBlacklight.Viewer = L.Class.extend({
   options: {},
 
   initialize: function(el, options) {
@@ -11,4 +11,4 @@
     // trigger viewer load function
     this.load();
   }
-});
+});

app/assets/javascripts/geoblacklight/viewers/wms.js

@@ -11,9 +11,9 @@ GeoBlacklight.Viewer.Wms = GeoBlacklight.Viewer.Leaflet.extend({
     if (this.data.available) {
       this.addPreviewLayer();
       this.addOpacityControl();
-    } else { 
+    } else {
       this.addBoundsOverlay(this.options.bbox);
-    };
+    }
   },
 
   addPreviewLayer: function() {

app/views/catalog/_show_default.html.erb

@@ -4,7 +4,7 @@
 
 <div class='row'>
   <div id='viewer-container' class="col-md-8">
-    <%= content_tag :div, id: 'map', data: { map: 'item', 'protocol' => document.viewer[:protocol], 'url' => document.viewer[:endpoint], 'layer-id' => document[:layer_id_s], 'map-bbox' => document[:solr_bbox], 'catalog-path'=> catalog_index_path, available: document_available? } do %>
+    <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol, url: document.viewer_endpoint, 'layer-id' => document[:layer_id_s], 'map-bbox' => document[:solr_bbox], 'catalog-path'=> catalog_index_path, available: document_available? } do %>
     <% end %>
   </div>
   <div id='table-container' class='col-md-4'><div id='attribute-table' ></div></div>

lib/geoblacklight.rb

@@ -6,6 +6,7 @@ module Geoblacklight
   require 'geoblacklight/controller_override'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/view_helper_override'
+  require 'geoblacklight/item_viewer'
   require 'geoblacklight/solr_document'
   require 'geoblacklight/wms_layer'
   require 'geoblacklight/download'

lib/geoblacklight/item_viewer.rb

@@ -0,0 +1,29 @@
+module Geoblacklight
+  class ItemViewer
+    def initialize(references)
+      @references = references
+    end
+
+    def viewer_protocol
+      return 'leaflet' if viewer_preference.nil?
+      viewer_preference.keys.first.to_s
+    end
+
+    def viewer_endpoint
+      return '' if viewer_preference.nil?
+      viewer_preference.values.first.to_s
+    end
+
+    def wms
+      @references.wms
+    end
+
+    def iiif
+      @references.iiif
+    end
+
+    def viewer_preference
+      [wms, iiif].compact.map(&:to_hash).first
+    end
+  end
+end

lib/geoblacklight/references.rb

@@ -53,15 +53,5 @@ def downloads_by_format
     def download_types
       downloads_by_format
     end
-
-    def viewer_protocol
-      if !wms.blank?
-        wms.to_hash
-      elsif !iiif.blank?
-        iiif.to_hash
-      else
-        {:leaflet => ''}
-      end
-    end
   end
 end

lib/geoblacklight/solr_document.rb

@@ -4,6 +4,8 @@ module SolrDocument
     extend Blacklight::Solr::Document
 
     delegate :download_types, to: :references
+    delegate :viewer_protocol, to: :item_viewer
+    delegate :viewer_endpoint, to: :item_viewer
 
     def available?
       public? || same_institution?
@@ -37,8 +39,8 @@ def same_institution?
       get(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
     end
 
-    def viewer
-      { protocol: references.viewer_protocol.keys.first.to_s, endpoint: references.viewer_protocol.values.first }   
+    def item_viewer
+      ItemViewer.new(references)
     end
 
     def itemtype

spec/lib/geoblacklight/item_viewer_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Geoblacklight::ItemViewer do
+  let(:document) { SolrDocument.new(document_attributes) }
+  let(:document_attributes) { {} }
+  let(:references) { document.references }
+  let(:item_viewer) { Geoblacklight::ItemViewer.new(references) }
+  describe 'viewer_preference' do
+    describe 'for no references' do
+      it 'returns nil' do
+        expect(item_viewer.viewer_preference).to be_nil
+      end
+    end
+    describe 'for wms reference' do
+      let(:document_attributes) {
+        {
+          dct_references_s: {
+            'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms',
+            'http://iiif.io/api/image' => 'http://www.example.com/iiif'
+          }.to_json
+        }
+      }
+      it 'wms if wms is present' do
+        expect(item_viewer.viewer_preference).to eq wms: 'http://www.example.com/wms'
+      end
+    end
+    describe 'for iiif only reference' do
+      let(:document_attributes) {
+        {
+          dct_references_s: {
+            'http://iiif.io/api/image' => 'http://www.example.com/iiif'
+          }.to_json
+        }
+      }
+      it 'returns iiif' do
+        expect(item_viewer.viewer_preference).to eq iiif: 'http://www.example.com/iiif'
+      end
+    end
+  end
+end

spec/lib/geoblacklight/references_spec.rb

@@ -130,11 +130,11 @@
     end
   end
   describe 'viewer_protocol' do
-    it 'should return iiif hash if iiif ref type is present' do
-      expect(simple_iiif_image.viewer_protocol[:iiif]).to eq 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
-    end
-    it 'should return wms hash if wms ref type is present' do
-      expect(typical_ogp_shapefile.viewer_protocol[:wms]).to eq 'http://hgl.harvard.edu:8080/geoserver/wms'
-    end
+    # it 'should return iiif hash if iiif ref type is present' do
+    #   expect(simple_iiif_image.viewer_protocol[:iiif]).to eq 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
+    # end
+    # it 'should return wms hash if wms ref type is present' do
+    #   expect(typical_ogp_shapefile.viewer_protocol[:wms]).to eq 'http://hgl.harvard.edu:8080/geoserver/wms'
+    # end
   end
 end

spec/lib/geoblacklight/solr_document_spec.rb

@@ -86,8 +86,31 @@
       expect(document.direct_download).to be_nil
     end
   end
-  describe 'viewer' do
+  describe 'item_viewer' do
     let(:document_attributes) { {} }
+    it 'is a ItemViewer' do
+      expect(document.item_viewer).to be_an Geoblacklight::ItemViewer
+    end
+  end
+  describe 'viewer_protocol' do
+    describe 'with a wms reference' do
+      let(:document_attributes) {
+        {
+          dct_references_s: {
+            'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
+          }.to_json
+        }
+      }
+      it 'returns wms protocol' do
+        expect(document.viewer_protocol).to eq 'wms'
+      end
+    end
+    let(:document_attributes) { {} }
+    it 'returns leaflet protocol' do
+      expect(document.viewer_protocol).to eq 'leaflet'
+    end
+  end
+  describe 'viewer_endpoint' do
     describe 'with a wms reference' do
       let(:document_attributes) {
         {
@@ -96,12 +119,13 @@
           }.to_json
         }
       }
-      it 'returns wms viewer endpoint' do
-        expect(document.viewer[:endpoint]).to eq 'http://www.example.com/wms'
+      it 'returns wms endpoint' do
+        expect(document.viewer_endpoint).to eq 'http://www.example.com/wms'
       end
     end
-    it 'returns leaflet as default if no viewer' do
-      expect(document.viewer[:protocol]).to eq 'leaflet'
+    let(:document_attributes) { {} }
+    it 'returns no endpoint' do
+      expect(document.viewer_endpoint).to eq ''
     end
   end
   describe 'checked_endpoint' do