geoblacklight 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2569474d1cd7946363ce5ba8be7d783145007c9f
-  data.tar.gz: dfb2e56fe8bc2302698a2192fd7a7bedac2c442d
+  metadata.gz: bffcde6f01bb25c38878c4c4643912723d2c8b4a
+  data.tar.gz: ba83d359a86f42f7ed8c558db32a7f2a36fb0b57
 SHA512:
-  metadata.gz: 5093d1b9eda7a53ef3b64c5a22f2bf02bdde068e904234471d4c5a2c68c23c934f743d827ac304ff340a8b46a0a6a759b5b6bffcd440ed1def990b6758b1ec13
-  data.tar.gz: 02d642f50886e7b86dd96999840f58ba91f787f217403f15e79baf4585b15d3788ccf3b79b30f7509a4673e08beed001d32e3f88ef540c2b4ee2e18fb9b6a80d
+  metadata.gz: c5ce60b374a179e08b712b54a212ccda9c6076dcfb10440aa8055edfe90534de27de88b93f1e9677f4e67bd2b032608b0b991eecf645291b4d7b1421044219b6
+  data.tar.gz: c42ef4e4c98c0a8b66e55dd10eb1400079b96ee99a35f1973e9abf10ce21e64e437262dbc4c69b5569a61a31161710169cb334a9e5e824bdf36baf6068185ed3

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

@@ -22,6 +22,9 @@ GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
   overlay: L.layerGroup(),
 
   load: function() {
+    if (this.data.mapBbox) {
+      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);

data/app/helpers/geoblacklight_helper.rb

@@ -41,7 +41,7 @@ module GeoblacklightHelper
   end
 
   def layer_type_image(type)
-    content_tag :span, '', class: "geoblacklight-icon geoblacklight-#{type.downcase}"
+    content_tag :span, '', class: "geoblacklight-icon geoblacklight-#{type.downcase.gsub(' ', '-')}"
   end
 
   def layer_institution_image(institution)
@@ -66,4 +66,18 @@ module GeoblacklightHelper
   def render_facet_links(facet, items)
     items.uniq.map { |item| link_to item, catalog_index_path(f: { "#{facet}" => [item] }) }.join(', ').html_safe
   end
+
+  ##
+  # Looks up properly formatted names for formats
+  #
+  def proper_case_format(format)
+    I18n.t "geoblacklight.formats.#{format.downcase}"
+  end
+
+  ##
+  # Wraps download text with proper_case_format
+  #
+  def download_text(format)
+    "#{I18n.t 'geoblacklight.download.download'} #{proper_case_format(format)}".html_safe
+  end
 end

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

@@ -21,9 +21,9 @@
     <% if document_downloadable? %>
       <div class='btn-group' itemprop='distribution' itemscope='itemscope' itemtype='http://schema.org/DataDownload'>
         <% unless document.direct_download.blank? %>
-          <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download]) %>
+          <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], class: 'btn btn-default', 'contentUrl' => document.direct_download[:download]) %>
         <% else %>
-          <%= link_to("Download #{document.download_types.first[0].capitalize}", '', data: { download_path: "#{download_path(document[:layer_slug_s], type: document.download_types.first[0])}"}, class: 'btn btn-default') %>
+          <%= link_to(download_text(document.download_types.first[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: document.download_types.first[0])}"}, class: 'btn btn-default') %>
         <% end %>
         <button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
           <span class='caret'></span>
@@ -33,14 +33,14 @@
           <% unless document.direct_download.blank? %>
             <li role="presentation" class="dropdown-header">Original</li>
             <li>
-              <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
+              <%= link_to(download_text(@document[:dc_format_s]), document.direct_download[:download], 'contentUrl' => document.direct_download[:download]) %>
             </li>
           <% 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])}" }) %>
+                <% link_to(download_text(type[0]), '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[0])}" }) %>
               <% end %>
             <% end %> 
           <% end %>   

data/config/locales/geoblacklight.en.yml

@@ -1,6 +1,7 @@
 en:
   geoblacklight:
     download:
+      download: 'Download'
       success: 'Your file %{title} is ready for download'
       error: 'Sorry, the requested file could not be downloaded'
     home:
@@ -9,4 +10,10 @@ en:
       category_heading: 'Find by...'
       map_heading: 'Find by location'
     tools:
-      login_to_view: 'Login to view and download'
+      login_to_view: 'Login to view and download'
+    formats:
+      arcgrid: 'ArcGRID'
+      geojson: 'GeoJSON'
+      geotiff: 'GeoTIFF'
+      kmz: 'KMZ'
+      shapefile: 'Shapefile'

data/lib/geoblacklight/item_viewer.rb

@@ -5,7 +5,7 @@ module Geoblacklight
     end
 
     def viewer_protocol
-      return 'leaflet' if viewer_preference.nil?
+      return 'map' if viewer_preference.nil?
       viewer_preference.keys.first.to_s
     end
 

data/lib/geoblacklight/version.rb

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

data/spec/features/download_layer_spec.rb

@@ -11,14 +11,14 @@ feature 'Download layer' do
     expect_any_instance_of(KmzDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-kmz.kmz')
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('button.download-dropdown-toggle').click
-    find('a', text: 'Download Kmz').click
+    find('a', text: 'Download KMZ').click
     expect(page).to have_css('a', text: 'Your file mit-us-ma-e25zcta5dct-2000-kmz.kmz is ready for download')
   end
   scenario 'options should be available under toggle' do
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('button.download-dropdown-toggle').click
     expect(page).to have_css('li a', text: 'Download Shapefile')
-    expect(page).to have_css('li a', text: 'Download Kmz')
+    expect(page).to have_css('li a', text: 'Download KMZ')
   end
   scenario 'restricted layer should not have download available to non logged in user' do
     visit catalog_path('stanford-jf841ys4828')
@@ -40,6 +40,6 @@ feature 'Download layer' do
     expect(page).to have_css 'li.dropdown-header', text: 'Original'
     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'
+    expect(page).to have_css 'li a', text: 'Download KMZ'
   end
 end

data/spec/features/iiif_viewer_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+feature 'iiif reference' do
+  scenario 'displays leaflet viewer', js: true do
+    visit catalog_path('princeton-02870w62c')
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+  end
+end

data/spec/features/layer_with_no_references_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+feature 'layer with no wms or iiif' do
+  scenario 'has map with bounding box' do
+    pending 'waiting on #201, need example metadata record'
+    fail
+  end
+end

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -13,4 +13,23 @@ describe GeoblacklightHelper do
       expect(html).to have_css 'a', text: 'Science', count: 1
     end
   end
+
+  describe '#layer_type_image' do
+    it 'lowercases and subs spaces for hyphens' do
+      html = Capybara.string(layer_type_image('TEst 123'))
+      expect(html).to have_css '.geoblacklight-test-123'
+    end
+  end
+
+  describe '#proper_case_format' do
+    it 'returns a properly cased format' do
+      expect(proper_case_format('GEOJSON')).to eq 'GeoJSON'
+    end
+  end
+
+  describe '#download_text' do
+    it 'returns download text concatenated with proper case format' do
+      expect(download_text('GEOJSON')).to eq 'Download GeoJSON'
+    end
+  end
 end

data/spec/lib/geoblacklight/solr_document_spec.rb

@@ -122,7 +122,7 @@ describe Geoblacklight::SolrDocument do
     end
     let(:document_attributes) { {} }
     it 'returns leaflet protocol' do
-      expect(document.viewer_protocol).to eq 'leaflet'
+      expect(document.viewer_protocol).to eq 'map'
     end
   end
   describe 'viewer_endpoint' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mike Graves
@@ -337,8 +337,10 @@ files:
 - spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
+- spec/features/iiif_viewer_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/layer_with_no_references_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb
@@ -404,8 +406,10 @@ test_files:
 - spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
+- spec/features/iiif_viewer_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/layer_with_no_references_spec.rb
 - spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb