geoblacklight 5.3.0 → 6.0.0.pre.alpha.1

data/lib/geoblacklight/configuration/leaflet_config.rb

@@ -0,0 +1,73 @@
+module Geoblacklight
+  class Configuration
+    class LeafletConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attr_accessor :bounds_overlay, :controls
+
+      attr_reader :sleep, :layers
+      # set to true to display attribute table as sidebar on map
+      attribute :sidebar, :boolean, default: false
+      attribute :selected_color, :string, default: "#2C7FB8"
+
+      DEFAULT_LAYERS_CONFIG = {
+        index: {
+          DEFAULT: {
+            color: "#7FCDBB",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Green"
+          },
+          UNAVAILABLE: {
+            weight: 1,
+            radius: 4,
+            color: "#EDF8B1",
+            sr_color_name: "Yellow"
+          },
+          SELECTED: {
+            weight: 1,
+            radius: 4,
+            color: "#2C7FB8",
+            sr_color_name: "Blue"
+          }
+        }
+      }.freeze
+
+      DEFAULT_SLEEP_CONFIG = {
+        sleep: true, # set to false to disable
+        margin_distance: 100, # set to zero / false if you want to disable this check
+        sleeptime: 750,
+        waketime: 750,
+        hovertowake: false,
+        message: "Click to Wake",
+        background: "rgba(214, 214, 214, .7)"
+      }.freeze
+
+      def initialize
+        super
+        @sleep = LeafletSleepConfig.new(DEFAULT_SLEEP_CONFIG)
+        @layers = LeafletLayersConfig.new(DEFAULT_LAYERS_CONFIG)
+      end
+
+      def sleep=(attributes)
+        @sleep = LeafletSleepConfig.new(attributes)
+      end
+
+      def layers=(attributes)
+        @layers = LeafletLayersConfig.new(attributes)
+      end
+
+      def to_h
+        {
+          bounds_overlay: bounds_overlay,
+          selected_color: selected_color,
+          sleep: sleep.to_h,
+          sidebar: sidebar,
+          layers: layers.to_h,
+          controls: controls
+        }.compact
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/leaflet_layers_config.rb

@@ -0,0 +1,21 @@
+module Geoblacklight
+  class Configuration
+    class LeafletLayersConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :detect_retina, :boolean, default: true
+
+      attr_accessor :index
+
+      def initialize(attributes = {})
+        super
+        @index = attributes[:index]
+      end
+
+      def to_h
+        attributes.merge({"index" => index})
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/leaflet_sleep_config.rb

@@ -0,0 +1,20 @@
+module Geoblacklight
+  class Configuration
+    class LeafletSleepConfig
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      attribute :sleep, :boolean, default: true # set to false to disable
+      attribute :margin_distance, :integer, default: 100 # set to zero / false if you want to disable this check
+      attribute :sleeptime, :integer, default: 750
+      attribute :waketime, :integer, default: 750
+      attribute :hovertowake, :boolean, default: false
+      attribute :message, :string, default: "Click to Wake"
+      attribute :background, :string, default: "rgba(214, 214, 214, .7)"
+
+      def to_h
+        attributes
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration/legacy_settings_builder.rb

@@ -0,0 +1,94 @@
+module Geoblacklight
+  class Configuration
+    # Builds a configuration from legacy (uppercase) settings
+    class LegacySettingsBuilder
+      def self.build
+        new.build
+      end
+
+      def initialize
+        @configuration = Configuration.new
+      end
+
+      def build
+        @configuration.tap do |config|
+          config.arcgis_base_url = Settings.ARCGIS_BASE_URL
+          config.bbox_within_boost = Settings.BBOX_WITHIN_BOOST
+          config.overlap_ratio_boost = Settings.OVERLAP_RATIO_BOOST
+          config.display_notes_shown = Settings.DISPLAY_NOTES_SHOWN
+          config.institution = Settings.INSTITUTION
+          config.help_text = Settings.HELP_TEXT.to_h
+          config.sidebar_static_map = Settings.SIDEBAR_STATIC_MAP
+          config.iiif_drag_drop_link = Settings.IIIF_DRAG_DROP_LINK
+          config.homepage_map_geom = Settings.HOMEPAGE_MAP_GEOM
+          config.vector_download_formats = Settings.DOWNLOAD_FORMATS&.VECTOR
+          config.metadata_shown = Settings.METADATA_SHOWN
+          config.webservices_shown = Settings.WEBSERVICES_SHOWN
+          config.relationships_shown = Settings.RELATIONSHIPS_SHOWN
+          config.download_path = Settings.DOWNLOAD_PATH if Settings.DOWNLOAD_PATH
+          config.gbl_params = Settings.GBL_PARAMS
+          config.wms_params = Settings.WMS_PARAMS.to_h
+          config.timeout_wms = Settings.TIMEOUT_WMS
+
+          build_fields(config)
+          build_leaflet_options(config)
+        end
+      end
+
+      private
+
+      def build_leaflet_options(config)
+        config.leaflet_options.bounds_overlay = Settings.LEAFLET.BOUNDSOVERLAY.to_h
+        config.leaflet_options.selected_color = Settings.LEAFLET.SELECTED_COLOR
+        config.leaflet_options.sleep = Settings.LEAFLET.SLEEP.to_h.transform_keys(&:downcase)
+        config.leaflet_options.sidebar = Settings.LEAFLET.SIDEBAR
+        config.leaflet_options.layers = Settings.LEAFLET.LAYERS.to_h.transform_keys(&:downcase)
+      end
+
+      def build_fields(config)
+        config.fields.access_rights = Settings.FIELDS.ACCESS_RIGHTS
+        config.fields.alternative_title = Settings.FIELDS.ALTERNATIVE_TITLE
+        config.fields.centroid = Settings.FIELDS.CENTROID
+        config.fields.creator = Settings.FIELDS.CREATOR
+        config.fields.date_issued = Settings.FIELDS.DATE_ISSUED
+        config.fields.date_range = Settings.FIELDS.DATE_RANGE
+        config.fields.description = Settings.FIELDS.DESCRIPTION
+        config.fields.display_note = Settings.FIELDS.DISPLAY_NOTE
+        config.fields.format = Settings.FIELDS.FORMAT
+        config.fields.file_size = Settings.FIELDS.FILE_SIZE
+        config.fields.georeferenced = Settings.FIELDS.GEOREFERENCED
+        config.fields.id = Settings.FIELDS.ID
+        config.fields.identifier = Settings.FIELDS.IDENTIFIER
+        config.fields.index_year = Settings.FIELDS.INDEX_YEAR
+        config.fields.is_part_of = Settings.FIELDS.IS_PART_OF
+        config.fields.is_replaced_by = Settings.FIELDS.IS_REPLACED_BY
+        config.fields.theme = Settings.FIELDS.THEME
+        config.fields.keyword = Settings.FIELDS.KEYWORD
+        config.fields.language = Settings.FIELDS.LANGUAGE
+        config.fields.license = Settings.FIELDS.LICENSE
+        config.fields.member_of = Settings.FIELDS.MEMBER_OF
+        config.fields.metadata_version = Settings.FIELDS.METADATA_VERSION
+        config.fields.modified = Settings.FIELDS.MODIFIED
+        config.fields.overlap_field = Settings.FIELDS.OVERLAP_FIELD
+        config.fields.publisher = Settings.FIELDS.PUBLISHER
+        config.fields.provider = Settings.FIELDS.PROVIDER
+        config.fields.references = Settings.FIELDS.REFERENCES
+        config.fields.relation = Settings.FIELDS.RELATION
+        config.fields.replaces = Settings.FIELDS.REPLACES
+        config.fields.resource_class = Settings.FIELDS.RESOURCE_CLASS
+        config.fields.resource_type = Settings.FIELDS.RESOURCE_TYPE
+        config.fields.rights = Settings.FIELDS.RIGHTS
+        config.fields.rights_holder = Settings.FIELDS.RIGHTS_HOLDER
+        config.fields.source = Settings.FIELDS.SOURCE
+        config.fields.spatial_coverage = Settings.FIELDS.SPATIAL_COVERAGE
+        config.fields.geometry = Settings.FIELDS.GEOMETRY
+        config.fields.subject = Settings.FIELDS.SUBJECT
+        config.fields.suppressed = Settings.FIELDS.SUPPRESSED
+        config.fields.temporal_coverage = Settings.FIELDS.TEMPORAL_COVERAGE
+        config.fields.title = Settings.FIELDS.TITLE
+        config.fields.version = Settings.FIELDS.VERSION
+        config.fields.wxs_identifier = Settings.FIELDS.WXS_IDENTIFIER
+      end
+    end
+  end
+end

data/lib/geoblacklight/configuration.rb

@@ -0,0 +1,148 @@
+module Geoblacklight
+  # Configuration for Geoblacklight
+  class Configuration
+    include ActiveModel::Attributes
+
+    # ArcGIS Online Base URL
+    attribute :arcgis_base_url, :string, default: "https://www.arcgis.com/apps/mapviewer/index.html"
+
+    # The bq boost value for spatial search matches within a bounding box
+    attribute :bbox_within_boost, :string, default: "10"
+
+    # The bf boost value for overlap ratio
+    attribute :overlap_ratio_boost, :string, default: "2"
+
+    # Institution deployed at
+    attribute :institution, :string, default: "Stanford"
+
+    # (For external Download) timeout and open_timeout parameters for Faraday
+    attribute :timeout_download, :integer, default: 180
+
+    # (For WMS inspection) timeout and open_timeout parameters for Faraday
+    attribute :timeout_wms, :integer, default: 4
+
+    # Display Notes to display / Non-prefixed default bootstrap class is alert-secondary
+    attr_accessor :display_notes_shown # typed as Hash
+
+    # Toggle the help text feature that offers users context
+    attr_accessor :help_text # typed as Hash
+
+    # Non-search-field GeoBlacklight application permitted params
+    attr_accessor :gbl_params # typed as Array
+
+    # WMS Parameters
+    attr_accessor :wms_params # typed as Hash
+
+    # Enable catalog#show sidebar static map for items with the following viewer protocols
+    attr_accessor :sidebar_static_map # typed as Array
+
+    attribute :iiif_drag_drop_link, :string, default: "@manifest?manifest=@manifest"
+
+    # Homepage Map Geometry
+    # Leave null to default to entire world
+    # Add a stringified GeoJSON object to scope initial render (example from UMass)
+    #   config.homepage_map_geom = '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
+    attribute :homepage_map_geom, :string
+
+    # Vector data download formats to be displayed
+    attr_accessor :vector_download_formats  # typed as Array
+
+    # Metadata shown in tool panel
+    attr_accessor :metadata_shown # typed as Array
+
+    # Web services shown in tool panel
+    attr_accessor :webservices_shown # typed as Array
+
+    # Relationships to display
+    attr_accessor :relationships_shown # typed as Hash
+
+    attribute :download_path, :string
+
+    def initialize
+      super
+      self.download_path ||= Rails.root.join("tmp", "cache", "downloads")
+      @gbl_params = [
+        :bbox, :email, :file, :format, :id, :logo, :provider, :type,
+        :BBOX, :HEIGHT, :LAYERS, :QUERY_LAYERS, :URL, :WIDTH, :X, :Y
+      ]
+      @wms_params = {
+        SERVICE: "WMS",
+        VERSION: "1.1.1",
+        REQUEST: "GetFeatureInfo",
+        STYLES: "",
+        SRS: "EPSG:4326",
+        EXCEPTIONS: "application/json",
+        INFO_FORMAT: "application/json"
+      }
+      @help_text = {
+        viewer_protocol: %w[
+          cog
+          dynamic_map_layer
+          feature_layer
+          iiif
+          iiif_manifest
+          image_map_layer
+          index_map
+          oembed
+          pmtiles
+          tiled_map_layer
+          tilejson
+          tms
+          wms
+          wmts
+          xyz
+        ]
+      }
+
+      @webservices_shown = %w[
+        wms
+        tms
+        wfs
+        xyz
+        wmts
+        tilejson
+        iiif
+        feature_layer
+        tiled_map_layer
+        dynamic_map_layer
+        image_map_layer
+        cog
+        pmtile
+      ]
+
+      @display_notes_shown = {
+        danger: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-danger",
+          icon: "fire-solid",
+          note_prefix: "Danger: "
+        ),
+        info: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-info",
+          icon: "circle-info-solid",
+          note_prefix: "Info: "
+        ),
+        tip: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-success",
+          icon: "lightbulb-solid",
+          note_prefix: "Tip: "
+        ),
+        warning: DisplayNoteShownConfig.new(
+          bootstrap_alert_class: "alert-warning",
+          icon: "triangle-exclamation-solid",
+          note_prefix: "Warning: "
+        )
+      }
+    end
+
+    def fields
+      @fields ||= FieldsConfig.new
+    end
+
+    ##
+    # Returns Leaflet plugin settings to pass to the viewer.
+    # @return[Geoblacklight::Configuration::LeafletConfig]
+    def leaflet_options
+      @leaflet_options ||= Geoblacklight::Configuration::LeafletConfig.new
+    end
+  end
+end

data/lib/geoblacklight/download.rb

@@ -16,7 +16,7 @@ module Geoblacklight
     end
 
     def self.file_path
-      Settings.DOWNLOAD_PATH || Rails.root.join("tmp", "cache", "downloads")
+      Geoblacklight.configuration.download_path
     end
 
     def file_path_and_name
@@ -95,7 +95,7 @@ module Geoblacklight
     # the Geoblacklight::Download class
     # @return [Fixnum] download timeout in seconds
     def timeout
-      @options[:timeout] || Settings.TIMEOUT_DOWNLOAD || 20
+      @options[:timeout] || Geoblacklight.configuration.timeout_download
     end
 
     ##

data/lib/geoblacklight/engine.rb

@@ -7,6 +7,7 @@ require "faraday"
 require "geoblacklight/version"
 require "nokogiri"
 require "mime/types"
+require "geo_combine"
 
 module Geoblacklight
   class Engine < ::Rails::Engine
@@ -18,21 +19,22 @@ module Geoblacklight
       end
     end
 
-    PRECOMPILE_ASSETS = %w[favicon.ico geoblacklight/geoblacklight.umd.cjs geoblacklight/geoblacklight.umd.cjs.map geoblacklight/geoblacklight.js geoblacklight/geoblacklight.js.map].freeze
+    PRECOMPILE_ASSETS = %w[favicon.ico].freeze
 
     # Make the source JS and CSS available to built apps
     initializer "geoblacklight.assets" do |app|
       app.config.assets.paths << Geoblacklight::Engine.root.join("app/javascript")
-      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets")
+      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets/images")
+      app.config.assets.paths << Geoblacklight::Engine.root.join("app/assets/stylesheets")
       app.config.assets.precompile += Geoblacklight::Engine::PRECOMPILE_ASSETS
     end
 
     # Add the Geoblacklight importmap to the built app's importmap
     initializer "geoblacklight.importmap", before: "importmap" do |app|
-      next unless app.config.respond_to?(:importmap) # skip for Vite
+      next unless app.config.respond_to?(:importmap)
 
-      app.config.importmap.paths << Engine.root.join("config/importmap.rb")
-      app.config.importmap.cache_sweepers << Engine.root.join("app/javascript")
+      app.config.importmap.paths << Geoblacklight::Engine.root.join("config/importmap.rb")
+      app.config.importmap.cache_sweepers << Geoblacklight::Engine.root.join("app/javascript")
     end
   end
 end

data/lib/geoblacklight/metadata/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "geo_combine"
-
 module Geoblacklight
   module Metadata
     ##

data/lib/geoblacklight/metadata_transformer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "geo_combine"
-
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/references.rb

@@ -5,7 +5,7 @@ module Geoblacklight
   class References
     attr_reader :refs, :reference_field
 
-    def initialize(document, reference_field = Settings.FIELDS.REFERENCES)
+    def initialize(document, reference_field = Geoblacklight.configuration.fields.references)
       @document = document
       @reference_field = reference_field
       @refs = parse_references.map { |ref| Reference.new(ref) }
@@ -15,9 +15,10 @@ module Geoblacklight
     # Return only those metadata references which are exposed within the configuration
     # @return [Geoblacklight::Reference]
     def shown_metadata_refs
-      metadata = @refs.select { |ref| Settings.METADATA_SHOWN.include?(ref.type.to_s) }
+      metadata_shown = Geoblacklight.configuration.metadata_shown
+      metadata = @refs.select { |ref| metadata_shown.include?(ref.type.to_s) }
       metadata.sort do |u, v|
-        Settings.METADATA_SHOWN.index(u.type.to_s) <=> Settings.METADATA_SHOWN.index(v.type.to_s)
+        metadata_shown.index(u.type.to_s) <=> metadata_shown.index(v.type.to_s)
       end
     end
 
@@ -111,7 +112,7 @@ module Geoblacklight
     end
 
     def format_list
-      Settings.DOWNLOAD_FORMATS&.VECTOR
+      Geoblacklight.configuration.vector_download_formats || []
     end
 
     def web_service_hash(format)

data/lib/geoblacklight/relation/ancestors.rb

@@ -10,8 +10,9 @@ module Geoblacklight
       end
 
       def create_search_params
-        {fq: ["{!join from=#{@field} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:#{@search_id}"],
-         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
+        {fq: ["{!join from=#{@field} to=#{Geoblacklight.configuration.fields.id}}#{Geoblacklight.configuration.fields.id}:#{@search_id}"],
+         fl: [Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id,
+           Geoblacklight.configuration.fields.resource_type]}
       end
 
       def execute_query

data/lib/geoblacklight/relation/descendants.rb

@@ -11,7 +11,8 @@ module Geoblacklight
 
       def create_search_params
         {fq: "#{@field}:#{@search_id}",
-         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
+         fl: [Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id,
+           Geoblacklight.configuration.fields.resource_type]}
       end
 
       def execute_query

data/lib/geoblacklight/relation/relation_response.rb

@@ -11,9 +11,9 @@ module Geoblacklight
       end
 
       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])
+        if Geoblacklight.configuration.relationships_shown.key?(method)
+          field = Geoblacklight.configuration.relationships_shown[method].field
+          query_type = query_type(Geoblacklight.configuration.relationships_shown[method])
           @results = query_type.new(@search_id, field, @repository).results
         else
           super
@@ -21,7 +21,7 @@ module Geoblacklight
       end
 
       def respond_to_missing?(method_name, *args)
-        Settings.RELATIONSHIPS_SHOWN.key?(method_name) or super
+        Geoblacklight.configuration.relationships_shown.key?(method_name) or super
       end
 
       private

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "5.3.0"
+  VERSION = "6.0.0-alpha.1"
 end

data/lib/geoblacklight/wms_layer.rb

@@ -3,7 +3,7 @@
 module Geoblacklight
   class WmsLayer
     def initialize(params)
-      @params = params.to_h.merge(Settings.WMS_PARAMS)
+      @params = params.to_h.merge(Geoblacklight.configuration.wms_params)
       @response = Geoblacklight::FeatureInfoResponse.new(request_response)
     end
 
@@ -23,8 +23,8 @@ module Geoblacklight
       conn = Faraday.new(url: url)
       conn.get do |request|
         request.params = search_params
-        request.options.timeout = Settings.TIMEOUT_WMS
-        request.options.open_timeout = Settings.TIMEOUT_WMS
+        request.options.timeout = Geoblacklight.configuration.timeout_wms
+        request.options.open_timeout = Geoblacklight.configuration.timeout_wms
       end
     rescue Faraday::ConnectionFailed, Faraday::TimeoutError => error
       Geoblacklight.logger.error error.inspect

data/lib/geoblacklight.rb

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
 require "active_support/dependencies"
-require "geoblacklight/engine"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
 loader.collapse("#{__dir__}/geoblacklight/download")
 loader.collapse("#{__dir__}/geoblacklight/wms_layer")
 loader.setup
+require "geoblacklight/engine"
 
 module Geoblacklight
   def self.logger
     ::Rails.logger
   end
+
+  mattr_accessor :configuration_builder, default: Geoblacklight::Configuration::LegacySettingsBuilder
+
+  def self.configuration
+    @configuration ||= configuration_builder.build
+  end
 end

data/package.json

@@ -1,37 +1,16 @@
 {
-  "name": "@geoblacklight/frontend",
-  "type": "module",
-  "version": "5.3.0",
+  "name": "geoblacklight",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "https://github.com/geoblacklight/geoblacklight.git",
+  "author": "Justin Coyne <jcoyne@justincoyne.com>",
   "license": "Apache-2.0",
-  "publishConfig": {
-    "access": "public"
+  "devDependencies": {
+    "prettier": "^3.8.3"
   },
   "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "watch": "vite build --watch"
-  },
-  "files": [
-    "app/assets",
-    "app/javascript"
-  ],
-  "module": "app/assets/javascripts/geoblacklight/geoblacklight.js",
-  "main": "app/assets/javascripts/geoblacklight/geoblacklight.umd.cjs",
-  "dependencies": {
-    "@github/auto-complete-element": "^3.6.2",
-    "@hotwired/stimulus": "^3.2.2",
-    "@popperjs/core": "^2.11.8",
-    "blacklight-frontend": "8",
-    "bootstrap": "^5.3.3",
-    "esri-leaflet": "^3.0.12",
-    "leaflet": "^1.9.4",
-    "leaflet.fullscreen": "^5.3.0",
-    "ol": "10.7.0",
-    "ol-pmtiles": "^2.0.2"
+    "lint": "prettier --check \"**/*.{js,json,yml,yaml}\"",
+    "format": "prettier --write \"**/*.{js,json,yml,yaml}\""
   },
-  "devDependencies": {
-    "jsdom": "^27.3.0",
-    "rollup-plugin-includepaths": "^0.2.4",
-    "vite": "^7.2.2"
-  }
+  "private": true
 }

data/schema/geoblacklight-schema-aardvark.json

@@ -47,15 +47,7 @@
       "type": "array",
       "items": {
         "type": "string",
-        "enum": [
-          "Datasets",
-          "Maps",
-          "Imagery",
-          "Collections",
-          "Websites",
-          "Web services",
-          "Other"
-        ]
+        "enum": ["Datasets", "Maps", "Imagery", "Collections", "Websites", "Web services", "Other"]
       }
     },
     "gbl_resourceType_sm": {

data/schema/readme.md

@@ -1,8 +1,7 @@
 #about the schema directory
 
-This directory contains two [JSON schema vocabulary](http://json-schema.org) files. These are provided for documentation and testing purposes.
+This directory contains a [JSON schema vocabulary](http://json-schema.org) file. It is provided for documentation and testing purposes.
 
-* geoblacklight-schema-1.0.json : This document is formatted in the [GeoBlacklight 1.0 Metadata version schema](https://opengeometadata.org/docs/gbl-1.0), compatible with Geoblacklight versions 2.0 to 3.7.
-* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0.
+* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0+.
 
-For more information on the metadata schemas for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)
+For more information on the metadata schema for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)

data/solr/conf/_rest_managed.json

@@ -1,3 +1,4 @@
 {
-  "initArgs":{},
-  "managedList":[]}
+  "initArgs": {},
+  "managedList": []
+}

data/solr/conf/schema.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="geoblacklight-schema" version="4.0">
+<schema name="geoblacklight-schema" version="1.6">
   <uniqueKey>id</uniqueKey>
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>