apidae 1.2.10 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83dac0ec19bab501ffe685ff871e4b1ebacb8211
-  data.tar.gz: 2e12955db455702f7ca0224fdc63ff543c3c630b
+  metadata.gz: 5b3849f9d44a0958ff3c66c50d7b88a11eb91ccf
+  data.tar.gz: ae55b5a634ab91442210a71828722263822ae78c
 SHA512:
-  metadata.gz: 0eda22b22c6297ddd8005bb992511d55125bb579998f48e9fbc3769ed7cc78aff2976fbfcbcca6dccd50ac2005d4b8d536adab0eb9a9a931e28776b043a761f8
-  data.tar.gz: 750bce121a6043b2b95513095e3a08bf31411be05fc1ac06efd0636dde66aacfba9c4daf9fd7e6a4a5307764ee77ad7b1b2b4784661419403f76a88d1fcbf365
+  metadata.gz: 3aa2d82b715fe8511f0c50bfc6d5c5c6fe747962aafd6fc52c7a0793f43f96fa78a28226f25bb0d509369ae9a535cb54937eedff10f03d1ed3fea34d47bbc373
+  data.tar.gz: 6bbe568e7412727e8dc7fc68602e013a5ed0e48a534925c64fbec23bce47e54d5f27ca3da4ae35d832e59f15824a8359aedef5950f006c7200ded8c93617eb6a

data/app/models/apidae/apidae_data_parser.rb

@@ -44,7 +44,7 @@ module Apidae
         'LUNDI' => MONDAY,
         'MARDI' => TUESDAY,
         'MERCREDI' => WEDNESDAY,
-        'JEUD' => THURSDAY,
+        'JEUDI' => THURSDAY,
         'VENDREDI' => FRIDAY,
         'SAMEDI' => SATURDAY,
         'DIMANCHE' => SUNDAY
@@ -223,6 +223,8 @@ module Apidae
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
+        loc_data[:map_reference] = geoloc_details[:reperePlan]
+        loc_data[:altitude] = geoloc_details[:altitude] if geoloc_details
         loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
         loc_data[:environments] = location_hash[:environnements].map {|e| e[:id]} if location_hash[:environnements]
       end
@@ -277,7 +279,8 @@ module Apidae
               (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 == Obj::DOS ? data_hash.except(:classification) : node_value(data_hash, :lieuDePratique),
-          track: apidae_obj.apidae_type == Obj::EQU ? data_hash[:itineraire] : nil,
+          track: apidae_obj.apidae_type == Obj::EQU ? (data_hash[:itineraire] || {}).except(:passagesDelicats) : nil,
+          tricky_sections: apidae_obj.apidae_type == Obj::EQU ? node_value(data_hash[:itineraire], :passagesDelicats, *locales) : nil,
           products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
           audience: lists_ids(prestations_hash[:typesClientele]),
           animals: {allowed: prestations_hash[:animauxAcceptes] == 'ACCEPTES', desc: node_value(prestations_hash, :descriptifAnimauxAcceptes, *locales),
@@ -319,13 +322,17 @@ module Apidae
       tags
     end
 
-    def self.parse_booking(reservation_hash, *locales)
+    def self.parse_booking(reservation_hash, visits_hash, *locales)
+      booking_hash = {}
       if reservation_hash
-        {
-            booking_desc: node_value(reservation_hash, :complement, *locales),
-            booking_entities: reservation_hash[:organismes]
-        }
+        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales),
+        booking_hash[:booking_entities] = reservation_hash[:organismes]
+      end
+      if visits_hash
+        booking_hash[:visits_allowed] = visits_hash[:visitable] == true
+        booking_hash[:visits_desc] = node_value(visits_hash, :complementVisite, *locales)
       end
+      booking_hash
     end
 
     def self.parse_town(location_hash)

data/app/models/apidae/obj.rb

@@ -15,15 +15,15 @@ module Apidae
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
+                   :tricky_sections, :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
-    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
+    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
     store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :booking_data, :booking_desc, :booking_entities
+    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
@@ -185,7 +185,7 @@ module Apidae
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
       apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
-      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], *locales)
+      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
       apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],
                                              object_data[:tourismeAffaires], *locales)
       apidae_obj.pictures_data = ApidaeDataParser.parse_pictures_data(object_data[:illustrations], *locales)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.10"
+  VERSION = "1.2.15"
 end

data/test/dummy/log/development.log

@@ -65,3 +65,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
   Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
   Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
+  Apidae::Obj Load (0.8ms)  SELECT  "apidae_objs".* FROM "apidae_objs" ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
+   (3.4ms)  SELECT COUNT(*) FROM "apidae_objs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.15
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails