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

ModuleApiCartoService → ApiCartoService

Browse source
This commit is contained in:
gregoirenovel 2018-12-10 11:31:07 +01:00
parent 27f4d9421f
commit e69310fe07
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/champs/carte_controller.rb
View file

@ -41,7 +41,7 @@ class Champs::CarteController < ApplicationController
coordinates = JSON.parse(coordinates) coordinates = JSON.parse(coordinates)
if @champ.cadastres? if @champ.cadastres?
cadastres = ModuleApiCartoService.generate_cadastre(coordinates) cadastres = ApiCartoService.generate_cadastre(coordinates)
geo_areas += cadastres.map do |cadastre| geo_areas += cadastres.map do |cadastre|
cadastre[:source] = GeoArea.sources.fetch(:cadastre) cadastre[:source] = GeoArea.sources.fetch(:cadastre)
cadastre cadastre
@ -49,7 +49,7 @@ class Champs::CarteController < ApplicationController
end end
if @champ.quartiers_prioritaires? if @champ.quartiers_prioritaires?
quartiers_prioritaires = ModuleApiCartoService.generate_qp(coordinates) quartiers_prioritaires = ApiCartoService.generate_qp(coordinates)
geo_areas += quartiers_prioritaires.map do |qp| geo_areas += quartiers_prioritaires.map do |qp|
qp[:source] = GeoArea.sources.fetch(:quartier_prioritaire) qp[:source] = GeoArea.sources.fetch(:quartier_prioritaire)
qp qp
@ -57,7 +57,7 @@ class Champs::CarteController < ApplicationController
end end
if @champ.parcelles_agricoles? if @champ.parcelles_agricoles?
parcelles_agricoles = ModuleApiCartoService.generate_rpg(coordinates) parcelles_agricoles = ApiCartoService.generate_rpg(coordinates)
geo_areas += parcelles_agricoles.map do |parcelle_agricole| geo_areas += parcelles_agricoles.map do |parcelle_agricole|
parcelle_agricole[:source] = GeoArea.sources.fetch(:parcelle_agricole) parcelle_agricole[:source] = GeoArea.sources.fetch(:parcelle_agricole)
parcelle_agricole parcelle_agricole

2
app/services/module_api_carto_service.rb → app/services/api_carto_service.rb
View file

@ -1,4 +1,4 @@
class ModuleApiCartoService class ApiCartoService
def self.generate_qp(coordinates) def self.generate_qp(coordinates)
coordinates.flat_map do |coordinate| coordinates.flat_map do |coordinate|
ApiCarto::QuartiersPrioritairesAdapter.new( ApiCarto::QuartiersPrioritairesAdapter.new(