geoblacklight 2.4.0 → 3.3.0

data/config/initializers/new_gbl_settings_defaults_3_3.yml

@@ -0,0 +1,10 @@
+# New GeoBlacklight v3.3 Solr field mappings
+FIELDS:
+  :IDENTIFIER: 'dc_identifier_s'
+  :LANGUAGE: 'dc_language_s'
+  :LAYER_MODIFIED: 'layer_modified_dt'
+  :OVERLAP_FIELD: 'solr_bboxtype'
+  :SOURCE: 'dc_source_sm'
+  :SUPPRESSED: 'suppressed_b'
+  :TYPE: 'dc_type_s'
+  :UNIQUE_KEY: 'layer_slug_s'

data/config/initializers/rails_config.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
 Config.setup do |config|
   config.const_name = 'Settings'
 end
+
+# GeoBlacklight v3.3 - New Settings.FIELDS values
+Settings.prepend_source!(File.expand_path('new_gbl_settings_defaults_3_3.yml', __dir__))
+Settings.reload!

data/config/locales/geoblacklight.en.yml

@@ -29,6 +29,7 @@ en:
       data_type: 'Data type'
       placename: 'Placename'
       subject: 'Subject'
+      version: 'GeoBlacklight version %{version}'
     tools:
       login_to_view: 'Login to View and Download'
       open_carto: 'Open in Carto'
@@ -63,12 +64,13 @@ en:
       data_dictionary: 'Documentation'
       services: 'Web services'
       services_close: 'Close'
+      tms: 'Tile Map Service'
     relations:
       ancestor: 'Source Datasets'
-      descendant: 'Derived Datasets (%{count})'
+      descendant: 'Derived Datasets'
       browse_all: "Browse all %{count} records..."
-      title: 'Data Relations'
     metadata:
+      toggle_summary: 'Toggle summary'
       view_metadata: 'View Metadata'
       more_details: 'More details at'
       metadata_error: 'The metadata view for selected schema is not available'
@@ -103,6 +105,9 @@ en:
         tiled_map_layer:
           title: ArcGIS Tiled Map Layer
           content: An ArcGIS Tiled Map Layer Service displays set of web-accessible tiles that reside on a server.
+        tms:
+          title: Tile Map Service
+          content: A Tile Map Service displays georeferenced map tiles as an image on a map.
         wms:
           title: Web Map Service (WMS)
           content: A Web Map Service displays a geospatial dataset as map images.

data/geoblacklight.gemspec

@@ -19,31 +19,29 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_rubygems_version = '>= 2.5.2'
 
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', '>= 5.2.4', '< 6.2'
   spec.add_dependency 'blacklight', '~> 7.0'
-  spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'config'
   spec.add_dependency 'faraday', '~> 1.0'
   spec.add_dependency 'faraday_middleware', '~> 1.0.0.rc1'
   spec.add_dependency 'coderay'
-  spec.add_dependency 'geoblacklight-icons', '>= 0.2'
   spec.add_dependency 'deprecation'
   spec.add_dependency 'geo_combine', '~> 0.4'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'handlebars_assets'
-  spec.add_dependency 'webpacker'
+  spec.add_dependency 'rgeo-geojson'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency 'capybara', '>= 2.5.0'
   spec.add_development_dependency 'webdrivers'
   spec.add_development_dependency 'factory_bot_rails'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
-  spec.add_development_dependency 'bixby'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'foreman'
-  spec.add_development_dependency 'teaspoon'
+  spec.add_development_dependency 'rubocop', '~> 1.10'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.9'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
 end

data/jest.config.js

@@ -0,0 +1,25 @@
+const util = require('util');
+const exec = util.promisify(require('child_process').exec);
+
+module.exports = async () => {
+  console.log('Getting asset pipeline lookup path from Rails');
+  const { stdout, stderr } = await exec('bundle exec rake geoblacklight:asset_paths');
+  if (stderr) {
+    console.error(stderr);
+  }
+  const paths = stdout.trim().split('\n');
+  return {
+    moduleDirectories: [
+      'node_modules',
+      'spec/javascripts',
+      ...paths,
+    ],
+    rootDir: './',
+    setupFilesAfterEnv: [
+      '<rootDir>/setupJest.js',
+    ],
+    testMatch: [
+      '<rootDir>/spec/javascripts/**/*_spec.js',
+    ],
+  };
+};

data/lib/generators/geoblacklight/assets_generator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Geoblacklight
+  class AssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    desc <<-DESCRIPTION
+      This generator makes the following changes to your application:
+       1. Copies GBL javascript into the application
+       2. Removes stock Rails and Blacklight stylesheets from the application
+       3. Copies GBL stylesheets into the local application
+       4. Sets asset initializer values into the local application
+    DESCRIPTION
+
+    def add_javascript
+      copy_file 'assets/geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
+
+      if Rails.version.to_i == 6
+        append_to_file 'app/assets/javascripts/application.js',
+                       "\n// Required by GeoBlacklight\n//= require geoblacklight"
+      end
+    end
+
+    def remove_stylesheets
+      remove_file 'app/assets/stylesheets/application.css'
+      remove_file 'app/assets/stylesheets/blacklight.scss'
+    end
+
+    def add_stylesheets
+      copy_file 'assets/application.scss', 'app/assets/stylesheets/application.scss'
+      copy_file 'assets/_blacklight.scss', 'app/assets/stylesheets/_blacklight.scss'
+      copy_file 'assets/_customizations.scss', 'app/assets/stylesheets/_customizations.scss'
+      copy_file 'assets/_geoblacklight.scss', 'app/assets/stylesheets/_geoblacklight.scss'
+    end
+
+    def add_initializers
+      append_to_file 'config/initializers/assets.rb',
+                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
+
+      append_to_file 'config/initializers/assets.rb',
+                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
+    end
+  end
+end

data/lib/generators/geoblacklight/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 module Geoblacklight
@@ -30,15 +31,8 @@ module Geoblacklight
       inject_into_file 'config/routes.rb', routes, before: /^end/
     end
 
-    def assets
-      copy_file 'geoblacklight.scss', 'app/assets/stylesheets/geoblacklight.scss'
-      copy_file 'geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
-
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
-
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
+    def generate_assets
+      generate 'geoblacklight:assets'
     end
 
     def create_blacklight_catalog
@@ -62,7 +56,7 @@ module Geoblacklight
 
     def add_unique_key
       inject_into_file 'app/models/solr_document.rb', after: "# self.unique_key = 'id'" do
-        "\n  self.unique_key = 'layer_slug_s'"
+        "\n  self.unique_key = Settings.FIELDS.UNIQUE_KEY"
       end
     end
 

data/lib/generators/geoblacklight/templates/assets/_blacklight.scss

@@ -0,0 +1 @@
+@import 'blacklight/blacklight';

data/lib/generators/geoblacklight/templates/assets/_customizations.scss

@@ -0,0 +1,28 @@
+// Local Application Customizations
+
+// Set Header Logo
+$logo-image: image_url('blacklight/logo.svg') !default;
+
+.navbar-brand {  /* The main logo image for the Blacklight instance */
+  @if $logo-image {
+    background: transparent $logo-image no-repeat top left;
+  }
+}
+
+// Optional
+// Override default Bootstrap variables here
+
+// Example: Bootstrap Colors
+$blue:    #007bff !default;
+$indigo:  #6610f2 !default;
+$purple:  #6f42c1 !default;
+$pink:    #e83e8c !default;
+$red:     #dc3545 !default;
+$orange:  #fd7e14 !default;
+$yellow:  #ffc107 !default;
+$green:   #28a745 !default;
+$teal:    #20c997 !default;
+$cyan:    #17a2b8 !default;
+
+// Example: Bootstrap Link color
+$link-color: $blue;

data/{app/assets/stylesheets/geoblacklight/application.scss → lib/generators/geoblacklight/templates/assets/_geoblacklight.scss}

@@ -1,2 +1 @@
-@import 'bootstrap';
 @import 'geoblacklight/geoblacklight';

data/lib/generators/geoblacklight/templates/assets/application.scss

@@ -0,0 +1,7 @@
+/*
+*= require leaflet-label
+*/
+@import 'customizations';
+@import 'bootstrap';
+@import 'blacklight';
+@import 'geoblacklight';

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

@@ -29,7 +29,7 @@ class CatalogController < ApplicationController
     #
     config.default_document_solr_params = {
      :qt => 'document',
-     :q => '{!raw f=layer_slug_s v=$id}'
+     :q => "{!raw f=#{Settings.FIELDS.UNIQUE_KEY} v=$id}"
     }
 
 
@@ -97,6 +97,7 @@ class CatalogController < ApplicationController
     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
+    config.add_facet_field Settings.FIELDS.SOURCE, show: false
 
     # 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
@@ -245,8 +246,9 @@ class CatalogController < ApplicationController
     # Custom tools for GeoBlacklight
     config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
     config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
-    config.add_show_tools_partial :exports, partial: 'exports', if: proc { |_context, _config, options| options[:document] }
-    config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] }
+    config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? }
+    config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? }
+    config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present? }
 
     # Configure basemap provider for GeoBlacklight maps (uses https only basemap
     # providers with open licenses)

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

@@ -4,12 +4,6 @@ APPLICATION_LOGO_URL: 'http://geoblacklight.org/images/geoblacklight-logo.png'
 # Carto OneClick Service https://carto.com/engine/open-in-carto/
 CARTO_ONECLICK_LINK: 'http://oneclick.carto.com/'
 
-# Hide Carto export link
-# CARTO_HIDE: true
-
-# Hide ArcGIS export link
-# ARCGIS_HIDE: true
-
 # ArcGIS Online Base URL
 ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'
 
@@ -27,24 +21,31 @@ OVERLAP_RATIO_BOOST: '2'
 
 # Solr field mappings
 FIELDS:
+  :CREATOR: 'dc_creator_sm'
+  :DESCRIPTION: 'dc_description_s'
   :FILE_FORMAT: 'dc_format_s'
+  :GEOM_TYPE: 'layer_geom_type_s'
   :GEOMETRY: 'solr_geom'
-  :WXS_IDENTIFIER: 'layer_id_s'
-  :RIGHTS: 'dc_rights_s'
+  :IDENTIFIER: 'dc_identifier_s'
+  :ISSUED: 'dct_issued_s'
+  :LANGUAGE: 'dc_language_s'
+  :LAYER_MODIFIED: 'layer_modified_dt'
+  :OVERLAP_FIELD: 'solr_bboxtype'
+  :PART_OF: 'dct_isPartOf_sm'
+  :PUBLISHER: 'dc_publisher_s'
   :PROVENANCE: 'dct_provenance_s'
-  :GEOM_TYPE: 'layer_geom_type_s'
+  :REFERENCES: 'dct_references_s'
+  :RIGHTS: 'dc_rights_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'
+  :SOURCE: 'dc_source_sm'
+  :SUPPRESSED: 'suppressed_b'
   :TEMPORAL: 'dct_temporal_sm'
   :TITLE: 'dc_title_s'
-  :SOURCE: 'dc_source_sm'
-  :ISSUED: 'dct_issued_s'
+  :TYPE: 'dc_type_s'
+  :UNIQUE_KEY: 'layer_slug_s'
+  :WXS_IDENTIFIER: 'layer_id_s'
+  :YEAR: 'solr_year_i'
 
 # Institution deployed at
 INSTITUTION: 'Stanford'
@@ -68,6 +69,7 @@ USE_GEOM_FOR_RELATIONS_ICON: false
 # Web services shown in tool panel
 WEBSERVICES_SHOWN:
   - 'wms'
+  - 'tms'
   - 'wfs'
   - 'iiif'
   - 'feature_layer'
@@ -128,4 +130,5 @@ HELP_TEXT:
       - 'index_map'
       - 'tiled_map_layer'
       - 'wms'
+      - 'tms'
       - 'oembed'

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 module Geoblacklight

data/lib/geoblacklight.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/dependencies'
 require 'geoblacklight/engine'
 
@@ -5,9 +6,9 @@ module Geoblacklight
   require 'geoblacklight/bounding_box'
   require 'geoblacklight/catalog_helper_override'
   require 'geoblacklight/constants'
-  # require 'geoblacklight/controller_override'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/geoblacklight_helper_behavior'
+  require 'geoblacklight/geometry'
   require 'geoblacklight/view_helper_override'
   require 'geoblacklight/item_viewer'
   require 'geoblacklight/wms_layer'
@@ -35,7 +36,6 @@ module Geoblacklight
   require 'geoblacklight/relation/relation_response'
 
   def self.inject!
-    # CatalogController.send(:include, Geoblacklight::ControllerOverride)
     CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
     CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
     CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless

data/lib/geoblacklight/bounding_box.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Transforms and parses a bounding box for various formats
@@ -27,7 +28,7 @@ module Geoblacklight
     # @param [String] bbox as "W S E N"
     # @return [Geoblacklight::BoundingBox]
     def self.from_rectangle(rectangle)
-      rectangle_array = rectangle.split(' ')
+      rectangle_array = rectangle.split
       message = 'Bounding box should be a string in Solr rectangle syntax e.g."W S E N"'
       fail Geoblacklight::Exceptions::WrongBoundingBoxFormat, message if rectangle_array.count != 4
       new(

data/lib/geoblacklight/catalog_helper_override.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module CatalogHelperOverride
     ##

data/lib/geoblacklight/constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   # Module to declare application level constants and lookup hash
   module Constants
@@ -15,6 +16,7 @@ module Geoblacklight
       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',
+      tms: 'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification',
       hgl: 'http://schema.org/DownloadAction',
       feature_layer: 'urn:x-esri:serviceType:ArcGIS#FeatureLayer',
       tiled_map_layer: 'urn:x-esri:serviceType:ArcGIS#TiledMapLayer',

data/lib/geoblacklight/download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class Download
     def initialize(document, options = {})
@@ -14,7 +15,7 @@ module Geoblacklight
     end
 
     def self.file_path
-      Settings.DOWNLOAD_PATH || "#{Rails.root}/tmp/cache/downloads"
+      Settings.DOWNLOAD_PATH || Rails.root.join('tmp', 'cache', 'downloads')
     end
 
     def file_path_and_name

data/lib/geoblacklight/download/geojson_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class GeojsonDownload < Geoblacklight::Download
     GEOJSON_DOWNLOAD_PARAMS = {

data/lib/geoblacklight/download/geotiff_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class GeotiffDownload < Geoblacklight::Download
     GEOTIFF_DOWNLOAD_PARAMS = {

data/lib/geoblacklight/download/hgl_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class HglDownload < Geoblacklight::Download
     def initialize(document, email, options = {})