From b0835312808eac47951c59035b6f4a4a42c31957 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:02:47 +0000 Subject: [PATCH 01/17] Bump follow-redirects from 1.14.7 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 51d9b02..3377e3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3546,9 +3546,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== for-in@^1.0.2: version "1.0.2" From 25433586dfffd3dde4adc4bf11140debdada222d Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Fri, 24 Jun 2022 14:42:44 -0400 Subject: [PATCH 02/17] upgrade and core fixes to get 4.0.0-rc2 functional --- Gemfile | 2 +- Gemfile.lock | 35 +++---- app/assets/stylesheets/application.scss | 3 - app/assets/stylesheets/umass.scss | 5 + app/controllers/catalog_controller.rb | 27 +++-- app/models/search_builder.rb | 2 +- app/views/catalog/_home_text.html.erb | 2 +- app/views/catalog/_show_sidebar.html.erb | 3 + config/locales/geoblacklight.en.yml | 15 ++- config/settings.yml | 98 +++++++++++++++---- .../mufs190-1952-dpb4h157-i001-geometry.json | 53 ++++++++++ 11 files changed, 192 insertions(+), 53 deletions(-) create mode 100644 test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json diff --git a/Gemfile b/Gemfile index b47de2d..bab3e25 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'blacklight', '~> 7.0' -gem 'geoblacklight', '~> 4.0.0.pre.alpha.3' +gem 'geoblacklight', '~> 4.0.0.pre.rc2' gem 'sprockets', '< 4.0' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index a8bdc3c..f019ac3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,11 +97,11 @@ GEM childprocess (3.0.0) coderay (1.1.3) concurrent-ruby (1.1.9) - config (3.1.0) + config (4.0.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) crass (1.0.6) - deep_merge (1.2.1) + deep_merge (1.2.2) deprecation (1.1.0) activesupport devise (4.7.3) @@ -118,7 +118,7 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - dry-configurable (0.13.0) + dry-configurable (0.15.0) concurrent-ruby (~> 1.0) dry-core (~> 0.6) dry-container (0.9.0) @@ -127,11 +127,11 @@ GEM dry-core (0.7.1) concurrent-ruby (~> 1.0) dry-inflector (0.2.1) - dry-initializer (3.0.4) + dry-initializer (3.1.1) dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.8.0) + dry-schema (1.9.3) concurrent-ruby (~> 1.0) dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) @@ -144,7 +144,7 @@ GEM dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.7.0) + dry-validation (1.8.1) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) dry-core (~> 0.5, >= 0.5) @@ -157,13 +157,11 @@ GEM multipart-post (>= 1.2, < 3) ruby2_keywords faraday-net_http (1.0.1) - faraday_middleware (1.0.0) - faraday (~> 1.0) ffi (1.15.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - geo_combine (0.5.1) + geo_combine (0.6.0) activesupport json-schema net-http-persistent (~> 2.0) @@ -171,17 +169,16 @@ GEM rsolr sanitize thor - geoblacklight (4.0.0.pre.alpha.3) - blacklight (~> 7.8) + geoblacklight (4.0.0.pre.rc2) + blacklight (~> 7.12) coderay config deprecation - faraday (~> 1.0) - faraday_middleware (~> 1.0.0.rc1) + faraday (>= 1.0) geo_combine (~> 0.4) handlebars_assets mime-types - rails (>= 5.2.4, < 6.2) + rails (>= 6.1, < 7) rgeo-geojson globalid (1.0.0) activesupport (>= 5.0) @@ -207,8 +204,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json-schema (2.8.1) - addressable (>= 2.4) + json-schema (3.0.0) + addressable (>= 2.8) kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -235,7 +232,7 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2022.0105) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.14.4) @@ -296,7 +293,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) retriable (3.1.2) - rgeo (2.3.0) + rgeo (2.4.0) rgeo-geojson (2.1.1) rgeo (>= 1.0.0) rsolr (2.3.0) @@ -388,7 +385,7 @@ DEPENDENCIES devise devise-guests (~> 0.6) dotenv-rails - geoblacklight (~> 4.0.0.pre.alpha.3) + geoblacklight (~> 4.0.0.pre.rc2) jbuilder (~> 2.7) jquery-rails listen (~> 3.3) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5af9314..3ba0c6d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,6 +1,3 @@ -/* -*= require leaflet-label -*/ @import 'customizations'; @import 'bootstrap'; @import 'blacklight'; diff --git a/app/assets/stylesheets/umass.scss b/app/assets/stylesheets/umass.scss index 5f877c2..084477f 100644 --- a/app/assets/stylesheets/umass.scss +++ b/app/assets/stylesheets/umass.scss @@ -17,3 +17,8 @@ $umass-maroon: #840128; border-color: #A89968; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(152, 136, 86, 0.6); } + +// Add margin to bottom of Locator box +.card.location { + margin-bottom: 20px; +} diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index bc08c0f..fc93811 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -29,7 +29,7 @@ class CatalogController < ApplicationController # config.default_document_solr_params = { :qt => 'document', - :q => "{!raw f=#{Settings.FIELDS.UNIQUE_KEY} v=$id}" + :q => "{!raw f=#{Settings.FIELDS.ID} v=$id}" } # GeoBlacklight Defaults @@ -94,16 +94,16 @@ class CatalogController < ApplicationController #to add additional facets, use the keys defined in the settings.yml file config.add_facet_field Settings.FIELDS.INDEX_YEAR, :label => 'Year', :limit => 10, :sort => 'index' config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8 - config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, :label => 'Access', :limit => 8, partial: "icon_facet", :sort => 'index' + config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, :label => 'Access', :limit => 8, item_component: Geoblacklight::IconFacetItemComponent config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, :label => 'Resource Class', :limit => 8, :sort => 'index' config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, :label => 'Resource Type', :limit => 8 config.add_facet_field Settings.FIELDS.FORMAT, :label => 'Format', :limit => 8 # config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8 - config.add_facet_field Settings.FIELDS.ISO_TOPIC_CATEGORY, :label => 'Theme', :limit =>20, :sort => 'index' + config.add_facet_field Settings.FIELDS.THEME, :label => 'Theme', :limit =>20, :sort => 'index' config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Creator', :limit => 8 # config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8 config.add_facet_field Settings.FIELDS.MEMBER_OF, :label => 'Collection', :limit => 8 - config.add_facet_field Settings.FIELDS.PROVIDER, :label => 'Provider', :limit => 8, partial: "icon_facet" + config.add_facet_field Settings.FIELDS.PROVIDER, :label => 'Provider', :limit => 8, item_component: Geoblacklight::IconFacetItemComponent config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3 # config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false config.add_facet_field Settings.FIELDS.ANNOTATION, :label => 'Annotated', :limit => 8 @@ -142,7 +142,7 @@ class CatalogController < ApplicationController config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher' config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Collection', itemprop: 'memberOf', link_to_facet: true config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_facet: true - config.add_show_field Settings.FIELDS.ISO_TOPIC_CATEGORY, label: 'Theme(s)', itemprop: 'keywords', link_to_facet: true + config.add_show_field Settings.FIELDS.THEME, label: 'Theme(s)', itemprop: 'keywords', link_to_facet: true config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights' config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File size' @@ -173,7 +173,7 @@ class CatalogController < ApplicationController # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year' # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of' # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by' - # config.add_show_field Settings.FIELDS.ISO_TOPIC_CATEGORY, label: 'Theme', itemprop: 'theme' + # config.add_show_field Settings.FIELDS.THEME, label: 'Theme', itemprop: 'theme' # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword' # config.add_show_field Settings.FIELDS.LANGUAGE, label: 'Language', itemprop: 'language' # config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license' @@ -191,7 +191,7 @@ class CatalogController < ApplicationController # config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights' # config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder' # config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial_coverage' - # config.add_show_field Settings.FIELDS.SPATIAL_EXTENT, label: 'Spatial Extent', itemprop: 'geometry' + # config.add_show_field Settings.FIELDS.GEOMETRY, label: 'Geometry', itemprop: 'geometry' # config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'subject' # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed' # config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal' @@ -294,7 +294,8 @@ class CatalogController < ApplicationController config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params) # Custom tools for GeoBlacklight - config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } + # This line was recommended to be deleted per the GBL upgrade guide + # config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? } config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? } @@ -320,6 +321,14 @@ class CatalogController < ApplicationController config.autocomplete_path = 'suggest' end + def web_services + @response, @documents = action_documents - + respond_to do |format| + format.html do + return render layout: false if request.xhr? + # Otherwise draw the full page + end + end + end end diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb index 6a1a76a..fb69ebd 100644 --- a/app/models/search_builder.rb +++ b/app/models/search_builder.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class SearchBuilder < Blacklight::SearchBuilder include Blacklight::Solr::SearchBuilderBehavior - include Geoblacklight::SpatialSearchBehavior + # include Geoblacklight::SpatialSearchBehavior ## # @example Adding a new step to the processor chain diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb index a97f32f..c009906 100644 --- a/app/views/catalog/_home_text.html.erb +++ b/app/views/catalog/_home_text.html.erb @@ -10,7 +10,7 @@
<%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'globe', label: 'geoblacklight.home.placename', facet_field: Settings.FIELDS.SPATIAL_COVERAGE, response: @response)) %> - <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'tags', label: 'geoblacklight.home.theme', facet_field: Settings.FIELDS.ISO_TOPIC_CATEGORY, response: @response)) %> + <%= render(Geoblacklight::HomepageFeatureFacetComponent.new(icon: 'tags', label: 'geoblacklight.home.theme', facet_field: Settings.FIELDS.THEME, response: @response)) %>
diff --git a/app/views/catalog/_show_sidebar.html.erb b/app/views/catalog/_show_sidebar.html.erb index 33b9508..75347f9 100644 --- a/app/views/catalog/_show_sidebar.html.erb +++ b/app/views/catalog/_show_sidebar.html.erb @@ -1,6 +1,9 @@ <%= render :partial => 'show_tools' %> +
+<%= render :partial => "show_web_services" %> <%= render :partial => "show_downloads" %> +
<% unless @document.more_like_this.empty? %>
diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml index 67bc6ab..fce8ad7 100644 --- a/config/locales/geoblacklight.en.yml +++ b/config/locales/geoblacklight.en.yml @@ -5,7 +5,7 @@ en: retrieved_from: 'Retrieved from %{document_url}' download: download: 'Download' - download_link: '%{download_format}' + download_link: 'Original %{download_format}' success: 'Your file %{title} is ready for download' hgl_success: 'You should receive an email when your download is ready.' hgl_request: 'Request Layer' @@ -16,7 +16,7 @@ en: error: 'Sorry, the requested file could not be downloaded' error_with_url: 'Sorry, the requested file could not be downloaded. Try downloading it directly from: %{link}' export_formats: 'Export Formats' - export_link: 'Export' + export_link: 'Export %{download_format}' export_shapefile_link: 'Shapefile' export_kmz_link: 'KMZ' export_geojson_link: 'GeoJSON' @@ -65,9 +65,20 @@ en: services: 'Web services' services_close: 'Close' tms: 'Tile Map Service' + tilejson: 'TileJSON Document' + xyz: 'XYZ Tiles' + wmts: 'Web Map Tile Service' relations: ancestor: 'Source Datasets' descendant: 'Derived Datasets' + member_of: 'Belongs to collection...' + part_of: 'Is part of...' + part_of_descendants: 'Has part...' + relation: 'Related Records' + replaces: 'Item replaces...' + replaced_by: 'Item replaced by...' + source: 'Source Datasets' + version_of: 'Version of...' browse_all: "Browse all %{count} records..." metadata: toggle_summary: 'Toggle summary' diff --git a/config/settings.yml b/config/settings.yml index ad83207..fff830c 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -42,9 +42,10 @@ FIELDS: :INDEX_YEAR: 'gbl_indexYear_im' :IS_PART_OF: 'dct_isPartOf_sm' :IS_REPLACED_BY: 'dct_isReplacedBy_sm' - :ISO_TOPIC_CATEGORY: 'dcat_theme_sm' + :THEME: 'dcat_theme_sm' :KEYWORD: 'dcat_keyword_sm' :LANGUAGE: 'dct_language_sm' + :LAYER_MODIFIED: 'gbl_mdModified_dt' :LICENSE: 'dct_license_sm' :MEMBER_OF: 'pcdm_memberOf_sm' :METADATA_VERSION: 'gbl_mdVersion_s' @@ -61,7 +62,7 @@ FIELDS: :RIGHTS_HOLDER: 'dct_rightsHolder_sm' :SOURCE: 'dct_source_sm' :SPATIAL_COVERAGE: 'dct_spatial_sm' - :SPATIAL_EXTENT: 'locn_geometry' + :GEOMETRY: 'locn_geometry' :SUBJECT: 'dct_subject_sm' :SUPPRESSED: 'gbl_suppressed_b' :TEMPORAL_COVERAGE: 'dct_temporal_sm' @@ -95,12 +96,63 @@ WEBSERVICES_SHOWN: - 'wms' - 'tms' - 'wfs' + - 'xyz' + - 'wmts' + - 'tilejson' - 'iiif' - 'feature_layer' - 'tiled_map_layer' - '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_ANCESTORS: + field: dct_isPartOf_sm + query_type: ancestors + icon: nil + label: geoblacklight.relations.part_of_ancestors + PART_OF_DESCENDANTS: + field: dct_isPartOf_sm + query_type: descendants + icon: child-item + label: geoblacklight.relations.part_of_descendants + 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: parent-item + label: geoblacklight.relations.ancestor + SOURCE_DESCENDANTS: + field: dct_source_sm + query_type: descendants + icon: child-item + 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' @@ -112,36 +164,48 @@ WMS_PARAMS: :INFO_FORMAT: 'text/html' # Settings for leaflet -OPACITY_CONTROL: &opacity_control - CONTROLS: - - 'Opacity' - LEAFLET: MAP: LAYERS: DETECT_RETINA: true INDEX: DEFAULT: &default - color: "#1eb300" + color: "#7FCDBB" weight: "1" radius: "4" UNAVAILABLE: <<: *default - color: "#b3001e" + color: "#EDF8B1" SELECTED: <<: *default - color: "#006bde" + color: "#2C7FB8" VIEWERS: - WMS: - <<: *opacity_control - TILEDMAPLAYER: - <<: *opacity_control - FEATURELAYER: - <<: *opacity_control DYNAMICMAPLAYER: - <<: *opacity_control + CONTROLS: + - 'Opacity' + - 'Fullscreen' + FEATURELAYER: + CONTROLS: + - 'Opacity' + - 'Fullscreen' + IIIF: + CONTROLS: + - 'Fullscreen' IMAGEMAPLAYER: - <<: *opacity_control + CONTROLS: + - 'Opacity' + - 'Fullscreen' + INDEXMAP: + CONTROLS: + - 'Fullscreen' + TILEDMAPLAYER: + CONTROLS: + - 'Opacity' + - 'Fullscreen' + WMS: + CONTROLS: + - 'Opacity' + - 'Fullscreen' # Toggle the help text feature that offers users context HELP_TEXT: diff --git a/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json b/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json new file mode 100644 index 0000000..0e3107e --- /dev/null +++ b/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json @@ -0,0 +1,53 @@ +{ + "dct_title_s": "1:20k Aerial Photograph (B/W): Town of Amherst, MA, 1952 (dpb-4h-157)", + "dct_description_sm": "Georeferenced black-and-white aerial photograph captured in 1952 of East Village (Town of Amherst, Hampshire County, MA). The photograph was scanned and manually georeferenced in ArcMap 10.8 against 2019 color orthoimagery from the U.S. Geological Survey.", + "dct_language_sm": "eng", + "dct_creator_sm": "MacConnell, William Preston, 1918-", + "dct_publisher_sm": "University of Massachusetts at Amherst. Department of Forestry and Wildlife Management", + "schema_provider_s": "UMass", + "gbl_resourceClass_sm": "Imagery", + "gbl_resourceType_sm": "Aerial photographs", + "dct_subject_sm": [ + "Historical aerial imagery", + "Black-and-white photos", + "Landscape" + ], + "dcat_theme_sm": [ + "Imagery", + "Land Cover" + ], + "dcat_keyword_sm": [ + "maconnell", + "maconell", + "macconnel", + "macconel" + ], + "dct_temporal_sm": "1952", + "dct_issued_s": "1952-07-01", + "gbl_indexYear_im": 1952, + "dct_spatial_sm": [ + "East Village, MA", + "Town of Amherst, MA", + "Hampshire County, MA" + ], + "locn_geometry": "POLYGON((-72.45736115 42.38631869, -72.51461532 42.38563725, -72.51366921 42.34281517, -72.45645377 42.34349615, -72.45736115 42.38631869))", + "dcat_bbox": "ENVELOPE(-72.514672, -72.456454, 42.386143, 42.342804)", + "pcdm_memberOf_sm": "umass-macconnell-1951", + "dct_rights_sm": "Requests to publish, redistribute, or replicate this material should be addressed to Special Collections and University Archives, University of Massachusetts Amherst Libraries.", + "dct_rightsHolder_sm": "Special Collections and University Archives, University of Massachusetts Amherst Libraries", + "dct_accessRights_s": "Public", + "dct_format_s": "GeoTIFF", + "gbl_fileSize_s": "about 90 MB", + "dct_references_s": "{\"http://schema.org/url\":\"https://credo.library.umass.edu/view/full/mufs190-1952-dpb4h157-i001\",\"http://schema.org/downloadUrl\":[{\"url\":\"https://credo.library.umass.edu/media/mufs190-1952-dpb4h157-i001.reference.tif\",\"label\":\"GeoTIFF\"},{\"url\":\"https://credo.library.umass.edu/images/resize/full/mufs190-1952-dpb4h157-i001-001.jpg\",\"label\":\"High-Res JPG\"}],\"http://iiif.io/api/image\":\"https://credo.library.umass.edu/iiif/mufs190-1952-dpb4h157-i001-001.tif/info.json\"}", + "id": "umass-mufs190-1952-dpb4h157-i001", + "dct_identifier_sm": "mufs190-1952-dpb4h157-i001", + "gbl_mdModified_dt": "2022-04-05T18:26:09Z", + "gbl_mdVersion_s": "Aardvark", + "gbl_suppressed_b": false, + "gbl_georeferenced_b": true, + "umass_annotated_s": "Whole image", + "umass_geonames_sm": [ + "4935528", + "4955054" + ] +} From 248078ceea698ecbf2732d0e3b2288cb2e49af0e Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Mon, 11 Jul 2022 17:23:14 -0400 Subject: [PATCH 03/17] update solr files copied over new code from the v4.0.0-rc2 version to the files `schema.xml` and `solrconfig.xml` --- solr/conf/schema.xml | 60 +++++++++++++++++++--------------------- solr/conf/solrconfig.xml | 34 +++++++++++------------ 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml index a270234..caf83de 100644 --- a/solr/conf/schema.xml +++ b/solr/conf/schema.xml @@ -11,13 +11,30 @@ + + + + + + + + + + + + - + @@ -44,31 +61,6 @@ - - - - - - - - @@ -146,16 +138,21 @@ - - + + + - - @@ -171,7 +168,6 @@ - @@ -200,5 +196,5 @@ - + diff --git a/solr/conf/solrconfig.xml b/solr/conf/solrconfig.xml index 9c7aef8..5987ce4 100644 --- a/solr/conf/solrconfig.xml +++ b/solr/conf/solrconfig.xml @@ -70,9 +70,9 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> 1024 - - - + + + true 20 200 @@ -117,35 +117,35 @@ *:* text^1 - dc_description_ti^2 - dc_creator_tmi^3 - dc_publisher_ti^3 + dct_description_ti^2 + dct_creator_tmi^3 + dct_publisher_ti^3 dct_isPartOf_tmi^4 - dc_subject_tmi^5 + dct_subject_tmi^5 dct_spatial_tmi^5 dct_temporal_tmi^5 - dc_title_ti^6 - dc_rights_ti^7 + dct_title_ti^6 + dct_accessRights_ti^7 dct_provider_ti^8 layer_geom_type_ti^9 layer_slug_ti^10 - dc_identifier_ti^10 + dct_identifier_ti^10 text^1 - dc_description_ti^2 - dc_creator_tmi^3 - dc_publisher_ti^3 + dct_description_ti^2 + dct_creator_tmi^3 + dct_publisher_ti^3 dct_isPartOf_tmi^4 - dc_subject_tmi^5 + dct_subject_tmi^5 dct_spatial_tmi^5 dct_temporal_tmi^5 - dc_title_ti^6 - dc_rights_ti^7 + dct_title_ti^6 + dct_accessRights_ti^7 dct_provider_ti^8 layer_geom_type_ti^9 layer_slug_ti^10 - dc_identifier_ti^10 + dct_identifier_ti^10 true 1 From 5e68991482da79e2bfee9128b4cc61c9dbda0235 Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Fri, 29 Jul 2022 11:41:09 -0400 Subject: [PATCH 04/17] Delete mufs190-1952-dpb4h157-i001-geometry.json --- .../mufs190-1952-dpb4h157-i001-geometry.json | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json diff --git a/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json b/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json deleted file mode 100644 index 0e3107e..0000000 --- a/test/fixtures/files/umass_documents/mufs190-1952-dpb4h157-i001-geometry.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "dct_title_s": "1:20k Aerial Photograph (B/W): Town of Amherst, MA, 1952 (dpb-4h-157)", - "dct_description_sm": "Georeferenced black-and-white aerial photograph captured in 1952 of East Village (Town of Amherst, Hampshire County, MA). The photograph was scanned and manually georeferenced in ArcMap 10.8 against 2019 color orthoimagery from the U.S. Geological Survey.", - "dct_language_sm": "eng", - "dct_creator_sm": "MacConnell, William Preston, 1918-", - "dct_publisher_sm": "University of Massachusetts at Amherst. Department of Forestry and Wildlife Management", - "schema_provider_s": "UMass", - "gbl_resourceClass_sm": "Imagery", - "gbl_resourceType_sm": "Aerial photographs", - "dct_subject_sm": [ - "Historical aerial imagery", - "Black-and-white photos", - "Landscape" - ], - "dcat_theme_sm": [ - "Imagery", - "Land Cover" - ], - "dcat_keyword_sm": [ - "maconnell", - "maconell", - "macconnel", - "macconel" - ], - "dct_temporal_sm": "1952", - "dct_issued_s": "1952-07-01", - "gbl_indexYear_im": 1952, - "dct_spatial_sm": [ - "East Village, MA", - "Town of Amherst, MA", - "Hampshire County, MA" - ], - "locn_geometry": "POLYGON((-72.45736115 42.38631869, -72.51461532 42.38563725, -72.51366921 42.34281517, -72.45645377 42.34349615, -72.45736115 42.38631869))", - "dcat_bbox": "ENVELOPE(-72.514672, -72.456454, 42.386143, 42.342804)", - "pcdm_memberOf_sm": "umass-macconnell-1951", - "dct_rights_sm": "Requests to publish, redistribute, or replicate this material should be addressed to Special Collections and University Archives, University of Massachusetts Amherst Libraries.", - "dct_rightsHolder_sm": "Special Collections and University Archives, University of Massachusetts Amherst Libraries", - "dct_accessRights_s": "Public", - "dct_format_s": "GeoTIFF", - "gbl_fileSize_s": "about 90 MB", - "dct_references_s": "{\"http://schema.org/url\":\"https://credo.library.umass.edu/view/full/mufs190-1952-dpb4h157-i001\",\"http://schema.org/downloadUrl\":[{\"url\":\"https://credo.library.umass.edu/media/mufs190-1952-dpb4h157-i001.reference.tif\",\"label\":\"GeoTIFF\"},{\"url\":\"https://credo.library.umass.edu/images/resize/full/mufs190-1952-dpb4h157-i001-001.jpg\",\"label\":\"High-Res JPG\"}],\"http://iiif.io/api/image\":\"https://credo.library.umass.edu/iiif/mufs190-1952-dpb4h157-i001-001.tif/info.json\"}", - "id": "umass-mufs190-1952-dpb4h157-i001", - "dct_identifier_sm": "mufs190-1952-dpb4h157-i001", - "gbl_mdModified_dt": "2022-04-05T18:26:09Z", - "gbl_mdVersion_s": "Aardvark", - "gbl_suppressed_b": false, - "gbl_georeferenced_b": true, - "umass_annotated_s": "Whole image", - "umass_geonames_sm": [ - "4935528", - "4955054" - ] -} From 33bf2a23e5725f69dba46068234aedb84b14bd69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 06:02:57 +0000 Subject: [PATCH 05/17] Bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 51d9b02..0e2661e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4605,9 +4605,9 @@ json3@^3.3.3: integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" @@ -4991,9 +4991,9 @@ minimatch@^3.0.4, minimatch@~3.0.2: brace-expansion "^1.1.7" minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass-collect@^1.0.2: version "1.0.2" From 246728159f23df8c10a4b70a088baa73fc0a8232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 22:28:33 +0000 Subject: [PATCH 06/17] Bump minimist from 1.2.5 to 1.2.8 Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 51d9b02..3a4d458 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4991,9 +4991,9 @@ minimatch@^3.0.4, minimatch@~3.0.2: brace-expansion "^1.1.7" minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== minipass-collect@^1.0.2: version "1.0.2" From b8f91b1dc5abaec139fa011b103ce114cf6bc19b Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Wed, 5 Apr 2023 19:46:56 -0400 Subject: [PATCH 07/17] initial update to v.4.0 Made core code changes to get application up to v4.0, following the upgrade guide: https://geoblacklight.org/docs/upgrading/Upgrading_to_version_4_0/ --- Gemfile | 2 +- Gemfile.lock | 36 ++-- app/controllers/catalog_controller.rb | 183 +++++++++--------- config/locales/geoblacklight.en.yml | 2 + config/settings.yml | 25 ++- solr/conf/schema.xml | 17 +- test/fixtures/files/gbl_documents/README.md | 89 +++++---- .../files/gbl_documents/actual-papermap1.json | 3 +- .../files/gbl_documents/actual-point1.json | 3 +- .../files/gbl_documents/actual-polygon1.json | 3 +- .../files/gbl_documents/actual-raster1.json | 5 +- .../gbl_documents/b1g_wabash_child_15.json | 62 ++++++ .../gbl_documents/b1g_wabash_child_16.json | 64 ++++++ .../gbl_documents/b1g_wabash_child_17.json | 62 ++++++ .../gbl_documents/b1g_wabash_child_18.json | 62 ++++++ .../gbl_documents/b1g_wabash_parent.json | 59 ++++++ .../files/gbl_documents/baruch_ancestor1.json | 3 +- .../files/gbl_documents/baruch_ancestor2.json | 3 +- .../baruch_documentation_download.json | 2 +- .../files/gbl_documents/bbox-spans-180.json | 3 +- .../gbl_documents/cornell_html_metadata.json | 7 +- .../esri-dynamic-layer-all-layers.json | 5 +- .../esri-dynamic-layer-single-layer.json | 5 +- .../gbl_documents/esri-feature-layer.json | 3 +- .../gbl_documents/esri-image-map-layer.json | 5 +- .../gbl_documents/esri-tiled_map_layer.json | 3 +- .../files/gbl_documents/esri-wms-layer.json | 3 +- .../files/gbl_documents/harvard_raster.json | 5 +- .../iiif-eastern-hemisphere.json | 5 +- .../index-map-polygon-no-downloadurl.json | 3 +- .../gbl_documents/index-map-polygon.json | 3 +- .../gbl_documents/index-map-stanford.json | 3 +- .../files/gbl_documents/index_map_point.json | 5 +- .../gbl_documents/metadata_no_provider.json | 3 +- .../gbl_documents/multiple-downloads.json | 5 +- .../files/gbl_documents/no_spatial.json | 5 +- test/fixtures/files/gbl_documents/oembed.json | 3 +- .../files/gbl_documents/princeton-child1.json | 5 +- .../files/gbl_documents/princeton-child2.json | 5 +- .../files/gbl_documents/princeton-child3.json | 3 +- .../files/gbl_documents/princeton-child4.json | 5 +- .../files/gbl_documents/princeton-parent.json | 8 +- .../gbl_documents/public_direct_download.json | 3 +- .../gbl_documents/public_iiif_princeton.json | 5 +- .../gbl_documents/public_polygon_mit.json | 3 +- .../files/gbl_documents/restricted-line.json | 3 +- .../files/gbl_documents/tilejson.json | 48 +++++ test/fixtures/files/gbl_documents/tms.json | 33 ++-- .../gbl_documents/umn_metro_result1.json | 8 +- .../gbl_documents/umn_state_result1.json | 5 +- .../gbl_documents/umn_state_result2.json | 8 +- .../files/gbl_documents/uva_slug_colon.json | 3 +- .../files/gbl_documents/wmts-multiple.json | 41 ++++ .../gbl_documents/wmts-single-layer.json | 48 +++++ test/fixtures/files/gbl_documents/xyz.json | 46 +++++ test/fixtures/files/umass_documents/.DS_Store | Bin 6148 -> 0 bytes .../umass-macconnell-1951.json | 5 +- 57 files changed, 800 insertions(+), 244 deletions(-) create mode 100644 test/fixtures/files/gbl_documents/b1g_wabash_child_15.json create mode 100644 test/fixtures/files/gbl_documents/b1g_wabash_child_16.json create mode 100644 test/fixtures/files/gbl_documents/b1g_wabash_child_17.json create mode 100644 test/fixtures/files/gbl_documents/b1g_wabash_child_18.json create mode 100644 test/fixtures/files/gbl_documents/b1g_wabash_parent.json create mode 100644 test/fixtures/files/gbl_documents/tilejson.json create mode 100644 test/fixtures/files/gbl_documents/wmts-multiple.json create mode 100644 test/fixtures/files/gbl_documents/wmts-single-layer.json create mode 100644 test/fixtures/files/gbl_documents/xyz.json delete mode 100644 test/fixtures/files/umass_documents/.DS_Store diff --git a/Gemfile b/Gemfile index bab3e25..4899b34 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'blacklight', '~> 7.0' -gem 'geoblacklight', '~> 4.0.0.pre.rc2' +gem 'geoblacklight', '~> 4.0' gem 'sprockets', '< 4.0' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index f019ac3..36bfa7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,9 +97,10 @@ GEM childprocess (3.0.0) coderay (1.1.3) concurrent-ruby (1.1.9) - config (4.0.0) + config (4.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) + connection_pool (2.4.0) crass (1.0.6) deep_merge (1.2.2) deprecation (1.1.0) @@ -121,22 +122,21 @@ GEM dry-configurable (0.15.0) concurrent-ruby (~> 1.0) dry-core (~> 0.6) - dry-container (0.9.0) + dry-container (0.11.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.13, >= 0.13.0) - dry-core (0.7.1) + dry-core (0.8.1) concurrent-ruby (~> 1.0) - dry-inflector (0.2.1) + dry-inflector (0.3.0) dry-initializer (3.1.1) dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.9.3) + dry-schema (1.10.6) concurrent-ruby (~> 1.0) dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) - dry-logic (~> 1.0) + dry-logic (~> 1.2) dry-types (~> 1.5) dry-types (1.5.1) concurrent-ruby (~> 1.0) @@ -157,19 +157,22 @@ GEM multipart-post (>= 1.2, < 3) ruby2_keywords faraday-net_http (1.0.1) + faraday-net_http_persistent (2.0.2) + faraday-net_http (< 3) + net-http-persistent (~> 4.0) ffi (1.15.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - geo_combine (0.6.0) + geo_combine (0.7.0) activesupport + faraday-net_http_persistent (~> 2.0) json-schema - net-http-persistent (~> 2.0) nokogiri rsolr sanitize thor - geoblacklight (4.0.0.pre.rc2) + geoblacklight (4.0.0) blacklight (~> 7.12) coderay config @@ -178,7 +181,7 @@ GEM geo_combine (~> 0.4) handlebars_assets mime-types - rails (>= 6.1, < 7) + rails (>= 6.1, < 7.1) rgeo-geojson globalid (1.0.0) activesupport (>= 5.0) @@ -232,14 +235,15 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.0218.1) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.14.4) msgpack (1.4.2) multipart-post (2.1.1) mysql2 (0.5.3) - net-http-persistent (2.9.4) + net-http-persistent (4.0.2) + connection_pool (~> 2.2) nio4r (2.5.8) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) @@ -293,7 +297,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) retriable (3.1.2) - rgeo (2.4.0) + rgeo (3.0.0) rgeo-geojson (2.1.1) rgeo (>= 1.0.0) rsolr (2.3.0) @@ -302,7 +306,7 @@ GEM ruby-progressbar (1.11.0) ruby2_keywords (0.0.4) rubyzip (2.3.0) - sanitize (6.0.0) + sanitize (6.0.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass-rails (6.0.0) @@ -385,7 +389,7 @@ DEPENDENCIES devise devise-guests (~> 0.6) dotenv-rails - geoblacklight (~> 4.0.0.pre.rc2) + geoblacklight (~> 4.0) jbuilder (~> 2.7) jquery-rails listen (~> 3.3) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index fc93811..1d352f3 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -44,11 +44,15 @@ class CatalogController < ApplicationController config.index.title_field = Settings.FIELDS.TITLE # solr field configuration for document/show views - + # This sets the metadata to display below the map viewer. + # To move metadata above the map viewer, + # remove the lines deleting and re-adding the :show partial config.show.display_type_field = 'format' + config.show.partials.delete(:show) config.show.partials << 'show_default_viewer_container' config.show.partials << 'show_default_attribute_table' config.show.partials << 'show_default_viewer_information' + config.show.partials << :show ## # Configure the index document presenter. @@ -102,102 +106,107 @@ class CatalogController < ApplicationController config.add_facet_field Settings.FIELDS.THEME, :label => 'Theme', :limit =>20, :sort => 'index' config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Creator', :limit => 8 # config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8 - config.add_facet_field Settings.FIELDS.MEMBER_OF, :label => 'Collection', :limit => 8 config.add_facet_field Settings.FIELDS.PROVIDER, :label => 'Provider', :limit => 8, item_component: Geoblacklight::IconFacetItemComponent config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3 # config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false config.add_facet_field Settings.FIELDS.ANNOTATION, :label => 'Annotated', :limit => 8 + # GEOBLACKLIGHT APPLICATION FACETS + + # Map-Based "Search Here" Feature + # item_presenter - Defines how the facet appears in the GBL UI + # filter_query_builder - Defines the query generated for Solr + # filter_class - Defines how to add/remove facet from query + # label - Defines the label used in contstraints container + config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD, label: 'Bounding Box' + + # Item Relationship Facets + # * Not displayed to end user (show: false) + # * Must be present for relationship "Browse all 4 records" links to work + # * Label value becomes the search contraint filter name + config.add_facet_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', show: false + config.add_facet_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', show: false + config.add_facet_field Settings.FIELDS.RELATION, label: 'Related', show: false + config.add_facet_field Settings.FIELDS.REPLACES, label: 'Replaces', show: false + config.add_facet_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', show: false + config.add_facet_field Settings.FIELDS.SOURCE, label: 'Source', show: false + config.add_facet_field Settings.FIELDS.VERSION, label: 'Is Version Of', show: false # Have BL send all facet field names to Solr, which has been the default # previously. Simply remove these lines if you'd rather use Solr request # handler defaults, or have no facets. config.add_facet_fields_to_solr_request! - #SEARCH RESULTS FIELDS - - # solr fields to be displayed in the index (search results) view - # The ordering of the field names is the order of the display - # config.add_index_field Settings.FIELDS.PROVIDER, :label => 'Institution:' - # config.add_index_field Settings.FIELDS.RIGHTS, :label => 'Access:' - # # config.add_index_field 'Area', :label => 'Area:' - # config.add_index_field Settings.FIELDS.SUBJECT, :label => 'Keywords:' - config.add_index_field Settings.FIELDS.INDEX_YEAR - config.add_index_field Settings.FIELDS.CREATOR - config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit - #config.add_index_field Settings.FIELDS.PUBLISHER - - - #ITEM VIEW FIELDS - - # solr fields to be displayed in the show (single result) view - # The ordering of the field names is the order of the display - # item_prop: [String] property given to span with Schema.org item property - # link_to_search: [Boolean] that can be passed to link to a facet search - # helper_method: [Symbol] method that can be used to render the value - - config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator' - config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Year', itemprop: 'temporal' - config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract - config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher' - config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Collection', itemprop: 'memberOf', link_to_facet: true - config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_facet: true - config.add_show_field Settings.FIELDS.THEME, label: 'Theme(s)', itemprop: 'keywords', link_to_facet: true - config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights' - config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true - config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File size' - - config.add_show_field( - Settings.FIELDS.REFERENCES, - label: 'More details at', - accessor: [:external_url], - if: proc { |_, _, doc| doc.external_url }, - helper_method: :render_references_url - ) - - # OPTIONAL FIELDS - #optional fields to add to the item view display - - # config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access Rights', itemprop: 'access_rights' - # config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: 'Alternative Title', itemprop: 'alt_title' - # config.add_show_field Settings.FIELDS.CENTROID, label: 'Centroid', itemprop: 'centroid' - # config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator' - # config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Issued', itemprop: 'issued' - # config.add_show_field Settings.FIELDS.DATE_RANGE, label: 'Date Range', itemprop: 'date_range' - # config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract - # config.add_show_field Settings.FIELDS.FORMAT, label: 'Format', itemprop: 'format' - # config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size' - # config.add_show_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', itemprop: 'georeferenced' - # config.add_show_field Settings.FIELDS.ID, label: 'ID', itemprop: 'id' - # config.add_show_field Settings.FIELDS.IDENTIFIER, label: 'Identifier', itemprop: 'identifier' - # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year' - # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of' - # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by' - # config.add_show_field Settings.FIELDS.THEME, label: 'Theme', itemprop: 'theme' - # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword' - # config.add_show_field Settings.FIELDS.LANGUAGE, label: 'Language', itemprop: 'language' - # config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license' - # config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', itemprop: 'member_of' - # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version' - # config.add_show_field Settings.FIELDS.MODIFIED, label: 'Date Modified', itemprop: 'modified' - # config.add_show_field Settings.FIELDS.OVERLAP_FIELD, label: 'Overlap BBox', itemprop: 'overlap_field' - # config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher' - # config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', itemprop: 'provider' - # config.add_show_field Settings.FIELDS.REFERENCES, label: 'References', itemprop: 'references' - # config.add_show_field Settings.FIELDS.RELATION, label: 'Relation', itemprop: 'relation' - # config.add_show_field Settings.FIELDS.REPLACES, label: 'Replaces', itemprop: 'replaces' - # config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', itemprop: 'class' - # config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', itemprop: 'type' - # config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights' - # config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder' - # config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial_coverage' - # config.add_show_field Settings.FIELDS.GEOMETRY, label: 'Geometry', itemprop: 'geometry' - # config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'subject' - # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed' - # config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal' - # config.add_show_field Settings.FIELDS.TITLE, label: 'Title', itemprop: 'title' - # config.add_show_field Settings.FIELDS.VERSION, label: 'Version', itemprop: 'version' - # config.add_show_field Settings.FIELDS.WXS_IDENTIFIER, label: 'Web Service Layer', itemprop: 'wxs_identifier' + # SEARCH RESULTS FIELDS + + # solr fields to be displayed in the index (search results) view + # The ordering of the field names is the order of the display + # config.add_index_field Settings.FIELDS.PROVIDER, :label => 'Institution:' + # config.add_index_field Settings.FIELDS.RIGHTS, :label => 'Access:' + # # config.add_index_field 'Area', :label => 'Area:' + # config.add_index_field Settings.FIELDS.SUBJECT, :label => 'Keywords:' + config.add_index_field Settings.FIELDS.INDEX_YEAR + config.add_index_field Settings.FIELDS.CREATOR + config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit + config.add_index_field Settings.FIELDS.PUBLISHER + + # ITEM VIEW FIELDS + + # solr fields to be displayed in the show (single result) view + # The ordering of the field names is the order of the display + # item_prop: [String] property given to span with Schema.org item property + # link_to_search: [Boolean] that can be passed to link to a facet search + # helper_method: [Symbol] method that can be used to render the value + + # DEFAULT FIELDS + # The following fields all feature string values. If there is a value present in the metadata, they fields will show up on the item show page. + # The labels and order can be customed. Comment out fields to hide them. + + config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator(s)', itemprop: 'creator' + config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Year', itemprop: 'temporal' + config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract + config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher' + config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place(s)', itemprop: 'spatial', link_to_facet: true + config.add_show_field Settings.FIELDS.THEME, label: 'Theme(s)', itemprop: 'keywords', link_to_facet: true + config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights' + config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true + config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File size' + + config.add_show_field( + Settings.FIELDS.REFERENCES, + label: 'More details at', + accessor: [:external_url], + if: proc { |_, _, doc| doc.external_url }, + helper_method: :render_references_url + ) + + # ADDITIONAL FIELDS + # The following fields are not user friendly and are not set to appear on the item show page. They contain non-literal values, codes, URIs, or are otherwise designed to power features in the interface. + # These values might need a translations to be readable by users. + + # config.add_show_field Settings.FIELDS.LANGUAGE, label: 'Language', itemprop: 'language' + # config.add_show_field Settings.FIELDS.KEYWORD, label: 'Keyword(s)', itemprop: 'keyword' + + # config.add_show_field Settings.FIELDS.INDEX_YEAR, label: 'Year', itemprop: 'year' + # config.add_show_field Settings.FIELDS.DATE_RANGE, label: 'Date Range', itemprop: 'date_range' + + # config.add_show_field Settings.FIELDS.CENTROID, label: 'Centroid', itemprop: 'centroid' + # config.add_show_field Settings.FIELDS.OVERLAP_FIELD, label: 'Overlap BBox', itemprop: 'overlap_field' + + # config.add_show_field Settings.FIELDS.RELATION, label: 'Relation', itemprop: 'relation' + # config.add_show_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', itemprop: 'member_of' + # config.add_show_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', itemprop: 'is_part_of' + # config.add_show_field Settings.FIELDS.VERSION, label: 'Version', itemprop: 'version' + # config.add_show_field Settings.FIELDS.REPLACES, label: 'Replaces', itemprop: 'replaces' + # config.add_show_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', itemprop: 'is_replaced_by' + + # config.add_show_field Settings.FIELDS.WXS_IDENTIFIER, label: 'Web Service Layer', itemprop: 'wxs_identifier' + # config.add_show_field Settings.FIELDS.ID, label: 'ID', itemprop: 'id' + # config.add_show_field Settings.FIELDS.IDENTIFIER, label: 'Identifier', itemprop: 'identifier' + + # config.add_show_field Settings.FIELDS.MODIFIED, label: 'Date Modified', itemprop: 'modified' + # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version' + # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed' # "fielded" search configuration. Used by pulldown among other places. # For supported keys in hash, see rdoc for Blacklight::SearchFields @@ -294,8 +303,6 @@ class CatalogController < ApplicationController config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params) # Custom tools for GeoBlacklight - # This line was recommended to be deleted per the GBL upgrade guide - # config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? } config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? } diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml index fce8ad7..4bf4fcf 100644 --- a/config/locales/geoblacklight.en.yml +++ b/config/locales/geoblacklight.en.yml @@ -20,6 +20,7 @@ en: export_shapefile_link: 'Shapefile' export_kmz_link: 'KMZ' export_geojson_link: 'GeoJSON' + export_geotiff_link: 'GeoTIFF' home: headline: 'Explore and discover...' search_heading: 'Find the maps and data you need' @@ -133,6 +134,7 @@ en: cornell: Cornell University dvd-rom: DVD-Rom esri-globe: Esri Global + george-mason: George Mason University harvard: Harvard University illinois: University of Illinois indiana: Indiana University diff --git a/config/settings.yml b/config/settings.yml index fff830c..ef35178 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -10,9 +10,6 @@ ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html' # Download path can be configured using this setting #DOWNLOAD_PATH: "./tmp/cache/downloads" -# DEPRECATED Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt' -GEOMETRY_FIELD: 'solr_geom' - # The bq boost value for spatial search matches within a bounding box BBOX_WITHIN_BOOST: '10' @@ -25,11 +22,30 @@ OVERLAP_RATIO_BOOST: '2' # HOMEPAGE_MAP_GEOM: null HOMEPAGE_MAP_GEOM: '{"type":"Polygon","coordinates":[[[-73.747,43.0045],[-73.747,41.1143],[-69.7787,41.1143],[-69.7787,43.0045]]]}' +# Non-search-field GeoBlacklight application permitted params +GBL_PARAMS: + - :bbox + - :email + - :file + - :format + - :id + - :logo + - :provider + - :type + - :BBOX + - :HEIGHT + - :LAYERS + - :QUERY_LAYERS + - :URL + - :WIDTH + - :X + - :Y + # Solr field mappings FIELDS: :ACCESS_RIGHTS: 'dct_accessRights_s' :ALTERNATIVE_TITLE: 'dct_alternative_sm' - :CENTROID: 'dcat_centroid_ss' + :CENTROID: 'dcat_centroid' :CREATOR: 'dct_creator_sm' :DATE_ISSUED: 'dct_issued_s' :DATE_RANGE: 'gbl_dateRange_drsim' @@ -70,6 +86,7 @@ FIELDS: :VERSION: 'dct_isVersionOf_sm' :WXS_IDENTIFIER: 'gbl_wxsIdentifier_s' :ANNOTATION: 'umass_annotated_s' + :GEONAME_ID: 'umass_geonameID_s' # Institution deployed at diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml index caf83de..9e3b58c 100644 --- a/solr/conf/schema.xml +++ b/solr/conf/schema.xml @@ -158,15 +158,15 @@ - - - - - - + + + + + + - - + + @@ -176,7 +176,6 @@ - diff --git a/test/fixtures/files/gbl_documents/README.md b/test/fixtures/files/gbl_documents/README.md index 9c8f8fd..7aeadb4 100644 --- a/test/fixtures/files/gbl_documents/README.md +++ b/test/fixtures/files/gbl_documents/README.md @@ -6,47 +6,50 @@ If you add a new document, please add it to the table below, and indicate its pu If you add a new document, please add it to the table below, and indicate its purpose. - | -| Filename | Title | ID | Purpose | + | +| Filename | Title | ID | Purpose | |---------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [actual-papermap1](actual-papermap1.json) | 1:1 500 000 series [cartographic material] : tectonic map of Britain, Ireland and adjacent areas / British Geological Survey ; Geological Survey of Ireland ; Geological Survey of Northern Ireland. | mit-001145244 | Nondigitized paper map with a link to a library catalog | -| [actual-point1](actual-point1.json) | 2014 New York City Places | nyu-2451-34564 | Point dataset with WMS and WFS | -| [actual-polygon1](actual-polygon1.json) | 100 Foot Grid Cambridge MA 2004 | tufts-cambridgegrid100-04 | Polygon dataset (no direct download) with WFS, WMS, and FGDC metadata as XML | -| [actual-raster1](actual-raster1.json) | 1-Meter Shaded Relief Multibeam Bathymetry Image (Color): Elkhorn Slough, California, 2005 | stanford-dp018hs9766 | Restricted raster layer with WMS and metadata in MODS and ISO 19139 | -| [baruch_ancestor1](baruch_ancestor1.json) | 2016 NYC Geodatabase, Open Source Version (jan2016) | nyu_2451_34635 | SQLite Database with documentation download Referenced as parent | -| [baruch_ancestor2](baruch_ancestor2.json) | 2016 NYC Geodatabase, ArcGIS Version (jan2016) | nyu_2451_34636 | Geodatabase with documentation download Referenced as parent | -| [baruch_documentation_download](baruch_documentation_download.json) | 2015 New York City Subway Complexes and Ridership | nyu_2451_34502 | Point dataset with WMS and WFS, documentation download, and two parent records | -| [bbox-spans-180](bbox-spans-180.json) | East Asia and Oceania | princeton-sx61dn82p | Scanned map with IIIF and direct TIFF download that spans across the 180th meridian | -| [cornell_html_metadata](cornell_html_metadata.json) | Air Monitoring Stations, Adirondack Park, 2000 | cugir-007741 | Point dataset with WMS, WFS, direct download, and FGDC metadata XML and HTML | -| [esri-dynamic-layer-all-layers](esri-dynamic-layer-all-layers.json) | Glacial Boundaries: Illinois, 1998 | 90f14ff4-1359-4beb-b931-5cb41d20ab90 | This record points to an the top level of an Esri Rest Web Map Service It does not specify a layer | -| [esri-dynamic-layer-single-layer](esri-dynamic-layer-single-layer.json) | Abandoned Quarries: Indiana | 4669301e-b4b2-4c8b-bf40-01b968a2865b | ArcGIS Dynamic Map Layer with single layer indicated | -| [esri-feature-layer](esri-feature-layer.json) | Transit - Airports: Maryland | f406332e63eb4478a9560ad86ae90327_18 | ArcGIS Feature Layer - point dataset | -| [esri-image-map-layer](esri-image-map-layer.json) | Wabash Topo (27): Indiana, 1929 | 32653ed6-8d83-4692-8a06-bf13ffe2c018 | ArcGIS Image Map Layer with GeoTIFF direct download | -| [esri-tiled_map_layer](esri-tiled_map_layer.json) | Soil Survey Geographic (SSURGO) | nyu-test-soil-survey-map | ArcGIS tiled map layer | -| [esri-wms-layer](esri-wms-layer.json) | Agriculture Census: Indiana, 1997 | purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa | Dataset with ArcGIS Dynamic Map Layer, ArcGIS WMS, and direct download | -| [harvard_raster](harvard_raster.json) | Saint Petersburg Region, Russia, 1834 (Raster Image) | harvard-g7064-s2-1834-k3 | This layer is a georeferenced raster image of the historic paper map | -| [iiif-eastern-hemisphere](iiif-eastern-hemisphere.json) | A new & accurate map of Asia: drawn from actual surveys, and otherwise collected from journals | 57f0f116-b64e-4773-8684-96ba09afb549 | Eastern hemisphere scanned map with IIIF manifest | -| [index_map_point](index_map_point.json) | New York Aerial Photos (1960s) | cornell-ny-aerial-photos-1960s | GeoJSON index map of points | -| [index-map-polygon](index-map-polygon.json) | Index of Digital Elevation Models (DEM), New York | cugir-008186-no-downloadurl | GeoJSON index map of polygons, with a downloadUrl for the index itself | -| [index-map-polygon-no-downloadurl](index-map-polygon-no-downloadurl.json) | Index of Digital Elevation Models (DEM), New York | cugir-008186 | GeoJSON index map of polygons, but lacking a downloadUrl for the index itself | -| [index-map-stanford](index-map-stanford.json) | Dabao Kinbōzu, Maps Index | stanford-fb897vt9938 | old-style (pre-GeoJSON) index map of rectangular polygons | -| [metadata_no_geom](metadata_no_geom.json) | Ames Library of South Asia Maps | 05d-p16022coll246-noGeo | This is a collection level record without spatial coordinates | -| [metadata_no_provider](metadata_no_provider.json) | Social Explorer | 99-0001-noprovider | This is a website record that does not have a Provider (aardvark)/ provider (GBL Metadata 1.0) | -| [multiple-downloads](multiple-downloads.json) | Test record with additional download formats | cugir-007950 | This is a test record containing new-style references as nested child documents In addition to the original shapefile download, the references section contains additional PDF and KMZ downloads | -| [no_locn_geometry](no_locn_geometry.json) | University of Minnesota Digital Conservancy DRUM | 05d-03-noGeomType | This is a collection level record without spatial coordinates or a Geometry Type (GBL Metadata 1.0) | -| [no_spatial](no_spatial.json) | ASTER Global Emissivity Dataset 1-kilometer V003 - AG1KM | aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20 | File without geometry type or solr_geometry (will cause error) | -| [oembed](oembed.json) | Jōshū Kusatsu Onsenzu | stanford-dc482zx1528 | This record has an Oembed reference link | -| [princeton-child1](princeton-child1.json) | Princeton, Mercer County, New Jersey (Sheet 1) | princeton-n009w382v | Child record for testing the suppressed_b property | -| [princeton-child2](princeton-child2.json) | Princeton, Mercer County, New Jersey (Sheet 2) | princeton-jq085m62x | Child record for testing the suppressed_b property | -| [princeton-child3](princeton-child3.json) | Princeton, Mercer County, New Jersey (Sheet 3) | princeton-n009w382v-fake1 | Child record for testing the suppressed_b property | -| [princeton-child4](princeton-child4.json) | Princeton, Mercer County, New Jersey (Sheet 4) | princeton-n009w382v-fake2 | Child record for testing the suppressed_b property | -| [princeton-parent](princeton-parent.json) | Princeton, Mercer County, New Jersey | princeton-1r66j405w | Parent record for testing the suppressed_b property | -| [public_direct_download](public_direct_download.json) | 2005 Rural Poverty GIS Database: Uganda | stanford-cz128vq0535 | includes a tentative dcat_distribution_sm property | -| [public_iiif_princeton](public_iiif_princeton.json) | The provinces of New York and New Jersey, with part of Pensilvania, and the Province of Quebec | princeton-02870w62c | Scanned map with IIIF | -| [public_polygon_mit](public_polygon_mit.json) | Massachusetts (ZCTA - 5 digit zip code tabulation area, 2000) | mit-f6rqs4ucovjk2 | Polygon shapefile with WMS and WFS | -| [restricted-line](restricted-line.json) | 10 Meter Contours: Russian River Basin, California | stanford-cg357zz0321 | Restricted line layer with WFS, WMS and metadata in MODS and ISO 19139 | -| [tms](tms.json) | Quaternary Fault and Fold Database of the United States | 6f47b103-9955-4bbe-a364-387039623106 | Includes a TMS type of web service | -| [umn_metro_result1](umn_metro_result1.json) | 2030 Regional Development Framework Planning Areas: Metro Twin Cities, Minnesota, 2011 | 02236876-9c21-42f6-9870-d2562da8e44f | Bounding box of metropolitan area and ArcGIS Dynamic Feature Service | -| [umn_state_result1](umn_state_result1.json) | 1:100k Digital Raster Graphic - Collars Removed: Minnesota | 2eddde2f-c222-41ca-bd07-2fd74a21f4de | Bounding box of state area and static image in references | -| [umn_state_result2](umn_state_result2.json) | 1:250k Digital Raster Graphic - Collars Removed: Minnesota | e9c71086-6b25-4950-8e1c-84c2794e3382 | Bounding box of state area and raster download | -| [uva_slug_colon](uva_slug_colon.json) | Norfolk 2005 Police Stations | uva-Norfolk:police_point | Multipoint dataset with WMS and WFS and a colon in the slug and layer ID | +| [actual-papermap1](actual-papermap1.json) | 1:1 500 000 series [cartographic material] : tectonic map of Britain, Ireland and adjacent areas / British Geological Survey ; Geological Survey of Ireland ; Geological Survey of Northern Ireland. | mit-001145244 | Nondigitized paper map with a link to a library catalog +| [actual-point1](actual-point1.json) | 2014 New York City Places | nyu-2451-34564 | Point dataset with WMS and WFS +| [actual-polygon1](actual-polygon1.json) | 100 Foot Grid Cambridge MA 2004 | tufts-cambridgegrid100-04 | Polygon dataset (no direct download) with WFS, WMS, and FGDC metadata as XML +| [actual-raster1](actual-raster1.json)| 1-Meter Shaded Relief Multibeam Bathymetry Image (Color): Elkhorn Slough, California, 2005 | stanford-dp018hs9766 | Restricted raster layer with WMS and metadata in MODS and ISO 19139 +| [baruch_ancestor1](baruch_ancestor1.json) | 2016 NYC Geodatabase, Open Source Version (jan2016) | nyu_2451_34635 | SQLite Database with documentation download Referenced as parent +| [baruch_ancestor2](baruch_ancestor2.json) | 2016 NYC Geodatabase, ArcGIS Version (jan2016) | nyu_2451_34636 | Geodatabase with documentation download Referenced as parent +| [baruch_documentation_download](baruch_documentation_download.json) | 2015 New York City Subway Complexes and Ridership | nyu_2451_34502 | Point dataset with WMS and WFS, documentation download, and two parent records +| [bbox-spans-180](bbox-spans-180.json) | East Asia and Oceania | princeton-sx61dn82p | Scanned map with IIIF and direct TIFF download that spans across the 180th meridian +| [cornell_html_metadata](cornell_html_metadata.json) | Air Monitoring Stations, Adirondack Park, 2000 | cugir-007741 | Point dataset with WMS, WFS, direct download, and FGDC metadata XML and HTML +| [esri-dynamic-layer-all-layers](esri-dynamic-layer-all-layers.json) | Glacial Boundaries: Illinois, 1998 | 90f14ff4-1359-4beb-b931-5cb41d20ab90 | This record points to an the top level of an Esri Rest Web Map Service It does not specify a layer +| [esri-dynamic-layer-single-layer](esri-dynamic-layer-single-layer.json) | Abandoned Quarries: Indiana | 4669301e-b4b2-4c8b-bf40-01b968a2865b | ArcGIS Dynamic Map Layer with single layer indicated +| [esri-feature-layer](esri-feature-layer.json) | Transit - Airports: Maryland | f406332e63eb4478a9560ad86ae90327_18| ArcGIS Feature Layer - point dataset | +| [esri-image-map-layer](esri-image-map-layer.json)| Wabash Topo (27): Indiana, 1929 | 32653ed6-8d83-4692-8a06-bf13ffe2c018 | ArcGIS Image Map Layer with GeoTIFF direct download +| [esri-tiled_map_layer](esri-tiled_map_layer.json)| Soil Survey Geographic (SSURGO) | nyu-test-soil-survey-map | ArcGIS tiled map layer +| [esri-wms-layer](esri-wms-layer.json) | Agriculture Census: Indiana, 1997 | purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa | Dataset with ArcGIS Dynamic Map Layer, ArcGIS WMS, and direct download +| [harvard_raster](harvard_raster.json) | Saint Petersburg Region, Russia, 1834 (Raster Image) | harvard-g7064-s2-1834-k3 | This layer is a georeferenced raster image of the historic paper map +| [iiif-eastern-hemisphere](iiif-eastern-hemisphere.json) | A new & accurate map of Asia: drawn from actual surveys, and otherwise collected from journals | 57f0f116-b64e-4773-8684-96ba09afb549 | Eastern hemisphere scanned map with IIIF manifest +| [index_map_point](index_map_point.json) | New York Aerial Photos (1960s) | cornell-ny-aerial-photos-1960s | GeoJSON index map of points +| [index-map-polygon](index-map-polygon.json) | Index of Digital Elevation Models (DEM), New York | cugir-008186-no-downloadurl | GeoJSON index map of polygons, with a downloadUrl for the index itself +| [index-map-polygon-no-downloadurl](index-map-polygon-no-downloadurl.json) | Index of Digital Elevation Models (DEM), New York | cugir-008186 | GeoJSON index map of polygons, but lacking a downloadUrl for the index itself +| [index-map-stanford](index-map-stanford.json) | Dabao Kinbōzu, Maps Index | stanford-fb897vt9938 | old-style (pre-GeoJSON) index map of rectangular polygons +| [metadata_no_geom](metadata_no_geom.json) | Ames Library of South Asia Maps | 05d-p16022coll246-noGeo | This is a collection level record without spatial coordinates +| [metadata_no_provider](metadata_no_provider.json)| Social Explorer | 99-0001-noprovider | This is a website record that does not have a Provider (aardvark)/ provider (GBL Metadata 1.0) +| [multiple-downloads](multiple-downloads.json) | Test record with additional download formats | cugir-007950 | This is a test record containing new-style references as nested child documents In addition to the original shapefile download, the references section contains additional PDF and KMZ downloads +| [no_locn_geometry](no_locn_geometry.json) | University of Minnesota Digital Conservancy DRUM | 05d-03-noGeomType | This is a collection level record without spatial coordinates or a Geometry Type (GBL Metadata 1.0) +| [no_spatial](no_spatial.json) | ASTER Global Emissivity Dataset 1-kilometer V003 - AG1KM | aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20 | File without geometry type or locn_geometry (will cause error) | +| [oembed](oembed.json) | Jōshū Kusatsu Onsenzu | stanford-dc482zx1528 | This record has an Oembed reference link +| [princeton-child1](princeton-child1.json) | Princeton, Mercer County, New Jersey (Sheet 1) | princeton-n009w382v | Child record for testing the gbl_suppressed_b property +| [princeton-child2](princeton-child2.json) | Princeton, Mercer County, New Jersey (Sheet 2) | princeton-jq085m62x | Child record for testing the gbl_suppressed_b property +| [princeton-child3](princeton-child3.json) | Princeton, Mercer County, New Jersey (Sheet 3) | princeton-n009w382v-fake1 | Child record for testing the gbl_suppressed_b property +| [princeton-child4](princeton-child4.json) | Princeton, Mercer County, New Jersey (Sheet 4) | princeton-n009w382v-fake2 | Child record for testing the gbl_suppressed_b property +| [princeton-parent](princeton-parent.json) | Princeton, Mercer County, New Jersey | princeton-1r66j405w | Parent record for testing the gbl_suppressed_b property +| [public_direct_download](public_direct_download.json) | 2005 Rural Poverty GIS Database: Uganda | stanford-cz128vq0535 | includes a tentative dcat_distribution_sm property +| [public_iiif_princeton](public_iiif_princeton.json) | The provinces of New York and New Jersey, with part of Pensilvania, and the Province of Quebec | princeton-02870w62c | Scanned map with IIIF +| [public_polygon_mit](public_polygon_mit.json) | Massachusetts (ZCTA - 5 digit zip code tabulation area, 2000) | mit-f6rqs4ucovjk2 | Polygon shapefile with WMS and WFS +| [restricted-line](restricted-line.json) | 10 Meter Contours: Russian River Basin, California | stanford-cg357zz0321 | Restricted line layer with WFS, WMS and metadata in MODS and ISO 19139 +| [tms](tms.json) | Agricultural Districts, Columbia County NY, 2009 (TMS) | cugir-007957 | Includes a reference to a TMS web service +| [umn_metro_result1](umn_metro_result1.json) | 2030 Regional Development Framework Planning Areas: Metro Twin Cities, Minnesota, 2011| 02236876-9c21-42f6-9870-d2562da8e44f | Bounding box of metropolitan area and ArcGIS Dynamic Feature Service +| [umn_state_result1](umn_state_result1.json) | 1:100k Digital Raster Graphic - Collars Removed: Minnesota | 2eddde2f-c222-41ca-bd07-2fd74a21f4de | Bounding box of state area and static image in references +| [umn_state_result2](umn_state_result2.json) | 1:250k Digital Raster Graphic - Collars Removed: Minnesota | e9c71086-6b25-4950-8e1c-84c2794e3382 | Bounding box of state area and raster download +| [uva_slug_colon](uva_slug_colon.json) | Norfolk 2005 Police Stations | uva-Norfolk:police_point | Multipoint dataset with WMS and WFS and a colon in the slug and layer ID +| [wmts-multiple](wmts-multiple.json) | Orthofoto 2016 Wien (WMTS) | princeton-fk4db9hn29 | Raster dataset with gbl_wxsIdentifier_s value and reference to WMTS service that supports multiple layers +| [wmts-single-layer](wmts-single-layer.json) | The Balkans [and] Turkey : G.S.G.S. no. 2097 | princeton-fk4544658v-wmts | Raster mosaic dataset with reference to a WMTS service that supports one layer +| [xyz](xyz.json)| Quaternary Fault and Fold Database of the United States (XYZ) | 6f47b103-9955-4bbe-a364-387039623106-xyz | Line shapefile with an XYZ tile service reference diff --git a/test/fixtures/files/gbl_documents/actual-papermap1.json b/test/fixtures/files/gbl_documents/actual-papermap1.json index 4ac8af3..8c65cf3 100644 --- a/test/fixtures/files/gbl_documents/actual-papermap1.json +++ b/test/fixtures/files/gbl_documents/actual-papermap1.json @@ -32,7 +32,8 @@ "[1996 TO 1996]" ], "locn_geometry": "ENVELOPE(-13,4,62,49)", - "dcat_centroid_ss": "55.5,-4.5", + "dcat_bbox": "ENVELOPE(-13,4,62,49)", + "dcat_centroid": "55.5,-4.5", "dct_accessRights_s": "Public", "dct_format_s": "Paper", "gbl_wxsIdentifier_s": "MIT:001145244", diff --git a/test/fixtures/files/gbl_documents/actual-point1.json b/test/fixtures/files/gbl_documents/actual-point1.json index c89b6c5..9eb5f48 100644 --- a/test/fixtures/files/gbl_documents/actual-point1.json +++ b/test/fixtures/files/gbl_documents/actual-point1.json @@ -42,7 +42,8 @@ "New York, New York" ], "locn_geometry": "ENVELOPE(-74.24856464,-73.73228698,40.89620987,40.49956589)", - "dcat_centroid_ss": "40.697887879999996,-73.99042581", + "dcat_bbox": "ENVELOPE(-74.24856464,-73.73228698,40.89620987,40.49956589)", + "dcat_centroid": "40.697887879999996,-73.99042581", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_wxsIdentifier_s": "sdr:nyu_2451_34564", diff --git a/test/fixtures/files/gbl_documents/actual-polygon1.json b/test/fixtures/files/gbl_documents/actual-polygon1.json index 2929c99..3421ddb 100644 --- a/test/fixtures/files/gbl_documents/actual-polygon1.json +++ b/test/fixtures/files/gbl_documents/actual-polygon1.json @@ -34,7 +34,8 @@ "[2004 TO 2004]" ], "locn_geometry": "ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)", - "dcat_centroid_ss": "42.377943,-71.1082825", + "dcat_bbox": "ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)", + "dcat_centroid": "42.377943,-71.1082825", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_wxsIdentifier_s": "sde:GISPORTAL.GISOWNER01.CAMBRIDGEGRID100_04", diff --git a/test/fixtures/files/gbl_documents/actual-raster1.json b/test/fixtures/files/gbl_documents/actual-raster1.json index 833c6f4..e72cacc 100644 --- a/test/fixtures/files/gbl_documents/actual-raster1.json +++ b/test/fixtures/files/gbl_documents/actual-raster1.json @@ -28,7 +28,7 @@ "Multibeam mapping" ], "dcat_theme_sm": [ - "Imagery and Base Maps", + "Imagery", "Elevation", "Inland Waters" ], @@ -50,7 +50,8 @@ "Monterey Bay (Calif.)" ], "locn_geometry": "ENVELOPE(-121.7948738,-121.7389503,36.8606925,36.8085911)", - "dcat_centroid_ss": "36.8346418,-121.76691205", + "dcat_bbox": "ENVELOPE(-121.7948738,-121.7389503,36.8606925,36.8085911)", + "dcat_centroid": "36.8346418,-121.76691205", "dct_rights_sm": [ "These data are licensed by Stanford Libraries and are available to Stanford University affiliates only. Affiliates are limited to current faculty, staff and students. These data may not be reproduced or used for any purpose without permission. For more information please contact brannerlibrary@stanford.edu" ], diff --git a/test/fixtures/files/gbl_documents/b1g_wabash_child_15.json b/test/fixtures/files/gbl_documents/b1g_wabash_child_15.json new file mode 100644 index 0000000..ee040b3 --- /dev/null +++ b/test/fixtures/files/gbl_documents/b1g_wabash_child_15.json @@ -0,0 +1,62 @@ +{ + "id": "b5857bb0-2819-49cf-a6da-fdb39d50c529", + "gbl_mdVersion_s": "Aardvark", + "dct_title_s": "Wabash Topo (15): Indiana, 1929", + "dct_description_sm": [ + "The maps represented here are on tiff files owned by EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984." + ], + "dct_language_sm": [ + "eng" + ], + "dct_creator_sm": [ + "Brock & Weymouth Inc.", + "United States Engineer Office" + ], + "dct_publisher_sm": [ + "Purdue University Libraries" + ], + "gbl_resourceClass_sm": [ + "Maps" + ], + "dcat_keyword_sm": [ + "Topography", + "Purdue Georeferenced Imagery" + ], + "dcat_theme_sm": [ + "Imagery and Base Maps" + ], + "dct_issued_s": "2015-10-31", + "dct_temporal_sm": [ + "1929" + ], + "gbl_dateRange_drsim": [ + "[1929 TO 1929]" + ], + "gbl_indexYear_im": [ + 1929 + ], + "dct_spatial_sm": [ + "Indiana" + ], + "locn_geometry": "ENVELOPE(-87.5071,-87.3597,39.539,39.4622)", + "dcat_bbox": "ENVELOPE(-87.5071,-87.3597,39.539,39.4622)", + "dcat_centroid": "39.500600000000006,-87.4334", + "pcdm_memberOf_sm": [ + "09d-01" + ], + "gbl_resourceType_sm": [ + "Topographic maps" + ], + "dct_format_s": "GeoTIFF", + "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabash_topo_15.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}", + "dct_identifier_sm": [ + "b5857bb0-2819-49cf-a6da-fdb39d50c529" + ], + "schema_provider_s": "Purdue University", + "dct_isPartOf_sm": [ + "88cc9b19-3294-4da9-9edd-775c81fb1c59" + ], + "dct_accessRights_s": "Public", + "gbl_suppressed_b": true, + "gbl_mdModified_dt": "2021-05-07T23:00:10Z" +} diff --git a/test/fixtures/files/gbl_documents/b1g_wabash_child_16.json b/test/fixtures/files/gbl_documents/b1g_wabash_child_16.json new file mode 100644 index 0000000..6d22793 --- /dev/null +++ b/test/fixtures/files/gbl_documents/b1g_wabash_child_16.json @@ -0,0 +1,64 @@ +{ + "id": "d8906fc8-92bb-4ced-bcd5-9ce9a4701c25", + "gbl_mdVersion_s": "Aardvark", + "dct_title_s": "Wabash Topo (16): Indiana, 1929", + "dct_description_sm": [ + "The maps represented here are on tiff files owned by EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984." + ], + "dct_language_sm": [ + "eng" + ], + "dct_creator_sm": [ + "Brock & Weymouth Inc.", + "United States Engineer Office" + ], + "dct_publisher_sm": [ + "Purdue University Libraries" + ], + "gbl_resourceClass_sm": [ + "Maps" + ], + "dcat_keyword_sm": [ + "Topography", + "Purdue Georeferenced Imagery" + ], + "dcat_theme_sm": [ + "Imagery and Base Maps" + ], + "dct_issued_s": "2015-10-31", + "dct_temporal_sm": [ + "1929" + ], + "gbl_dateRange_drsim": [ + "[1929 TO 1929]" + ], + "gbl_indexYear_im": [ + 1929 + ], + "dct_spatial_sm": [ + "Indiana", + "Tippecano County, Indiana", + "Wabash River, Indiana" + ], + "locn_geometry": "ENVELOPE(-87.4831,-87.336,39.606,39.5301)", + "dcat_bbox": "ENVELOPE(-87.4831,-87.336,39.606,39.5301)", + "dcat_centroid": "39.56805,-87.40955", + "pcdm_memberOf_sm": [ + "09d-01" + ], + "gbl_resourceType_sm": [ + "Topographic maps" + ], + "dct_format_s": "GeoTIFF", + "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabash_topo_16.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}", + "dct_identifier_sm": [ + "d8906fc8-92bb-4ced-bcd5-9ce9a4701c25" + ], + "schema_provider_s": "Purdue University", + "dct_isPartOf_sm": [ + "88cc9b19-3294-4da9-9edd-775c81fb1c59" + ], + "dct_accessRights_s": "Public", + "gbl_suppressed_b": true, + "gbl_mdModified_dt": "2021-05-07T23:00:10Z" +} diff --git a/test/fixtures/files/gbl_documents/b1g_wabash_child_17.json b/test/fixtures/files/gbl_documents/b1g_wabash_child_17.json new file mode 100644 index 0000000..fab3acf --- /dev/null +++ b/test/fixtures/files/gbl_documents/b1g_wabash_child_17.json @@ -0,0 +1,62 @@ +{ + "id": "55d9f193-9f29-4cbf-860d-23c1cff11691", + "gbl_mdVersion_s": "Aardvark", + "dct_title_s": "Wabash Topo (17): Indiana, 1929", + "dct_description_sm": [ + "The maps represented here are on tiff files owned by EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984." + ], + "dct_language_sm": [ + "eng" + ], + "dct_creator_sm": [ + "Brock & Weymouth Inc.", + "United States Engineer Office" + ], + "dct_publisher_sm": [ + "Purdue University Libraries" + ], + "gbl_resourceClass_sm": [ + "Maps" + ], + "dcat_keyword_sm": [ + "Topography", + "Purdue Georeferenced Imagery" + ], + "dcat_theme_sm": [ + "Imagery and Base Maps" + ], + "dct_issued_s": "2015-10-31", + "dct_temporal_sm": [ + "1929" + ], + "gbl_dateRange_drsim": [ + "[1929 TO 1929]" + ], + "gbl_indexYear_im": [ + 1929 + ], + "dct_spatial_sm": [ + "Indiana" + ], + "locn_geometry": "ENVELOPE(-87.4665,-87.3179,39.6748,39.5982)", + "dcat_bbox": "ENVELOPE(-87.4665,-87.3179,39.6748,39.5982)", + "dcat_centroid": "39.6365,-87.3922", + "pcdm_memberOf_sm": [ + "09d-01" + ], + "gbl_resourceType_sm": [ + "Topographic maps" + ], + "dct_format_s": "GeoTIFF", + "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabash_topo_17.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}", + "dct_identifier_sm": [ + "55d9f193-9f29-4cbf-860d-23c1cff11691" + ], + "schema_provider_s": "Purdue University", + "dct_isPartOf_sm": [ + "88cc9b19-3294-4da9-9edd-775c81fb1c59" + ], + "dct_accessRights_s": "Public", + "gbl_suppressed_b": true, + "gbl_mdModified_dt": "2021-05-07T23:00:10Z" +} diff --git a/test/fixtures/files/gbl_documents/b1g_wabash_child_18.json b/test/fixtures/files/gbl_documents/b1g_wabash_child_18.json new file mode 100644 index 0000000..01ecb4e --- /dev/null +++ b/test/fixtures/files/gbl_documents/b1g_wabash_child_18.json @@ -0,0 +1,62 @@ +{ + "id": "b835efbd-ca27-41af-bae2-c22210e58a89", + "gbl_mdVersion_s": "Aardvark", + "dct_title_s": "Wabash Topo (18): Indiana, 1929", + "dct_description_sm": [ + "The maps represented here are on tiff files owned by EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984." + ], + "dct_language_sm": [ + "eng" + ], + "dct_creator_sm": [ + "Brock & Weymouth Inc.", + "United States Engineer Office" + ], + "dct_publisher_sm": [ + "Purdue University Libraries" + ], + "gbl_resourceClass_sm": [ + "Maps" + ], + "dcat_keyword_sm": [ + "Topography", + "Purdue Georeferenced Imagery" + ], + "dcat_theme_sm": [ + "Imagery and Base Maps" + ], + "dct_issued_s": "2015-10-30", + "dct_temporal_sm": [ + "1929" + ], + "gbl_dateRange_drsim": [ + "[1929 TO 1929]" + ], + "gbl_indexYear_im": [ + 1929 + ], + "dct_spatial_sm": [ + "Indiana" + ], + "locn_geometry": "ENVELOPE(-87.4407,-87.2936,39.7429,39.6653)", + "dcat_bbox": "ENVELOPE(-87.4407,-87.2936,39.7429,39.6653)", + "dcat_centroid": "39.7041,-87.36715000000001", + "pcdm_memberOf_sm": [ + "09d-01" + ], + "gbl_resourceType_sm": [ + "Topographic maps" + ], + "dct_format_s": "GeoTIFF", + "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabash_topo_18.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}", + "dct_identifier_sm": [ + "b835efbd-ca27-41af-bae2-c22210e58a89" + ], + "schema_provider_s": "Purdue University", + "dct_isPartOf_sm": [ + "88cc9b19-3294-4da9-9edd-775c81fb1c59" + ], + "dct_accessRights_s": "Public", + "gbl_suppressed_b": true, + "gbl_mdModified_dt": "2021-05-07T23:00:10Z" +} diff --git a/test/fixtures/files/gbl_documents/b1g_wabash_parent.json b/test/fixtures/files/gbl_documents/b1g_wabash_parent.json new file mode 100644 index 0000000..fdb25c2 --- /dev/null +++ b/test/fixtures/files/gbl_documents/b1g_wabash_parent.json @@ -0,0 +1,59 @@ +{ + "id": "88cc9b19-3294-4da9-9edd-775c81fb1c59", + "gbl_mdVersion_s": "Aardvark", + "dct_title_s": "Wabash River Topographic Maps: Indiana, 1929", + "dct_description_sm": [ + "See Related Records below to download individual GeoTIFFs. The maps represented here are tiff files owned by Purdue University's EAS library. The topos were scanned in color and are up to 550MB each. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984." + ], + "dct_language_sm": [ + "eng" + ], + "dct_creator_sm": [ + "Brock & Weymouth Inc.", + "United States Engineer Office" + ], + "dct_publisher_sm": [ + "Purdue University Libraries" + ], + "gbl_resourceClass_sm": [ + "Maps" + ], + "dcat_keyword_sm": [ + "Topography", + "Purdue Georeferenced Imagery" + ], + "dcat_theme_sm": [ + "Imagery and Base Maps" + ], + "dct_issued_s": "2015-10-17", + "dct_temporal_sm": [ + "1929" + ], + "gbl_dateRange_drsim": [ + "[1929 TO 1929]" + ], + "gbl_indexYear_im": [ + 1929 + ], + "dct_spatial_sm": [ + "Indiana" + ], + "locn_geometry": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)", + "dcat_bbox": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)", + "dcat_centroid": "40.1004,-86.86785", + "pcdm_memberOf_sm": [ + "09d-01" + ], + "gbl_resourceType_sm": [ + "Topographic maps" + ], + "dct_format_s": "Image Service", + "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashtopo/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}", + "dct_identifier_sm": [ + "88cc9b19-3294-4da9-9edd-775c81fb1c59" + ], + "schema_provider_s": "Purdue University", + "dct_accessRights_s": "Public", + "gbl_suppressed_b": false, + "gbl_mdModified_dt": "2021-05-07T23:00:10Z" +} diff --git a/test/fixtures/files/gbl_documents/baruch_ancestor1.json b/test/fixtures/files/gbl_documents/baruch_ancestor1.json index f9ec6d2..1534197 100644 --- a/test/fixtures/files/gbl_documents/baruch_ancestor1.json +++ b/test/fixtures/files/gbl_documents/baruch_ancestor1.json @@ -57,7 +57,8 @@ "Borough of Staten Island, New York" ], "locn_geometry": "ENVELOPE(-74.255895,-73.700272,40.915282,40.495929)", - "dcat_centroid_ss": "40.7056055,-73.9780835", + "dcat_bbox": "ENVELOPE(-74.255895,-73.700272,40.915282,40.495929)", + "dcat_centroid": "40.7056055,-73.9780835", "dct_accessRights_s": "Public", "dct_format_s": "SQLite Database", "gbl_wxsIdentifier_s": "sdr:nyu_2451_34635", diff --git a/test/fixtures/files/gbl_documents/baruch_ancestor2.json b/test/fixtures/files/gbl_documents/baruch_ancestor2.json index 97608ba..6717e33 100644 --- a/test/fixtures/files/gbl_documents/baruch_ancestor2.json +++ b/test/fixtures/files/gbl_documents/baruch_ancestor2.json @@ -57,7 +57,8 @@ "Borough of Staten Island, New York" ], "locn_geometry": "ENVELOPE(-74.255895,-73.700272,40.915282,40.495929)", - "dcat_centroid_ss": "40.7056055,-73.9780835", + "dcat_bbox": "ENVELOPE(-74.255895,-73.700272,40.915282,40.495929)", + "dcat_centroid": "40.7056055,-73.9780835", "dct_accessRights_s": "Public", "dct_format_s": "Geodatabase", "gbl_wxsIdentifier_s": "sdr:nyu_2451_34636", diff --git a/test/fixtures/files/gbl_documents/baruch_documentation_download.json b/test/fixtures/files/gbl_documents/baruch_documentation_download.json index 092f2ef..045b28a 100644 --- a/test/fixtures/files/gbl_documents/baruch_documentation_download.json +++ b/test/fixtures/files/gbl_documents/baruch_documentation_download.json @@ -57,7 +57,7 @@ "Borough of Queens, New York" ], "locn_geometry": "ENVELOPE(-74.030876,-73.755405,40.903125,40.576127)", - "dcat_centroid_ss": "40.739626,-73.8931405", + "dcat_centroid": "40.739626,-73.8931405", "dct_source_sm": [ "nyu_2451_34635", "nyu_2451_34636" diff --git a/test/fixtures/files/gbl_documents/bbox-spans-180.json b/test/fixtures/files/gbl_documents/bbox-spans-180.json index 564bdf3..f251741 100644 --- a/test/fixtures/files/gbl_documents/bbox-spans-180.json +++ b/test/fixtures/files/gbl_documents/bbox-spans-180.json @@ -24,7 +24,8 @@ "GBL Fixture records" ], "locn_geometry": "ENVELOPE(-124.7333333,68,62.45,-53.23333333)", - "dcat_centroid_ss": "4.608,-28.366", + "dcat_bbox": "ENVELOPE(-124.7333333,68,62.45,-53.23333333)", + "dcat_centroid": "4.608,-28.366", "dct_accessRights_s": "Public", "dct_format_s": "TIFF", "gbl_wxsIdentifier_s": "public-figgy:a990e1b4-7f0e-44b8-ae2a-de7e93cdd74a", diff --git a/test/fixtures/files/gbl_documents/cornell_html_metadata.json b/test/fixtures/files/gbl_documents/cornell_html_metadata.json index c36a032..84dd603 100644 --- a/test/fixtures/files/gbl_documents/cornell_html_metadata.json +++ b/test/fixtures/files/gbl_documents/cornell_html_metadata.json @@ -28,7 +28,7 @@ ], "dcat_theme_sm": [ "Environment", - "Climatology, Meteorology and Atmosphere" + "Climate" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -47,12 +47,13 @@ "New York" ], "locn_geometry": "ENVELOPE(-74.989258,-73.858335,44.67778,43.452994)", - "dcat_centroid_ss": "44.065387,-74.42379650000001", + "dcat_bbox": "ENVELOPE(-74.989258,-73.858335,44.67778,43.452994)", + "dcat_centroid": "44.065387,-74.42379650000001", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_fileSize_s": "0.07 MB", "gbl_wxsIdentifier_s": "cugir007741", - "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://schema.org/downloadUrl:https://s3.amazonaws.com/cugir-data/00/77/41/cugir-007741.zip\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://s3.amazonaws.com/cugir-data/00/77/41/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"https://s3.amazonaws.com/cugir-data/00/77/41/fgdc.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://cugir.library.cornell.edu/geoserver/cugir/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://cugir.library.cornell.edu/geoserver/cugir/wms\"}", + "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://s3.amazonaws.com/cugir-data/00/77/41/cugir-007741.zip\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://s3.amazonaws.com/cugir-data/00/77/41/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"https://s3.amazonaws.com/cugir-data/00/77/41/fgdc.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://cugir.library.cornell.edu/geoserver/cugir/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://cugir.library.cornell.edu/geoserver/cugir/wms\"}", "id": "cugir-007741", "dct_identifier_sm": [ "https://cugir.library.cornell.edu/catalog/cugir-007741" diff --git a/test/fixtures/files/gbl_documents/esri-dynamic-layer-all-layers.json b/test/fixtures/files/gbl_documents/esri-dynamic-layer-all-layers.json index bc1b323..bc6efe7 100644 --- a/test/fixtures/files/gbl_documents/esri-dynamic-layer-all-layers.json +++ b/test/fixtures/files/gbl_documents/esri-dynamic-layer-all-layers.json @@ -24,7 +24,7 @@ "Polygon data" ], "dcat_theme_sm": [ - "Geoscientific Information" + "Geology" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -43,7 +43,8 @@ "Illinois" ], "locn_geometry": "ENVELOPE(-91.513518,-87.495214,42.508348,36.969972)", - "dcat_centroid_ss": "39.73916,-89.504366", + "dcat_bbox": "ENVELOPE(-91.513518,-87.495214,42.508348,36.969972)", + "dcat_centroid": "39.73916,-89.504366", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://clearinghouse.isgs.illinois.edu/sites/clearinghouse.isgs/files/Clearinghouse/data/ISGS/Geology/zips/IL_Glacial_Bndys_Py.zip\",\"http://schema.org/url\":\"https://clearinghouse.isgs.illinois.edu/data/geology/glacial-boundaries\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"https://data.isgs.illinois.edu/arcgis/rest/services/Geology/Glacial_Boundaries/MapServer\"}", diff --git a/test/fixtures/files/gbl_documents/esri-dynamic-layer-single-layer.json b/test/fixtures/files/gbl_documents/esri-dynamic-layer-single-layer.json index 914a35e..af6ccf6 100644 --- a/test/fixtures/files/gbl_documents/esri-dynamic-layer-single-layer.json +++ b/test/fixtures/files/gbl_documents/esri-dynamic-layer-single-layer.json @@ -25,7 +25,7 @@ "Point data" ], "dcat_theme_sm": [ - "Geoscientific Information" + "Geology" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -44,7 +44,8 @@ "Indiana" ], "locn_geometry": "ENVELOPE(-87.9324,-86.2569,39.8521,37.8626)", - "dcat_centroid_ss": "38.85735,-87.09465", + "dcat_bbox": "ENVELOPE(-87.9324,-86.2569,39.8521,37.8626)", + "dcat_centroid": "38.85735,-87.09465", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://maps.indiana.edu/download/Geology/Industrial_Minerals_Quarries_Abandoned.zip\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://maps.indiana.edu/metadata/Geology/Industrial_Minerals_Quarries_Abandoned.xml\",\"http://schema.org/url\":\"http://maps.indiana.edu/previewMaps/Geology/Industrial_Minerals_Quarries_Abandoned.html\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"https://maps.indiana.edu/arcgis/rest/services/Geology/Industrial_Minerals_Quarries_Abandoned/MapServer/0\"}", diff --git a/test/fixtures/files/gbl_documents/esri-feature-layer.json b/test/fixtures/files/gbl_documents/esri-feature-layer.json index 51a91b2..01fa1a1 100644 --- a/test/fixtures/files/gbl_documents/esri-feature-layer.json +++ b/test/fixtures/files/gbl_documents/esri-feature-layer.json @@ -43,7 +43,8 @@ "Maryland" ], "locn_geometry": "ENVELOPE(-79.4539,-75.124,39.7194,37.9667)", - "dcat_centroid_ss": "38.843050000000005,-77.28895", + "dcat_bbox": "ENVELOPE(-79.4539,-75.124,39.7194,37.9667)", + "dcat_centroid": "38.843050000000005,-77.28895", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://data.imap.maryland.gov/datasets/f406332e63eb4478a9560ad86ae90327_18.zip\",\"urn:x-esri:serviceType:ArcGIS#FeatureLayer\":\"https://geodata.md.gov/imap/rest/services/Transportation/MD_Transit/FeatureServer/18\",\"http://schema.org/url\":\"http://data.imap.maryland.gov/datasets/f406332e63eb4478a9560ad86ae90327_18\"}", diff --git a/test/fixtures/files/gbl_documents/esri-image-map-layer.json b/test/fixtures/files/gbl_documents/esri-image-map-layer.json index f845c66..941821d 100644 --- a/test/fixtures/files/gbl_documents/esri-image-map-layer.json +++ b/test/fixtures/files/gbl_documents/esri-image-map-layer.json @@ -21,7 +21,7 @@ "Topographic maps" ], "dcat_theme_sm": [ - "Imagery and Base Maps" + "Imagery" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -40,7 +40,8 @@ "Indiana" ], "locn_geometry": "ENVELOPE(-87.324704,-87.174404,40.310695,40.233691)", - "dcat_centroid_ss": "40.272193,-87.24955399999999", + "dcat_bbox": "ENVELOPE(-87.324704,-87.174404,40.310695,40.233691)", + "dcat_centroid": "40.272193,-87.24955399999999", "dct_source_sm": [ "88cc9b19-3294-4da9-9edd-775c81fb1c59" ], diff --git a/test/fixtures/files/gbl_documents/esri-tiled_map_layer.json b/test/fixtures/files/gbl_documents/esri-tiled_map_layer.json index 6ce70e3..9fc7fd1 100644 --- a/test/fixtures/files/gbl_documents/esri-tiled_map_layer.json +++ b/test/fixtures/files/gbl_documents/esri-tiled_map_layer.json @@ -33,7 +33,8 @@ "[2010 TO 2010]" ], "locn_geometry": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)", - "dcat_centroid_ss": "35.22075,-96.96745", + "dcat_bbox": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)", + "dcat_centroid": "35.22075,-96.96745", "dct_accessRights_s": "Public", "dct_format_s": "GeoTIFF", "gbl_wxsIdentifier_s": "test-soil-survey_map", diff --git a/test/fixtures/files/gbl_documents/esri-wms-layer.json b/test/fixtures/files/gbl_documents/esri-wms-layer.json index 47fb1e8..ef0b5d7 100644 --- a/test/fixtures/files/gbl_documents/esri-wms-layer.json +++ b/test/fixtures/files/gbl_documents/esri-wms-layer.json @@ -44,7 +44,8 @@ "Indiana" ], "locn_geometry": "ENVELOPE(-88.1607,-84.6882,41.7753,37.7554)", - "dcat_centroid_ss": "39.76,-86.42", + "dcat_bbox": "ENVELOPE(-88.1607,-84.6882,41.7753,37.7554)", + "dcat_centroid": "39.76,-86.42", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_wxsIdentifier_s": "0", diff --git a/test/fixtures/files/gbl_documents/harvard_raster.json b/test/fixtures/files/gbl_documents/harvard_raster.json index 1ee68e2..901132a 100644 --- a/test/fixtures/files/gbl_documents/harvard_raster.json +++ b/test/fixtures/files/gbl_documents/harvard_raster.json @@ -29,7 +29,7 @@ "Bodies of water" ], "dcat_theme_sm": [ - "Imagery and Base Maps", + "Imagery", "Transportation" ], "dcat_keyword_sm": [ @@ -49,7 +49,8 @@ "Russia Saint Petersburg" ], "locn_geometry": "ENVELOPE(30.013108,30.875309,60.041712,59.669749)", - "dcat_centroid_ss": "59.8557305,30.444208500000002", + "dcat_bbox": "ENVELOPE(30.013108,30.875309,60.041712,59.669749)", + "dcat_centroid": "59.8557305,30.444208500000002", "dct_accessRights_s": "Public", "dct_format_s": "GeoTIFF", "gbl_wxsIdentifier_s": "cite:G7064_S2_1834_K3", diff --git a/test/fixtures/files/gbl_documents/iiif-eastern-hemisphere.json b/test/fixtures/files/gbl_documents/iiif-eastern-hemisphere.json index 6c84d2d..2bfed8f 100644 --- a/test/fixtures/files/gbl_documents/iiif-eastern-hemisphere.json +++ b/test/fixtures/files/gbl_documents/iiif-eastern-hemisphere.json @@ -29,8 +29,9 @@ "gbl_dateRange_drsim": [ "[1750 TO 1750]" ], - "locn_geometry": "ENVELOPE(25,-168.35,81.66,-12.93)", - "dcat_centroid_ss": "34.365,-71.675", + "locn_geometry": "MULTIPOLYGON (((-180 81.66,-168.35 81.66,-168.35 -12.93, -180 -12.93, -180 81.66),(25 81.66,25 -12.93,180 -12.93,180 81.66, 25 81.66)))", + "dcat_bbox": "ENVELOPE(25,-168.35,81.66,-12.93)", + "dcat_centroid": "34.365,-71.675", "dct_accessRights_s": "Public", "dct_format_s": "JPEG", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://umedia.lib.umn.edu/sites/default/files/archive/113/image/tiff/1058396.tif\",\"http://schema.org/url\":\"http://purl.umn.edu/200804\",\"http://iiif.io/api/presentation#manifest\":\"https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll246/224/manifest.json\"}", diff --git a/test/fixtures/files/gbl_documents/index-map-polygon-no-downloadurl.json b/test/fixtures/files/gbl_documents/index-map-polygon-no-downloadurl.json index f793abb..71f7d6a 100644 --- a/test/fixtures/files/gbl_documents/index-map-polygon-no-downloadurl.json +++ b/test/fixtures/files/gbl_documents/index-map-polygon-no-downloadurl.json @@ -44,7 +44,8 @@ "New York" ], "locn_geometry": "ENVELOPE(-79.750232,-71.750494,44.999963,40.499893)", - "dcat_centroid_ss": "42.749928,-75.750363", + "dcat_bbox": "ENVELOPE(-79.750232,-71.750494,44.999963,40.499893)", + "dcat_centroid": "42.749928,-75.750363", "dct_accessRights_s": "Public", "dct_format_s": "GeoTIFF", "gbl_wxsIdentifier_s": "cugir008186", diff --git a/test/fixtures/files/gbl_documents/index-map-polygon.json b/test/fixtures/files/gbl_documents/index-map-polygon.json index a03d393..0959070 100644 --- a/test/fixtures/files/gbl_documents/index-map-polygon.json +++ b/test/fixtures/files/gbl_documents/index-map-polygon.json @@ -44,7 +44,8 @@ "New York" ], "locn_geometry": "ENVELOPE(-79.750232,-71.750494,44.999963,40.499893)", - "dcat_centroid_ss": "42.749928,-75.750363", + "dcat_bbox": "ENVELOPE(-79.750232,-71.750494,44.999963,40.499893)", + "dcat_centroid": "42.749928,-75.750363", "dct_accessRights_s": "Public", "dct_format_s": "GeoTIFF", "gbl_wxsIdentifier_s": "cugir008186", diff --git a/test/fixtures/files/gbl_documents/index-map-stanford.json b/test/fixtures/files/gbl_documents/index-map-stanford.json index e0e954c..6089bbc 100644 --- a/test/fixtures/files/gbl_documents/index-map-stanford.json +++ b/test/fixtures/files/gbl_documents/index-map-stanford.json @@ -49,7 +49,8 @@ "Davao (Philippines)" ], "locn_geometry": "ENVELOPE(125,126,7.3333,6.6666)", - "dcat_centroid_ss": "6.99995,125.5", + "dcat_bbox": "ENVELOPE(125,126,7.3333,6.6666)", + "dcat_centroid": "6.99995,125.5", "dct_rights_sm": [ "These data are licensed by Stanford Libraries and are available to Stanford University affiliates only. Affiliates are limited to current faculty, staff and students. These data may not be reproduced or used for any purpose without permission. For more information please contact brannerlibrary@stanford.edu" ], diff --git a/test/fixtures/files/gbl_documents/index_map_point.json b/test/fixtures/files/gbl_documents/index_map_point.json index 8c62096..fd21ce1 100644 --- a/test/fixtures/files/gbl_documents/index_map_point.json +++ b/test/fixtures/files/gbl_documents/index_map_point.json @@ -26,7 +26,7 @@ "Index maps" ], "dcat_theme_sm": [ - "Imagery and Base Maps" + "Imagery" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -42,7 +42,8 @@ "New York" ], "locn_geometry": "ENVELOPE(-74.783,-74.733,40.2,40.166)", - "dcat_centroid_ss": "40.183,-74.75800000000001", + "dcat_bbox": "ENVELOPE(-74.783,-74.733,40.2,40.166)", + "dcat_centroid": "40.183,-74.75800000000001", "dct_accessRights_s": "Public", "dct_format_s": "GeoJSON", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://raw.githubusercontent.com/OpenIndexMaps/edu.cornell/master/ny-aerial-photos-1960s.geojson\",\"https://openindexmaps.org\":\"https://raw.githubusercontent.com/OpenIndexMaps/edu.cornell/master/ny-aerial-photos-1960s.geojson\"}", diff --git a/test/fixtures/files/gbl_documents/metadata_no_provider.json b/test/fixtures/files/gbl_documents/metadata_no_provider.json index b02299c..33da10c 100644 --- a/test/fixtures/files/gbl_documents/metadata_no_provider.json +++ b/test/fixtures/files/gbl_documents/metadata_no_provider.json @@ -30,7 +30,8 @@ "United States" ], "locn_geometry": "ENVELOPE(-179.9,-64.4,71.6,-14.8)", - "dcat_centroid_ss": "28.4,-122.15", + "dcat_bbox": "ENVELOPE(-179.9,-64.4,71.6,-14.8)", + "dcat_centroid": "28.4,-122.15", "dct_accessRights_s": "Restricted", "dct_references_s": "{\"http://schema.org/url\":\"https://www.socialexplorer.com/\"}", "id": "99-0001-noprovider", diff --git a/test/fixtures/files/gbl_documents/multiple-downloads.json b/test/fixtures/files/gbl_documents/multiple-downloads.json index 7d144f6..fdb61f0 100644 --- a/test/fixtures/files/gbl_documents/multiple-downloads.json +++ b/test/fixtures/files/gbl_documents/multiple-downloads.json @@ -33,10 +33,11 @@ "Broome County NY" ], "locn_geometry": "ENVELOPE(-76.12987,-75.42034,42.414648,41.997963)", - "dcat_centroid_ss": "42.2063055,-75.775105", + "dcat_bbox": "ENVELOPE(-76.12987,-75.42034,42.414648,41.997963)", + "dcat_centroid": "42.2063055,-75.775105", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", - "dct_references_s": "{\"http:\/\/schema.org\/downloadUrl\":[{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http:\/\/www.opengis.net\/cat\/csw\/csdgm\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.xml\",\"http:\/\/www.w3.org\/1999\/xhtml\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.html\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wfs\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wfs\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wms\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wms\"}", + "dct_references_s": "{\"http://schema.org/downloadUrl\":[{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http://www.opengis.net/cat/csw/csdgm\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://cugir.library.cornell.edu/geoserver/cugir/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://cugir.library.cornell.edu/geoserver/cugir/wms\"}", "id": "cugir-007950", "gbl_mdModified_dt": "2021-06-11T18:39:49Z", "gbl_mdVersion_s": "Aardvark" diff --git a/test/fixtures/files/gbl_documents/no_spatial.json b/test/fixtures/files/gbl_documents/no_spatial.json index 4cc2d95..babd501 100644 --- a/test/fixtures/files/gbl_documents/no_spatial.json +++ b/test/fixtures/files/gbl_documents/no_spatial.json @@ -4,7 +4,7 @@ "no_spatial" ], "dct_description_sm": [ - "File without geometry type or solr_geometry (will cause error). ", + "File without geometry type or locn_geometry (will cause error). ", "The Advanced Spaceborne Thermal Emission and Reflection radiometer Global Emissivity Database (ASTER GED) was developed by the National Aeronautics and Space Administration's (NASA) Jet Propulsion Laboratory (JPL), California Institute of Technology. The North America portion of this collection was formerly called the North American ASTER Land Surface Emissivity Database (NAALSED) - a seasonal dataset consisting of mean summer (J-A-S) and winter (J-F-M) products. ASTER GED products are output on 1degree x 1 degree grids at 100-meter or 1-kilometer spatial resolution (nominal) and include the mean emissivity and standard deviation for all 5 ASTER thermal infrared bands, mean land surface temperature (LST) and standard deviation, a re-sampled ASTER GDEM (not included in the North America Winter products), land-water mask, mean Normalized Difference Vegetation Index (NDVI) and standard deviation, latitude, longitude, and observation count. Additional ASTER GED product information is available at https://lpdaac.usgs.gov/products/community_products_table. Product tiles are available in HDF and binary format and may be downloaded via HTTP by visiting the following data clients: NASA Reverb (http://reverb.echo.nasa.gov), LP DAAC Data Pool (http://e4ftl01.cr.usgs.gov/ASTT/), or EarthExplorer (http://earthexplorer.usgs.gov)." ], "schema_provider_s": "U.S. Geological Survey, Department of the Interior", @@ -22,9 +22,6 @@ "Image map", "Emissivity" ], - "dcat_theme_sm": [ - "Imagery and Base Maps" - ], "dcat_keyword_sm": [ "GBL Fixture records" ], diff --git a/test/fixtures/files/gbl_documents/oembed.json b/test/fixtures/files/gbl_documents/oembed.json index 81f6b04..1475ffb 100644 --- a/test/fixtures/files/gbl_documents/oembed.json +++ b/test/fixtures/files/gbl_documents/oembed.json @@ -28,7 +28,8 @@ "Japan" ], "locn_geometry": "ENVELOPE(138.523426,138.630362,36.656354,36.597519)", - "dcat_centroid_ss": "36.6269365,138.57689399999998", + "dcat_bbox": "ENVELOPE(138.523426,138.630362,36.656354,36.597519)", + "dcat_centroid": "36.6269365,138.57689399999998", "dct_accessRights_s": "Public", "dct_format_s": "JPEG", "dct_references_s": "{\"http://schema.org/url\":\"http://purl.stanford.edu/dc482zx1528\",\"https://oembed.com\":\"https://purl.stanford.edu/embed.json?&hide_title=true&url=https://purl.stanford.edu/dc482zx1528\"}", diff --git a/test/fixtures/files/gbl_documents/princeton-child1.json b/test/fixtures/files/gbl_documents/princeton-child1.json index 822efce..75ab059 100644 --- a/test/fixtures/files/gbl_documents/princeton-child1.json +++ b/test/fixtures/files/gbl_documents/princeton-child1.json @@ -4,7 +4,7 @@ "princeton-child1" ], "dct_description_sm": [ - "Child record for testing the suppressed_b property. ", + "Child record for testing the gbl_suppressed_b property. ", "Title taken from sheet 1 of 1927 map. \"Feb. 1885.\" Includes location map and key. Oriented with the north to the upper left." ], "dct_language_sm": [ @@ -28,7 +28,8 @@ "GBL Fixture records" ], "locn_geometry": "ENVELOPE(-74.68,-74.63,40.37,40.33)", - "dcat_centroid_ss": "40.349999999999994,-74.655", + "dcat_bbox": "ENVELOPE(-74.68,-74.63,40.37,40.33)", + "dcat_centroid": "40.349999999999994,-74.655", "dct_source_sm": [ "princeton-1r66j405w" ], diff --git a/test/fixtures/files/gbl_documents/princeton-child2.json b/test/fixtures/files/gbl_documents/princeton-child2.json index d213e37..47572eb 100644 --- a/test/fixtures/files/gbl_documents/princeton-child2.json +++ b/test/fixtures/files/gbl_documents/princeton-child2.json @@ -4,7 +4,7 @@ "princeton-child2" ], "dct_description_sm": [ - "Child record for testing the suppressed_b property. ", + "Child record for testing the gbl_suppressed_b property. ", "Title taken from sheet 1 of 1927 map. \"Feb. 1885.\" Includes location map and key. Oriented with the north to the upper left." ], "dct_language_sm": [ @@ -28,7 +28,8 @@ "GBL Fixture records" ], "locn_geometry": "ENVELOPE(-74.68,-74.63,40.37,40.33)", - "dcat_centroid_ss": "40.349999999999994,-74.655", + "dcat_bbox": "ENVELOPE(-74.68,-74.63,40.37,40.33)", + "dcat_centroid": "40.349999999999994,-74.655", "dct_source_sm": [ "princeton-1r66j405w" ], diff --git a/test/fixtures/files/gbl_documents/princeton-child3.json b/test/fixtures/files/gbl_documents/princeton-child3.json index e6f3f7e..046894c 100644 --- a/test/fixtures/files/gbl_documents/princeton-child3.json +++ b/test/fixtures/files/gbl_documents/princeton-child3.json @@ -28,7 +28,8 @@ "GBL Fixture records" ], "locn_geometry": "ENVELOPE(-74.68,-74.63,40.37,40.33)", - "dcat_centroid_ss": "40.349999999999994,-74.655", + "dcat_bbox": "ENVELOPE(-74.68,-74.63,40.37,40.33)", + "dcat_centroid": "40.349999999999994,-74.655", "dct_source_sm": [ "princeton-1r66j405w" ], diff --git a/test/fixtures/files/gbl_documents/princeton-child4.json b/test/fixtures/files/gbl_documents/princeton-child4.json index 1888297..b56104e 100644 --- a/test/fixtures/files/gbl_documents/princeton-child4.json +++ b/test/fixtures/files/gbl_documents/princeton-child4.json @@ -4,7 +4,7 @@ "princeton-child4" ], "dct_description_sm": [ - "Child record for testing the suppressed_b property. ", + "Child record for testing the gbl_suppressed_b property. ", "Title taken from sheet 1 of 1927 map. \"Feb. 1885.\" Includes location map and key. Oriented with the north to the upper left." ], "dct_language_sm": [ @@ -28,7 +28,8 @@ "GBL Fixture records" ], "locn_geometry": "ENVELOPE(-74.68,-74.63,40.37,40.33)", - "dcat_centroid_ss": "40.349999999999994,-74.655", + "dcat_bbox": "ENVELOPE(-74.68,-74.63,40.37,40.33)", + "dcat_centroid": "40.349999999999994,-74.655", "dct_source_sm": [ "princeton-1r66j405w" ], diff --git a/test/fixtures/files/gbl_documents/princeton-parent.json b/test/fixtures/files/gbl_documents/princeton-parent.json index e188ec4..50ef999 100644 --- a/test/fixtures/files/gbl_documents/princeton-parent.json +++ b/test/fixtures/files/gbl_documents/princeton-parent.json @@ -4,7 +4,7 @@ "princeton-parent" ], "dct_description_sm": [ - "Parent record for testing the suppressed_b property. ", + "Parent record for testing the gbl_suppressed_b property. ", "Title taken from sheet 1 of 1927 map. \"Feb. 1885.\" Includes location map and key. Oriented with the north to the upper left." ], "dct_language_sm": [ @@ -14,7 +14,8 @@ "Sanborn Map Company" ], "dct_publisher_sm": [ - "New York : Sanborn Map & Publishing Co., Limited, 1885." + "New York : Sanborn Map & Publishing Co., Limited, 1885.", + "Princeton University Library" ], "schema_provider_s": "Princeton", "gbl_resourceClass_sm": [ @@ -34,7 +35,8 @@ "[1885 TO 1885]" ], "locn_geometry": "ENVELOPE(-74.68,-74.63,40.37,40.33)", - "dcat_centroid_ss": "40.350,-74.655", + "dcat_bbox": "ENVELOPE(-74.68,-74.63,40.37,40.33)", + "dcat_centroid": "40.350,-74.655", "dct_accessRights_s": "Public", "gbl_wxsIdentifier_s": "ark:/88435/1r66j405w", "dct_references_s": "{\"http://iiif.io/api/image\":\"https://libimages1.princeton.edu/loris/figgy_prod/5a%2F20%2F58%2F5a20585db50d44959fe5ae44821fd174%2Fintermediate_file.jp2/info.json\",\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/4266648\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy.princeton.edu/concern/scanned_maps/9a193476-5f2e-4f82-95a5-6db472e39b7b/manifest\"}", diff --git a/test/fixtures/files/gbl_documents/public_direct_download.json b/test/fixtures/files/gbl_documents/public_direct_download.json index 74c5a30..b8366d7 100644 --- a/test/fixtures/files/gbl_documents/public_direct_download.json +++ b/test/fixtures/files/gbl_documents/public_direct_download.json @@ -44,7 +44,8 @@ "Uganda" ], "locn_geometry": "ENVELOPE(29.572742,35.000308,4.234077,-1.478794)", - "dcat_centroid_ss": "1.3776415000000002,32.286525", + "dcat_bbox": "ENVELOPE(29.572742,35.000308,4.234077,-1.478794)", + "dcat_centroid": "1.3776415000000002,32.286525", "dct_rights_sm": [ "This item is in the public domain. There are no restrictions on use." ], diff --git a/test/fixtures/files/gbl_documents/public_iiif_princeton.json b/test/fixtures/files/gbl_documents/public_iiif_princeton.json index 3c73297..40dbdd7 100644 --- a/test/fixtures/files/gbl_documents/public_iiif_princeton.json +++ b/test/fixtures/files/gbl_documents/public_iiif_princeton.json @@ -47,11 +47,12 @@ "Pennsylvania" ], "locn_geometry": "ENVELOPE(-76.3394,-72.1916,46.5798,38.6693)", - "dcat_centroid_ss": "42.62455,-74.2655", + "dcat_bbox": "ENVELOPE(-76.3394,-72.1916,46.5798,38.6693)", + "dcat_centroid": "42.62455,-74.2655", "dct_accessRights_s": "Public", "dct_format_s": "Raster", "gbl_wxsIdentifier_s": "02870w62c", - "dct_references_s": "{\"http://iiif.io/api/image\":\"https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/info.json\",\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\"}", + "dct_references_s": "{\"http://iiif.io/api/image\":\"https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json\",\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\"}", "id": "princeton-02870w62c", "dct_identifier_sm": [ "http://arks.princeton.edu/ark:/88435/02870w62c" diff --git a/test/fixtures/files/gbl_documents/public_polygon_mit.json b/test/fixtures/files/gbl_documents/public_polygon_mit.json index be07bb1..17cf1b7 100644 --- a/test/fixtures/files/gbl_documents/public_polygon_mit.json +++ b/test/fixtures/files/gbl_documents/public_polygon_mit.json @@ -32,7 +32,8 @@ "Massachusetts" ], "locn_geometry": "ENVELOPE(-73.533237,-69.898565,42.888068,41.230345)", - "dcat_centroid_ss": "42.0592065,-71.715901", + "dcat_bbox": "ENVELOPE(-73.533237,-69.898565,42.888068,41.230345)", + "dcat_centroid": "42.0592065,-71.715901", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_wxsIdentifier_s": "mit:SDE_DATA_US_MA_E25ZCTA5DCT_2000", diff --git a/test/fixtures/files/gbl_documents/restricted-line.json b/test/fixtures/files/gbl_documents/restricted-line.json index 2c3bee0..9664af8 100644 --- a/test/fixtures/files/gbl_documents/restricted-line.json +++ b/test/fixtures/files/gbl_documents/restricted-line.json @@ -51,7 +51,8 @@ "Mendocino County (Calif.)" ], "locn_geometry": "ENVELOPE(-123.387366,-122.52958,39.398403,38.302994)", - "dcat_centroid_ss": "38.8506985,-122.958473", + "dcat_bbox": "ENVELOPE(-123.387366,-122.52958,39.398403,38.302994)", + "dcat_centroid": "38.8506985,-122.958473", "dct_rights_sm": [ "These data are licensed by Stanford Libraries and are available to Stanford University affiliates only. Affiliates are limited to current faculty, staff and students. These data may not be reproduced or used for any purpose without permission. For more information please contact brannerlibrary@stanford.edu" ], diff --git a/test/fixtures/files/gbl_documents/tilejson.json b/test/fixtures/files/gbl_documents/tilejson.json new file mode 100644 index 0000000..03cdafe --- /dev/null +++ b/test/fixtures/files/gbl_documents/tilejson.json @@ -0,0 +1,48 @@ +{ + "gbl_mdVersion_s": "Aardvark", + "dct_identifier_sm": [ + "ark:/99999/fk4544658v" + ], + "id": "princeton-fk4544658v-tilejson", + "dct_title_s": "The Balkans [and] Turkey : G.S.G.S. no. 2097 / War Office. General Staff. Geographical Section (TileJSON Fixture)", + "locn_geometry": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)", + "dcat_bbox": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)", + "schema_provider_s": "Princeton", + "dct_accessRights_s": "Public", + "dct_description_sm": [ + "Relief shown by contours approximately 100 feet interval, spot heights, and shading. Title varies; some sheets are titled \"Turkey\". Shows international boundaries, railways, 2 categories of roads, telegraph lines, places of worship, ruins. Constantinople latest edition map has a glossary." + ], + "dct_creator_sm": [ + "Great Britain. War Office. General Staff. Geographical Section" + ], + "dct_language_sm": [ + "eng" + ], + "dct_publisher_sm": [ + "[London] : War Office. General Staff. Geographical Section. General Staff, 1908-25." + ], + "dct_subject_sm": [ + "Balkan Peninsula Maps", + "Turkey Maps", + "Topographic Maps" + ], + "dct_spatial_sm": [ + "Balkan Peninsula", + "Turkey" + ], + "dct_issued_s": 1908, + "gbl_indexYear_im": [ + "1908" + ], + "gbl_mdModified_dt": "2022-02-03T22:13:40Z", + "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames\":\"https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x.png?id=2a91d82c541c426cb787cc62afe8f248\",\"https://github.com/mapbox/tilejson-spec\":\"https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248\"}", + "layer_geom_type_s": "Image", + "gbl_resourceClass_sm": [ + "Maps", + "Web services" + ], + "gbl_resourceType_sm": [ + "Military maps", + "Topographic maps" + ] +} diff --git a/test/fixtures/files/gbl_documents/tms.json b/test/fixtures/files/gbl_documents/tms.json index cff6cab..e5c2acb 100644 --- a/test/fixtures/files/gbl_documents/tms.json +++ b/test/fixtures/files/gbl_documents/tms.json @@ -1,45 +1,42 @@ { - "dct_title_s": "Quaternary Fault and Fold Database of the United States", + "dct_title_s": "Agricultural Districts, Columbia County NY, 2009 (TMS)", "dct_alternative_sm": [ "tms" ], "dct_description_sm": [ - "Quaternary Fault and Fold Database of the United States" + "These GIS files represent geographic boundaries for lands that are under the protection of NYS Agricultural District Law, administered by the New York State Department of Agriculture and Markets. The boundaries are derived from New York State Agricultural District, 1:24,000-scale, maps produced at county agencies. The district boundaries correspond to tax parcel data. District boundaries are joined into a file representing all of the Agricultural Districts within an entire county. Note that 2003 legislation allows lands to be added to districts on an annual basis. Electronic data provided here may predate those additions. Tax parcel detail and secondary rights-of-way are not included in this dataset. Rights-of-way for state and federal highways, railroads and utilities are only included when they are delineated on the original 1:24,000 scale maps. The data files are in ArcGIS shapefile format. A Geographic Information System (ArcGIS) file intended to represent the lands within agricultural district. Please note that boundaries may be generalizations; precise information can be obtained from the county or town tax parcel information." ], "dct_language_sm": [ "eng" ], - "dct_publisher_sm": [ - "Geological Survey (U.S.)" - ], - "schema_provider_s": "Stanford", + "schema_provider_s": "Cornell", "gbl_resourceClass_sm": [ "Datasets" ], "gbl_resourceType_sm": [ - "Polyline data" + "Polygon" ], "dct_subject_sm": [ - "Earthquakes", - "Faults" + "New York State Agricultural District boundaries", + "Agriculture and Markets", + "Agricultural Districts Mapping Program" ], "dcat_keyword_sm": [ "GBL Fixture records" ], "dct_temporal_sm": [ - "2020" + "2009" ], - "dct_issued_s": "1905-07-12", + "dct_issued_s": "2009-02-13", "dct_spatial_sm": [ - "Earth (Planet)", - "North America" + "Columbia County NY" ], - "locn_geometry": "ENVELOPE(-156.02,-70.8,65.59,18.93)", - "dcat_centroid_ss": "42.260000000000005,-113.41", + "locn_geometry": "ENVELOPE(-73.918247, -73.367, 42.507614, 41.978298)", + "dcat_bbox": "ENVELOPE(-73.918247, -73.367, 42.507614, 41.978298)", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", - "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}", - "id": "6f47b103-9955-4bbe-a364-387039623106", - "gbl_mdModified_dt": "2021-06-11T18:44:16Z", + "dct_references_s": "{\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://cugir.library.cornell.edu/geoserver/gwc/service/tms/1.0.0/cugir%3Acugir007957@EPSG%3A3857@png/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://cugir-data.s3.amazonaws.com/00/79/57/cugir-007957.zip\"}", + "id": "cugir-007957", + "gbl_mdModified_dt": "2019-05-24T23:12:06.151Z", "gbl_mdVersion_s": "Aardvark" } diff --git a/test/fixtures/files/gbl_documents/umn_metro_result1.json b/test/fixtures/files/gbl_documents/umn_metro_result1.json index 3f579ce..1d6c3c4 100644 --- a/test/fixtures/files/gbl_documents/umn_metro_result1.json +++ b/test/fixtures/files/gbl_documents/umn_metro_result1.json @@ -25,7 +25,7 @@ "Polygon data" ], "dcat_theme_sm": [ - "Planning and Cadastral" + "Property" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -35,7 +35,8 @@ ], "dct_issued_s": "2015-10-01", "gbl_indexYear_im": [ - "2014" + "2014", + "2030" ], "gbl_dateRange_drsim": [ "[2014 TO 2014]" @@ -44,7 +45,8 @@ "Minnesota" ], "locn_geometry": "ENVELOPE(-94.012,-92.732,45.415,44.471)", - "dcat_centroid_ss": "44.943,-93.372", + "dcat_bbox": "ENVELOPE(-94.012,-92.732,45.415,44.471)", + "dcat_centroid": "44.943,-93.372", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://ftp.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_metc/plan_frmwrk2030dev_plan_ar2011/shp_plan_frmwrk2030dev_plan_ar2011.zip\",\"urn:x-esri:serviceType:ArcGIS#FeatureLayer\":\"https://arcgis.metc.state.mn.us/server/rest/services/GISLibrary/Framework2030PlanningAreas2011/FeatureServer/0\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/02236876-9c21-42f6-9870-d2562da8e44f\"}", diff --git a/test/fixtures/files/gbl_documents/umn_state_result1.json b/test/fixtures/files/gbl_documents/umn_state_result1.json index af39c21..a754c14 100644 --- a/test/fixtures/files/gbl_documents/umn_state_result1.json +++ b/test/fixtures/files/gbl_documents/umn_state_result1.json @@ -24,7 +24,7 @@ "Raster data" ], "dcat_theme_sm": [ - "Imagery and Base Maps" + "Imagery" ], "dcat_keyword_sm": [ "GBL Fixture records" @@ -43,7 +43,8 @@ "Minnesota" ], "locn_geometry": "ENVELOPE(-97.612501,-88.842351,49.464145,42.906949)", - "dcat_centroid_ss": "46.185547,-93.227426", + "dcat_bbox": "ENVELOPE(-97.612501,-88.842351,49.464145,42.906949)", + "dcat_centroid": "46.185547,-93.227426", "dct_accessRights_s": "Public", "dct_format_s": "ArcGRID", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://gdrs.dnr.state.mn.us/gdrs/data/pub/us_mn_state_dnr/fgdb_base_usgs_scanned_topo_100k_drg.zip\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/2eddde2f-c222-41ca-bd07-2fd74a21f4de\"}", diff --git a/test/fixtures/files/gbl_documents/umn_state_result2.json b/test/fixtures/files/gbl_documents/umn_state_result2.json index 11d6137..bd10fe6 100644 --- a/test/fixtures/files/gbl_documents/umn_state_result2.json +++ b/test/fixtures/files/gbl_documents/umn_state_result2.json @@ -24,14 +24,11 @@ "Raster data" ], "dcat_theme_sm": [ - "Imagery and Base Maps" + "Imagery" ], "dcat_keyword_sm": [ "GBL Fixture records" ], - "dct_isPartOf_sm": [ - "Minnesota Geospatial Commons" - ], "dct_temporal_sm": [ "1998" ], @@ -46,7 +43,8 @@ "Minnesota" ], "locn_geometry": "ENVELOPE(-97.991522,-87.177541,49.892443,42.891013)", - "dcat_centroid_ss": "46.391728,-92.5845315", + "dcat_bbox": "ENVELOPE(-97.991522,-87.177541,49.892443,42.891013)", + "dcat_centroid": "46.391728,-92.5845315", "dct_accessRights_s": "Public", "dct_format_s": "GeoTIFF", "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://ftp.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/base_usgs_scanned_topo_250k_drg/fgdb_base_usgs_scanned_topo_250k_drg.zip\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/e9c71086-6b25-4950-8e1c-84c2794e3382\"}", diff --git a/test/fixtures/files/gbl_documents/uva_slug_colon.json b/test/fixtures/files/gbl_documents/uva_slug_colon.json index eee552f..00fb60a 100644 --- a/test/fixtures/files/gbl_documents/uva_slug_colon.json +++ b/test/fixtures/files/gbl_documents/uva_slug_colon.json @@ -34,7 +34,8 @@ "[2015 TO 2018]" ], "locn_geometry": "ENVELOPE(-76.346,-76.176,36.971,36.82)", - "dcat_centroid_ss": "36.8955,-76.261", + "dcat_bbox": "ENVELOPE(-76.346,-76.176,36.971,36.82)", + "dcat_centroid": "36.8955,-76.261", "dct_accessRights_s": "Public", "dct_format_s": "Shapefile", "gbl_wxsIdentifier_s": "Norfolk:police_point", diff --git a/test/fixtures/files/gbl_documents/wmts-multiple.json b/test/fixtures/files/gbl_documents/wmts-multiple.json new file mode 100644 index 0000000..4d6a433 --- /dev/null +++ b/test/fixtures/files/gbl_documents/wmts-multiple.json @@ -0,0 +1,41 @@ +{ + "gbl_mdVersion_s": "Aardvark", + "dct_identifier_sm": [ + "ark:/99999/fk4db9hn29" + ], + "id": "princeton-fk4db9hn29", + "dct_title_s": "Orthofoto 2016 Wien (WMTS)", + "locn_geometry": "ENVELOPE(16.133423, 16.626434, 48.3348, 48.106056)", + "dcat_bbox": "ENVELOPE(16.133423, 16.626434, 48.3348, 48.106056)", + "schema_provider_s": "Princeton", + "dct_accessRights_s": "Public", + "dct_description_sm": [ + "The Vienna orthophoto from the year 2016 covers the entire city area with a pixel size of 15 centimeters. The aerial images were taken on 18th and 27th of March and 5th of April 2016." + ], + "dct_creator_sm": [ + "Magistrat Wien - Magistratsabteilung 41 - Stadtvermessung" + ], + "dct_spatial_sm": [ + "Vienna", + "Austria" + ], + "dct_temporal_sm": [ + "2022" + ], + "gbl_indexYear_im": [ + "2022" + ], + "gbl_mdModified_dt": "2022-02-04T22:13:37Z", + "gbl_wxsIdentifier_s": "lb2016", + "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml\"}", + "layer_geom_type_s": "Raster", + "gbl_resourceClass_sm": [ + "Imagery" + ], + "gbl_resourceType_sm": [ + "Aerial photographs", + "Raster data" + ], + "dct_format_s": "GeoTIFF", + "dct_issued_s": "2016-01-01T00:00:00Z" +} diff --git a/test/fixtures/files/gbl_documents/wmts-single-layer.json b/test/fixtures/files/gbl_documents/wmts-single-layer.json new file mode 100644 index 0000000..ee66e0b --- /dev/null +++ b/test/fixtures/files/gbl_documents/wmts-single-layer.json @@ -0,0 +1,48 @@ +{ + "gbl_mdVersion_s": "Aardvark", + "dct_identifier_sm": [ + "ark:/99999/fk4544658v" + ], + "id": "princeton-fk4544658v-wmts", + "dct_title_s": "The Balkans [and] Turkey : G.S.G.S. no. 2097 / War Office. General Staff. Geographical Section (WMTS Fixture)", + "locn_geometry": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)", + "dcat_bbox": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)", + "schema_provider_s": "Princeton", + "dct_accessRights_s": "Public", + "dct_description_sm": [ + "Relief shown by contours approximately 100 feet interval, spot heights, and shading. Title varies; some sheets are titled \"Turkey\". Shows international boundaries, railways, 2 categories of roads, telegraph lines, places of worship, ruins. Constantinople latest edition map has a glossary." + ], + "dct_creator_sm": [ + "Great Britain. War Office. General Staff. Geographical Section" + ], + "dct_language_sm": [ + "eng" + ], + "dct_publisher_sm": [ + "[London] : War Office. General Staff. Geographical Section. General Staff, 1908-25." + ], + "dct_subject_sm": [ + "Balkan Peninsula Maps", + "Turkey Maps", + "Topographic Maps" + ], + "dct_spatial_sm": [ + "Balkan Peninsula", + "Turkey" + ], + "dct_issued_s": 1908, + "gbl_indexYear_im": [ + "1908" + ], + "gbl_mdModified_dt": "2022-02-03T22:13:40Z", + "gbl_wxsIdentifier_s": "mosaic", + "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248\"}", + "gbl_resourceClass_sm": [ + "Maps", + "Web services" + ], + "gbl_resourceType_sm": [ + "Military maps", + "Topographic maps" + ] +} diff --git a/test/fixtures/files/gbl_documents/xyz.json b/test/fixtures/files/gbl_documents/xyz.json new file mode 100644 index 0000000..03a4172 --- /dev/null +++ b/test/fixtures/files/gbl_documents/xyz.json @@ -0,0 +1,46 @@ +{ + "dct_identifier_sm": [ + "6f47b103-9955-4bbe-a364-387039623106" + ], + "dct_title_s": "Quaternary Fault and Fold Database of the United States (XYZ)", + "dct_description_sm":[ + "Quaternary Fault and Fold Database of the United States" + ], + "dct_accessRights_s": "Public", + "schema_provider_s": "Stanford", + "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}", + "id": "6f47b103-9955-4bbe-a364-387039623106-xyz", + "gbl_resourceClass_sm": [ + "Datasets", + "Web services" + ], + "gbl_resourceType_sm": [ + "Line data" + ], + "dct_format_s": "Shapefile", + "dct_language_sm": [ + "eng" + ], + "dct_publisher_sm": [ + "Geological Survey (U.S.)" + ], + "dct_subject_sm": [ + "Earthquakes", + "Faults" + ], + "dct_issued_s": 2020, + "gbl_indexYear_im": [ + "2020" + ], + "dct_temporal_sm": [ + "2020" + ], + "dct_spatial_sm": [ + "Earth (Planet)", + "North America" + ], + "locn_geometry": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)", + "dcat_bbox": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)", + "gbl_mdModified_dt": "2021-06-11T17:55:01Z", + "gbl_mdVersion_s": "Aardvark" +} diff --git a/test/fixtures/files/umass_documents/.DS_Store b/test/fixtures/files/umass_documents/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Thu, 6 Apr 2023 16:19:51 -0400 Subject: [PATCH 08/17] aesthetic updates closes https://github.com/umass-gis/geoblacklight/issues/73 closes https://github.com/umass-gis/geoblacklight/issues/74 - moves IIIF box below metadata - removes GeoBlacklight version from home page - changes branding/name - fixes links in navigation bar and footer --- app/controllers/catalog_controller.rb | 5 ++--- app/views/catalog/_home_text.html.erb | 2 +- app/views/shared/_header_navbar.html.erb | 4 ++-- app/views/shared/_top_navbar.html.erb | 2 +- app/views/shared/_umass_footer.html.erb | 10 +++++----- app/views/shared/_user_util_links.html.erb | 5 +---- config/locales/blacklight.en.yml | 2 +- config/locales/geoblacklight.en.yml | 2 +- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 1d352f3..dd7e412 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -48,11 +48,11 @@ class CatalogController < ApplicationController # To move metadata above the map viewer, # remove the lines deleting and re-adding the :show partial config.show.display_type_field = 'format' - config.show.partials.delete(:show) + # config.show.partials.delete(:show) config.show.partials << 'show_default_viewer_container' config.show.partials << 'show_default_attribute_table' config.show.partials << 'show_default_viewer_information' - config.show.partials << :show + # config.show.partials << :show ## # Configure the index document presenter. @@ -108,7 +108,6 @@ class CatalogController < ApplicationController # config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8 config.add_facet_field Settings.FIELDS.PROVIDER, :label => 'Provider', :limit => 8, item_component: Geoblacklight::IconFacetItemComponent config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3 - # config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false config.add_facet_field Settings.FIELDS.ANNOTATION, :label => 'Annotated', :limit => 8 # GEOBLACKLIGHT APPLICATION FACETS diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb index c009906..5fedd97 100644 --- a/app/views/catalog/_home_text.html.erb +++ b/app/views/catalog/_home_text.html.erb @@ -18,7 +18,7 @@ <%= content_tag :div, '', id: 'map', aria: { label: t('geoblacklight.map.label') }, data: { map: 'home', 'catalog-path'=> search_catalog_path , 'map-geom' => Settings.HOMEPAGE_MAP_GEOM, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
-
+
<%= t('geoblacklight.home.version', version: Geoblacklight::VERSION ) %>
diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index 0b8b90b..27f7051 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -20,8 +20,8 @@ <% else %>
-
- <%= content_tag :h3, t('geoblacklight.home.search_heading'), class: 'text-center' %> +
+ <%= content_tag :h2, t('geoblacklight.home.search_heading'), class: 'text-center' %>
diff --git a/app/views/shared/_top_navbar.html.erb b/app/views/shared/_top_navbar.html.erb index d0e9bd0..739077f 100644 --- a/app/views/shared/_top_navbar.html.erb +++ b/app/views/shared/_top_navbar.html.erb @@ -7,7 +7,7 @@

- <%= link_to 'GeoData', root_url %> + <%= link_to 'UMAP GeoData', root_url %>

diff --git a/app/views/shared/_umass_footer.html.erb b/app/views/shared/_umass_footer.html.erb index 9c4f00a..1982ab4 100644 --- a/app/views/shared/_umass_footer.html.erb +++ b/app/views/shared/_umass_footer.html.erb @@ -5,11 +5,11 @@ <%= image_tag('UMass_logo_white.png', alt: 'UMass Amherst', class: 'app-footer-logo', height: '150px') %>
-

GeoData

+

UMAP GeoData

  • <%= link_to('About', 'https://gis.library.umass.edu/data/geodata/', {class: 'nav-link'}) %>
    • -
  • <%=link_to('Help', 'https://gis.library.umass.edu/data/geodata/#help', {class: 'nav-link'})%>
    • -
  • <%=link_to('Contact', 'https://gis.library.umass.edu/learning-gis/consultations/', {class: 'nav-link'})%>
    • +
  • <%=link_to('Get Help', 'https://gis.library.umass.edu/learning-gis/get-help/', {class: 'nav-link'})%>
    • +
  • <%=link_to('View on GitHub', 'https://github.com/umass-gis/geoblacklight', {class: 'nav-link'})%>
@@ -24,13 +24,13 @@
- ©2021 University of Massachusetts Amherst + © <%= Date.today.year %> University of Massachusetts Amherst
diff --git a/config/locales/blacklight.en.yml b/config/locales/blacklight.en.yml index ae2ecb3..80260e0 100644 --- a/config/locales/blacklight.en.yml +++ b/config/locales/blacklight.en.yml @@ -1,6 +1,6 @@ en: blacklight: - application_name: 'GeoData' + application_name: 'UMAP GeoData' search: form: search: diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml index 4bf4fcf..33b4206 100644 --- a/config/locales/geoblacklight.en.yml +++ b/config/locales/geoblacklight.en.yml @@ -23,7 +23,7 @@ en: export_geotiff_link: 'GeoTIFF' home: headline: 'Explore and discover...' - search_heading: 'Find the maps and data you need' + search_heading: 'UMass Amherst Portal for Geospatial Data' category_heading: 'Find by...' map_heading: 'Find by location' institution: 'Institution' From 3b0e717271d8e82bb54f80356b9285bbba721a65 Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Thu, 6 Apr 2023 18:18:17 -0400 Subject: [PATCH 09/17] add "collection support" relation support Copied code from Big Ten Geoportal --- config/locales/geoblacklight.en.yml | 3 ++- config/settings.yml | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml index 33b4206..ba379c9 100644 --- a/config/locales/geoblacklight.en.yml +++ b/config/locales/geoblacklight.en.yml @@ -72,7 +72,8 @@ en: relations: ancestor: 'Source Datasets' descendant: 'Derived Datasets' - member_of: 'Belongs to collection...' + member_of_ancestors: 'Belongs to collection...' + member_of_descendants: 'Collection records...' part_of: 'Is part of...' part_of_descendants: 'Has part...' relation: 'Related Records' diff --git a/config/settings.yml b/config/settings.yml index ef35178..6785576 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -124,11 +124,16 @@ WEBSERVICES_SHOWN: # Relationships to display RELATIONSHIPS_SHOWN: - MEMBER_OF: + MEMBER_OF_ANCESTORS: field: pcdm_memberOf_sm query_type: ancestors icon: nil - label: geoblacklight.relations.member_of + label: geoblacklight.relations.member_of_ancestors + MEMBER_OF_DESCENDANTS: + field: pcdm_memberOf_sm + query_type: descendants + icon: nil + label: geoblacklight.relations.member_of_descendants PART_OF_ANCESTORS: field: dct_isPartOf_sm query_type: ancestors From 1b51669dca540431c643ca1ff35f6adc6d8bc0cb Mon Sep 17 00:00:00 2001 From: Becky Seifried Date: Thu, 6 Apr 2023 18:40:38 -0400 Subject: [PATCH 10/17] add icons to collection records Also updates branding when viewing on mobile --- app/assets/stylesheets/modules/_header.scss | 2 +- app/views/shared/_header_navbar.html.erb | 2 +- config/settings.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/modules/_header.scss b/app/assets/stylesheets/modules/_header.scss index 3fb64b7..0d6e987 100644 --- a/app/assets/stylesheets/modules/_header.scss +++ b/app/assets/stylesheets/modules/_header.scss @@ -23,7 +23,7 @@ top:2rem; left:1rem; padding: 1rem; - font-weight: normal; + font-weight: bold; font-size: 30px; font-family: 'Open Sans', serif; font-style: normal; diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index 27f7051..58108df 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -1,6 +1,6 @@