Switch back to Open Struct.

Author: rywall

lib/spatial_features/importers/geo_json.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'digest/md5'
 
 module SpatialFeatures
@@ -15,11 +16,11 @@ def each_record(&block)
 
           metadata = record['properties'] || {}
           name = metadata.delete('name')
-          yield Struct.new(:feature_type, :geog, :name, :metadata).new(
-            record['geometry']['type'],
-            SpatialFeatures::Utils.geom_from_json(record['geometry']),
-            name,
-            metadata
+          yield OpenStruct.new(
+            :feature_type => record['geometry']['type'],
+            :geog => SpatialFeatures::Utils.geom_from_json(record['geometry']),
+            :name => name,
+            :metadata => metadata
           )
         end
       end

lib/spatial_features/importers/kml.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 
 module SpatialFeatures
   module Importers
@@ -35,7 +36,7 @@ def each_record(&block)
 
             importable_image_paths = images_from_metadata(metadata)
 
-            yield Struct.new(:geog, :name, :metadata, :importable_image_paths).new(geog, name, metadata, importable_image_paths)
+            yield OpenStruct.new(:geog => geog, :name => name, :metadata => metadata, :importable_image_paths => importable_image_paths)
           end
         end
       end

lib/spatial_features/importers/shapefile.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'digest/md5'
 
 module SpatialFeatures
@@ -29,10 +30,7 @@ def self.create_all(data, **options)
       def each_record
         open_shapefile(archive) do |records, proj4|
           records.each do |record|
-            if record.geometry.present?
-              data = data_from_record(record, proj4)
-              yield Struct.new(:geog, :metadata).new(data[:geog], data[:metadata])
-            end
+            yield OpenStruct.new(data_from_record(record, proj4)) if record.geometry.present?
           end
         end
       rescue Errno::ENOENT => e

lib/spatial_features/venn_polygons.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module SpatialFeatures
   # Splits overlapping features into separate polygons at their areas of overlap, and returns an array of objects
   # with kml for the overlapping area and a list of the record ids whose kml overlapped within that area
@@ -57,7 +59,7 @@ def self.venn_polygons(*scopes)
     polygons.group_by{|row| row['kml']}.collect do |kml, rows|
       # Uniq on row id in case a single record had self intersecting multi geometry, which would cause it to appear duplicated on a single venn polygon
       records = rows.uniq {|row| row.values_at('id', 'type') }.collect{|row| eager_load_hash.fetch(row['type']).detect{|record| record.id == row['id'].to_i } }
-      Struct.new(:kml, :records).new(kml, records)
+      OpenStruct.new(:kml => kml, :records => records)
     end
   end
 end

spatial_features.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rgeo-geojson", '>= 2.1.1'
   s.add_runtime_dependency "rubyzip", "~> 3.0"
   s.add_runtime_dependency "nokogiri"
+  s.add_runtime_dependency "ostruct"
 
   s.add_development_dependency "rails", '>= 7', '< 9'
   s.add_development_dependency "pg", '~> 1'