geoblacklight 0.12.1 → 1.0.0.pre1

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

@@ -21,21 +21,19 @@ class CatalogController < ApplicationController
      :q => '{!raw f=layer_slug_s v=$id}'
     }
 
-    config.search_builder_class = Geoblacklight::SearchBuilder
-
     # solr field configuration for search results/index views
     # config.index.show_link = 'title_display'
     # config.index.record_display_type = 'format'
 
-    config.index.title_field = 'dc_title_s'
+    config.index.title_field = Settings.FIELDS.TITLE
 
     # solr field configuration for document/show views
 
     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'
+    ## 
+    # Configure the index document presenter.
+    config.index.document_presenter_class = Geoblacklight::DocumentPresenter
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
@@ -72,18 +70,18 @@ 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: 8, partial: "icon_facet"
-    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 Settings.FIELDS.PROVENANCE, label: 'Institution', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Author', :limit => 8
+    config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
+    config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8
+    config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8
+    config.add_facet_field Settings.FIELDS.PART_OF, :label => 'Collection', :limit => 8
 
-    config.add_facet_field 'solr_year_i', :label => 'Year', :limit => 10
+    config.add_facet_field Settings.FIELDS.YEAR, :label => 'Year', :limit => 10
 
-    config.add_facet_field 'dc_rights_s', label: 'Access', limit: 8, partial: "icon_facet"
-    config.add_facet_field 'layer_geom_type_s', label: 'Data type', limit: 8, partial: "icon_facet"
-    config.add_facet_field 'dc_format_s', :label => 'Format', :limit => 8
+    config.add_facet_field Settings.FIELDS.RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.GEOM_TYPE, label: 'Data type', limit: 8, partial: "icon_facet"
+    config.add_facet_field Settings.FIELDS.FILE_FORMAT, :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
@@ -103,10 +101,14 @@ class CatalogController < ApplicationController
     # config.add_index_field 'lc_callnum_display', :label => 'Call number:'
 
     # config.add_index_field 'dc_title_t', :label => 'Display Name:'
-    # config.add_index_field 'dct_provenance_s', :label => 'Institution:'
-    # config.add_index_field 'dc_rights_s', :label => 'Access:'
+    # config.add_index_field Settings.FIELDS.PROVENANCE, :label => 'Institution:'
+    # config.add_index_field Settings.FIELDS.RIGHTS, :label => 'Access:'
     # # config.add_index_field 'Area', :label => 'Area:'
-    # config.add_index_field 'dc_subject_sm', :label => 'Keywords:'
+    # config.add_index_field Settings.FIELDS.SUBJECT, :label => 'Keywords:'
+    config.add_index_field Settings.FIELDS.YEAR
+    config.add_index_field Settings.FIELDS.CREATOR
+    config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit
+    config.add_index_field Settings.FIELDS.PUBLISHER
 
 
 
@@ -116,14 +118,14 @@ class CatalogController < ApplicationController
     # item_prop: [String] property given to span with Schema.org item property
     # link_to_search: [Boolean] that can be passed to link to a facet search
     # helper_method: [Symbol] method that can be used to render the value
-    config.add_show_field 'dc_creator_sm', label: 'Author(s)', itemprop: 'author'
-    config.add_show_field 'dc_description_s', label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
-    config.add_show_field 'dc_publisher_s', label: 'Publisher', itemprop: 'publisher'
-    config.add_show_field 'dct_isPartOf_sm', label: 'Collection', itemprop: 'isPartOf'
-    config.add_show_field 'dct_spatial_sm', label: 'Place(s)', itemprop: 'spatial', link_to_search: true
-    config.add_show_field 'dc_subject_sm', label: 'Subject(s)', itemprop: 'keywords', link_to_search: true
-    config.add_show_field 'dct_temporal_sm', label: 'Year', itemprop: 'temporal'
-    config.add_show_field 'dct_provenance_s', label: 'Held by', link_to_search: true
+    config.add_show_field Settings.FIELDS.CREATOR, label: 'Author(s)', itemprop: 'author'
+    config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
+    config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
+    config.add_show_field Settings.FIELDS.PART_OF, label: 'Collection', itemprop: 'isPartOf'
+    config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_search: true
+    config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject(s)', itemprop: 'keywords', link_to_search: true
+    config.add_show_field Settings.FIELDS.TEMPORAL, label: 'Year', itemprop: 'temporal'
+    config.add_show_field Settings.FIELDS.PROVENANCE, label: 'Held by', link_to_search: true
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -198,8 +200,8 @@ class CatalogController < ApplicationController
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
     config.add_sort_field 'score desc, dc_title_sort asc', :label => 'relevance'
-    config.add_sort_field 'solr_year_i desc, dc_title_sort asc', :label => 'year'
-    config.add_sort_field 'dc_publisher_sort asc, dc_title_sort asc', :label => 'publisher'
+    config.add_sort_field "#{Settings.FIELDS.YEAR} desc, dc_title_sort asc", :label => 'year'
+    config.add_sort_field "#{Settings.FIELDS.PUBLISHER} asc, dc_title_sort asc", :label => 'publisher'
     config.add_sort_field 'dc_title_sort asc', :label => 'title'
 
     # If there are more than this many search results, no spelling ("did you
@@ -215,10 +217,13 @@ class CatalogController < ApplicationController
     # Configure basemap provider for GeoBlacklight maps (uses https only basemap
     # providers with open licenses)
     # Valid basemaps include:
-    # 'mapquest' http://developer.mapquest.com/web/products/open/map
     # 'positron' http://cartodb.com/basemaps/
     # 'darkMatter' http://cartodb.com/basemaps/
-    config.basemap_provider = 'mapquest'
+    config.basemap_provider = 'positron'
+
+    # Configuration for autocomplete suggestor
+    config.autocomplete_enabled = true
+    config.autocomplete_path = 'suggest'
   end
 
 

data/lib/generators/geoblacklight/templates/config/jetty.yml

@@ -3,7 +3,7 @@ development:
   jetty_port: 8983
 test:
   startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
 production:
   startup_wait: 15

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

@@ -1,5 +1,6 @@
 //= require geoblacklight/geoblacklight
 //= require geoblacklight/basemaps
+//= require geoblacklight/controls
 //= require geoblacklight/viewers
 //= require geoblacklight/modules
 //= require geoblacklight/downloaders

data/lib/generators/geoblacklight/templates/settings.yml

@@ -7,9 +7,28 @@ CARTODB_ONECLICK_LINK: 'http://oneclick.cartodb.com/'
 # Download path can be configured using this setting
 #DOWNLOAD_PATH: "./tmp/cache/downloads"
 
-#Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
+# DEPRECATED Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
 GEOMETRY_FIELD: 'solr_geom'
 
+#Solr field mappings
+FIELDS:
+  :FILE_FORMAT: 'dc_format_s'
+  :GEOMETRY: 'solr_geom'
+  :WXS_IDENTIFIER: 'layer_id_s'
+  :RIGHTS: 'dc_rights_s'
+  :PROVENANCE: 'dct_provenance_s'
+  :GEOM_TYPE: 'layer_geom_type_s'
+  :SPATIAL_COVERAGE: 'dct_spatial_sm'
+  :SUBJECT: 'dc_subject_sm'
+  :REFERENCES: 'dct_references_s'
+  :YEAR: 'solr_year_i'
+  :CREATOR: 'dc_creator_sm'
+  :DESCRIPTION: 'dc_description_s'
+  :PUBLISHER: 'dc_publisher_s'
+  :PART_OF: 'dct_isPartOf_sm'
+  :TEMPORAL: 'dct_temporal_sm'
+  :TITLE: 'dc_title_s'
+
 # Institution deployed at
 INSTITUTION: 'Stanford'
 
@@ -29,6 +48,7 @@ TIMEOUT_WMS: 4
 WEBSERVICES_SHOWN:
   - 'wms'
   - 'wfs'
+  - 'iiif'
   - 'feature_layer'
   - 'tiled_map_layer'
   - 'dynamic_map_layer'
@@ -42,4 +62,24 @@ WMS_PARAMS:
   :STYLES: ''
   :SRS: 'EPSG:4326'
   :EXCEPTIONS: 'application/json'
-  :INFO_FORMAT: 'text/html'
+  :INFO_FORMAT: 'text/html'
+
+# Settings for leaflet 
+OPACITY_CONTROL: &opacity_control
+  CONTROLS:
+    - 'Opacity'
+
+LEAFLET:
+  MAP:
+  LAYERS:
+  VIEWERS:
+    WMS:
+      <<: *opacity_control
+    TILEDMAPLAYER:
+      <<: *opacity_control
+    FEATURELAYER:
+      <<: *opacity_control
+    DYNAMICMAPLAYER:
+      <<: *opacity_control
+    IMAGEMAPLAYER:
+      <<: *opacity_control

data/lib/geoblacklight.rb

@@ -1,3 +1,4 @@
+require 'active_support/dependencies'
 require 'geoblacklight/engine'
 
 module Geoblacklight
@@ -21,7 +22,6 @@ module Geoblacklight
   require 'geoblacklight/reference'
   require 'geoblacklight/references'
   require 'geoblacklight/routes'
-  require 'geoblacklight/search_builder'
 
   def self.inject!
     CatalogController.send(:include, Geoblacklight::ControllerOverride)
@@ -33,7 +33,6 @@ module Geoblacklight
       SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
     SavedSearchesController.send(:helper, Geoblacklight::ViewHelperOverride) unless
       SavedSearchesController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
-    Blacklight::Routes.send(:include, Geoblacklight::Routes)
   end
 
   def self.logger

data/lib/geoblacklight/constants.rb

@@ -19,6 +19,6 @@ module Geoblacklight
       tiled_map_layer: 'urn:x-esri:serviceType:ArcGIS#TiledMapLayer',
       dynamic_map_layer: 'urn:x-esri:serviceType:ArcGIS#DynamicMapLayer',
       image_map_layer: 'urn:x-esri:serviceType:ArcGIS#ImageMapLayer'
-    }
+    }.freeze
   end
 end

data/lib/geoblacklight/download.rb

@@ -10,7 +10,7 @@ module Geoblacklight
     end
 
     def file_name
-      "#{@document[:layer_slug_s]}-#{@options[:type]}.#{@options[:extension]}"
+      "#{@document.id}-#{@options[:type]}.#{@options[:extension]}"
     end
 
     def self.file_path
@@ -40,13 +40,10 @@ module Geoblacklight
     def create_download_file
       download = initiate_download
       File.open("#{file_path_and_name}.tmp", 'wb') do |file|
-        if download.headers['content-type'] == @options[:content_type]
-          file.write download.body
-        else
-          fail Geoblacklight::Exceptions::WrongDownloadFormat
-        end
+        fail Geoblacklight::Exceptions::WrongDownloadFormat unless matches_mimetype?(download)
+        file.write download.body
       end
-      File.rename("#{file_path_and_name}.tmp", "#{file_path_and_name}")
+      File.rename("#{file_path_and_name}.tmp", file_path_and_name)
       file_name
     rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
       Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} "\
@@ -86,6 +83,10 @@ module Geoblacklight
 
     private
 
+    def matches_mimetype?(download)
+      MIME::Type.simplified(download.headers['content-type']) == @options[:content_type]
+    end
+
     ##
     # Returns timeout for the download request. `timeout` passed as an option to
     # the Geoblacklight::Download class

data/lib/geoblacklight/download/geojson_download.rb

@@ -6,7 +6,7 @@ module Geoblacklight
       request: 'GetFeature',
       srsName: 'EPSG:4326',
       outputformat: 'application/json'
-    }
+    }.freeze
 
     def initialize(document, options = {})
       request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])

data/lib/geoblacklight/download/geotiff_download.rb

@@ -3,7 +3,7 @@ module Geoblacklight
     GEOTIFF_DOWNLOAD_PARAMS = {
       format: 'image/geotiff',
       width: 4096
-    }
+    }.freeze
 
     def initialize(document, options = {})
       request_params = GEOTIFF_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s])

data/lib/geoblacklight/download/kmz_download.rb

@@ -5,7 +5,7 @@ module Geoblacklight
                             request: 'GetMap',
                             srsName: 'EPSG:900913',
                             format: 'application/vnd.google-earth.kmz',
-                            width: 2000, height: 2000 }
+                            width: 2000, height: 2000 }.freeze
 
     def initialize(document, options = {})
       bbox_wsen = document.bounding_box_as_wsen.split(' ').join(', ')

data/lib/geoblacklight/download/shapefile_download.rb

@@ -4,7 +4,7 @@ module Geoblacklight
                                   version: '2.0.0',
                                   request: 'GetFeature',
                                   srsName: 'EPSG:4326',
-                                  outputformat: 'SHAPE-ZIP' }
+                                  outputformat: 'SHAPE-ZIP' }.freeze
 
     def initialize(document, options = {})
       request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])

data/lib/geoblacklight/geoblacklight_helper_behavior.rb

@@ -4,17 +4,11 @@ module Geoblacklight
   # BlacklightHelperBehavior
   module GeoblacklightHelperBehavior
     ##
-    # @param [SolrDocument]
+    # Calls the presenter on the requested method
+    # @param [Symbol, String] presenting_method
     # @return [String]
-    def wxs_identifier(document = nil)
-      document ||= @document
-      presenter(document).wxs_identifier
-    end
-
-    ##
-    # Use the Geoblacklight::DocumentPresenter
-    def presenter_class
-      Geoblacklight::DocumentPresenter
+    def geoblacklight_present(presenting_method, document = @document)
+      presenter(document).try(presenting_method.to_sym) || ''
     end
   end
 end

data/lib/geoblacklight/metadata.rb

@@ -14,12 +14,9 @@ module Geoblacklight
     # @return [String] returned metadata string
     def metadata
       response = retrieve_metadata
-      if response.nil? || response.status == 404
-        Geoblacklight.logger.error "Could not reach #{@reference.endpoint}"
-        return "Could not reach #{@reference.endpoint}"
-      else
-        return response.body
-      end
+      return response.body unless response.nil? || response.status == 404
+      Geoblacklight.logger.error "Could not reach #{@reference.endpoint}"
+      "Could not reach #{@reference.endpoint}"
     end
 
     ##

data/lib/geoblacklight/references.rb

@@ -2,7 +2,7 @@ module Geoblacklight
   # References is a geoblacklight-schema dct:references parser
   class References
     attr_reader :refs, :reference_field
-    def initialize(document, reference_field = :dct_references_s)
+    def initialize(document, reference_field = Settings.FIELDS.REFERENCES)
       @document = document
       @reference_field = reference_field
       @refs = parse_references.map { |ref| Reference.new(ref) }
@@ -12,7 +12,7 @@ module Geoblacklight
     # Accessor for a document's file format
     # @return [String] file format for the document
     def format
-      @document[:dc_format_s]
+      @document[Settings.FIELDS.FILE_FORMAT]
     end
 
     ##

data/lib/geoblacklight/routes.rb

@@ -1,21 +1,7 @@
 module Geoblacklight
   module Routes
-    extend ActiveSupport::Concern
-    included do |klass|
-      klass.default_route_sets += [:web_services_routes]
-    end
-
-    def web_services_routes(primary_resource)
-      add_routes do
-        post 'wms/handle'
-        resources :download, only: [:show, :file]
-        get 'download/file/:id' => 'download#file', as: :download_file
-        get 'download/hgl/:id' => 'download#hgl', as: :download_hgl
-        get "#{primary_resource}/:id/web_services" => "#{primary_resource}#web_services",
-            as: "web_services_#{primary_resource}"
-        get "#{primary_resource}/:id/metadata" => "#{primary_resource}#metadata",
-            as: "metadata_#{primary_resource}"
-      end
-    end
+    require 'geoblacklight/routes/exportable'
+    require 'geoblacklight/routes/downloadable'
+    require 'geoblacklight/routes/wms'
   end
 end

data/lib/geoblacklight/routes/downloadable.rb

@@ -0,0 +1,14 @@
+module Geoblacklight
+  module Routes
+    class Downloadable
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, _options = {})
+        mapper.get 'file'
+        mapper.get 'hgl'
+      end
+    end
+  end
+end

data/lib/geoblacklight/routes/exportable.rb

@@ -0,0 +1,16 @@
+module Geoblacklight
+  module Routes
+    class Exportable
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, _options = {})
+        mapper.member do
+          mapper.get 'web_services'
+          mapper.get 'metadata'
+        end
+      end
+    end
+  end
+end

data/lib/geoblacklight/routes/wms.rb

@@ -0,0 +1,13 @@
+module Geoblacklight
+  module Routes
+    class Wms
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, _options = {})
+        mapper.post 'handle'
+      end
+    end
+  end
+end