Merge ce12ee4 into 04e9e72

sul-dlss-deprecated · Apr 23, 2019 · 15e9126 · 15e9126
2 parents 04e9e72 + ce12ee4
commit 15e9126
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 38 deletions.
diff --git a/lib/dor-services.rb b/lib/dor-services.rb
@@ -83,7 +83,6 @@ def logger
     autoload :Governable
     autoload :Publishable
     autoload :Embargoable
-    autoload :Geoable
     autoload :Releaseable
   end
 

diff --git a/lib/dor/models/concerns/geoable.rb b/lib/dor/models/concerns/geoable.rb
diff --git a/lib/dor/models/item.rb b/lib/dor/models/item.rb
@@ -4,7 +4,6 @@ module Dor
   class Item < Dor::Abstract
     include Embargoable
     include Publishable
-    include Geoable
     include Releaseable
 
     has_object_type 'item'
@@ -18,7 +17,17 @@ class Item < Dor::Abstract
       WorkflowsIndexer
     )
 
-    has_metadata name: 'technicalMetadata', type: TechnicalMetadataDS, label: 'Technical Metadata', control_group: 'M'
-    has_metadata name: 'contentMetadata', type: Dor::ContentMetadataDS, label: 'Content Metadata', control_group: 'M'
+    has_metadata name: 'technicalMetadata',
+                 type: TechnicalMetadataDS,
+                 label: 'Technical Metadata',
+                 control_group: 'M'
+    has_metadata name: 'contentMetadata',
+                 type: Dor::ContentMetadataDS,
+                 label: 'Content Metadata',
+                 control_group: 'M'
+    has_metadata name: 'geoMetadata',
+                 type: Dor::GeoMetadataDS,
+                 label: 'Geographic Information Metadata in ISO 19139',
+                 control_group: 'M'
   end
 end
diff --git a/spec/models/concerns/geoable_spec.rb b/spec/models/concerns/geoable_spec.rb
diff --git a/spec/models/item_spec.rb b/spec/models/item_spec.rb
@@ -48,6 +48,14 @@
     it { is_expected.to include 'active_fedora_model_ssi' => 'Dor::Item' }
   end
 
+  describe '#geoMetadata' do
+    let(:item) { described_class.new(pid: 'foo:123') }
+
+    it 'has a geoMetadata datastream' do
+      expect(item.geoMetadata).to be_a(Dor::GeoMetadataDS)
+    end
+  end
+
   describe '#descMetadata' do
     let(:item) { described_class.new(pid: 'foo:123') }