geoblacklight 3.4.0 → 4.0.0.pre.alpha

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

@@ -27,31 +27,47 @@ HOMEPAGE_MAP_GEOM: null
 
 # 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'
-  :IDENTIFIER: 'dc_identifier_s'
-  :ISSUED: 'dct_issued_s'
-  :LANGUAGE: 'dc_language_s'
-  :LAYER_MODIFIED: 'layer_modified_dt'
+  :ACCESS_RIGHTS: 'dct_accessRights_s'
+  :ALTERNATIVE_TITLE: 'dct_alternative_sm'
+  :CENTROID: 'dcat_centroid_ss'
+  :CREATOR: 'dct_creator_sm'
+  :DATE_ISSUED: 'dct_issued_s'
+  :DATE_RANGE: 'gbl_dateRange_drsim'
+  :DESCRIPTION: 'dct_description_sm'
+  :FORMAT: 'dct_format_s'
+  :FILE_SIZE: 'gbl_fileSize_s'
+  :GEOREFERENCED: 'gbl_georeferenced_b'
+  :ID: 'id'
+  :IDENTIFIER: 'dct_identifier_sm'
+  :INDEX_YEAR: 'gbl_indexYear_im'
+  :IS_PART_OF: 'dct_isPartOf_sm'
+  :IS_REPLACED_BY: 'dct_isReplacedBy_sm'
+  :ISO_TOPIC_CATEGORY: 'dcat_theme_sm'
+  :KEYWORD: 'dcat_keyword_sm'
+  :LANGUAGE: 'dct_language_sm'
+  :LICENSE: 'dct_license_sm'
+  :MEMBER_OF: 'pcdm_memberOf_sm'
+  :METADATA_VERSION: 'gbl_mdVersion_s'
+  :MODIFIED: 'gbl_mdModified_dt'
   :OVERLAP_FIELD: 'solr_bboxtype'
-  :PART_OF: 'dct_isPartOf_sm'
-  :PUBLISHER: 'dc_publisher_s'
-  :PROVENANCE: 'dct_provenance_s'
+  :PUBLISHER: 'dct_publisher_sm'
+  :PROVIDER: 'schema_provider_s'
   :REFERENCES: 'dct_references_s'
-  :RIGHTS: 'dc_rights_s'
+  :RELATION: 'dct_relation_sm'
+  :REPLACES: 'dct_replaces_sm'
+  :RESOURCE_CLASS: 'gbl_resourceClass_sm'
+  :RESOURCE_TYPE: 'gbl_resourceType_sm'
+  :RIGHTS: 'dct_rights_sm'
+  :RIGHTS_HOLDER: 'dct_rightsHolder_sm'
+  :SOURCE: 'dct_source_sm'
   :SPATIAL_COVERAGE: 'dct_spatial_sm'
-  :SUBJECT: 'dc_subject_sm'
-  :SOURCE: 'dc_source_sm'
-  :SUPPRESSED: 'suppressed_b'
-  :TEMPORAL: 'dct_temporal_sm'
-  :TITLE: 'dc_title_s'
-  :TYPE: 'dc_type_s'
-  :UNIQUE_KEY: 'layer_slug_s'
-  :WXS_IDENTIFIER: 'layer_id_s'
-  :YEAR: 'solr_year_i'
+  :SPATIAL_EXTENT: 'locn_geometry'
+  :SUBJECT: 'dct_subject_sm'
+  :SUPPRESSED: 'gbl_suppressed_b'
+  :TEMPORAL_COVERAGE: 'dct_temporal_sm'
+  :TITLE: 'dct_title_s'
+  :VERSION: 'dct_isVersionOf_sm'
+  :WXS_IDENTIFIER: 'gbl_wxsIdentifier_s'
 
 # Institution deployed at
 INSTITUTION: 'Stanford'
@@ -83,6 +99,49 @@ WEBSERVICES_SHOWN:
   - 'dynamic_map_layer'
   - 'image_map_layer'
 
+# Relationships to display
+RELATIONSHIPS_SHOWN:
+  MEMBER_OF:
+    field: pcdm_memberOf_sm
+    query_type: ancestors
+    icon: nil
+    label: geoblacklight.relations.member_of
+  PART_OF:
+    field: dct_isPartOf_sm
+    query_type: ancestors
+    icon: nil
+    label: geoblacklight.relations.part_of
+  RELATION:
+    field: dct_relation_sm
+    query_type: ancestors
+    icon: nil
+    label: geoblacklight.relations.relation
+  REPLACES:
+    field: dct_replaces_sm
+    query_type: ancestors
+    icon: nil
+    label: geoblacklight.relations.replaces
+  REPLACED_BY:
+    field: dct_isReplacedBy_sm
+    query_type: descendants
+    icon: nil
+    label: geoblacklight.relations.replaced_by
+  SOURCE_ANCESTORS:
+    field: dct_source_sm
+    query_type: ancestors
+    icon: pagelines-brands
+    label: geoblacklight.relations.ancestor
+  SOURCE_DESCENDANTS:
+    field: dct_source_sm
+    query_type: descendants
+    icon: leaf
+    label: geoblacklight.relations.descendant
+  VERSION_OF:
+    field: dct_isVersionOf_sm
+    query_type: descendants
+    icon: nil
+    label: geoblacklight.relations.version_of
+
 # WMS Parameters
 WMS_PARAMS:
   :SERVICE: 'WMS'

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

@@ -10,7 +10,7 @@ module Geoblacklight
 
     def initialize(document, options = {})
       bbox_wsen = document.geometry.bounding_box
-      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: bbox_wsen)
+      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/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=#{Settings.FIELDS.UNIQUE_KEY}}#{Settings.FIELDS.UNIQUE_KEY}:#{@search_id}"],
-          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.UNIQUE_KEY, 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, Settings.FIELDS.UNIQUE_KEY, 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.4.0'
+  VERSION = '4.0.0-alpha'
 end

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"]
+}