apidae 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a932429ac3790b5e279d5de784875cdbea3bd1
-  data.tar.gz: 676578b32fa75039a2eca51af6d8101521adcff8
+  metadata.gz: 0ebf98cf5fe002225d6e5ae04b67f4ee810afd28
+  data.tar.gz: 2a4064146401f9e4780fea21d308b55fe6686a54
 SHA512:
-  metadata.gz: 25ed0df335595cccfd1e54ae9e1d9b79f409dcd6445375d2d8ce31fa66a80ebea8494d043d6b100d6d9fe9ed6fc7101259cf5370b2cb5f6ad36dd0bea382fc96
-  data.tar.gz: 50337084399352cdf742574a65c05c5cddbfa778b5acf33c21afa9d42996d23be1c11061c84f18e9eee9cc32806c86fcca65d1866e73fc2d92fe4d6696045ff7
+  metadata.gz: a61050c9244d67578ed7ff5dfef54b847940336939f20e2c2fad395c49ed7d53e67b8c4ffec03f04864fea320551adb879f2ca492e9011bd57cb4ec6e552d597
+  data.tar.gz: 43be5cefdec139fa193e84a589ebfb0f709081b5ecb7166066620bf06190736ca582e719dbbb6ab882443be1e88571d7b3433b8076fb993315e7348c66df902b

data/app/models/apidae/object.rb

@@ -197,7 +197,8 @@ module Apidae
             capacity: data_hash[:capacite],
             classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
                                       lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
-            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]),
+            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap], data_hash[:aopAocIgps]) +
+                (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
             chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
             area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : nil,
             track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
@@ -216,7 +217,8 @@ module Apidae
             services: lists_ids(data_hash[:services]),
             equipments: lists_ids(data_hash[:equipements]),
             comfort: lists_ids(data_hash[:conforts]),
-            activities: lists_ids(data_hash[:activites]) + lists_ids(type_data_hash[:activites])
+            activities: lists_ids(data_hash[:activites], type_data_hash[:activites],
+                                  type_data_hash[:activitesSportives], type_data_hash[:activitesCulturelles])
         }
       end
     end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails