geoblacklight 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 011958937e26e5422c1365a2ffbdafb22da97478
-  data.tar.gz: e9201eb061d67072de1372c24066ce352a29acd3
+  metadata.gz: dcd3f92534945380a7a09f870a4d824564b2800c
+  data.tar.gz: 8e39704e5a860b36b933816e7cd690155e10f7af
 SHA512:
-  metadata.gz: 34843481a05279c3bf2935312873dd99298e14f5070f2baacd88939fb36f891982dbaae8dbd29dd841b182c1812c0ad26dcced0a45db0d1784437724593cdb91
-  data.tar.gz: 1107f1be59b0188378e712a55258abcc232462831cf0a8b8107170d43503dd91ab8d4c027ea92071b755e34ddfb7822bdca933ac71e95aabeaf62b3ee4529122
+  metadata.gz: d177f2ee3aedaeab70153ca7d996d643c22de8b2b967d31eb976600170cdbca1bc106059fd94dd876b498a9e68180abe97c9b17f0b2b498d3e5f359d01a1c189
+  data.tar.gz: aa0cc7103063c8eb5f480888248197ac07fd125565f068f13eef5ac247719bf095d1da9f96cf029a5ccaf962d12f1f497f8d28e734b2b47cb798d994af1ba516

data/app/helpers/blacklight_helper.rb

@@ -0,0 +1,4 @@
+module BlacklightHelper
+  include Blacklight::BlacklightHelperBehavior
+  include Geoblacklight::GeoblacklightHelperBehavior
+end

data/app/helpers/geoblacklight_helper.rb

@@ -104,4 +104,17 @@ module GeoblacklightHelper
     )
     Settings.CARTODB_ONECLICK_LINK + '?' + params
   end
+
+  ##
+  # Renders the partials for a Geoblacklight::Reference in the web services
+  # modal
+  # @param [Geoblacklight::Reference]
+  def render_web_services(reference)
+    render(
+      partial: "web_services_#{reference.type}",
+      locals: { reference: reference }
+    )
+  rescue ActionView::MissingTemplate
+    render partial: 'web_services_default', locals: { reference: reference }
+  end
 end

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

@@ -1,5 +1,5 @@
 <% document ||= @document %>
 <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.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available?, basemap: geoblacklight_basemap } do %>
+  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol, url: document.viewer_endpoint, 'layer-id' => wxs_identifier(document), 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available?, basemap: geoblacklight_basemap } do %>
   <% end %>
 </div>

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

@@ -2,11 +2,7 @@
 
 <% document.references.refs.each do |reference| %>
   <% if Settings.WEBSERVICES_SHOWN.include? reference.type.to_s %>
-    <div class='form-group web-services-form'>
-      <label for='<%= reference.type%>_webservice'>
-        <%= "#{formatted_name_reference(reference.type)} link" %>
-      </label>
-      <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' readonly='readonly' class='form-control'>
-    </div>
+    <%= render_web_services(reference) %>
+    <hr>
   <% end %>
 <% end %>

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

@@ -0,0 +1,8 @@
+<% document ||= @document %>
+
+<div class='form-group web-services-form'>
+  <label for='<%= reference.type%>_webservice'>
+    <%= "#{formatted_name_reference(reference.type)}" %>
+  </label>
+  <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' readonly='readonly' class='form-control'>
+</div>

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

@@ -0,0 +1,8 @@
+<% document ||= @document %>
+
+<%= render partial: 'web_services_default', locals: { reference: reference } %>
+
+<div class='form-group form-inline'>
+  <label class='control-label'>WFS <code>typeNames</code></label>
+  <input type='text' value='<%= wxs_identifier(document) %>' readonly='readonly' class='form-control'>
+</div>

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

@@ -0,0 +1,8 @@
+<% document ||= @document %>
+
+<%= render partial: 'web_services_default', locals: { reference: reference } %>
+
+<div class='form-group form-inline'>
+  <label class='control-label'>WMS <code>layers</code></label>
+  <input type='text' value='<%= wxs_identifier(document) %>' readonly='readonly' class='form-control'>
+</div>

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -33,7 +33,9 @@ class CatalogController < ApplicationController
 
     config.show.display_type_field = 'format'
 
-
+    # Custom GeoBlacklight fields which currently map to GeoBlacklight-Schema
+    # v0.3.2
+    config.wxs_identifier_field = 'layer_id_s'
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display

data/lib/geoblacklight.rb

@@ -7,6 +7,8 @@ module Geoblacklight
   require 'geoblacklight/constants'
   require 'geoblacklight/controller_override'
   require 'geoblacklight/exceptions'
+  require 'geoblacklight/geoblacklight_helper_behavior'
+  require 'geoblacklight/document_presenter'
   require 'geoblacklight/view_helper_override'
   require 'geoblacklight/item_viewer'
   require 'geoblacklight/solr_document/finder'
@@ -25,7 +27,7 @@ module Geoblacklight
   require 'geoblacklight/references'
   require 'geoblacklight/routes'
   require 'geoblacklight/search_builder'
-  
+
   def self.inject!
     CatalogController.send(:include, Geoblacklight::ControllerOverride)
     CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)

data/lib/geoblacklight/document_presenter.rb

@@ -0,0 +1,15 @@
+module Geoblacklight
+  ##
+  # Adds custom functionality for Geoblacklight document presentation
+  class DocumentPresenter < Blacklight::DocumentPresenter
+    ##
+    # Accesses a documents configured Wxs Identifier
+    # @param [SolrDocument]
+    # @return [String]
+    def wxs_identifier
+      fields = Array(@configuration.wxs_identifier_field)
+      f = fields.find { |field| @document.has? field }
+      render_field_value(@document[f])
+    end
+  end
+end

data/lib/geoblacklight/download.rb

@@ -63,10 +63,8 @@ module Geoblacklight
       conn = Faraday.new(url: url)
       conn.get do |request|
         request.params = @options[:request_params]
-        request.options = {
-          timeout: timeout,
-          open_timeout: timeout
-        }
+        request.options.timeout = timeout
+        request.options.open_timeout = timeout
       end
     rescue Faraday::Error::ConnectionFailed => error
       raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Download connection failed', url: conn.url_prefix.to_s

data/lib/geoblacklight/geoblacklight_helper_behavior.rb

@@ -0,0 +1,20 @@
+module Geoblacklight
+  ##
+  # Adds helper behavior logic for GeoBlacklight, to used alongside
+  # BlacklightHelperBehavior
+  module GeoblacklightHelperBehavior
+    ##
+    # @param [SolrDocument]
+    # @return [String]
+    def wxs_identifier(document = nil)
+      document ||= @document
+      presenter(document).wxs_identifier
+    end
+
+    ##
+    # Use the Geoblacklight::DocumentPresenter
+    def presenter_class
+      Geoblacklight::DocumentPresenter
+    end
+  end
+end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

data/lib/geoblacklight/wms_layer.rb

@@ -23,10 +23,8 @@ module Geoblacklight
         conn = Faraday.new(url: url)
         conn.get do |request|
           request.params = search_params
-          request.options = {
-            timeout: Settings.TIMEOUT_WMS,
-            open_timeout: Settings.TIMEOUT_WMS
-          }
+          request.options.timeout = Settings.TIMEOUT_WMS
+          request.options.open_timeout = Settings.TIMEOUT_WMS
         end
       rescue Faraday::Error::ConnectionFailed => error
         Geoblacklight.logger.error error.inspect

data/spec/features/web_services_modal_spec.rb

@@ -7,11 +7,14 @@ feature 'web services tools' do
       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 'input', count: 2
-        expect(page).to have_css 'label', text: 'Web Feature Service (WFS) link'
+        expect(page).to have_css 'input', count: 4
+        expect(page).to have_css 'label', text: 'Web Feature Service (WFS)'
         expect(page).to have_css 'input[value="http://geowebservices-restricted.stanford.edu/geoserver/wfs"]'
-        expect(page).to have_css 'label', text: 'Web Mapping Service (WMS) link'
+        expect(page).to have_css 'label', text: 'WFS typeNames'
+        expect(page).to have_css 'input[value="druid:cg357zz0321"]', count: 2
+        expect(page).to have_css 'label', text: 'Web Mapping Service (WMS)'
         expect(page).to have_css 'input[value="http://geowebservices-restricted.stanford.edu/geoserver/wms"]'
+        expect(page).to have_css 'label', text: 'WMS layers'
       end
     end
   end

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GeoblacklightHelper do
+describe GeoblacklightHelper, type: :helper do
   include GeoblacklightHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TranslationHelper
@@ -45,4 +45,22 @@ describe GeoblacklightHelper do
       expect(geoblacklight_basemap).to eq 'positron'
     end
   end
+  describe '#render_web_services' do
+    let(:reference) { double(type: 'wms') }
+    it 'with a reference to a defined partial' do
+      expect(helper).to receive(:render)
+        .with(partial: 'web_services_wms', locals: { reference: reference })
+      helper.render_web_services(reference)
+    end
+    it 'with a reference to a missing partial' do
+      reference = double(type: 'iiif')
+      # expect(helper).to receive(:render).and_raise ActionView::MissingTemplate
+      expect(helper).to receive(:render)
+        .with(partial: 'web_services_iiif', locals: { reference: reference })
+        .and_raise ActionView::MissingTemplate.new({}, '', '', '', '')
+      expect(helper).to receive(:render)
+        .with(partial: 'web_services_default', locals: { reference: reference })
+      helper.render_web_services(reference)
+    end
+  end
 end

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Geoblacklight::DocumentPresenter do
+  let(:request_context) { double(add_facet_params: '') }
+  let(:config) { Blacklight::Configuration.new }
+  subject { presenter }
+  let(:presenter) do
+    Geoblacklight::DocumentPresenter.new(document, request_context, config)
+  end
+
+  let(:document) do
+    SolrDocument.new(id: 1, layer_id_s: 'druid:abc123')
+  end
+
+  describe '#wxs_identifier' do
+    describe 'without wxs identifier in configuration' do
+    end
+    it 'returns empty string' do
+      expect(subject.wxs_identifier).to eq ''
+    end
+    describe 'without wxs identifier in configuration' do
+      let(:config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.wxs_identifier_field = 'layer_id_s'
+        end
+      end
+      it 'returns configured field' do
+        expect(subject.wxs_identifier).to eq 'druid:abc123'
+      end
+    end
+  end
+end

data/spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Geoblacklight::GeoblacklightHelperBehavior do
+  let(:dummy_class) do
+    Class.new { include Geoblacklight::GeoblacklightHelperBehavior }.new
+  end
+  describe '#wxs_identifier' do
+    it 'calls defined presenter class' do
+      expect(dummy_class).to receive(:presenter)
+        .and_return(double(wxs_identifier: 'druid:abc123'))
+      expect(dummy_class.wxs_identifier).to eq 'druid:abc123'
+    end
+  end
+  describe '#presenter_class' do
+    it 'is defined as Geoblacklight::DocumentPresenter' do
+      expect(dummy_class.presenter_class.new({}, {}, {}))
+        .to be_a Geoblacklight::DocumentPresenter
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 /*
- * Leaflet-IIIF 0.0.5
+ * Leaflet-IIIF 0.0.7
  * IIIF Viewer for Leaflet
  * by Jack Reed, @mejackreed
  */
@@ -8,7 +8,8 @@ L.TileLayer.Iiif = L.TileLayer.extend({
   options: {
     continuousWorld: true,
     tileSize: 256,
-    updateWhenIdle: true
+    updateWhenIdle: true,
+    tileFormat: 'jpg'
   },
 
   initialize: function(url, options) {
@@ -23,21 +24,38 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       x = coords.x,
       y = (coords.y),
       zoom = _this._map.getZoom(),
-      scale = Math.pow(2, _this.maxZoom - zoom),
+      scale = Math.pow(2, _this.maxNativeZoom - 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);
+    
+    var xDiff = (maxx - minx);
+    var yDiff = (maxy - miny);
 
     return L.Util.template(this._baseUrl, L.extend({
-      format: 'jpg',
+      format: _this.options.tileFormat,
       quality: _this.quality,
-      region: [minx, miny, (maxx - minx), (maxy - miny)].join(','),
+      region: [minx, miny, xDiff, yDiff].join(','),
       rotation: 0,
-      size: 'pct:' + (100 / scale)
+      size: _this._iiifSizeParam(Math.ceil(xDiff / scale), Math.ceil(yDiff / scale))
     }, this.options));
   },
+  /**
+  * Returns a IIIF size parameter based off of the max dimension of
+  * a tile
+  * @param {Number} x - The width of a tile
+  * @param {Number} y - The height of a tile
+  * @returns {String}
+  */
+  _iiifSizeParam: function(x, y) {
+    if (x >= y) {
+      return x + ',';
+    } else {
+      return ',' + y;
+    }
+  },
   onAdd: function(map) {
     var _this = this;
 
@@ -98,23 +116,11 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         }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':
+        switch (true) {
+          case /^http:\/\/library.stanford.edu\/iiif\/image-api\/1.1\/compliance.html.*$/.test(profile):
             _this.quality = 'native';
             break;
-          case 'http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1':
-            _this.quality = 'native';
-            break;
-          case 'http://iiif.io/api/image/2/level2.json':
-            _this.quality = 'default';
-            break;
-          case 'http://iiif.io/api/image/2/level1.json':
-            _this.quality = 'default';
-            break;
-          case 'http://iiif.io/api/image/2/level0.json':
+          case /^http:\/\/iiif.io\/api\/image\/2.*$/.test(profile):
             _this.quality = 'default';
             break;
         }
@@ -123,12 +129,20 @@ L.TileLayer.Iiif = L.TileLayer.extend({
           return Math.ceil(Math.log(x) / Math.LN2);
         };
 
-        // Calculates maxZoom for the layer
-        _this.maxZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
+        // Calculates maximum native zoom for the layer
+        _this.maxNativeZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
           ceilLog2(_this.y / _this.options.tileSize));
-
+        
+        // Enable zooming further than native if needed
+        if (_this.options.maxZoom && _this.options.maxZoom > _this.maxNativeZoom) {
+          _this.maxZoom = _this.options.maxZoom;
+        }
+        else {
+          _this.maxZoom = _this.maxNativeZoom;
+        }
+        
         for (var i = 0; i <= _this.maxZoom; i++) {
-          scale = Math.pow(2, _this.maxZoom - i);
+          scale = Math.pow(2, _this.maxNativeZoom - i);
           width_ = Math.ceil(_this.x / scale);
           height_ = Math.ceil(_this.y / scale);
           tilesX_ = Math.ceil(width_ / _this.options.tileSize);
@@ -169,7 +183,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       tolerance = 0.8,
       imageSize;
 
-    for (var i = _this.maxZoom; i >= 0; i--) {
+    for (var i = _this.maxNativeZoom; i >= 0; i--) {
       imageSize = this._imageSizes[i];
       if (imageSize.x * tolerance < mapSize.x && imageSize.y * tolerance < mapSize.y) {
         return i;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -308,6 +308,7 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/web_services.scss
 - app/controllers/download_controller.rb
 - app/controllers/wms_controller.rb
+- app/helpers/blacklight_helper.rb
 - app/helpers/geoblacklight_helper.rb
 - app/views/catalog/_document_action.html.erb
 - app/views/catalog/_document_split.html.erb
@@ -326,6 +327,9 @@ files:
 - app/views/catalog/_show_header_default.html.erb
 - app/views/catalog/_upper_metadata.html.erb
 - app/views/catalog/_web_services.html.erb
+- app/views/catalog/_web_services_default.html.erb
+- app/views/catalog/_web_services_wfs.html.erb
+- app/views/catalog/_web_services_wms.html.erb
 - app/views/catalog/index.html.erb
 - app/views/catalog/metadata.html.erb
 - app/views/catalog/metadata.js.erb
@@ -349,6 +353,7 @@ files:
 - lib/geoblacklight/config.rb
 - lib/geoblacklight/constants.rb
 - lib/geoblacklight/controller_override.rb
+- lib/geoblacklight/document_presenter.rb
 - lib/geoblacklight/download.rb
 - lib/geoblacklight/download/geojson_download.rb
 - lib/geoblacklight/download/geotiff_download.rb
@@ -357,6 +362,7 @@ files:
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
+- lib/geoblacklight/geoblacklight_helper_behavior.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
 - lib/geoblacklight/reference.rb
@@ -404,12 +410,14 @@ files:
 - spec/javascripts/spec_helper.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
 - spec/lib/geoblacklight/controller_override_spec.rb
+- spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
 - spec/lib/geoblacklight/download/hgl_download_spec.rb
 - 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/geoblacklight_helper_behavior_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/reference_spec.rb
@@ -489,12 +497,14 @@ test_files:
 - spec/javascripts/spec_helper.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
 - spec/lib/geoblacklight/controller_override_spec.rb
+- spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
 - spec/lib/geoblacklight/download/hgl_download_spec.rb
 - 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/geoblacklight_helper_behavior_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/reference_spec.rb