Fix metadata, emit array

teritorio · Jan 30, 2024 · a08e23c · a08e23c
1 parent 379bebf
commit a08e23c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/datasources/sources/geotrek.rb b/datasources/sources/geotrek.rb
@@ -94,19 +94,18 @@ def practice_slug(practice)
     }][(practice&.dig('name', 'en') || practice&.dig('name', 'fr'))&.parameterize]
   end
 
-  sig { returns(MetadataRow) }
-  def metadata
-    super.deep_merge_array({
-      data: @practices.to_h{ |practice_id, practice|
-        [
-          practice_slug(practice_id),
-          {
-            name: practice['name'],
-            attribution: @settings.attribution,
-          }.compact_blank
-        ]
-      }.compact_blank
-    })
+  sig { returns(T::Array[MetadataRow]) }
+  def metadatas
+    super + @practices.collect{ |practice_id, practice|
+      MetadataRow.new({
+        data: {
+          practice_slug(practice_id) => Metadata.from_hash({
+            'name' => practice['name'],
+            'attribution' => @settings.attribution,
+          })
+        }.compact_blank
+      })
+    }
   end
 
   def map_destination_id(type_feat)

diff --git a/datasources/sources/metadata.rb b/datasources/sources/metadata.rb
@@ -25,11 +25,11 @@ def load(urls)
     }
   end
 
-  sig { returns(MetadataRow) }
-  def metadata
-    super.deep_merge_array({
+  sig { returns(T::Array[MetadataRow]) }
+  def metadatas
+    [super[0].deep_merge_array({
       'data' => load(@settings.meta)&.inject({}, &:deep_merge_array),
-    })
+    })]
   end
 
   sig { returns(SchemaRow) }

diff --git a/datasources/sources/source.rb b/datasources/sources/source.rb
@@ -79,17 +79,16 @@ def initialize(job_id, destination_id, name, settings)
     @settings = settings
   end
 
-  sig { returns(MetadataRow) }
-  def metadata
-    MetadataRow.new(
-      destination_id: @destination_id,
+  sig { returns(T::Array[MetadataRow]) }
+  def metadatas
+    [MetadataRow.new(
       data: {
         @destination_id => Metadata.from_hash({
           'name' => @name,
           'attribution' => @settings.attribution
         }).deep_merge_array(@settings.metadata)
       }.compact_blank
-    )
+    )]
   end
 
   sig { returns(SchemaRow) }
@@ -219,15 +218,17 @@ def one(row, bad)
   end
 
   def each(raw)
-    metadata_data = metadata
-    yield [:metadata, metadata_data]
+    metadata_datas = metadatas
+    metadata_datas.each{ |metadata_data|
+      yield [:metadata, metadata_data]
+    }
     schema_data = schema
     yield [:schema, schema_data]
     osm_tags_data = osm_tags
     yield [:osm_tags, osm_tags_data]
 
     log = "    > #{self.class.name}, #{@destination_id.inspect}: #{raw.size}"
-    log += ' +metadata' if metadata_data.present?
+    log += ' +metadata' if metadata_datas.present?
     log += ' +schema' if schema_data.schema.present?
     log += ' +i18n' if schema_data.i18n.present?
     log += ' +osm_tags' if osm_tags_data.data.present?