apidae 1.2.29 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b32d29c7fda2d444873eb02202333f0b4aba4fa88aa885ca6dfc122046471e
-  data.tar.gz: c7c603f93c675854d30420c2febab0f472c4bc71b404572809fda5d5d382b514
+  metadata.gz: 062ad531aa659b7d8a57b19e6104e0e4636213fec13b4672d7d81aaf3213e0f9
+  data.tar.gz: 28a6b823f51365534631d787db318ab17c8061231447538dc5cfe58ca0a1a69f
 SHA512:
-  metadata.gz: 6bc3877ca1af9382b728947c17e31309753536e2242a257c808585ec6692886f950bb93216f2b79bb5aa7ad315db6e3b56a50a276ed08f2c3ce9bfad4dcccbbe
-  data.tar.gz: '0619277eb5e642f0f2d4a6158de9f924f9eabee4cc90b1e6835b5ebb93c2f0e74ba94970f25caedd6c477247f5670841b684b754f1dd1835028f6b2cb7fdd1c3'
+  metadata.gz: 3b9b6e32ddf0fda31552ea8cd61efea276f5db7d5b5dad20c6b33d233e995ad92354b75142ab596ab80a106131f2699f7c494ed32ffe34b3f4b5a4f76cec5375
+  data.tar.gz: 4c805857fdfa7f04ae20bac8ea2a2df6ca4aac3c1f11346a2319b2aa91fe3d97ec724818a6aea982f50eadcecc487b913a6d1ebc9fd4e1348bfa1ab697e45666

data/app/models/apidae/apidae_data_parser.rb

@@ -217,12 +217,12 @@ module Apidae
         address_hash = location_hash[:adresse]
         computed_address = []
         unless address_hash.blank?
-          computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
-          computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
-          computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
+          computed_address << address_hash[:adresse1]
+          computed_address << address_hash[:adresse2]
+          computed_address << address_hash[:adresse3]
         end
         loc_data.merge!({address: computed_address})
-        loc_data.merge!({place: type_data_hash[:nomLieu]}) if type_data_hash
+        loc_data.merge!({place: (type_data_hash ? type_data_hash[:nomLieu] : nil) || address_hash[:nomDuLieu]})
         geoloc_details = location_hash[:geolocalisation]
         if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]

data/app/models/apidae/obj.rb

@@ -175,7 +175,7 @@ module Apidae
     def self.populate_fields(apidae_obj, object_data, locales)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?
-      apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire], object_data[:enquete]) unless (object_data[:gestion].blank? && object_data[:gestion].blank?)
+      apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire], object_data[:enquete]) unless (object_data[:gestion].blank? && object_data[:enquete].blank?)
       apidae_obj.apidae_type = object_data[:type]
       apidae_obj.apidae_subtype = ApidaeDataParser.node_id(object_data[type_fields[:node]], type_fields[:subtype])
       apidae_obj.title_data = ApidaeDataParser.parse_title(object_data, *locales)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.29"
+  VERSION = "1.2.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.29
+  version: 1.2.31
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-16 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails