geoblacklight 3.2.0 → 3.3.0

data/babel.config.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["@babel/plugin-transform-runtime"],
+  "presets": ["@babel/preset-env"]
+}

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

@@ -2,3 +2,7 @@
 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

@@ -64,6 +64,7 @@ en:
       data_dictionary: 'Documentation'
       services: 'Web services'
       services_close: 'Close'
+      tms: 'Tile Map Service'
     relations:
       ancestor: 'Source Datasets'
       descendant: 'Derived Datasets'
@@ -104,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

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'geo_combine', '~> 0.4'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'handlebars_assets'
+  spec.add_dependency 'rgeo-geojson'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'
@@ -38,8 +39,9 @@ Gem::Specification.new do |spec|
   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 '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/install_generator.rb

@@ -56,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/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}"
     }
 
 

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

@@ -21,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'
@@ -62,6 +69,7 @@ USE_GEOM_FOR_RELATIONS_ICON: false
 # Web services shown in tool panel
 WEBSERVICES_SHOWN:
   - 'wms'
+  - 'tms'
   - 'wfs'
   - 'iiif'
   - 'feature_layer'
@@ -122,4 +130,5 @@ HELP_TEXT:
       - 'index_map'
       - 'tiled_map_layer'
       - 'wms'
+      - 'tms'
       - 'oembed'

data/lib/geoblacklight.rb

@@ -6,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'
@@ -36,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

@@ -28,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/constants.rb

@@ -16,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/kmz_download.rb

@@ -9,7 +9,7 @@ module Geoblacklight
                             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/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

@@ -47,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/base.rb

@@ -55,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/relation/ancestors.rb

@@ -8,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

@@ -9,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/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/lib/geoblacklight/wms_layer.rb

@@ -25,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/tasks/geoblacklight.rake

@@ -106,4 +106,9 @@ namespace :geoblacklight 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

data/package.json

@@ -1,4 +1,20 @@
 {
   "name": "geoblacklight",
-  "version": "2.1.2"
+  "version": "2.1.2",
+  "private": true,
+  "license": "Apache-2.0",
+  "private": true,
+  "scripts": {
+    "test": "jest -c jest.config.js"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.12.16",
+    "@babel/core": "^7.12.16",
+    "@babel/plugin-transform-runtime": "^7.12.15",
+    "@babel/preset-env": "^7.12.16",
+    "@testing-library/dom": "^7.29.4",
+    "@testing-library/jest-dom": "^5.11.9",
+    "jest": "^26.6.3",
+    "jest-fixtures": "^0.6.0"
+  }
 }

data/setupJest.js

@@ -0,0 +1,14 @@
+import { JSDOM } from 'jsdom';
+import $ from 'jquery';
+const GeoBlacklight = require('./app/assets/javascripts/geoblacklight/geoblacklight');
+
+const jsdom = new JSDOM('<html></html>', { pretendToBeVisual: true });
+const { window } = jsdom;
+
+global.GeoBlacklight = GeoBlacklight;
+global.window = window;
+global.jQuery = $;
+global.$ = global.jQuery;
+
+import * as L from 'leaflet.js.erb';
+global.leaflet = L;

data/solr/conf/schema.xml

@@ -143,13 +143,11 @@
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
 
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
+               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
     <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
-
-
   </types>
 
   <!-- for scoring formula -->

data/spec/config/initializers/rails_config_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe 'Config' do
+  it 'Loads new v3.3 Settings.FIELDS defaults' do
+    expect(Settings.FIELDS.IDENTIFIER).to eq 'dc_identifier_s'
+    expect(Settings.FIELDS.LANGUAGE).to eq 'dc_language_s'
+    expect(Settings.FIELDS.LAYER_MODIFIED).to eq 'layer_modified_dt'
+    expect(Settings.FIELDS.SOURCE).to eq 'dc_source_sm'
+    expect(Settings.FIELDS.SUPPRESSED).to eq 'suppressed_b'
+    expect(Settings.FIELDS.TYPE).to eq 'dc_type_s'
+    expect(Settings.FIELDS.UNIQUE_KEY).to eq 'layer_slug_s'
+  end
+end