geo_combine 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b168ca81c2b6d5ff2fa0ce75d18154ad9806f5a872cc6f96e41ab0cea628864
-  data.tar.gz: 9ba88c0cca642ebe79301182f992f2dfe223bc1cf4abaa9b00ac4687293b78f4
+  metadata.gz: 4e3fb1725efbf8ad6c3af8b523b514bb899945cca8000820d9ddd3ab2063003b
+  data.tar.gz: 61a33c13e094f49a33938c0b4cd37ca0c72218f0d271db035de6a2e0cb5d05f1
 SHA512:
-  metadata.gz: 8c54ead8b591bd20fc3b62fddbfec2b0ac6830972cd85bf49fd31f230c84c8cf1a7bd4c0b56de702a235eca130fc643e4c796cb84adf15fd93f0b73075161fe2
-  data.tar.gz: 28fe9a5209dd77c2f8b60e87fddec8c7892ddf33794afd75522cf09c6827496c445c6c2f52445ad7fa46508ac1a4dcedd0c5068e161d0e176ec7ab232b21d296
+  metadata.gz: 25aa2a4ce8ef4bd083a3a125a54b0b77180d5a3f0e15512312a3045972d9c4bdaac972821067b0f634f31f9983730264c2880a31cfe3b1f8dc189f7484512c3a
+  data.tar.gz: 51d00efcc3c2555187b0618213cef9180494eda1d9df6b3e93668df8f5f1be903a32fc384779d2d7f3bf7785fd1fbc9f5f78fb6d27959134990738b7183d4d2a

data/lib/geo_combine/migrators/v1_aardvark_migrator.rb

@@ -50,6 +50,7 @@ module GeoCombine
       end
 
       # Convert non-crosswalked fields via lookup tables
+      # rubocop:disable Metrics/PerceivedComplexity
       def convert_non_crosswalked_fields
         # Keys may or may not include whitespace, so we normalize them.
         # Resource class is required so we default to "Other"; resource type is not required.
@@ -57,6 +58,9 @@ module GeoCombine
         resource_type = RESOURCE_TYPE_MAP[@v1_hash['layer_geom_type_s']&.gsub(/\s+/, '')]
         @v2_hash['gbl_resourceType_sm'] = resource_type unless resource_type.nil?
 
+        # If locn_geometry is in the ENVELOPE format, also add it as dcat_bbox
+        @v2_hash['dcat_bbox'] = @v2_hash['locn_geometry'] if @v2_hash['locn_geometry']&.match?(/ENVELOPE/)
+
         # If the user specified a collection id map, use it to convert the collection names to ids
         is_part_of = @v1_hash['dct_isPartOf_sm']&.map { |name| @collection_id_map[name] }&.compact
         if is_part_of.present?
@@ -65,6 +69,7 @@ module GeoCombine
           @v2_hash.delete('dct_isPartOf_sm')
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # Remove fields that are no longer used
       def remove_deprecated_fields
@@ -80,7 +85,7 @@ module GeoCombine
         'dc_publisher_s' => 'dct_publisher_sm', # new namespace; single to multi-valued
         'dct_provenance_s' => 'schema_provider_s', # new URI name
         'dc_subject_sm' => 'dct_subject_sm', # new namespace
-        'solr_geom' => 'dcat_bbox', # new URI name
+        'solr_geom' => 'locn_geometry', # new URI name
         'solr_year_i' => 'gbl_indexYear_im', # new URI name; single to multi-valued
         'dc_source_sm' => 'dct_source_sm', # new namespace
         'dc_rights_s' => 'dct_accessRights_s', # new URI name

data/lib/geo_combine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoCombine
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/fixtures/docs/full_geoblacklight_aardvark.json

@@ -44,6 +44,7 @@
     "stanford-rb371kw9607"
   ],
   "dcat_bbox":"ENVELOPE(29.572742, 35.000308, 4.234077, -1.478794)",
+  "locn_geometry":"ENVELOPE(29.572742, 35.000308, 4.234077, -1.478794)",
   "gbl_indexYear_im":[
     2005
   ],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_combine
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A Ruby toolkit for managing geospatial metadata