diff --git a/app/helpers/champ_helper.rb b/app/helpers/champ_helper.rb index ef8f6386f..7f3df63d2 100644 --- a/app/helpers/champ_helper.rb +++ b/app/helpers/champ_helper.rb @@ -9,9 +9,9 @@ module ChampHelper raw({ position: champ.position, selection: champ.value.present? ? JSON.parse(champ.value) : [], - quartiersPrioritaires: champ.quartiers_prioritaires? ? champ.quartiers_prioritaires : [], - cadastres: champ.cadastres? ? champ.cadastres : [], - parcellesAgricoles: champ.parcelles_agricoles? ? champ.parcelles_agricoles : [] + quartiersPrioritaires: champ.quartiers_prioritaires? ? champ.quartiers_prioritaires.as_json(except: :properties) : [], + cadastres: champ.cadastres? ? champ.cadastres.as_json(except: :properties) : [], + parcellesAgricoles: champ.parcelles_agricoles? ? champ.parcelles_agricoles.as_json(except: :properties) : [] }.to_json) # rubocop:enable Rails/OutputSafety end diff --git a/app/helpers/type_de_champ_helper.rb b/app/helpers/type_de_champ_helper.rb index 0b9e5f3eb..e8c4584ae 100644 --- a/app/helpers/type_de_champ_helper.rb +++ b/app/helpers/type_de_champ_helper.rb @@ -3,7 +3,6 @@ module TypeDeChampHelper TypeDeChamp.type_champs.fetch(:piece_justificative) => :champ_pj?, TypeDeChamp.type_champs.fetch(:siret) => :champ_siret?, TypeDeChamp.type_champs.fetch(:linked_drop_down_list) => :champ_linked_dropdown?, - TypeDeChamp.type_champs.fetch(:carte) => :champ_carte?, TypeDeChamp.type_champs.fetch(:integer_number) => :champ_integer_number? } diff --git a/config/features.rb b/config/features.rb index ed4d0faf2..6ee9d203e 100644 --- a/config/features.rb +++ b/config/features.rb @@ -13,8 +13,6 @@ Flipflop.configure do title: "Champ SIRET" feature :champ_linked_dropdown, title: "Champ double menu déroulant" - feature :champ_carte, - title: "Champ Carte" feature :champ_integer_number, title: "Champ nombre entier" end diff --git a/spec/controllers/champs/carte_controller_spec.rb b/spec/controllers/champs/carte_controller_spec.rb index c4393bbcd..9a9d56896 100644 --- a/spec/controllers/champs/carte_controller_spec.rb +++ b/spec/controllers/champs/carte_controller_spec.rb @@ -43,7 +43,6 @@ describe Champs::CarteController, type: :controller do let(:selection) { [[{ "lat": 48.87442541960633, "lng": 2.3859214782714844 }, { "lat": 48.87273183590832, "lng": 2.3850631713867183 }, { "lat": 48.87081237174292, "lng": 2.3809432983398438 }, { "lat": 48.8712640169951, "lng": 2.377510070800781 }, { "lat": 48.87510283703279, "lng": 2.3778533935546875 }, { "lat": 48.87544154230615, "lng": 2.382831573486328 }, { "lat": 48.87442541960633, "lng": 2.3859214782714844 }]] } it { expect(response.body).not_to be_nil } - it { expect(response.body).to include('QPCODE1234') } it { expect(response.body).to include('MultiPolygon') } it { expect(response.body).to include('[2.38715792094576,48.8723062632126]') } end