geoblacklight 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb92c283b222d30905b5012385f7a51bb3f303f
-  data.tar.gz: a7e10de6f63d7991d008cd01ff2f41d1b4b3c0c1
+  metadata.gz: 988a3047b866166e07486f36a5ee3137d1ee8063
+  data.tar.gz: 81983cd641d63130d8c6aa22d65ac9ef4579724b
 SHA512:
-  metadata.gz: 02ce6eef716f16b585772465b5678883bb23df710607d66327b57ea68e497b0165b2e26eebd74e0ace42836cc0024a09e1b15023e36e74ad12bc7764e544e4c6
-  data.tar.gz: 6edc12e20927c02d0800d1f4df2566406442792951cc8279ebe8124b4621c7859cb0d7383237a4b00f852dfddbd3adac0a0fc124137114eb2a37889feab4e49d
+  metadata.gz: 6332e409be975db18f3f3861551875207b6748f46bfe9e4f04996d1550f2183a7891acca52dbb8b0bb652ba94ccc526ef3f10f5393009b6ca862cbbff9596dc5
+  data.tar.gz: d86a9a17886bf0fbe309625ea03bb70d747392261798336cf023dfc8ae698207f304dddaeeafa685ad405723db54df0364667eafeb56790fc60160acd99d09fe

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

@@ -17,16 +17,19 @@
       var container = L.DomUtil.create('div', 'opacity-control unselectable'),
         controlArea = L.DomUtil.create('div', 'opacity-area', container),
         handle = L.DomUtil.create('div', 'opacity-handle', container),
+        handleArrowUp = L.DomUtil.create('div', 'opacity-arrow-up', handle),
+        handleText = L.DomUtil.create('div', 'opacity-text', handle),
+        handleArrowDown = L.DomUtil.create('div', 'opacity-arrow-down', handle),
         bottom = L.DomUtil.create('div', 'opacity-bottom', container);
 
       L.DomEvent.disableClickPropagation(container);
-      this.setListeners(handle, bottom);
-      handle.style.top = handle.offsetTop - 12 + 50 + 'px';
-      handle.innerHTML = parseInt(this.options.layer.options.opacity * 100) + '%';
+      this.setListeners(handle, bottom, handleText);
+      handle.style.top = handle.offsetTop - 13 + 50 + 'px';
+      handleText.innerHTML = parseInt(this.options.layer.options.opacity * 100) + '%';
       return container;
     },
 
-    setListeners: function(handle, bottom) {
+    setListeners: function(handle, bottom, handleText) {
       var _this = this,
         start = false,
         startTop;
@@ -34,10 +37,10 @@
       L.DomEvent.addListener(document, 'mousemove', function(e) {
         if (!start) return;
         var percentInverse = Math.max(0, Math.min(200, startTop + parseInt(e.clientY, 10) - start)) / 2;
-        handle.style.top = ((percentInverse * 2) - 12) + 'px';
-        handle.innerHTML = Math.round((1 - (percentInverse / 100)) * 100) + '%';
-        bottom.style.height = Math.max(0, (((100 - percentInverse) * 2) - 12)) + 'px';
-        bottom.style.top = Math.min(200, (percentInverse * 2) + 12) + 'px';
+        handle.style.top = ((percentInverse * 2) - 13) + 'px';
+        handleText.innerHTML = Math.round((1 - (percentInverse / 100)) * 100) + '%';
+        bottom.style.height = Math.max(0, (((100 - percentInverse) * 2) - 13)) + 'px';
+        bottom.style.top = Math.min(200, (percentInverse * 2) + 13) + 'px';
         _this.options.layer.setOpacity(1 - (percentInverse / 100));
       });
 

data/app/assets/stylesheets/geoblacklight/_geoblacklight.css.scss

@@ -13,6 +13,7 @@
  */
 
 @import 'geoblacklight/styles';
+@import 'modules/mixins';
 @import 'modules/icons';
 @import 'modules/icon-customization';
 @import 'modules/home';

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

@@ -5,3 +5,7 @@
 [data-map="item"][data-available="true"] {
   cursor: crosshair;
 }
+
+.download-element {
+  padding-bottom: 10px;
+}

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

@@ -1,39 +1,68 @@
 .leaflet-control.opacity-control {
   background-color: #a9acb1;
   border-radius: 15px;
+  color: black;
+  font: bold 18px 'Lucida Console', Monaco, monospace;
   display: block;
   height: 200px;
-  left: 10px;
+  left: 11px;
   position: relative;
   top: 15px;
   width: 5px;
   
   .opacity-handle {
     background-color: #fff;
-    border-radius: 100%;
+    border-radius: 4px;
+    border: 1px solid #eee;
     cursor: ns-resize;
     font-size: 10px;
-    height: 24px;
-    left: -10px;
-    line-height: 24px;
+    height: 26px;
+    left: -11px;
+    line-height: 26px;
     position: absolute;
     text-align: center;
     top: 0;
-    width: 24px;
-
-    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+    width: 26px;
+    @include map-control-shadow;
+    
+    &:hover {
+      background-color: #f4f4f4;
+    }
+  }
+  
+  .opacity-arrow-up {
+    color: #aaa;
+    position: absolute;
+    top: -11px;
+    text-align: center;
+    width: 100%;
+    
+    &:before {
+      content: '=';
+    } 
+  }
+  
+  .opacity-arrow-down {
+    bottom: -10px;
+    color: #aaa;
+    position: absolute;
+    text-align: center;
+    width: 100%;
+    
+    &:before {
+      content: '=';
+    }  
   }
 
   .opacity-bottom {
     background-color: #017afd;
     border-radius: 15px;
     display: block;
-    height: 138px;
+    height: 137px;
     left: 0px;
     position: relative;
-    top: 62px;
-    width: 5px;    
+    top: 63px;
+    width: 5px;  
   }
   
   // Area underneath slider to prevent unintentioned map clicks
@@ -41,7 +70,7 @@
     padding: 14px;
     cursor: default;
     height: 200px;
-    left: -12px;
+    left: -11px;
     position: absolute;
     top: 0px;
     width: 20px;

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

@@ -0,0 +1,5 @@
+// Leaflet control box-shadow
+@mixin map-control-shadow {
+  
+  box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+}

data/app/helpers/geoblacklight_helper.rb

@@ -69,5 +69,4 @@ module GeoblacklightHelper
       ""
     end
   end
-
 end

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

@@ -20,15 +20,28 @@
     </ul>
     <% if document_downloadable? %>
       <div class='btn-group'>
-        <%= button_tag(type: 'button', class: 'btn btn-default dropdown-toggle', data: { toggle: 'dropdown' }) do %>
-          Download <span class='caret'></span>
+        <% unless document.direct_download.blank? %>
+          <%= link_to("Download #{@document[:dc_format_s]}", document.direct_download[:download], class: 'btn btn-default') %>
+        <% 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') %>
         <% end %>
-        <ul class="dropdown-menu" role="menu">
+        <button type='button' class='btn btn-default dropdown-toggle download-dropdown-toggle' data-toggle='dropdown' aria-expanded='false'>
+          <span class='caret'></span>
+          <span class='sr-only'>Toggle Download Dropdown</span>
+        </button>
+        <ul class='dropdown-menu' role='menu'>
+          <% 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]) %>
+            </li>
+          <% end %>
+          <li role="presentation" class="dropdown-header">Projected</li>
           <% document.download_types.each do |type| %>
             <%= content_tag(:li) do %>
-              <%= link_to(type[:label], '', data: { download_path: "#{download_path(document[:layer_slug_s], type: type[:type])}" }) %>
+              <% 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/shared/_header_navbar.html.erb

@@ -16,7 +16,7 @@
   </div>
 </div>
 
-<% unless current_page?(root_url) %>
+<% if controller_name == 'catalog' && has_search_parameters? %>
   <div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
     <div class="container">
       <%= render_search_bar  %>

data/lib/geoblacklight.rb

@@ -2,6 +2,7 @@ require "geoblacklight/engine"
 
 module Geoblacklight
   require 'geoblacklight/config'
+  require 'geoblacklight/constants'
   require 'geoblacklight/controller_override'
   require 'geoblacklight/view_helper_override'
   require 'geoblacklight/solr_document'
@@ -9,9 +10,13 @@ module Geoblacklight
   require 'geoblacklight/download'
   require 'geoblacklight/download/shapefile_download'
   require 'geoblacklight/download/kmz_download'
+  require 'geoblacklight/reference'
+  require 'geoblacklight/references'
   def self.inject!
     CatalogController.send(:include, Geoblacklight::ControllerOverride)
     CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
+    CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
+      CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
     SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
   end

data/lib/geoblacklight/constants.rb

@@ -0,0 +1,18 @@
+module Geoblacklight
+  # Module to declare application level constants and lookup hash
+  module Constants
+    URI = {
+      download: 'http://schema.org/downloadUrl',
+      fgdc: 'http://www.opengis.net/cat/csw/csdgm',
+      html: 'http://www.w3.org/1999/xhtml',
+      iiif: 'http://iiif.io/api/image',
+      iso19139: 'http://www.isotc211.org/schemas/2005/gmd/',
+      mods: 'http://www.loc.gov/mods/v3',
+      shapefile: 'http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf',
+      url: 'http://schema.org/url',
+      wcs: 'http://www.opengis.net/def/serviceType/ogc/wcs',
+      wfs: 'http://www.opengis.net/def/serviceType/ogc/wfs',
+      wms: 'http://www.opengis.net/def/serviceType/ogc/wms'
+    }
+  end
+end

data/lib/geoblacklight/reference.rb

@@ -0,0 +1,21 @@
+module Geoblacklight
+  class Reference
+    attr_reader :reference
+
+    def initialize(reference)
+      @reference = reference
+    end
+
+    def endpoint
+      @reference[1]
+    end
+
+    def type
+      Geoblacklight::Constants::URI.key(@reference[0])
+    end
+
+    def to_hash
+      { type => endpoint }
+    end
+  end
+end

data/lib/geoblacklight/references.rb

@@ -0,0 +1,55 @@
+module Geoblacklight
+  # References is a geoblacklight-schema dct:references parser
+  class References
+    attr_reader :refs
+    def initialize(document)
+      @document = document
+      @refs = parse_references.map { |ref| Reference.new(ref) }
+    end
+
+    def method_missing(m, *args, &b)
+      if Geoblacklight::Constants::URI.key?(m)
+        references m
+      else
+        super
+      end
+    end
+
+    def format
+      @document[:dc_format_s]
+    end
+
+    def references(ref_type)
+      @refs.find { |reference| reference.type == ref_type }
+    end
+
+    def parse_references
+      if @document[:dct_references_s].nil?
+        Hash.new
+      else
+        JSON.parse(@document[:dct_references_s])
+      end
+    end
+
+    def preferred_download
+      return file_download unless download.blank?
+    end
+
+    def file_download
+      { file_download: download.to_hash }
+    end
+
+    def downloads_by_format
+      case format
+      when 'Shapefile'
+        { shapefile: wfs.to_hash, kmz: wms.to_hash }
+      when 'GeoTIFF'
+        { geotiff: wms.to_hash }
+      end
+    end
+
+    def download_types
+      downloads_by_format
+    end
+  end
+end

data/lib/geoblacklight/solr_document.rb

@@ -20,7 +20,15 @@ module Geoblacklight
     end
 
     def download_types
-      [{ label: 'Shapefile', type: 'shapefile' }, { label: 'KMZ', type: 'kmz' }]
+      references.download_types
+    end
+
+    def references
+      References.new(self)
+    end
+
+    def direct_download
+      return references.download.to_hash unless references.download.blank?
     end
 
     def same_institution?

data/lib/geoblacklight/version.rb

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

data/lib/geoblacklight/view_helper_override.rb

@@ -10,7 +10,7 @@ module Geoblacklight
       super || has_spatial_parameters?
     end
     
-    def query_has_contraints(params = params)
+    def query_has_contraints?(params = params)
       super || has_search_parameters?
     end
   end

data/spec/features/dct_references_generate.rb

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'geoblacklight'
+
+def do_write n, doc
+  unless File.size?("spec/fixtures/test-dct-references#{n}.json")
+    puts "Writing spec/fixtures/test-dct-references#{n}.json"
+    File.open("spec/fixtures/test-dct-references#{n}.json", 'wb') {|f| f << JSON.pretty_generate(doc) }
+  end
+end
+
+URIs = Geoblacklight::Constants::URI
+selected = JSON.parse(File.open('schema/examples/selected.json').read)
+
+# scenario 'Case 1: Minimal case of HTML metadata only' do
+doc = selected.sample
+doc['dct_references_s'] = {
+  URIs[:html] => "http://example.com/#{doc['uuid']}/metadata.html"
+}.to_json
+do_write 1, doc
+
+# scenario 'Case 2: Minimal case of FGDC metadata, a URL (homepage), and WMS tile server' do
+doc = selected.sample
+doc['dct_references_s'] = {
+  URIs[:fgdc] => "http://example.com/#{doc['uuid']}/fgdc.xml",
+  URIs[:url] => "http://example.com/#{doc['uuid']}/homepage",
+  URIs[:wms] => doc['solr_wms_url']
+}.to_json
+do_write 2, doc
+
+# scenario 'Case 3: ISO & MODS metadata, a URL, and WMS tile server' do
+doc = selected.sample
+doc['dct_references_s'] = {
+  URIs[:iso19139] => "http://example.com/#{doc['uuid']}/iso19139.xml",
+  URIs[:mods] => "http://example.com/#{doc['uuid']}/mods.xml",
+  URIs[:url] => "http://example.com/#{doc['uuid']}/homepage",
+  URIs[:wms] => doc['solr_wms_url']
+}.to_json
+do_write 3, doc
+
+# scenario 'Case 4: FGDC metadata and IIIF tile server' do
+doc = selected.sample
+doc['dct_references_s'] = {
+  URIs[:fgdc] => "http://example.com/#{doc['uuid']}/fgdc.xml",
+  URIs[:iiif] => "http://example.com/iiif"
+}.to_json
+do_write 4, doc
+
+# scenario 'Case 5: ISO & MODS metadata, a URL, Shapefile ZIP and WFS, and WMS tile server' do
+doc = selected.sample
+while doc['dc_format_s'] != 'Shapefile'
+  doc = selected.sample  
+end
+raise ArgumentError, doc['dc_format_s'] unless doc['dc_format_s'] == 'Shapefile'
+doc['dct_references_s'] = {
+  URIs[:download] => "http://example.com/#{doc['uuid']}/data.zip",
+  URIs[:iso19139] => "http://example.com/#{doc['uuid']}/iso19139.xml",
+  URIs[:mods] => "http://example.com/#{doc['uuid']}/mods.xml",
+  URIs[:url] => "http://example.com/#{doc['uuid']}/homepage",
+  URIs[:wms] => doc['solr_wms_url'],
+  URIs[:wfs] => doc['solr_wfs_url']
+}.to_json
+do_write 5, doc
+
+# scenario 'Case 6: ISO & MODS metadata, GeoTIFF ZIP and WCS, and WMS tile server' do
+doc = selected.sample
+while doc['dc_format_s'] != 'GeoTIFF'
+  doc = selected.sample  
+end
+doc['dct_references_s'] = {
+  URIs[:download] => "http://example.com/#{doc['uuid']}/data.zip",
+  URIs[:iso19139] => "http://example.com/#{doc['uuid']}/iso19139.xml",
+  URIs[:mods] => "http://example.com/#{doc['uuid']}/mods.xml",
+  URIs[:wms] => doc['solr_wms_url'],
+  URIs[:wcs] => doc['solr_wcs_url']
+}.to_json
+do_write 6, doc
+
+# scenario 'Case 7: No metadata, GeoJSON'
+doc = selected.sample
+while doc['dc_format_s'] != 'Shapefile'
+  doc = selected.sample  
+end
+doc['dct_references_s'] = {
+  URIs[:download] => "http://example.com/#{doc['uuid']}/data.json"
+}.to_json
+do_write 7, doc
+
+# scenario 'Case 8: HTML metadata and WMS tile server'
+doc = selected.sample
+doc['dct_references_s'] = {
+  URIs[:html] => "http://example.com/#doc['uuid']/metadata.html",
+  URIs[:wms] => doc['solr_wms_url']
+}.to_json
+do_write 8, doc
+
+
+
+
+