DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Unify #generate_qp with #generate_cadastre

Browse source
This commit is contained in:
gregoirenovel 2018-10-15 16:07:15 +02:00
parent a18af4e616
commit 22beb41240
4 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users/carte_controller.rb
View file

@ -38,7 +38,7 @@ class Users::CarteController < UsersController
@error = true
else
if @dossier.procedure.module_api_carto.quartiers_prioritaires?
quartiers_prioritaires = ModuleApiCartoService.generate_qp(geo_json).values
quartiers_prioritaires = ModuleApiCartoService.generate_qp(geo_json)
@dossier.quartier_prioritaires.build(quartiers_prioritaires)
@data[:quartiersPrioritaires] = quartiers_prioritaires
end

13
app/lib/carto/sgmap/quartiers_prioritaires/adapter.rb
View file

@ -8,15 +8,8 @@ class CARTO::SGMAP::QuartiersPrioritaires::Adapter
end
def to_params
params = {}
data_source[:features].each do |feature|
qp_code = feature[:properties][:code]
params[qp_code] = feature[:properties]
params[qp_code][:geometry] = feature[:geometry]
end
params
data_source[:features].map do |feature|
feature[:properties].merge({ geometry: feature[:geometry] })
end
end
end

8
app/services/module_api_carto_service.rb
View file

@ -3,7 +3,7 @@ class ModuleApiCartoService
if dossier.procedure.module_api_carto.quartiers_prioritaires?
qp_list = generate_qp(JSON.parse(json_latlngs))
qp_list.each_value do |qp|
qp_list.each do |qp|
qp[:dossier_id] = dossier.id
qp[:geometry] = qp[:geometry].to_json
QuartierPrioritaire.create(qp)
@ -24,11 +24,11 @@ class ModuleApiCartoService
end
def self.generate_qp(coordinates)
coordinates.inject({}) { |acc, coordinate|
acc.merge CARTO::SGMAP::QuartiersPrioritaires::Adapter.new(
coordinates.flat_map do |coordinate|
CARTO::SGMAP::QuartiersPrioritaires::Adapter.new(
coordinate.map { |element| [element['lng'], element['lat']] }
).to_params
}
end
end
def self.generate_cadastre(coordinates)

12
spec/lib/carto/sgmap/quartiers_prioritaires/adapter_spec.rb
View file

@ -15,18 +15,16 @@ describe CARTO::SGMAP::QuartiersPrioritaires::Adapter do
let(:status) { 200 }
let(:body) { File.read('spec/support/files/geojson/response_qp.json') }
it { expect(subject).to be_a_instance_of(Hash) }
it { expect(subject).to be_a_instance_of(Array) }
context 'Attributes' do
let(:qp_code) { 'QP057019' }
subject { super()[qp_code] }
it { expect(subject.first[:code]).to eq(qp_code) }
it { expect(subject.first[:nom]).to eq('Hauts De Vallières') }
it { expect(subject.first[:commune]).to eq('Metz') }
it { expect(subject[:code]).to eq(qp_code) }
it { expect(subject[:nom]).to eq('Hauts De Vallières') }
it { expect(subject[:commune]).to eq('Metz') }
it { expect(subject[:geometry]).to eq({ :type => "MultiPolygon", :coordinates => [[[[6.2136923480551, 49.1342109827851], [6.21416055031881, 49.1338823553928]]]] }) }
it { expect(subject.first[:geometry]).to eq({ :type => "MultiPolygon", :coordinates => [[[[6.2136923480551, 49.1342109827851], [6.21416055031881, 49.1338823553928]]]] }) }
end
end