geoblacklight 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767308fdd3b12467270a409a98f4732062c57878
-  data.tar.gz: b822a8bc6294c81601963a4db3e7fbeef4434b09
+  metadata.gz: 2569474d1cd7946363ce5ba8be7d783145007c9f
+  data.tar.gz: dfb2e56fe8bc2302698a2192fd7a7bedac2c442d
 SHA512:
-  metadata.gz: a1cc828205ad3c72548ad044d20522e306e01461552beea0b02fdd9313717b03fe724fc933ee808d6fe906bbe44c89f0b83967e697679911379d9b2e77d54b13
-  data.tar.gz: 27812b3d5d30157ab0c9e2a0e273d5dd5abe111503325edadae9fbc19a5a4d5706a473ad317e4501d5234969b490c3dad00691694177fc8a4745bd880db5aedb
+  metadata.gz: 5093d1b9eda7a53ef3b64c5a22f2bf02bdde068e904234471d4c5a2c68c23c934f743d827ac304ff340a8b46a0a6a759b5b6bffcd440ed1def990b6758b1ec13
+  data.tar.gz: 02d642f50886e7b86dd96999840f58ba91f787f217403f15e79baf4585b15d3788ccf3b79b30f7509a4673e08beed001d32e3f88ef540c2b4ee2e18fb9b6a80d

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

@@ -1,3 +1,8 @@
+//= require leaflet
+//= require leaflet-iiif
+//= require native.history
+//= require readmore.min
+
 !function(global) {
   'use strict';
 
@@ -16,7 +21,6 @@
   };
 
   var GeoBlacklight = L.Class.extend({
-
     statics: {
       __version__: '0.0.1',
 
@@ -30,64 +34,7 @@
           }, delay);
         };
       }
-    },
-
-    options: {
-      /**
-       * Initial bounds of map
-       * @type {L.LatLngBounds}
-       */
-      bbox: [[-85, -180], [85, 180]]
-    },
-
-    initialize: function(el, options) {
-      var data = $(el).data(),
-          basemap, map;
-
-      L.Util.setOptions(this, options);
-
-      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
-        }
-      );
-
-      this.overlay = L.layerGroup();
-
-      map = L.map(el);
-      this.map = map;
-      map.addLayer(basemap);
-      map.addLayer(this.overlay);
-
-      map.fitBounds(this.options.bbox);
-
-    },
-
-    /**
-     * Add a bounding box overlay to map.
-     * @param {L.LatLngBounds} bounds Leaflet LatLngBounds
-     */
-    addBoundsOverlay: function(bounds) {
-      if (bounds instanceof L.LatLngBounds) {
-        this.overlay.addLayer(L.polygon([
-          bounds.getSouthWest(),
-          bounds.getSouthEast(),
-          bounds.getNorthEast(),
-          bounds.getNorthWest()
-        ]));
-      }
-    },
-
-    /**
-     * Remove bounding box overlay from map.
-     */
-    removeBoundsOverlay: function() {
-      this.overlay.clearLayers();
     }
-
   });
 
   global.GeoBlacklight = GeoBlacklight;

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

@@ -0,0 +1 @@
+//= require_tree ./modules

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

@@ -1,6 +1,7 @@
-Blacklight.onLoad(function () {
+Blacklight.onLoad(function() {
   $('[data-map="home"]').each(function(i, element) {
-    var geoblacklight = new GeoBlacklight(this),
+
+    var geoblacklight = new GeoBlacklight.Viewer.Map(this),
         data = $(this).data();
     geoblacklight.map.addControl(L.control.geosearch({
       baseUrl: data.catalogPath,

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

@@ -1,79 +1,16 @@
 Blacklight.onLoad(function() {
   $('[data-map="item"]').each(function(i, element) {
-    var bbox = L.bboxToBounds($(this).data().mapBbox);
-    new GeoBlacklight.Item(element, { bbox: bbox });
-  });
-});
-
-GeoBlacklight.Item = GeoBlacklight.extend({
-
-  initialize: function(element, options) {
-    GeoBlacklight.prototype.initialize.call(this, element, options);
-    this.dataAttributes = $(element).data();
-    this.layer = new L.layerGroup().addTo(this.map);
-    if (this.dataAttributes.available && this.dataAttributes.wmsUrl !== null) {
-      this.addPreviewLayer();
-      this.addOpacityControl();
-    } else {
-      this.addBoundsOverlay(L.bboxToBounds(this.dataAttributes.mapBbox));
-    }
-  },
 
-  addPreviewLayer: function() {
-    var _this = this;
-    _this.wmsLayer = L.tileLayer.wms(_this.dataAttributes.wmsUrl, {
-      layers: _this.dataAttributes.layerId,
-      format: 'image/png',
-      transparent: true,
-      tiled: true,
-      CRS: 'EPSG:900913',
-      opacity: 0.75
-    });
-    _this.layer.addLayer(_this.wmsLayer);
-    _this.setupInspection();
-  },
+    // get viewer module from protocol value and capitalize to match class name
+    var viewerName = $(element).data().protocol,
+      viewer;
+    viewerName = viewerName.charAt(0).toUpperCase() + viewerName.substring(1);
 
-  addOpacityControl: function() {
-    var _this = this;
-    _this.map.addControl(new L.Control.LayerOpacity(_this.layer));
-  },
-
-  setupInspection: function() {
-    var _this = this;
-    _this.map.on('click', function(e) {
-      spinner = '<span id="attribute-table"><i class="fa fa-spinner fa-spin fa-3x fa-align-center"></i></span>';
-      $('#attribute-table').replaceWith(spinner);
-      var wmsoptions = {
-        URL: _this.dataAttributes.wmsUrl,
-        LAYERS: _this.dataAttributes.layerId,
-        BBOX: _this.map.getBounds().toBBoxString(),
-        WIDTH: $('#map').width(),
-        HEIGHT: $('#map').height(),
-        QUERY_LAYERS: _this.dataAttributes.layerId,
-        X: Math.round(e.containerPoint.x),
-        Y: Math.round(e.containerPoint.y)
-      };
-
-      $.ajax({
-        type: 'POST',
-        url: '/wms/handle',
-        data: wmsoptions,
-        success: function(data) {
-          if (data.hasOwnProperty('error')) {
-            $('#attribute-table').html('Could not find that feature');
-            return;
-          }
-          var t = $('<table id="attribute-table" class="table table-hover table-condensed table-responsive table-striped table-bordered"><thead><tr><th>Attribute</th><th>Value</th></tr></thead><tbody>');
-          $.each(data.values, function(i,val) {
-            t.append('<tr><td>' + val[0] + '</td><td>' + val[1] + '</tr>');
-          });
-          $('#attribute-table').replaceWith(t);
-        },
-        fail: function(error) {
-          console.log(error);
-        }
-      });
-    });
-  }
+    // get new viewer instance and pass in element
+    viewer = new window['GeoBlacklight']['Viewer'][viewerName](element);
+  });
 
+  $('.truncate-abstract').readmore({
+    maxHeight: 60
+  });
 });

data/app/assets/javascripts/geoblacklight/modules/results.js

@@ -10,14 +10,14 @@ Blacklight.onLoad(function() {
 
   $('[data-map="index"]').each(function() {
     var data = $(this).data(),
-        opts = { baseUrl: data.catalogPath },
-        geoblacklight, bbox;
+    opts = { baseUrl: data.catalogPath },
+    geoblacklight, bbox;
 
-    if (typeof data.mapBbox === "string") {
+    if (typeof data.mapBbox === 'string') {
       bbox = L.bboxToBounds(data.mapBbox);
     } else {
       $('.document [data-bbox]').each(function() {
-        if (typeof bbox === "undefined") {
+        if (typeof bbox === 'undefined') {
           bbox = L.bboxToBounds($(this).data().bbox);
         } else {
           bbox.extend(L.bboxToBounds($(this).data().bbox));
@@ -34,39 +34,36 @@ Blacklight.onLoad(function() {
       });
     }
 
-    geoblacklight = new GeoBlacklight(this, { bbox: bbox }).setHoverListeners();
+    // instantiate new map
+    geoblacklight = new GeoBlacklight.Viewer.Map(this, { bbox: bbox });
+
+    // set hover listeners on map
+    $('#content')
+      .on('mouseenter', '#documents [data-layer-id]', function() {
+        var bounds = L.bboxToBounds($(this).data('bbox'));
+        geoblacklight.addBoundsOverlay(bounds);
+      })
+      .on('mouseleave', '#documents [data-layer-id]', function() {
+        geoblacklight.removeBoundsOverlay();
+      });
+
+    // add geosearch control to map
     geoblacklight.map.addControl(L.control.geosearch(opts));
   });
 
   function updatePage(url) {
     $.get(url).done(function(data) {
       var resp = $.parseHTML(data);
-          $doc = $(resp);
-      $("#documents").replaceWith($doc.find("#documents"));
-      $("#sidebar").replaceWith($doc.find("#sidebar"));
-      $("#sortAndPerPage").replaceWith($doc.find("#sortAndPerPage"));
-      if ($("#map").next().length) {
-        $("#map").next().replaceWith($doc.find("#map").next());
+      $doc = $(resp);
+      $('#documents').replaceWith($doc.find('#documents'));
+      $('#sidebar').replaceWith($doc.find('#sidebar'));
+      $('#sortAndPerPage').replaceWith($doc.find('#sortAndPerPage'));
+      if ($('#map').next().length) {
+        $('#map').next().replaceWith($doc.find('#map').next());
       } else {
-        $("#map").after($doc.find("#map").next());
+        $('#map').after($doc.find('#map').next());
       }
     });
   }
 
 });
-
-GeoBlacklight.prototype.setHoverListeners = function() {
-  var _this = this;
-
-  $("#content")
-    .on("mouseenter", "#documents [data-layer-id]", function() {
-      var bounds = L.bboxToBounds($(this).data('bbox'));
-      _this.addBoundsOverlay(bounds);
-    })
-    .on("mouseleave", "#documents [data-layer-id]", function() {
-      _this.removeBoundsOverlay();
-    });
-
-  return this;
-
-};

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

@@ -0,0 +1 @@
+//= require_tree ./viewers

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

@@ -0,0 +1,25 @@
+//= require geoblacklight/viewers/viewer
+
+GeoBlacklight.Viewer.Iiif = GeoBlacklight.Viewer.extend({
+  load: function() {
+    this.adjustLayout();
+
+    this.map = L.map(this.element, {
+      center: [0, 0],
+      crs: L.CRS.Simple,
+      zoom: 0
+    });
+
+    this.iiifLayer = L.tileLayer.iiif(this.data.url)
+      .addTo(this.map);
+  },
+
+  adjustLayout: function() {
+
+    // hide attribute table
+    $('#table-container').hide();
+
+    // expand viewer element
+    $(this.element).parent().attr('class', 'col-md-12');
+  }
+});

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

@@ -0,0 +1,54 @@
+//= require geoblacklight/viewers/viewer
+
+GeoBlacklight.Viewer.Map = 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
+    }
+  ),
+
+  overlay: L.layerGroup(),
+
+  load: function() {
+    this.map = L.map(this.element).fitBounds(this.options.bbox);
+    this.map.addLayer(this.basemap);
+    this.map.addLayer(this.overlay);
+    if (this.data.map !== 'index') {
+      this.addBoundsOverlay(this.options.bbox);
+    }
+  },
+
+  /**
+   * Add a bounding box overlay to map.
+   * @param {L.LatLngBounds} bounds Leaflet LatLngBounds
+   */
+  addBoundsOverlay: function(bounds) {
+    if (bounds instanceof L.LatLngBounds) {
+      this.overlay.addLayer(L.polygon([
+        bounds.getSouthWest(),
+        bounds.getSouthEast(),
+        bounds.getNorthEast(),
+        bounds.getNorthWest()
+      ]));
+    }
+  },
+
+  /**
+   * Remove bounding box overlay from map.
+   */
+  removeBoundsOverlay: function() {
+    this.overlay.clearLayers();
+  }
+});

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

@@ -0,0 +1,14 @@
+// base viewer
+GeoBlacklight.Viewer = L.Class.extend({
+  options: {},
+
+  initialize: function(el, options) {
+    this.element = el;
+    this.data = $(el).data();
+
+    L.Util.setOptions(this, options);
+
+    // trigger viewer load function
+    this.load();
+  }
+});

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

@@ -0,0 +1,73 @@
+//= require geoblacklight/viewers/map
+
+GeoBlacklight.Viewer.Wms = GeoBlacklight.Viewer.Map.extend({
+
+  load: function() {
+    this.options.bbox = L.bboxToBounds(this.data.mapBbox);
+    this.map = L.map(this.element).fitBounds(this.options.bbox);
+    this.map.addLayer(this.basemap);
+    this.map.addLayer(this.overlay);
+
+    if (this.data.available) {
+      this.addPreviewLayer();
+      this.addOpacityControl();
+    } else {
+      this.addBoundsOverlay(this.options.bbox);
+    }
+  },
+
+  addPreviewLayer: function() {
+    var wmsLayer = L.tileLayer.wms(this.data.url, {
+      layers: this.data.layerId,
+      format: 'image/png',
+      transparent: true,
+      tiled: true,
+      CRS: 'EPSG:900913',
+      opacity: 0.75
+    });
+    this.overlay.addLayer(wmsLayer);
+    this.setupInspection();
+  },
+
+  addOpacityControl: function() {
+    this.map.addControl(new L.Control.LayerOpacity(this.overlay));
+  },
+
+  setupInspection: function() {
+    var _this = this;
+    this.map.on('click', function(e) {
+      spinner = '<span id="attribute-table"><i class="fa fa-spinner fa-spin fa-3x fa-align-center"></i></span>';
+      $('#attribute-table').replaceWith(spinner);
+      var wmsoptions = {
+        URL: _this.data.url,
+        LAYERS: _this.data.layerId,
+        BBOX: _this.map.getBounds().toBBoxString(),
+        WIDTH: $('#map').width(),
+        HEIGHT: $('#map').height(),
+        QUERY_LAYERS: _this.data.layerId,
+        X: Math.round(e.containerPoint.x),
+        Y: Math.round(e.containerPoint.y)
+      };
+
+      $.ajax({
+        type: 'POST',
+        url: '/wms/handle',
+        data: wmsoptions,
+        success: function(data) {
+          if (data.hasOwnProperty('error')) {
+            $('#attribute-table').html('Could not find that feature');
+            return;
+          }
+          var t = $('<table id="attribute-table" class="table table-hover table-condensed table-responsive table-striped table-bordered"><thead><tr><th>Attribute</th><th>Value</th></tr></thead><tbody>');
+          $.each(data.values, function(i, val) {
+            t.append('<tr><td>' + val[0] + '</td><td>' + val[1] + '</tr>');
+          });
+          $('#attribute-table').replaceWith(t);
+        },
+        fail: function(error) {
+          console.log(error);
+        }
+      });
+    });
+  }
+});

data/app/assets/stylesheets/geoblacklight/modules/item.css.scss

@@ -2,7 +2,7 @@
   height: 440px;
 }
 
-[data-map="item"][data-available="true"] {
+[data-viewer="wms"][data-available="true"] {
   cursor: crosshair;
 }
 

data/app/helpers/geoblacklight_helper.rb

@@ -24,17 +24,6 @@ module GeoblacklightHelper
     document_available? && @document.downloadable?
   end
 
-  def abstract_truncator(abstract)
-    if (abstract)
-      if (abstract.length > 150)
-        html = abstract.slice(0,150) + content_tag(:span, ("..." + link_to("more", "#", :id =>"more-abstract", :data => {no_turbolink: true})).html_safe, :id => "abstract-trunc") + content_tag(:span, abstract.slice(150,abstract.length), :id => "abstract-full", :class => "hidden")
-      else
-        html = abstract
-      end
-      content_tag(:span, html.html_safe)
-    end
-  end
-
   def snippit(text)
     if (text)
       if (text.length > 150)

data/app/views/catalog/_abstract_metadata.html.erb

@@ -0,0 +1,8 @@
+<% if @document['dc_description_s'].present? %>
+  <dt>Abstract</dt>
+  <dd itemprop="description">
+    <div class='truncate-abstract'>
+      <%= @document['dc_description_s'] %>
+    </div>
+  </dd>
+<% end %>

data/app/views/catalog/_show_default.html.erb

@@ -3,8 +3,8 @@
 <%= render 'upper_metadata', locals: { document: document} %>
 
 <div class='row'>
-  <div class="col-md-8">
-    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document.wms_url, available: document_available? } do %>
+  <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 %>
     <% end %>
   </div>
   <div id='table-container' class='col-md-4'><div id='attribute-table' ></div></div>

data/app/views/catalog/_show_sidebar.html.erb

@@ -36,12 +36,14 @@
               <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
             </li>
           <% end %>
-          <li role="presentation" class="dropdown-header">Projected</li>
-          <% document.download_types.each do |type| %>
-            <%= content_tag(:li) do %>
-              <% link_to("Download #{type[0].capitalize}", '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}" }) %>
-            <% end %>
-          <% end %>    
+          <% if document.download_types.present? %>
+            <li role="presentation" class="dropdown-header">Generated</li>
+            <% document.download_types.each do |type| %>
+              <%= content_tag(:li) do %>
+                <% link_to("Download #{type[0].capitalize}", '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}" }) %>
+              <% end %>
+            <% end %> 
+          <% end %>   
         </ul>
       </div>
     <% elsif document.restricted? && document.same_institution? %>

data/app/views/catalog/_upper_metadata.html.erb

@@ -2,26 +2,23 @@
 <div class="geoblacklight-view-panel">
 
   <dl class="dl-horizontal">
+    <% unless document['dct_provenance_s'].nil? %>
+      <dt>Institution</dt>
+      <dd><%= document['dct_provenance_s'] %></dd>
+    <% end %>      
     <% unless document['dc_creator_sm'].nil? %>
       <dt>Author</dt>
       <dd itemprop="author"><%= document['dc_creator_sm'].join(', ') %>&nbsp;</dd>
-  <% end %>
+    <% end %>
     <% unless document['dc_publisher_s'].nil? %>
       <dt>Publisher</dt>
       <dd itemprop="publisher"><%= document['dc_publisher_s'] %>&nbsp;</dd>
-  <% end %>
-    <dt>Year</dt>
-    <dd itemprop="dateCreated"><%= document['solr_year_i'] %>&nbsp;</dd>
-    <dt>Abstract</dt>
-    <dd id="" itemprop="description"><%= abstract_truncator(document['dc_description_s']) %>&nbsp;</dd>
+    <% end %>
+    <%= render 'abstract_metadata' %>
     <% unless document['dct_isPartOf_sm'].nil? %>
       <dt>Collection</dt>
       <dd itemprop="isPartOf"><%= document['dct_isPartOf_sm'].sort.uniq.join(', ') %>&nbsp;</dd>
     <% end %>
-    <% if document['dct_provenance_s'] == 'Stanford' and not document['dc_identifier_s'].nil? %>
-      <dt>Citation</dt>
-      <dd itemprop="url"><%= link_to document['dc_identifier_s'], document['dc_identifier_s'] %>&nbsp;</dd>
-    <% end %>
     <% unless document['dct_spatial_sm'].nil? %>
       <dt>Places</dt>
       <dd itemprop="spatial"><%= render_facet_links('dct_spatial_sm', document['dct_spatial_sm']) %>&nbsp;</dd>
@@ -34,5 +31,9 @@
       <dt>Years</dt>
       <dd itemprop="temporal"><%= document['dct_temporal_sm'].sort.uniq.join(', ') %>&nbsp;</dd>
     <% end %>
+    <% if !@document.references.nil? && !@document.references.url.nil? %>
+       <dt>More details at</dt>
+       <dd itemprop="url"><%= link_to @document.references.url.endpoint %></dd>
+    <% end %>
   </dl>
 </div>

data/geoblacklight.gemspec

@@ -6,10 +6,10 @@ require 'geoblacklight/version'
 Gem::Specification.new do |spec|
   spec.name          = 'geoblacklight'
   spec.version       = Geoblacklight::VERSION
-  spec.authors       = ['Darren Hardy', 'Jack Reed']
-  spec.email         = ['drh@stanford.edu', 'pjreed@stanford.edu']
+  spec.authors       = ['Mike Graves', 'Darren Hardy', 'Eliot Jordan', 'Jack Reed']
+  spec.email         = ['mgraves@mit.edu', 'drh@stanford.edu', 'eliotj@princeton.edu', 'pjreed@stanford.edu']
   spec.summary       = 'A discovery platform for geospatial holdings'
-  spec.description   = 'GeoBlacklight started at Stanford and its goal is to provide 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 federated metadata sharing communities.'
+  spec.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 federated metadata sharing communities.'
   spec.homepage      = 'http://github.com/geoblacklight/geoblacklight'
   spec.license       = 'Apache 2.0'
 

data/lib/generators/geoblacklight/templates/geoblacklight.js

@@ -1,2 +1,4 @@
-//= require geoblacklight/application
+//= require geoblacklight/geoblacklight
+//= require geoblacklight/viewers
+//= require geoblacklight/modules
 //= require blacklight_range_limit

data/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'

data/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

data/lib/geoblacklight/references.rb

@@ -47,6 +47,8 @@ module Geoblacklight
         end
       when 'GeoTIFF'
         { geotiff: wms.to_hash } if wms.present?
+      when 'ArcGRID'
+        { arcgrid: wms.to_hash } if wms.present?
       end
     end
 

data/lib/geoblacklight/solr_document.rb

@@ -4,6 +4,8 @@ module Geoblacklight
     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?
@@ -18,7 +20,7 @@ module Geoblacklight
     end
 
     def downloadable?
-      download_types.present? && available?
+      (direct_download || download_types.present?) && available?
     end
 
     def download_types
@@ -37,6 +39,10 @@ module Geoblacklight
       get(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
     end
 
+    def item_viewer
+      ItemViewer.new(references)
+    end
+
     def itemtype
       "http://schema.org/Dataset"
     end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/spec/features/download_layer_spec.rb

@@ -38,7 +38,7 @@ feature 'Download layer' do
     expect(page).to have_css 'a', text: 'Download Shapefile'
     find('button.download-dropdown-toggle').click
     expect(page).to have_css 'li.dropdown-header', text: 'Original'
-    expect(page).to have_css 'li.dropdown-header', text: 'Projected'
+    expect(page).to have_css 'li.dropdown-header', text: 'Generated'
     expect(page).to have_css 'li a', text: 'Download Shapefile'
     expect(page).to have_css 'li a', text: 'Download Kmz'
   end

data/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

data/spec/lib/geoblacklight/references_spec.rb

@@ -31,6 +31,17 @@ describe Geoblacklight::References do
       )
     )
   }
+  let(:typical_arcgrid) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'ArcGRID',
+        dct_references_s: {
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
+        }.to_json
+      )
+    )
+  }
   let(:complex_shapefile) {
     Geoblacklight::References.new(
       SolrDocument.new(
@@ -54,6 +65,17 @@ describe Geoblacklight::References do
       }.to_json
     )
   }
+  let(:simple_iiif_image) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'Raster',
+        dct_references_s: {
+          'http://schema.org/url' => 'http://arks.princeton.edu/ark:/88435/02870w62c',
+          'http://iiif.io/api/image' => 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
+        }.to_json
+      )
+    )
+  }
   describe 'format' do
     it 'should return format' do
       expect(complex_shapefile.format).to eq 'Shapefile'
@@ -111,6 +133,10 @@ describe Geoblacklight::References do
       expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
       expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq 'http://hgl.harvard.edu:8080/geoserver/wms'
     end
+    it 'returns arcgrid' do
+      expect(typical_arcgrid.downloads_by_format.count).to eq 1
+      expect(typical_arcgrid.downloads_by_format[:arcgrid][:wms]).to eq 'http://hgl.harvard.edu:8080/geoserver/wms'
+    end
     it 'does not return shapefile if wms and wfs are not present' do
       expect(no_service_shapefile.downloads_by_format).to be_nil
     end

data/spec/lib/geoblacklight/solr_document_spec.rb

@@ -33,6 +33,21 @@ describe Geoblacklight::SolrDocument do
       end
     end
   end
+  describe '#downloadable?' do
+    describe 'available direct download' do
+      let(:document_attributes) {
+        {
+          dc_rights_s: 'Public',
+          dct_references_s: {
+            'http://schema.org/downloadUrl' => 'http://example.com/direct/data.zip'
+          }.to_json
+        }
+      }
+      it 'will be downloadable' do
+        expect(document.downloadable?).to be_truthy
+      end
+    end
+  end
   describe '#same_institution?' do
     describe 'within the same institution' do
       let(:document_attributes) { { dct_provenance_s: 'STANFORD' } }
@@ -86,6 +101,48 @@ describe Geoblacklight::SolrDocument do
       expect(document.direct_download).to be_nil
     end
   end
+  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) {
+        {
+          dct_references_s: {
+            'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
+          }.to_json
+        }
+      }
+      it 'returns wms endpoint' do
+        expect(document.viewer_endpoint).to eq 'http://www.example.com/wms'
+      end
+    end
+    let(:document_attributes) { {} }
+    it 'returns no endpoint' do
+      expect(document.viewer_endpoint).to eq ''
+    end
+  end
   describe 'checked_endpoint' do
     let(:document_attributes) { {} }
     let(:reference) { Geoblacklight::Reference.new(['http://www.opengis.net/def/serviceType/ogc/wms', 'http://www.example.com/wms']) }

data/vendor/assets/javascripts/leaflet-iiif.js

@@ -0,0 +1,152 @@
+/*
+* Leaflet-IIIF 0.0.2
+* IIIF Viewer for Leaflet
+* by Jack Reed, @mejackreed
+*/
+
+L.TileLayer.Iiif = L.TileLayer.extend({
+  options: {
+    continuousWorld: true,
+    tileSize: 256,
+    updateWhenIdle: true
+  },
+
+  initialize: function(url, options) {
+    options = L.setOptions(this, options);
+    this._infoDeferred = new $.Deferred();
+    this._infoUrl = url;
+    this._baseUrl = this._templateUrl();
+    this._getInfo();
+  },
+  getTileUrl: function(coords) {
+    var _this = this,
+    x = coords.x,
+    y = (coords.y),
+    zoom = _this._map.getZoom(),
+    scale = Math.pow(2, _this.maxZoom - zoom),
+    tileBaseSize = _this.options.tileSize * scale,
+    minx = (x * tileBaseSize),
+    miny = (y * tileBaseSize),
+    maxx = Math.min(minx + tileBaseSize, _this.x),
+    maxy = Math.min(miny + tileBaseSize, _this.y);
+
+    return L.Util.template(this._baseUrl, L.extend({
+      format: 'jpg',
+      quality: _this.quality,
+      region: [minx, miny, (maxx - minx), (maxy - miny)].join(','),
+      rotation: 0,
+      size: 'pct:' + (100 / scale)
+    }, this.options));
+  },
+  onAdd: function(map) {
+    var _this = this;
+
+    // Wait for deferred to complete
+    $.when(_this._infoDeferred).done(function() {
+
+      // Try to center the map a bit
+      map.setView([-_this.options.tileSize / 2, _this.options.tileSize / 4], 1);
+
+      // Set maxZoom for map
+      map._layersMaxZoom = _this.maxZoom;
+
+      // Call add TileLayer
+      L.TileLayer.prototype.onAdd.call(_this, map);
+
+      // Reset tile sizes to handle non 256x256 IIIF tiles
+      _this.on('tileload', function(tile, url) {
+
+        var height = tile.tile.naturalHeight,
+        width = tile.tile.naturalWidth;
+
+        // No need to resize if tile is 256 x 256
+        if (height === 256 && width === 256) return;
+
+        tile.tile.style.width = width + 'px';
+        tile.tile.style.height = height + 'px';
+
+      });
+    });
+  },
+  _getInfo: function() {
+    var _this = this;
+
+    // Look for a way to do this without jQuery
+    $.getJSON(_this._infoUrl)
+    .done(function(data) {
+      _this.y = data.height;
+      _this.x = data.width;
+
+      var profile,
+      tierSizes = [],
+      scale,
+      width_,
+      height_,
+      tilesX_,
+      tilesY_;
+
+      // Set quality based off of IIIF version
+      if (data.profile instanceof Array) {
+        profile = data.profile[0];
+      }else {
+        profile = data.profile;
+      }
+      switch (profile) {
+        case 'http://library.stanford.edu/iiif/image-api/compliance.html#level1':
+          _this.quality = 100;
+          break;
+        case 'http://library.stanford.edu/iiif/image-api/1.1/compliance.html':
+          _this.quality = 'native';
+          break;
+        case 'http://iiif.io/api/image/2/level2.json':
+          _this.quality = 'default';
+          break;
+      }
+
+      ceilLog2 = function(x) {
+        return Math.ceil(Math.log(x) / Math.LN2);
+      };
+
+      // Calculates maxZoom for the layer
+      _this.maxZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
+      ceilLog2(_this.y / _this.options.tileSize));
+
+      for (var i = 0; i <= _this.maxZoom; i++) {
+        scale = Math.pow(2, _this.maxZoom - i);
+        width_ = Math.ceil(_this.x / scale);
+        height_ = Math.ceil(_this.y / scale);
+        tilesX_ = Math.ceil(width_ / _this.options.tileSize);
+        tilesY_ = Math.ceil(height_ / _this.options.tileSize);
+        tierSizes.push([tilesX_, tilesY_]);
+      }
+      _this._tierSizes = tierSizes;
+
+      // Resolved Deferred to initiate tilelayer load
+      _this._infoDeferred.resolve();
+    });
+  },
+  _infoToBaseUrl: function() {
+    return this._infoUrl.replace('info.json', '');
+  },
+  _templateUrl: function() {
+    return this._infoToBaseUrl() + '{region}/{size}/{rotation}/{quality}.{format}';
+  },
+  _tileShouldBeLoaded: function(coords) {
+    var _this = this,
+    zoom = _this._map.getZoom(),
+    sizes = _this._tierSizes[zoom],
+    x = coords.x,
+    y = (coords.y);
+
+    if (!sizes) return false;
+    if (x < 0 || sizes[0] <= x || y < 0 || sizes[1] <= y) {
+      return false;
+    }else {
+      return true;
+    }
+  }
+});
+
+L.tileLayer.iiif = function(url, options) {
+  return new L.TileLayer.Iiif(url, options);
+};

data/vendor/assets/javascripts/readmore.min.js

@@ -0,0 +1,7 @@
+(function(c){function g(b,a){this.element=b;this.options=c.extend({},h,a);c(this.element).data("max-height",this.options.maxHeight);c(this.element).data("height-margin",this.options.heightMargin);delete this.options.maxHeight;if(this.options.embedCSS&&!k){var d=".readmore-js-toggle, .readmore-js-section { "+this.options.sectionCSS+" } .readmore-js-section { overflow: hidden; }",e=document.createElement("style");e.type="text/css";e.styleSheet?e.styleSheet.cssText=d:e.appendChild(document.createTextNode(d));
+document.getElementsByTagName("head")[0].appendChild(e);k=!0}this._defaults=h;this._name=f;this.init()}var f="readmore",h={speed:100,maxHeight:200,heightMargin:16,moreLink:'<a href="#">Read More</a>',lessLink:'<a href="#">Close</a>',embedCSS:!0,sectionCSS:"display: block; width: 100%;",startOpen:!1,expandedClass:"readmore-js-expanded",collapsedClass:"readmore-js-collapsed",beforeToggle:function(){},afterToggle:function(){}},k=!1;g.prototype={init:function(){var b=this;c(this.element).each(function(){var a=
+  c(this),d=a.css("max-height").replace(/[^-\d\.]/g,"")>a.data("max-height")?a.css("max-height").replace(/[^-\d\.]/g,""):a.data("max-height"),e=a.data("height-margin");"none"!=a.css("max-height")&&a.css("max-height","none");b.setBoxHeight(a);if(a.outerHeight(!0)<=d+e)return!0;a.addClass("readmore-js-section "+b.options.collapsedClass).data("collapsedHeight",d);a.after(c(b.options.startOpen?b.options.lessLink:b.options.moreLink).on("click",function(c){b.toggleSlider(this,a,c)}).addClass("readmore-js-toggle"));
+  b.options.startOpen||a.css({height:d})});c(window).on("resize",function(a){b.resizeBoxes()})},toggleSlider:function(b,a,d){d.preventDefault();var e=this;d=newLink=sectionClass="";var f=!1;d=c(a).data("collapsedHeight");c(a).height()<=d?(d=c(a).data("expandedHeight")+"px",newLink="lessLink",f=!0,sectionClass=e.options.expandedClass):(newLink="moreLink",sectionClass=e.options.collapsedClass);e.options.beforeToggle(b,a,f);c(a).animate({height:d},{duration:e.options.speed,complete:function(){e.options.afterToggle(b,
+    a,f);c(b).replaceWith(c(e.options[newLink]).on("click",function(b){e.toggleSlider(this,a,b)}).addClass("readmore-js-toggle"));c(this).removeClass(e.options.collapsedClass+" "+e.options.expandedClass).addClass(sectionClass)}})},setBoxHeight:function(b){var a=b.clone().css({height:"auto",width:b.width(),overflow:"hidden"}).insertAfter(b),c=a.outerHeight(!0);a.remove();b.data("expandedHeight",c)},resizeBoxes:function(){var b=this;c(".readmore-js-section").each(function(){var a=c(this);b.setBoxHeight(a);
+      (a.height()>a.data("expandedHeight")||a.hasClass(b.options.expandedClass)&&a.height()<a.data("expandedHeight"))&&a.css("height",a.data("expandedHeight"))})},destroy:function(){var b=this;c(this.element).each(function(){var a=c(this);a.removeClass("readmore-js-section "+b.options.collapsedClass+" "+b.options.expandedClass).css({"max-height":"",height:"auto"}).next(".readmore-js-toggle").remove();a.removeData()})}};c.fn[f]=function(b){var a=arguments;if(void 0===b||"object"===typeof b)return this.each(function(){if(c.data(this,
+        "plugin_"+f)){var a=c.data(this,"plugin_"+f);a.destroy.apply(a)}c.data(this,"plugin_"+f,new g(this,b))});if("string"===typeof b&&"_"!==b[0]&&"init"!==b)return this.each(function(){var d=c.data(this,"plugin_"+f);d instanceof g&&"function"===typeof d[b]&&d[b].apply(d,Array.prototype.slice.call(a,1))})}})(jQuery);

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
+- Mike Graves
 - Darren Hardy
+- Eliot Jordan
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -235,12 +237,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: GeoBlacklight started at Stanford and its goal is to provide 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 federated metadata sharing communities.
+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
+  federated metadata sharing communities.
 email:
+- mgraves@mit.edu
 - drh@stanford.edu
+- eliotj@princeton.edu
 - pjreed@stanford.edu
 executables: []
 extensions: []
@@ -259,8 +263,8 @@ files:
 - app/assets/fonts/geoblacklight.ttf
 - app/assets/fonts/geoblacklight.woff
 - app/assets/images/blacklight/logo.png
-- app/assets/javascripts/geoblacklight/application.js
 - app/assets/javascripts/geoblacklight/geoblacklight.js
+- app/assets/javascripts/geoblacklight/modules.js
 - app/assets/javascripts/geoblacklight/modules/collapse.js
 - app/assets/javascripts/geoblacklight/modules/download.js
 - app/assets/javascripts/geoblacklight/modules/geosearch.js
@@ -268,6 +272,11 @@ files:
 - app/assets/javascripts/geoblacklight/modules/item.js
 - app/assets/javascripts/geoblacklight/modules/layer_opacity.js
 - app/assets/javascripts/geoblacklight/modules/results.js
+- app/assets/javascripts/geoblacklight/viewers.js
+- app/assets/javascripts/geoblacklight/viewers/iiif.js
+- app/assets/javascripts/geoblacklight/viewers/map.js
+- app/assets/javascripts/geoblacklight/viewers/viewer.js
+- app/assets/javascripts/geoblacklight/viewers/wms.js
 - app/assets/stylesheets/geoblacklight/_geoblacklight.css.scss
 - app/assets/stylesheets/geoblacklight/_styles.css.scss
 - app/assets/stylesheets/geoblacklight/application.css.scss
@@ -282,6 +291,7 @@ files:
 - app/controllers/download_controller.rb
 - app/controllers/wms_controller.rb
 - app/helpers/geoblacklight_helper.rb
+- app/views/catalog/_abstract_metadata.html.erb
 - app/views/catalog/_document_split.html.erb
 - app/views/catalog/_facet_tag_item.html.erb
 - app/views/catalog/_facet_tag_layout.html.erb
@@ -313,6 +323,7 @@ files:
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
+- lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/reference.rb
 - lib/geoblacklight/references.rb
 - lib/geoblacklight/solr_document.rb
@@ -346,6 +357,7 @@ files:
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
+- spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
@@ -359,7 +371,9 @@ files:
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb
 - template.rb
+- vendor/assets/javascripts/leaflet-iiif.js
 - vendor/assets/javascripts/native.history.js
+- vendor/assets/javascripts/readmore.min.js
 homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
@@ -410,6 +424,7 @@ test_files:
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
+- spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb

data/app/assets/javascripts/geoblacklight/application.js

@@ -1,3 +0,0 @@
-//= require leaflet
-//= require native.history
-//= require_tree .