geoblacklight 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988a3047b866166e07486f36a5ee3137d1ee8063
-  data.tar.gz: 81983cd641d63130d8c6aa22d65ac9ef4579724b
+  metadata.gz: 567c21f3752e5b7c91f8dcb100a2c0d93333b48b
+  data.tar.gz: a5cbdded6456236c0f516dafe9e76d34042ebc68
 SHA512:
-  metadata.gz: 6332e409be975db18f3f3861551875207b6748f46bfe9e4f04996d1550f2183a7891acca52dbb8b0bb652ba94ccc526ef3f10f5393009b6ca862cbbff9596dc5
-  data.tar.gz: d86a9a17886bf0fbe309625ea03bb70d747392261798336cf023dfc8ae698207f304dddaeeafa685ad405723db54df0364667eafeb56790fc60160acd99d09fe
+  metadata.gz: fa9384f5fdf9c6c19ae43789c79afb6bafb92ed2fe3425ef2694a81887f60d9e1ae833faa437c92f8052ec3065d728094884ab355da264fa74c1614809f2207d
+  data.tar.gz: bcc7b6e80ae7ee42d17ec94b5c448c488ea2c5b266f10568638b3639b0b1716e8fca9f78bd690b79c6e594ee8303cb0bc12963ff2b879f36967c8f62d239e7ce

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

@@ -32,13 +32,23 @@
       }
     },
 
-    initialize: function(el) {
+    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="http://developer.mapquest.com/content/osm/mq_logo.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
@@ -52,11 +62,8 @@
       map.addLayer(basemap);
       map.addLayer(this.overlay);
 
-      if (typeof data['mapBbox'] === "string") {
-        map.fitBounds(L.bboxToBounds(data.mapBbox));
-      } else {
-        map.setView([0,0], 2);
-      }
+      map.fitBounds(this.options.bbox);
+
     },
 
     /**

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

@@ -1,13 +1,14 @@
 Blacklight.onLoad(function() {
   $('[data-map="item"]').each(function(i, element) {
-    var layerMap = new GeoBlacklight.Item(element);
+    var bbox = L.bboxToBounds($(this).data().mapBbox);
+    new GeoBlacklight.Item(element, { bbox: bbox });
   });
 });
 
 GeoBlacklight.Item = GeoBlacklight.extend({
 
-  initialize: function(element) {
-    GeoBlacklight.prototype.initialize.call(this, element);
+  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) {

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

@@ -7,12 +7,24 @@ Blacklight.onLoad(function() {
 
   $('[data-map="index"]').each(function() {
     var data = $(this).data(),
-        dynamicSearcher, geoblacklight, search;
+        dynamicSearcher, geoblacklight, search, bbox;
+
+    if (typeof data.mapBbox === "string") {
+      bbox = L.bboxToBounds(data.mapBbox);
+    } else {
+      $('.document [data-bbox]').each(function() {
+        if (typeof bbox === "undefined") {
+          bbox = L.bboxToBounds($(this).data().bbox);
+        } else {
+          bbox.extend(L.bboxToBounds($(this).data().bbox));
+        }
+      });
+    }
 
     dynamicSearcher = GeoBlacklight.debounce(function(querystring) {
       History.pushState(null, null, data.catalogPath + '?' + querystring);
     }, 800);
-    geoblacklight = new GeoBlacklight(this).setHoverListeners();
+    geoblacklight = new GeoBlacklight(this, { bbox: bbox }).setHoverListeners();
     search = new L.Control.GeoSearch(dynamicSearcher);
     geoblacklight.map.addControl(search);
   });

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

@@ -6,17 +6,16 @@
   text-align: center;
 }
 
-.home-facet-label {
-  background: $gray-light;
-  border-radius: .25em;
-  color: #fff;
-  font-size: 1.4em;
-  line-height: 2em;
-  padding: .2em .6em .3em;
-  text-align: center;
+.home-facet-link {
+  
+}
+
+.category-block {
+  @extend .col-md-6;
+  @extend .text-center;
+  min-height: 200px;
   
-  &:hover {
-    color: #fff;
-    text-decoration: none;
+  .category-icon {
+    font-size: 6em;
   }
 }

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

@@ -1,3 +1,3 @@
 <% display_facet.items.each do |item| %>
-  <%= link_to item.value, catalog_index_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-label' %>
+  <%= link_to item.value, catalog_index_path({f: {"#{facet_field.field}" => [item.value]}}), class: 'home-facet-link' %><%= "," unless item == display_facet.items.last %>
 <% end %>

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

@@ -7,9 +7,34 @@
 </div>
 
 <div class='row'>
-  <div class='col-md-6 text-center'>
-    <%= content_tag :h4, t('geoblacklight.home.category_heading') %>
-    <%= render_facet_tags [:dc_subject_sm] %>
+  <div class='col-md-6'>
+    <%= content_tag :h4, t('geoblacklight.home.category_heading'), class: 'text-center' %>
+    <div class='row'>
+      <div class='category-block'>
+        <div class='category-icon'>
+          <span class='glyphicon glyphicon-home'></span>
+        </div>
+        <%= render_facet_tags [:dct_provenance_s] %>
+      </div>
+      <div class='category-block'>
+        <div class='category-icon'>
+          <span class='glyphicon glyphicon-download'></span>
+        </div>
+        <%= render_facet_tags [:layer_geom_type_s] %>
+      </div>
+      <div class='category-block'>
+        <div class='category-icon'>
+          <span class='glyphicon glyphicon-globe'></span>
+        </div>
+        <%= render_facet_tags [:dct_spatial_sm] %>
+      </div>
+      <div class='category-block'>
+        <div class='category-icon'>
+          <span class='glyphicon glyphicon-tags'></span>
+        </div>
+        <%= render_facet_tags [:dc_subject_sm] %>
+      </div>
+    </div>
   </div>
   <div class='col-md-6 text-center'>
     <%= content_tag :h4, t('geoblacklight.home.map_heading') %>

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

@@ -68,12 +68,12 @@ class CatalogController < ApplicationController
     #    :years_25 => { :label => 'within 25 Years', :fq => "pub_date:[#{Time.now.year - 25 } TO *]" }
     # }
 
-    config.add_facet_field 'dct_provenance_s', :label => 'Institution', :limit => 7
-    config.add_facet_field 'dc_creator_sm', :label => 'Author', :limit => 6
-    config.add_facet_field 'dc_publisher_s', :label => 'Publisher', :limit => 6
-    config.add_facet_field 'dc_subject_sm', :label => 'Subject', :limit => 6
-    config.add_facet_field 'dct_spatial_sm', :label => 'Place', :limit => 6
-    config.add_facet_field 'dct_isPartOf_sm', :label => 'Collection', :limit => 6
+    config.add_facet_field 'dct_provenance_s', :label => 'Institution', :limit => 8
+    config.add_facet_field 'dc_creator_sm', :label => 'Author', :limit => 8
+    config.add_facet_field 'dc_publisher_s', :label => 'Publisher', :limit => 8
+    config.add_facet_field 'dc_subject_sm', :label => 'Subject', :limit => 8
+    config.add_facet_field 'dct_spatial_sm', :label => 'Place', :limit => 8
+    config.add_facet_field 'dct_isPartOf_sm', :label => 'Collection', :limit => 8
 
     config.add_facet_field 'solr_year_i', :label => 'Year', :limit => 10, :range => {
       # :num_segments => 6,
@@ -81,11 +81,9 @@ class CatalogController < ApplicationController
       # :segments => true
     }
 
-    config.add_facet_field 'dc_rights_s', :label => 'Access', :limit => 3
-    config.add_facet_field 'layer_geom_type_s', :label => 'Data type', :limit => 5
-    config.add_facet_field 'dc_format_s', :label => 'Format', :limit => 3
-    config.add_facet_field 'dc_language_s', :label => 'Language', :limit => 3
-
+    config.add_facet_field 'dc_rights_s', :label => 'Access', :limit => 8
+    config.add_facet_field 'layer_geom_type_s', :label => 'Data type', :limit => 8
+    config.add_facet_field 'dc_format_s', :label => 'Format', :limit => 8
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request

data/lib/generators/geoblacklight/templates/geoblacklight.css.scss

@@ -1,3 +1,4 @@
 /*
 *= require geoblacklight/application
+*= require blacklight_range_limit
 */

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

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

data/lib/geoblacklight.rb

@@ -19,5 +19,7 @@ module Geoblacklight
       CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
     SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
+    SavedSearchesController.send(:helper, Geoblacklight::ViewHelperOverride) unless
+      SavedSearchesController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
   end
 end

data/lib/geoblacklight/constants.rb

@@ -4,6 +4,7 @@ module Geoblacklight
     URI = {
       download: 'http://schema.org/downloadUrl',
       fgdc: 'http://www.opengis.net/cat/csw/csdgm',
+      geojson: 'http://geojson.org/geojson-spec.html',
       html: 'http://www.w3.org/1999/xhtml',
       iiif: 'http://iiif.io/api/image',
       iso19139: 'http://www.isotc211.org/schemas/2005/gmd/',

data/lib/geoblacklight/engine.rb

@@ -5,6 +5,7 @@ require 'httparty'
 require 'font-awesome-rails'
 require 'rails_config'
 require 'faraday'
+require 'blacklight_range_limit'
 
 module Geoblacklight
   class Engine < ::Rails::Engine

data/lib/geoblacklight/references.rb

@@ -43,8 +43,6 @@ module Geoblacklight
       case format
       when 'Shapefile'
         { shapefile: wfs.to_hash, kmz: wms.to_hash }
-      when 'GeoTIFF'
-        { geotiff: wms.to_hash }
       end
     end
 

data/lib/geoblacklight/solr_document.rb

@@ -16,7 +16,7 @@ module Geoblacklight
     end
 
     def downloadable?
-      get(:solr_wfs_url) && get(:solr_wms_url) && available?
+      download_types.present? && available?
     end
 
     def download_types

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/geoblacklight/view_helper_override.rb

@@ -1,17 +1,25 @@
 module Geoblacklight
   module ViewHelperOverride
-    
     def has_spatial_parameters?
       params[:bbox]
     end
-    
+
     # Overrides BL method to enable results for spatial only params
     def has_search_parameters?
-      super || has_spatial_parameters?
+      has_spatial_parameters? || super
     end
-    
+
     def query_has_contraints?(params = params)
-      super || has_search_parameters?
+      has_search_parameters? || super
+    end
+
+    def render_search_to_s(params)
+      super + render_search_to_s_bbox(params)
+    end
+
+    def render_search_to_s_bbox(params)
+      return ''.html_safe if params['bbox'].blank?
+      render_search_to_s_element('Bounding box', render_filter_value(params['bbox']) )
     end
   end
-end
+end

data/spec/features/home_page_spec.rb

@@ -13,7 +13,8 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     end
   end
   scenario 'find by category' do
-    expect(page).to have_css '.home-facet-label', count: 7
+    expect(page).to have_css '.category-block', count: 4
+    expect(page).to have_css '.home-facet-link', count: 28
     click_link 'Census'
     expect(page).to have_css '.filterName', text: 'Subject'
     expect(page).to have_css '.filterValue', text: 'Census'
@@ -21,7 +22,7 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
   scenario 'map should be visible' do
     within '#main-container' do
       expect(page).to have_css('#map')
-      expect(page).to have_css('img.leaflet-tile', count: 4)
+      expect(page).to have_css('img.leaflet-tile', minimum: 3)
     end
   end
   scenario 'clicking map search should create a spatial search' do

data/spec/features/saved_searches_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+feature 'saved searches' do
+  scenario 'list spatial search', js: true do
+    visit root_path
+    find('#map').double_click
+    within '#map' do
+      find('a.search-control').click
+      expect(page.current_url).to match /bbox=/
+    end
+    visit search_history_path
+    expect(page).to have_css 'td.query a', text: /Bounding box:/
+  end
+end

data/spec/features/split_view.html.erb_spec.rb

@@ -22,7 +22,6 @@ feature 'Index view', js: true do
       expect(page).to have_css('div.panel.facet_limit', text: 'Access')
       expect(page).to have_css('div.panel.facet_limit', text: 'Data type')
       expect(page).to have_css('div.panel.facet_limit', text: 'Format')
-      expect(page).to have_css('div.panel.facet_limit', text: 'Language')
     end
     click_link 'Institution'
     expect(page).to have_css('a.facet_select', text: 'Harvard', visible: true)

data/spec/lib/geoblacklight/references_spec.rb

@@ -38,9 +38,18 @@ describe Geoblacklight::References do
       )
     )
   }
+  let(:direct_download_only) {
+    Geoblacklight::References.new(
+      dc_format_s: 'GeoTIFF',
+      dct_references_s: {
+        'http://schema.org/downloadUrl' => 'http://example.com/layer-id-geotiff.tiff'
+      }.to_json
+    )
+  }
   describe 'format' do
     it 'should return format' do
       expect(complex_shapefile.format).to eq 'Shapefile'
+      expect(direct_download_only.format).to eq 'GeoTIFF'
     end
   end
   describe 'refs' do
@@ -55,6 +64,7 @@ describe Geoblacklight::References do
       download = complex_shapefile.download
       expect(download).to be_an Geoblacklight::Reference
       expect(download.endpoint).to eq('http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip')
+      expect(direct_download_only.download.endpoint).to eq 'http://example.com/layer-id-geotiff.tiff'
     end
     it 'should not return if download not available' do
       expect(typical_ogp_shapefile.download).to be_nil
@@ -63,6 +73,7 @@ describe Geoblacklight::References do
   describe 'preferred_download' do
     it 'should return the direct download if available' do
       expect(complex_shapefile.preferred_download[:file_download][:download]).to eq 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
+      expect(direct_download_only.preferred_download[:file_download][:download]).to eq 'http://example.com/layer-id-geotiff.tiff'
     end
     it 'should return nil if there is no direct download' do
       expect(typical_ogp_shapefile.preferred_download).to be_nil
@@ -76,6 +87,7 @@ describe Geoblacklight::References do
       types = complex_shapefile.download_types
       expect(types.first[1]).to eq wfs: 'http://hgl.harvard.edu:8080/geoserver/wfs'
       expect(types.count).to eq 2
+      expect(direct_download_only.download_types).to be_nil
     end
     it 'should only return available downloads if no direct is present' do
       types = typical_ogp_shapefile.download_types

data/spec/lib/geoblacklight/view_helper_override_spec.rb

@@ -20,4 +20,17 @@ describe Geoblacklight::ViewHelperOverride do
       expect(@fake_controller.has_spatial_parameters?).to be_truthy
     end
   end
-end
+  describe 'render_search_to_s_bbox' do
+    it 'returns an empty string for no bbox' do
+      @fake_controller.params = {}
+      expect(@fake_controller.render_search_to_s_bbox(@fake_controller.params)).to eq ''
+    end
+    it 'returns render_search_to_s_element when bbox is present' do
+      @fake_controller.params = { bbox: '123'}
+      params = { 'bbox' => '123' }
+      expect(@fake_controller).to receive(:render_search_to_s_element)
+      expect(@fake_controller).to receive(:render_filter_value)
+      @fake_controller.render_search_to_s_bbox(params)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Darren Hardy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -319,12 +319,12 @@ files:
 - lib/tasks/geoblacklight.rake
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
-- spec/features/dct_references_generate.rb
 - spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/fixtures/test-dct-references1.json
@@ -345,6 +345,7 @@ files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/spec_helper.rb
+- spec/support/dct_references_generate.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -379,12 +380,12 @@ summary: A discovery platform for geospatial holdings
 test_files:
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
-- spec/features/dct_references_generate.rb
 - spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/saved_searches_spec.rb
 - spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/fixtures/test-dct-references1.json
@@ -405,6 +406,7 @@ test_files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/spec_helper.rb
+- spec/support/dct_references_generate.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb