Fix reflex sync Refs #6141

2 files changed, 13 insertions, 16 deletions

diff --git a/lib/stif/reflex_synchronization.rb b/lib/stif/reflex_synchronization.rb
index 4eb5bb541..202446da3 100644
--- a/lib/stif/reflex_synchronization.rb
+++ b/lib/stif/reflex_synchronization.rb
@@ -51,7 +51,7 @@ module Stif
           stop_areas = results[:Quay] | results[:StopPlace]
 
           time = Benchmark.measure do
-            stop_areas.in_batches.each do |entry|
+            stop_areas.each do |entry|
               next unless is_valid_type_of_place_ref?(method, entry)
               entry['TypeOfPlaceRef'] = self.stop_area_area_type entry, method
               self.create_or_update_stop_area entry
@@ -152,23 +152,19 @@ module Stif
       def create_or_update_stop_area entry
         stop = Chouette::StopArea.find_or_create_by(objectid: entry['id'], stop_area_referential: self.defaut_referential )
         {
-          kind:          :commercial,
-          deleted_at:    nil,
           comment:       'Description',
-          :name          'Name',
-          :area_type     'TypeOfPlaceRef',
-          :object_version 'version',
-          :zip_code       'PostalRegion',
-          :city_name      'Town',
-          :stif_type      'OBJECT_STATUS',
-          longitude: (entry['gml:pos'][:lng] && entry['gml:pos'][:lng]) ? entry['gml:pos'][:lng] : nil,
-          latitude: (entry['gml:pos'][:lat] && entry['gml:pos'][:lat]) ? entry['gml:pos'][:lat] : nil
+          name:          'Name',
+          area_type:     'TypeOfPlaceRef',
+          object_version: 'version',
+          zip_code:       'PostalRegion',
+          city_name:      'Town',
+          stif_type:      'OBJECT_STATUS',
+          longitude: (entry['gml:pos'] && entry['gml:pos'][:lng]) ? entry['gml:pos'][:lng] : nil,
+          latitude: (entry['gml:pos'] && entry['gml:pos'][:lat]) ? entry['gml:pos'][:lat] : nil
         }.each do |k, v| stop[k] = entry[v] end
 
-        # if entry['gml:pos']
-        #   stop['longitude'] = entry['gml:pos'][:lng]
-        #   stop['latitude']  = entry['gml:pos'][:lat]
-        # end
+        stop.kind = :commercial
+        stop.deleted_at            = nil
         stop.confirmed_at = Time.now if stop.new_record?
 
         if stop.changed?
diff --git a/spec/features/stop_areas_spec.rb b/spec/features/stop_areas_spec.rb
index 02e853999..17aee2cc0 100644
--- a/spec/features/stop_areas_spec.rb
+++ b/spec/features/stop_areas_spec.rb
@@ -32,8 +32,9 @@ describe "StopAreas", :type => :feature do
       end
 
       context 'filtering by status' do
-        before do
+        before(:each) do
           stop_areas.first.activate!
+          stop_areas.last.activate!
           stop_areas.last.deactivate!
         end