geoblacklight 2.4.0 → 3.3.0

data/lib/geoblacklight/download/kmz_download.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 module Geoblacklight
   class KmzDownload < Geoblacklight::Download
     KMZ_DOWNLOAD_PARAMS = { service: 'wms',
                             version: '1.1.0',
                             request: 'GetMap',
-                            srsName: 'EPSG:900913',
+                            srsName: 'EPSG:3857',
                             format: 'application/vnd.google-earth.kmz',
                             width: 2000, height: 2000 }.freeze
 
     def initialize(document, options = {})
-      bbox_wsen = document.bounding_box_as_wsen.split(' ').join(', ')
+      bbox_wsen = document.geometry.bounding_box
       request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: bbox_wsen)
       super(document, {
         type: 'kmz',

data/lib/geoblacklight/download/shapefile_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class ShapefileDownload < Geoblacklight::Download
     SHAPEFILE_DOWNLOAD_PARAMS = { service: 'wfs',

data/lib/geoblacklight/engine.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
 require 'blacklight'
-require 'font-awesome-rails'
 require 'coderay'
 require 'config'
 require 'faraday'
 require 'faraday_middleware'
+require 'geoblacklight/version'
 require 'nokogiri'
-require 'geoblacklight-icons'
 require 'mime/types'
 require 'handlebars_assets'
 

data/lib/geoblacklight/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Exceptions
     class ExternalDownloadFailed < StandardError

data/lib/geoblacklight/geoblacklight_helper_behavior.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Adds helper behavior logic for GeoBlacklight, to used alongside

data/lib/geoblacklight/geometry.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+require 'rgeo'
+require 'rgeo-geojson'
+
+module Geoblacklight
+  # Transforms and parses geometry expressed in WKT or CSW WKT ENVELOPE syntax
+  class Geometry
+    attr_reader :geom
+
+    # @param [String] geom WKT or WKT ENVELOPE syntax formatted string
+    def initialize(geom)
+      @geom = geom
+    end
+
+    # Convert geometry to GeoJSON
+    # @return [String]
+    def geojson
+      obj = factory.parse_wkt(geometry_as_wkt)
+      RGeo::GeoJSON.encode(obj).to_json
+    rescue RGeo::Error::ParseError
+      ''
+    end
+
+    # Generate a wsen bounding box from the geometry
+    # @return [String] bounding box as comma delimited wsen "w, s, e, n"
+    def bounding_box
+      obj = factory.parse_wkt(geometry_as_wkt)
+
+      # Get the minimum bounding box for the geometry as a Polygon
+      bbox = obj.envelope
+
+      # Return as wsen string
+      minx = bbox.coordinates[0][0][0]
+      miny = bbox.coordinates[0][0][1]
+      maxx = bbox.coordinates[0][1][0]
+      maxy = bbox.coordinates[0][2][1]
+      "#{minx}, #{miny}, #{maxx}, #{maxy}"
+    rescue RGeo::Error::ParseError
+      ''
+    end
+
+    private
+
+    # Convert WKT ENVELOPE string to WKT POLYGON string
+    # @return [String]
+    def envelope_to_polygon
+      exp = /^\s*ENVELOPE\(
+                  \s*([-.\d]+)\s*,
+                  \s*([-.\d]+)\s*,
+                  \s*([-.\d]+)\s*,
+                  \s*([-.\d]+)\s*
+                  \)\s*$/x # uses 'x' option for free-spacing mode
+      bbox_match = exp.match(geom)
+      minx, maxx, maxy, miny = bbox_match.captures
+      "POLYGON ((#{minx} #{maxy}, #{minx} #{miny}, #{maxx} #{miny}, #{maxx} #{maxy}, #{minx} #{maxy}))"
+    end
+
+    def factory
+      @factory ||= RGeo::Cartesian.factory
+    end
+
+    # Return geometry as valid WKT string
+    # @return [String]
+    def geometry_as_wkt
+      return geom unless geom.match?(/ENVELOPE/)
+
+      envelope_to_polygon
+    end
+  end
+end

data/lib/geoblacklight/item_viewer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class ItemViewer
     def initialize(references)
@@ -46,8 +47,12 @@ module Geoblacklight
       @references.oembed
     end
 
+    def tms
+      @references.tms
+    end
+
     def viewer_preference
-      [oembed, index_map, wms, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, index_map, tms, wms, iiif, tiled_map_layer, dynamic_map_layer,
        image_map_layer, feature_layer].compact.map(&:to_hash).first
     end
   end

data/lib/geoblacklight/metadata.rb

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

data/lib/geoblacklight/metadata/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     ##
@@ -54,13 +55,7 @@ module Geoblacklight
           return response.body unless response.nil? || response.status == 404
           Geoblacklight.logger.error "Could not reach #{@reference.endpoint}"
           ''
-        rescue Faraday::ConnectionFailed => error
-          Geoblacklight.logger.error error.inspect
-          ''
-        rescue Faraday::TimeoutError => error
-          Geoblacklight.logger.error error.inspect
-          ''
-        rescue OpenSSL::SSL::SSLError => error
+        rescue Faraday::ConnectionFailed, Faraday::TimeoutError, OpenSSL::SSL::SSLError => error
           Geoblacklight.logger.error error.inspect
           ''
         end

data/lib/geoblacklight/metadata/fgdc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Fgdc < Base

data/lib/geoblacklight/metadata/html.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Html < Base
       def transform
-        ActionController::Base.helpers.content_tag(:iframe,
-                                                   '',
+        ActionController::Base.helpers.tag.iframe('',
                                                    src: @reference.endpoint,
                                                    scrolling: 'yes',
                                                    frameborder: 0)

data/lib/geoblacklight/metadata/iso19139.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Iso19139 < Base

data/lib/geoblacklight/metadata_transformer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'geo_combine'
 
 module Geoblacklight

data/lib/geoblacklight/metadata_transformer/base.rb

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

data/lib/geoblacklight/metadata_transformer/fgdc.rb

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

data/lib/geoblacklight/metadata_transformer/iso19139.rb

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

data/lib/geoblacklight/reference.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Parses an array of dct_references to create useful reference information

data/lib/geoblacklight/references.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   # References is a geoblacklight-schema dct:references parser
   class References
@@ -43,7 +44,7 @@ module Geoblacklight
     # Preferred download (should be a file download)
     # @return [Hash, nil]
     def preferred_download
-      return file_download unless download.blank?
+      return file_download if download.present?
     end
 
     ##
@@ -100,9 +101,12 @@ module Geoblacklight
     # present
     # @return (see #downloads_by_format)
     def vector_download_formats
-      { shapefile: wfs.to_hash,
+      return unless wms.present? && wfs.present?
+      {
+        shapefile: wfs.to_hash,
         kmz: wms.to_hash,
-        geojson: wfs.to_hash } if wms.present? && wfs.present?
+        geojson: wfs.to_hash
+      }
     end
 
     ##

data/lib/geoblacklight/relation/ancestors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Ancestors
@@ -7,8 +8,8 @@ module Geoblacklight
       end
 
       def create_search_params
-        { fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:#{@search_id}"],
-          fl: [Settings.FIELDS.TITLE, 'layer_slug_s', Settings.FIELDS.GEOM_TYPE] }
+        { fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.UNIQUE_KEY}}#{Settings.FIELDS.UNIQUE_KEY}:#{@search_id}"],
+          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/descendants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Descendants
@@ -8,7 +9,7 @@ module Geoblacklight
 
       def create_search_params
         { fq: "#{Settings.FIELDS.SOURCE}:#{@search_id}",
-          fl: [Settings.FIELDS.TITLE, 'layer_slug_s', Settings.FIELDS.GEOM_TYPE] }
+          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.UNIQUE_KEY, Settings.FIELDS.GEOM_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/relation_response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Relation
     class RelationResponse
@@ -17,7 +18,7 @@ module Geoblacklight
       end
 
       def empty?
-        !(ancestors['numFound'] > 0 || descendants['numFound'] > 0)
+        !(ancestors['numFound'].positive? || descendants['numFound'].positive?)
       end
     end
   end

data/lib/geoblacklight/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     require 'geoblacklight/routes/exportable'

data/lib/geoblacklight/routes/downloadable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Downloadable

data/lib/geoblacklight/routes/exportable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Exportable

data/lib/geoblacklight/routes/wms.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Wms

data/lib/geoblacklight/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
-  VERSION = '2.4.0'.freeze
+  VERSION = '3.3.0'
 end

data/lib/geoblacklight/view_helper_override.rb

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

data/lib/geoblacklight/wms_layer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class WmsLayer
     def initialize(params)
@@ -24,10 +25,7 @@ module Geoblacklight
         request.options.timeout = Settings.TIMEOUT_WMS
         request.options.open_timeout = Settings.TIMEOUT_WMS
       end
-    rescue Faraday::ConnectionFailed => error
-      Geoblacklight.logger.error error.inspect
-      { error: error.inspect }
-    rescue Faraday::TimeoutError => error
+    rescue Faraday::ConnectionFailed, Faraday::TimeoutError => error
       Geoblacklight.logger.error error.inspect
       { error: error.inspect }
     end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class FeatureInfoResponse
     def initialize(response)

data/lib/tasks/geoblacklight.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'generators/geoblacklight/install_generator'
 
@@ -7,15 +8,15 @@ namespace :geoblacklight do
     require 'solr_wrapper'
     SolrWrapper.wrap(port: '8983') do |solr|
       solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
-          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
-          puts "\n^C to stop"
-          puts ' '
-          begin
-            Rake::Task['geoblacklight:solr:seed'].invoke
-            system "bundle exec rails s #{args[:rails_server_args]}"
-          rescue Interrupt
-            puts 'Shutting down...'
-          end
+        puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+        puts "\n^C to stop"
+        puts ' '
+        begin
+          Rake::Task['geoblacklight:solr:seed'].invoke
+          system "bundle exec rails s #{args[:rails_server_args]}"
+        rescue Interrupt
+          puts 'Shutting down...'
+        end
       end
     end
   end
@@ -30,7 +31,7 @@ namespace :geoblacklight do
         puts ' '
         begin
           Rake::Task['geoblacklight:solr:seed'].invoke
-          system "foreman start"
+          system 'foreman start'
         rescue Interrupt
           puts 'Shutting down...'
         end
@@ -39,23 +40,23 @@ namespace :geoblacklight do
   end
 
   namespace :index do
-    desc "Put sample data into solr"
+    desc 'Put sample data into solr'
     task :seed => :environment do
       docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
     end
 
-    desc "Ingests a GeoHydra transformed.json"
+    desc 'Ingests a GeoHydra transformed.json'
     task :ingest_all => :environment do
-      docs = JSON::parse(File.read("#{Rails.root}/tmp/transformed.json"))
+      docs = JSON.parse(File.read(Rails.root.join('tmp', 'transformed.json')))
       docs.each do |doc|
         Blacklight.default_index.connection.add doc
         Blacklight.default_index.connection.commit
       end
     end
 
-    desc "Ingests a directory of geoblacklight.json files"
+    desc 'Ingests a directory of geoblacklight.json files'
     task :ingest, [:directory] => :environment do |_t, args|
       args.with_defaults(directory: 'data')
       Dir.glob(File.join(args[:directory], '**', 'geoblacklight.json')).each do |fn|
@@ -66,7 +67,7 @@ namespace :geoblacklight do
           puts "Failed to ingest #{fn}: #{e.inspect}"
         end
       end
-      puts "Committing changes to Solr"
+      puts 'Committing changes to Solr'
       Blacklight.default_index.connection.commit
     end
   end
@@ -74,35 +75,40 @@ namespace :geoblacklight do
   namespace :downloads do
     desc 'Delete all cached downloads'
     task delete: :environment do
-      FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/cache/downloads/*")
+      FileUtils.rm_rf Dir.glob(Rails.root.join('tmp', 'cache', 'downloads', '*'))
     end
     desc 'Create download directory'
     task mkdir: :environment do
-      FileUtils.mkdir_p Rails.root.join('tmp/cache/downloads'), verbose: true
+      FileUtils.mkdir_p(Rails.root.join('tmp', 'cache', 'downloads'), verbose: true)
     end
     desc 'Precaches a download'
-    task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |t, args|
-      begin
-        fail 'Please supply required arguments [document_id, download_type and timeout]' unless args[:doc_id] && args[:download_type] && args[:timeout]
-        document = Geoblacklight::SolrDocument.find(args[:doc_id])
-        fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
-        download = "Geoblacklight::#{args[:download_type].capitalize}Download"
-                   .constantize.new(document, timeout: args[:timeout].to_i)
-        download.get
-        Rails.logger.info "Successfully downloaded #{download.file_name}"
-        Rails.logger.info "#{Geoblacklight::ShapefileDownload.file_path}"
-      rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
-        Rails.logger.error error.message + ' ' + error.url
-      rescue NameError
-        Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
+    task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |_t, args|
+      unless args[:doc_id] && args[:download_type] && args[:timeout]
+        fail 'Please supply required arguments [document_id, download_type and timeout]'
       end
+      document = Geoblacklight::SolrDocument.find(args[:doc_id])
+      fail Blacklight::Exceptions::RecordNotFound if document[:layer_slug_s] != args[:doc_id]
+      download = "Geoblacklight::#{args[:download_type].capitalize}Download"
+                 .constantize.new(document, timeout: args[:timeout].to_i)
+      download.get
+      Rails.logger.info "Successfully downloaded #{download.file_name}"
+      Rails.logger.info Geoblacklight::ShapefileDownload.file_path.to_s
+    rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
+      Rails.logger.error error.message + ' ' + error.url
+    rescue NameError
+      Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
     end
   end
 
   namespace :solr do
-    desc "Put sample data into solr"
+    desc 'Put sample data into solr'
     task :seed => :environment do
       Rake::Task['geoblacklight:index:seed'].invoke
     end
   end
+
+  desc 'Stdout output asset paths'
+  task application_asset_paths: [:environment] do
+    puts Rails.application.config.assets.paths
+  end
 end