geoblacklight 5.0.0.pre.alpha.11 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2b959de4c55a7527ad4d7687af25f972a6e219f94dc0ec8b7fb9c76154d5ee
-  data.tar.gz: 99cba751fbb1f088a2f96e40c64998e77e07bccb50511508fa57da35c8cb38a2
+  metadata.gz: 4b43c78b979a0af3b5429327478ffa766a52566d6f04594ebd6ae62bd30611d3
+  data.tar.gz: 9741a9cc0f6a693f1f1502dc22f718f855cdb6bae45920fcbf915d78f532857c
 SHA512:
-  metadata.gz: f98c1fd49c6dd1c0718a22dab3fea41457f54844415cf1003b36e5a14f6584eabb91061e52bdd7cf4224deadb4557d78125d90d06f15c74b808a1acff3bd9716
-  data.tar.gz: 1d716078cca8102a668cbb9ac1e6d987b9837f9428ffcc2ec51aa7f6986681fa169200e2f0e9fe5916ba187705e154d78189e82009cf5d4ddec2148385fa0d5a
+  metadata.gz: e6f1683e70a2f760a3582315d48c4910af9746aa540165fdedbbd2093e22a89081fb95f37ab3fb8af978e96997b7351dddf24609c001db52a3757f37402d3d73
+  data.tar.gz: 9d1e1e83ffcc5fb48a5e112b55d47314b6d59b01304bdb601ab92a2230634df58460308d18fe8abc25104ee3e396c915e2ec8ec8fd2b43b082a5265cbcc75731

data/.github/workflows/build-demo-app.yml

@@ -29,13 +29,16 @@ jobs:
       - name: Install dependencies
         run: bundle install
         env:
-          RAILS_VERSION: 7.1.3
+          RAILS_VERSION: "7.2.2.1"
 
-      - name: Setup Yarn
-        run: exec "yarnpkg"
+      - name: Build frontend package
+        run: |
+          yarn install
+          yarn build
+          yarn link
 
       - name: Build
-        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft
+        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft --css bootstrap --js rollup
 
       - name: Cleanup
         run: rm -rf build/node_modules build/Gemfile.lock build/yarn.lock build/tmp

data/.github/workflows/ruby.yml

@@ -30,24 +30,17 @@ jobs:
           ruby-version: 3.2
       - name: Install json schema validator
         run: gem install json_schemer
-      - name: Run json_schemer against aarkvark fixtures
+      - name: Run json_schemer against aardvark fixtures
         run: find spec/fixtures/solr_documents -type f -name "*.json" | xargs json_schemer schema/geoblacklight-schema-aardvark.json
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ["3.2", "3.3"]
-        rails_version: ["7.0.8.4", "7.1.3.4", "7.2.0"]
+        ruby_version: ["3.2", "3.3", "3.4"]
+        rails_version: ["7.1.5.1", "7.2.2.1", "8.0.1"]
         asset_pipeline: ["vite"]
-        additional_engine_cart_rails_options: [""]
-        # this build has failing tests that aren't easy to replicate locally
-        # https://github.com/geoblacklight/geoblacklight/issues/1585
-        # include:
-        #   - ruby_version: "3.2"
-        #     rails_version: "7.1.3.4"
-        #     additional_engine_cart_rails_options: "--css bootstrap"
-        #     asset_pipeline: "importmap"
+        additional_engine_cart_rails_options: ["--js rollup"]
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.asset_pipeline }}
     steps:
@@ -56,18 +49,22 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
-      - name: Install dependencies
+      - name: Install Ruby dependencies
         run: bundle install
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
-      - name: Setup Yarn
-        run: exec "yarnpkg"
+      - name: Build and link frontend package, if using vite
+        if: matrix.asset_pipeline == 'vite'
+        run: |
+          yarn install
+          yarn build
+          yarn link
       - name: Run tests
         run: bundle exec rake ci
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
           ASSET_PIPELINE: ${{ matrix.asset_pipeline }}
-          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-keeps --skip-action-cable --skip-test -a propshaft ${{ matrix.additional_engine_cart_rails_options }}"
+          ENGINE_CART_RAILS_OPTIONS: "--skip-docker --skip-action-cable --skip-rubocop --skip-brakeman --skip-kamal --skip-solid -a propshaft --css bootstrap ${{ matrix.additional_engine_cart_rails_options }}"
           SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
       - name: Upload coverage artifacts
         uses: actions/upload-artifact@v4

data/Rakefile

@@ -14,7 +14,15 @@ require "open3"
 
 # Ensure the app generates with Propshaft; sprockets is no longer supported
 # https://github.com/geoblacklight/geoblacklight/issues/1265
-ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft --css bootstrap"
+
+# Ensure the app generates with the correct javascript pipeline; rollup
+# (for Vite) is the default
+ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
+  " --js importmap"
+else
+  " --js rollup"
+end
 
 def system_with_error_handling(*args)
   Open3.popen3(*args) do |_stdin, stdout, stderr, thread|

data/app/assets/stylesheets/geoblacklight/modules/_base.scss

@@ -10,7 +10,6 @@
  *
  */
 
-@import 'facets';
 @import 'icon-customization';
 @import 'home';
 @import 'index_maps';

data/app/assets/stylesheets/geoblacklight/modules/geosearch.scss

@@ -1,9 +1,3 @@
-.search-control {
-  background-color: #FFF;
-  border-radius: 4px;
-  box-shadow: 0 1px 5px rgba(0,0,0,0.65);
-}
-
 .search-control a {
   color: #FFF
 }

data/app/assets/stylesheets/geoblacklight/modules/results.scss

@@ -54,3 +54,7 @@
     }
   }
 }
+
+.row > #leaflet-viewer {
+  --bs-gutter-x: 0;
+}

data/app/components/geoblacklight/static_map_component.rb

@@ -18,6 +18,8 @@ module Geoblacklight
     end
 
     def viewer_tag
+      leaflet_options = helpers.leaflet_options.deep_dup
+      leaflet_options.SLEEP.SLEEP = false
       tag.div(nil,
         id: "static-map",
         aria: {
@@ -28,7 +30,7 @@ module Geoblacklight
           "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
           "leaflet-viewer-page-value" => "STATIC_MAP",
           "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
-          "leaflet-viewer-options-value" => helpers.leaflet_options,
+          "leaflet-viewer-options-value" => leaflet_options,
           "leaflet-viewer-draw-initial-bounds-value" => true
         })
     end

data/app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js

@@ -6,6 +6,7 @@ import { Controller } from "@hotwired/stimulus";
 import basemaps from "geoblacklight/leaflet/basemaps";
 import LayerOpacityControl from "geoblacklight/leaflet/controls/layer_opacity";
 import GeoSearchControl from "geoblacklight/leaflet/controls/geosearch";
+import Sleep from "geoblacklight/leaflet/controls/sleep";
 import { wmsInspection,
   tiledMapLayerInspection,
   featureLayerInspection,
@@ -38,8 +39,7 @@ export default class LeafletViewerController extends Controller {
   };
 
   connect() {
-    // Sets leaflet icon paths to ex. /assets/marker-icon-2x-rails-fingerprint
-    // TODO: figure out why vite @leaftlet_images alias is not working.
+    // Use leaflet icon images from CDN
     Icon.Default.imagePath = "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/images/";
 
     // Set up layers
@@ -65,7 +65,10 @@ export default class LeafletViewerController extends Controller {
     if (this.map) return;
 
     // Set up the map and fit to bounds
-    this.map = map(this.element);
+    const sleepSettings = this.optionsValue.SLEEP || { 'SLEEP' : false }
+    this.map = map(this.element, sleepSettings);
+    if (sleepSettings.SLEEP) this.map.addHandler('SLEEP', Sleep);
+
     this.map.addLayer(this.basemap);
     this.map.addLayer(this.overlay);
     this.fitBounds(this.bounds);

data/app/javascript/geoblacklight/controllers/openlayers_viewer_controller.js

@@ -6,6 +6,7 @@ import { FullScreen, defaults as defaultControls } from "ol/control";
 import { pmTilesLayer, cogLayer } from "geoblacklight/openlayers/layers";
 import basemaps from "geoblacklight/openlayers/basemaps";
 import { Controller } from "@hotwired/stimulus";
+import { pmTilesInspection } from "geoblacklight/openlayers/inspection";
 
 export default class OpenlayersViewerController extends Controller {
   static values = {
@@ -33,6 +34,11 @@ export default class OpenlayersViewerController extends Controller {
       layers: [this.basemap, this.overlay],
     });
     this.map.getView().fit(this.extent, this.map.getSize());
+    this.addInspection()
+  }
+
+  addInspection() {
+    if (this.protocolValue == "Pmtiles") return pmTilesInspection(this.map);
   }
 
   async getBounds() {

data/app/javascript/geoblacklight/leaflet/controls/layer_opacity.js

@@ -50,7 +50,7 @@ export default class LayerOpacityControl extends Control {
       try {
         layer.setOpacity(opacity);
       } catch {
-        console.log(layer)
+        console.error("Couldn't set opacity for layer", layer)
       }
     }
   }

data/app/javascript/geoblacklight/leaflet/controls/sleep.js

@@ -0,0 +1,98 @@
+import { DomUtil, DomEvent, Handler } from "leaflet";
+
+export default class Sleep extends Handler {
+  addHooks() {
+    const container = DomUtil.create("div", "wake-overlay w-100 h-100 position-absolute align-items-center justify-content-center", this._map._container);
+    const button = DomUtil.create("button", "btn btn-primary wake-button", container)
+
+    button.innerHTML = this._map.options.MESSAGE;
+    button.setAttribute("tabindex", "0");
+    button.style.zIndex = 2000;
+    container.style.zIndex = 1999;
+    const background = String(this._map.options.BACKGROUND);
+    container.style.background = background;
+    this.container = container;
+    if (this._map.options.MARGIN_DISTANCE) {
+      this.updateBasedOnSize()
+    } else {
+      this.sleepMap();
+    }
+    this.setListeners()
+  }
+
+  sleepMap() {
+    this._map.dragging.disable();
+    this._map.touchZoom.disable();
+    this._map.scrollWheelZoom.disable();
+    this._map.doubleClickZoom.disable();
+    this._map.boxZoom.disable();
+    this._map.keyboard.disable();  
+    this.container.classList.add('d-flex');
+    this.container.classList.remove('d-none');
+  }
+
+  wakeMap() {
+    this._map.dragging.enable();
+    this._map.touchZoom.enable();
+    this._map.scrollWheelZoom.enable();
+    this._map.doubleClickZoom.enable();
+    this._map.boxZoom.enable();
+    this._map.keyboard.enable();
+    this.container.classList.remove('d-flex');
+    this.container.classList.add('d-none');
+  }
+
+  updateBasedOnSize() {
+    const rect = this._map._container.getBoundingClientRect();
+    // sometimes the left/right side has larger margin, so we take an average
+    const calculation = ((window.innerWidth - rect.right) + rect.left) / 2;
+    if (calculation < this._map.options.MARGIN_DISTANCE) {
+      this.sleepMap();
+    } else {
+      this.wakeMap();
+    }
+  }
+
+  setListeners() {
+    const _this = this;
+    let timer;
+    let sleeptimer;
+
+    if (_this._map.options.MARGIN_DISTANCE){
+      window.addEventListener("resize", (event) => {
+        _this.updateBasedOnSize();
+      })
+    }
+
+    DomEvent.on(_this.container, "click", (e) => {
+      _this.wakeMap()
+    });
+
+    DomEvent.on(_this.container, "focus", (e) => {
+      _this.wakeMap()
+    });
+
+    if (this._map.options.HOVERTOWAKE) {
+      DomEvent.on(this._map._container, "mouseenter", (e) => {
+        clearTimeout(sleeptimer);
+
+        timer = setTimeout(function() {
+          _this.wakeMap()
+        }, _this._map.options.WAKETIME);
+      
+      });
+
+      DomEvent.on(this._map._container, "mouseleave", (e) => {
+        clearTimeout(timer);
+      
+        sleeptimer = setTimeout(function() {
+          _this.sleepMap()
+        }, _this._map.options.SLEEPTIME);
+      });
+    }
+
+    DomEvent.on(this.container, "touchstart", (e) => {
+      _this.wakeMap()
+    });
+  }
+}

data/app/javascript/geoblacklight/openlayers/inspection.js

@@ -0,0 +1,44 @@
+import { linkify } from "geoblacklight/leaflet/utils";
+
+export const pmTilesInspection = (map) => {
+  // add crosshair class for map items
+  map.on('pointermove', function(e){
+    var pixel = map.getEventPixel(e.originalEvent);
+    var hit = map.hasFeatureAtPixel(pixel);
+    map.getViewport().style.cursor = hit ? 'crosshair' : '';
+  });
+
+  map.on('click', (event) => {
+    const spinner = document.createElement("tbody");
+    spinner.className = "attribute-table-body";
+    spinner.innerHTML =
+      '<tr><td colspan="2"><div class="spinner-border" role="status"><span class="visually-hidden">Inspecting</span></div></td></tr>';
+    document.querySelector(".attribute-table-body").replaceWith(spinner);
+
+    const features = map.getFeaturesAtPixel(event.pixel);
+    if (features.length == 0) {
+      document.querySelector(".attribute-table-body").innerHTML =
+        '<tr><td colspan="2">Could not find that feature</td></tr>';
+      return;
+    }
+
+    const properties = features[0].getProperties();
+    populateAttributeTable(properties);
+  });
+}
+
+const populateAttributeTable = (properties) => {
+  let html = '<tbody class="attribute-table-body">';
+
+  // Step through properties and append to table
+  Object.keys(properties).forEach((property) => {
+    html += `<tr><td>${property}</td>
+               <td>${linkify(properties[property])}</td></tr>`;
+  });
+  html += "</tbody>";
+
+  const tableBody = document.querySelector(".attribute-table-body");
+  if (tableBody) {
+    tableBody.outerHTML = html; // Replace existing table body with new content
+  }
+}

data/app/models/concerns/geoblacklight/solr_document/inspection.rb

@@ -9,7 +9,7 @@ module Geoblacklight
       # Returns boolean about whether document viewer protocol is inspectable
       # @return [Boolean]
       def inspectable?
-        %w[wms feature_layer dynamic_map_layer tiled_map_layer]
+        %w[wms feature_layer dynamic_map_layer tiled_map_layer pmtiles]
           .include? viewer_protocol
       end
     end

data/geoblacklight.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split(%(\x0))
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 3.2.0"
   spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency "rails", ">= 6.1", "< 8"
+  spec.add_dependency "rails", ">= 6.1", "< 9"
   spec.add_dependency "blacklight", "~> 8.0"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"

data/lib/generators/geoblacklight/assets/importmap_generator.rb

@@ -27,11 +27,6 @@ module Geoblacklight
         run "yarn link @geoblacklight/frontend" if options[:test]
       end
 
-      # Workaround for https://github.com/projectblacklight/blacklight/pull/3285
-      def update_blacklight_frontend
-        run "yarn add blacklight-frontend@8.3"
-      end
-
       # Add the customization overrides and insert before bootstrap import
       def add_customizations
         copy_file "assets/_customizations.scss", "app/assets/stylesheets/_customizations.scss"

data/lib/generators/geoblacklight/assets/vite_generator.rb

@@ -21,7 +21,7 @@ module Geoblacklight
       DESCRIPTION
 
       # Install Vite
-      def install_vite
+      def install_vite_rails
         gem "vite_rails", "~> 3.0"
         run "bundle install"
       end
@@ -37,33 +37,16 @@ module Geoblacklight
         copy_file "vite.config.ts", "vite.config.ts"
       end
 
-      # Add our package.json with non-GBL dependencies (Blacklight, Bootstrap, etc.)
-      def install_dependencies
-        copy_file "package.json", "package.json"
-        run "yarn install"
-      end
-
-      # This will write its own package.json if one doesn't exist, causing a
-      # conflict, so it needs to happen after we copy ours
-      def bundle_install
+      # Run the vite install generator (create binstubs, etc.)
+      def setup_vite
         run "bundle exec vite install"
       end
 
       # Pick a version of the frontend asset package and install it.
       def add_frontend
-        # If in local development or CI, install the version we made linkable in
-        # the test app generator. This will make it so changes made in the outer
-        # directory are picked up automatically, like a symlink. Note that this
-        # does NOT install the dependencies of the package, so we have to make
-        # sure to install those separately. See:
-        # https://classic.yarnpkg.com/lang/en/docs/cli/link/
-        # https://github.com/yarnpkg/yarn/issues/2914
-        if options[:test]
-          run "yarn link @geoblacklight/frontend"
-
         # If a branch was specified (e.g. you are running a template.rb build
         # against a test branch), use the latest version available on npm
-        elsif ENV["BRANCH"]
+        if ENV["BRANCH"]
           run "yarn add @geoblacklight/frontend@latest"
 
         # Otherwise, pick the version from npm that matches our Geoblacklight
@@ -71,6 +54,25 @@ module Geoblacklight
         else
           run "yarn add @geoblacklight/frontend@#{Geoblacklight::VERSION}"
         end
+
+        # If in local development or CI, also create a link. This will make it so
+        # changes made in the outer directory are picked up automatically.
+        # `yarn link` has to have already been run in the outer directory first.
+        run "yarn link @geoblacklight/frontend" if options[:test]
+      end
+
+      # The vite_rails gem doesn't currently install the vite-plugin-rails
+      # node package, so we need to do that manually.
+      def install_dev_dependencies
+        run "yarn add --dev vite-plugin-rails"
+      end
+
+      # Remove generated npm scripts from rollup and replace with our own.
+      # Adds a shortcut so that 'yarn build' runs our vite pipeline
+      # No easy way to do this with yarn, so we use `npm pkg`...
+      def setup_npm_scripts
+        run "npm pkg delete scripts"
+        run "npm pkg set scripts.build=\"vite build\""
       end
 
       # Add our own stylesheets that reference the versions from npm

data/lib/generators/geoblacklight/templates/base.html.erb

@@ -24,13 +24,10 @@
     <%= content_for(:head) %>
   </head>
   <body class="<%= render_body_class %>">
-    <nav id="skip-link" role="navigation" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
-      <div class="container-xl">
-        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'd-inline-flex p-2 m-1', data: { turbolinks: 'false' } %>
-        <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'd-inline-flex p-2 m-1', data: { turbolinks: 'false' } %>
-        <%= content_for(:skip_links) %>
-      </div>
-    </nav>
+    <%= render blacklight_config.skip_link_component.new do %>
+      <%= content_for(:skip_links) %>
+    <% end %>
+
     <%= render partial: 'shared/header_navbar' %>
 
     <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">

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

@@ -239,6 +239,14 @@ LEAFLET:
     STATIC_MAP:
       color: '#3388ff'
   SELECTED_COLOR: "#2C7FB8"
+  SLEEP:
+    SLEEP: true # set to false to disable
+    MARGIN_DISTANCE: 100 # set to zero / false if you want to disable this check
+    SLEEPTIME: 750
+    WAKETIME: 750
+    HOVERTOWAKE: false
+    MESSAGE: 'Click to Wake'
+    BACKGROUND: 'rgba(214, 214, 214, .7)'
   LAYERS:
     DETECT_RETINA: true
     INDEX:

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "5.0.0-alpha.11"
+  VERSION = "5.0.1"
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@geoblacklight/frontend",
   "type": "module",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.1",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -23,12 +23,12 @@
     "@hotwired/stimulus": "^3.2.2",
     "@popperjs/core": "^2.11.8",
     "@samvera/clover-iiif": "^2.3.2",
-    "blacklight-frontend": "^8.4.0",
+    "blacklight-frontend": "8",
     "bootstrap": "^5.3.3",
     "esri-leaflet": "^3.0.12",
     "leaflet": "^1.9.4",
-    "leaflet-fullscreen": "^1.0.2",
     "leaflet-iiif": "^3.0.0",
+    "leaflet-fullscreen": "^1.0.2",
     "ol": "8.1.0",
     "ol-pmtiles": "^0.3.0",
     "react": "^18.2.0",

data/spec/features/layer_inspection_spec.rb

@@ -9,4 +9,13 @@ feature "Layer inspection", js: true do
     find("#leaflet-viewer").click
     expect(page).not_to have_css("td.default-text")
   end
+
+  context "with a pmtiles layer" do
+    scenario "clicking map should trigger inspection" do
+      visit solr_document_path("princeton-t722hd30j")
+      expect(page).to have_css("th", text: "Attribute")
+      find("#openlayers-viewer").click
+      expect(page).not_to have_css("td.default-text")
+    end
+  end
 end

data/spec/features/relations_spec.rb

@@ -34,7 +34,7 @@ feature "Display related documents" do
 
   scenario "Relationship browse link returns relationship-scoped results", js: true do
     # Wabash Topo parent record
-    visit solr_document_path("88cc9b19-3294-4da9-9edd-775c81fb1c59")
+    visit solr_document_path("eee6150b-ce2f-4837-9d17-ce72a0c1c26f")
 
     expect(page).to have_content("Has part...")
     expect(page).to have_link("Browse all 4 records...")

data/spec/fixtures/solr_documents/b1g_wabash_child_15.json

@@ -1,9 +1,7 @@
 {
-  "id": "b5857bb0-2819-49cf-a6da-fdb39d50c529",
-  "gbl_mdVersion_s": "Aardvark",
-  "dct_title_s": "Wabash Topo (15): Indiana, 1929",
+  "dct_title_s": "Wabash Aerial (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."
+    "The images represented here are the raster orthophoto set collected by remote sensing of 25 aerial images  owned by EAS library. Each aerial image was up to 450MB, 400dpi, grayscale. 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"
@@ -12,51 +10,47 @@
     "Brock & Weymouth Inc.",
     "United States Engineer Office"
   ],
-  "dct_publisher_sm": [
-    "Purdue University Libraries"
-  ],
+  "schema_provider_s": "Purdue University",
   "gbl_resourceClass_sm": [
-    "Maps"
-  ],
-  "dcat_keyword_sm": [
-    "Topography",
-    "Purdue Georeferenced Imagery"
+    "Imagery"
   ],
   "dcat_theme_sm": [
-    "Imagery and Base Maps"
+    "Imagery"
+  ],
+  "dcat_keyword_sm": [
+    "Universities",
+    "Campuses"
   ],
-  "dct_issued_s": "2015-10-31",
   "dct_temporal_sm": [
     "1929"
   ],
-  "gbl_dateRange_drsim": [
-    "[1929 TO 1929]"
-  ],
+  "dct_issued_s": "2015-11-02",
   "gbl_indexYear_im": [
     1929
   ],
+  "gbl_dateRange_drsim": [
+    "[1929 TO 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",
+  "locn_geometry": "ENVELOPE(-87.508,-87.3596,39.5374,39.4628)",
+  "dcat_bbox": "ENVELOPE(-87.508,-87.3596,39.5374,39.4628)",
+  "dcat_centroid": "39.5001,-87.43379999999999",
   "pcdm_memberOf_sm": [
-    "09d-01"
+    "dc8c18df-7d64-4ff4-a754-d18d0891187d"
   ],
-  "gbl_resourceType_sm": [
-    "Topographic maps"
+  "dct_isPartOf_sm": [
+    "09d-01",
+    "eee6150b-ce2f-4837-9d17-ce72a0c1c26f"
   ],
+  "dct_accessRights_s": "Public",
   "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_references_s": "{\"http://schema.org/downloadUrl\":\"https://mapsweb.lib.purdue.edu/datasets/Wabash1929/wabashAerial_15.tif.zip\",\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashaerial/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}",
+  "id": "757d0f6e-2e04-4ac1-bd28-a5204df46ac1",
   "dct_identifier_sm": [
-    "b5857bb0-2819-49cf-a6da-fdb39d50c529"
+    "757d0f6e-2e04-4ac1-bd28-a5204df46ac1"
   ],
-  "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"
-}
+  "gbl_mdModified_dt": "2022-05-31T13:44:06Z",
+  "gbl_mdVersion_s": "Aardvark"
+}