geoblacklight 3.2.0 → 4.0.0.pre.alpha

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/geojson_download.rb

@@ -10,7 +10,7 @@ module Geoblacklight
     }.freeze
 
     def initialize(document, options = {})
-      request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])
+      request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document[Settings.FIELDS.WXS_IDENTIFIER])
       super(document, {
         type: 'geojson',
         extension: 'json',

data/lib/geoblacklight/download/geotiff_download.rb

@@ -7,7 +7,7 @@ module Geoblacklight
     }.freeze
 
     def initialize(document, options = {})
-      request_params = GEOTIFF_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s])
+      request_params = GEOTIFF_DOWNLOAD_PARAMS.merge(layers: document[Settings.FIELDS.WXS_IDENTIFIER])
       super(document, {
         type: 'geotiff',
         extension: 'tif',

data/lib/geoblacklight/download/hgl_download.rb

@@ -3,7 +3,7 @@ module Geoblacklight
   class HglDownload < Geoblacklight::Download
     def initialize(document, email, options = {})
       request_params = {
-        'LayerName' => document[:layer_id_s].sub(/^cite:/, ''),
+        'LayerName' => document[Settings.FIELDS.WXS_IDENTIFIER].sub(/^cite:/, ''),
         'UserEmail' => email
       }
       super(document, {

data/lib/geoblacklight/download/kmz_download.rb

@@ -9,8 +9,8 @@ module Geoblacklight
                             width: 2000, height: 2000 }.freeze
 
     def initialize(document, options = {})
-      bbox_wsen = document.bounding_box_as_wsen.split(' ').join(', ')
-      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: bbox_wsen)
+      bbox_wsen = document.geometry.bounding_box
+      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[Settings.FIELDS.WXS_IDENTIFIER], bbox: bbox_wsen)
       super(document, {
         type: 'kmz',
         extension: 'kmz',

data/lib/geoblacklight/download/shapefile_download.rb

@@ -8,7 +8,7 @@ module Geoblacklight
                                   outputformat: 'SHAPE-ZIP' }.freeze
 
     def initialize(document, options = {})
-      request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])
+      request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document[Settings.FIELDS.WXS_IDENTIFIER])
       super(document, {
         type: 'shapefile',
         extension: 'zip',

data/lib/geoblacklight/geometry.rb

@@ -0,0 +1,85 @@
+# 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 StandardError
+      Geoblacklight.logger.warn "Geometry is not valid: #{geom}"
+      default_extent
+    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
+      Geoblacklight.logger.warn "Error parsing geometry: #{geom}"
+      default_extent
+    end
+
+    private
+
+    # Default extent as GeoJSON
+    # @return [String]
+    def default_extent
+      {
+        'type' => 'Polygon',
+        'coordinates' => [
+          [
+            [-180.0, 90.0], [-180.0, -90.0], [180.0, -90.0], [180.0, 90.0], [-180.0, 90.0]
+          ]
+        ]
+      }.to_json
+    end
+
+    # 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/references.rb

@@ -30,7 +30,7 @@ module Geoblacklight
     # Accessor for a document's file format
     # @return [String] file format for the document
     def format
-      @document[Settings.FIELDS.FILE_FORMAT]
+      @document[Settings.FIELDS.FORMAT]
     end
 
     ##

data/lib/geoblacklight/relation/ancestors.rb

@@ -2,14 +2,15 @@
 module Geoblacklight
   module Relation
     class Ancestors
-      def initialize(id, repository)
+      def initialize(id, field, repository)
         @search_id = id
+        @field = field
         @repository = repository
       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=#{@field} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:#{@search_id}"],
+          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/descendants.rb

@@ -2,14 +2,15 @@
 module Geoblacklight
   module Relation
     class Descendants
-      def initialize(id, repository)
+      def initialize(id, field, repository)
         @search_id = id
+        @field = field
         @repository = repository
       end
 
       def create_search_params
-        { fq: "#{Settings.FIELDS.SOURCE}:#{@search_id}",
-          fl: [Settings.FIELDS.TITLE, 'layer_slug_s', Settings.FIELDS.GEOM_TYPE] }
+        { fq: "#{@field}:#{@search_id}",
+          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE] }
       end
 
       def execute_query

data/lib/geoblacklight/relation/relation_response.rb

@@ -9,16 +9,31 @@ module Geoblacklight
         @repository = repository
       end
 
-      def ancestors
-        @ancestors ||= Geoblacklight::Relation::Ancestors.new(@search_id, @repository).results
+      def method_missing(method, *args, &block)
+        if Settings.RELATIONSHIPS_SHOWN.key?(method)
+          field = Settings.RELATIONSHIPS_SHOWN[method].field
+          query_type = query_type(Settings.RELATIONSHIPS_SHOWN[method])
+          @results = query_type.new(@search_id, field, @repository).results
+        else
+          super
+        end
       end
 
-      def descendants
-        @descendants ||= Geoblacklight::Relation::Descendants.new(@search_id, @repository).results
+      def respond_to_missing?(method_name, *args)
+        Settings.RELATIONSHIPS_SHOWN.key?(method_name) or super
       end
 
-      def empty?
-        !(ancestors['numFound'].positive? || descendants['numFound'].positive?)
+      private
+
+      def query_type(option)
+        case option.query_type
+        when 'ancestors'
+          Geoblacklight::Relation::Ancestors
+        when 'descendants'
+          Geoblacklight::Relation::Descendants
+        else
+          fail ArgumentError, "Bad RelationResponse query_type: #{option.query_type}. Only 'ancestors' or 'descendants' is allowed."
+        end
       end
     end
   end

data/lib/geoblacklight/version.rb

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

data/lib/geoblacklight/view_helper_override.rb

@@ -27,7 +27,7 @@ module Geoblacklight
 
     def render_constraints_filters(localized_params = params)
       content = super(localized_params)
-      localized_params = localized_params.to_unsafe_h if localized_params.respond_to?(:to_unsafe_h)
+      localized_params = localized_params.to_h if localized_params.respond_to?(:to_h)
 
       if localized_params[:bbox]
         path = search_action_path(remove_spatial_filter_group(:bbox, localized_params))

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/geoblacklight.rb

@@ -6,9 +6,8 @@ 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 +35,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/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/schema/{geoblacklight-schema.json → geoblacklight-schema-1.0.json}

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Schema for GeoBlacklight. See https://github.com/geoblacklight/geoblacklight/wiki/Schema for more details.",
   "id": "http://geoblacklight.org/v1.0/schema",
-  "title": "GeoBlacklight Schema",
+  "title": "GeoBlacklight Schema - v1.0",
   "definitions": {
     "layer": {
       "title": "layer",

data/schema/geoblacklight-schema-aardvark.json

@@ -0,0 +1,211 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "description": "Schema for GeoBlacklight. See https://opengeometadata.github.io/aardvark/aardvarkMetadata.html for more details.",
+  "id": "http://geoblacklight.org/schema/aardvark",
+  "title": "GeoBlacklight Schema - Aardvark",
+  "type": "object",
+  "properties": {
+    "dct_title_s": { "type": "string" },
+    "dct_alternative_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_description_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_language_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_creator_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_publisher_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "schema_provider_s": { "type": "string" },
+    "gbl_resourceClass_sm": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "Datasets",
+          "Maps",
+          "Imagery",
+          "Collections",
+          "Websites",
+          "Web services",
+          "Other"
+        ]
+      }
+    },
+    "gbl_resourceType_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_subject_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dcat_theme_sm": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "Farming",
+          "Biota",
+          "Boundaries",
+          "Climatology, Meteorology and Atmosphere",
+          "Economy",
+          "Elevation",
+          "Environment",
+          "Geoscientific Information",
+          "Health",
+          "Imagery and Base Maps",
+          "Intelligence and Military",
+          "Inland Waters",
+          "Location",
+          "Oceans",
+          "Planning and Cadastral",
+          "Society",
+          "Structure",
+          "Transportation",
+          "Utilities and Communications"
+        ]
+      }
+    },
+    "dcat_keyword_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_temporal_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_issued_s": { "type": "string" },
+    "gbl_indexYear_im": {
+      "type": "array",
+      "items": {
+        "type": "integer"
+      }
+    },
+    "gbl_dateRange_drsim": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_spatial_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "locn_geometry": { "type": "string" },
+    "dcat_centroid_ss": { "type": "string" },
+    "dct_relation_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "pcdm_memberOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isPartOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_source_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isVersionOf_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_replaces_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_isReplacedBy_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_rights_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_rightsHolder_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_license_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "dct_accessRights_s": { "type": "string" },
+    "dct_format_s": { "type": "string" },
+    "gbl_fileSize_s": { "type": "string" },
+    "gbl_wxsIdentifier_s": { "type": "string" },
+    "dct_references_s": { "type": "string" },
+    "id": { "type": "string" },
+    "dct_identifier_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "gbl_mdModified_dt": {
+      "type": "string",
+      "format": "date-time"
+    },
+    "gbl_mdVersion_s": {
+      "type": "string",
+      "const": "Aardvark"
+    },
+    "gbl_suppressed_b": { "type": "boolean" },
+    "gbl_georeferenced_b": { "type": "boolean" }
+  },
+  "required": ["id", "dct_title_s", "gbl_resourceClass_sm", "dct_accessRights_s", "gbl_mdVersion_s"]
+}