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

perf(carto): use json schema to validate geojson instead of rgeo

Browse source
This commit is contained in:
Paul Chavard 2023-04-07 15:24:28 +02:00
parent 3d3b90c4fb
commit c4432b1b47
11 changed files with 1312 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -73,7 +73,6 @@ gem 'rails-i18n' # Locales par défaut
gem 'rake-progressbar', require: false
gem 'redcarpet'
gem 'rexml' # add missing gem due to ruby3 (https://github.com/Shopify/bootsnap/issues/325)
gem 'rgeo-geojson'
gem 'rqrcode'
gem 'saml_idp'
gem 'sanitize-url'

4
Gemfile.lock
View file

@ -566,9 +566,6 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rgeo (2.2.0)
rgeo-geojson (2.1.1)
rgeo (>= 1.0.0)
rodf (1.1.1)
builder (>= 3.0)
dry-inflector (~> 0.1)
@ -890,7 +887,6 @@ DEPENDENCIES
rake-progressbar
redcarpet
rexml
rgeo-geojson
rqrcode
rspec-rails
rspec_junit_formatter

11
app/jobs/migrations/normalize_geo_area_job.rb
View file

@ -1,11 +0,0 @@
class Migrations::NormalizeGeoAreaJob < ApplicationJob
def perform(ids)
GeoArea.where(id: ids).find_each do |geo_area|
geojson = RGeo::GeoJSON.decode(geo_area.geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
geometry = RGeo::GeoJSON.encode(geojson)
geo_area.update_column(:geometry, geometry)
rescue RGeo::Error::InvalidGeometry
geo_area.destroy
end
end
end

18
app/models/geo_area.rb
View file

@ -52,7 +52,6 @@ class GeoArea < ApplicationRecord
scope :cadastres, -> { where(source: sources.fetch(:cadastre)) }
validates :geometry, geo_json: true, allow_nil: false
before_validation :normalize_geometry
def to_feature
{
@ -230,21 +229,4 @@ class GeoArea < ApplicationRecord
properties['id']
end
end
private
def normalize_geometry
if geometry.present?
normalized_geometry = rgeo_geometry
if normalized_geometry.present?
self.geometry = RGeo::GeoJSON.encode(normalized_geometry)
end
end
end
def rgeo_geometry
RGeo::GeoJSON.decode(geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
rescue RGeo::Error::InvalidGeometry
nil
end
end

1279
app/schemas/geojson.json Normal file
View file

File diff suppressed because it is too large Load diff

5
app/services/geojson_service.rb
View file

@ -1,4 +1,9 @@
class GeojsonService
def self.valid?(json)
schemer = JSONSchemer.schema(Rails.root.join('app/schemas/geojson.json'))
schemer.valid?(json)
end
def self.to_json_polygon_for_cadastre(coordinates)
polygon = {
geom: {

4
app/validators/geo_json_validator.rb
View file

@ -4,9 +4,7 @@ class GeoJSONValidator < ActiveModel::EachValidator
record.errors.add(attribute, :blank, message: options[:message] || "ne peut pas être vide")
end
begin
RGeo::GeoJSON.decode(value.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
rescue RGeo::Error::InvalidGeometry
unless value.blank? || GeojsonService.valid?(value)
record.errors.add(attribute, :invalid_geometry, message: options[:message] || "n'est pas un GeoJSON valide")
end
end

19
lib/tasks/deployment/20230215100231_normalize_geometries.rake
View file

@ -1,19 +0,0 @@
namespace :after_party do
desc 'Deployment task: normalize_geometries'
task normalize_geometries: :environment do
puts "Running deploy task 'normalize_geometries'"
progress = ProgressReport.new(GeoArea.count)
GeoArea.in_batches(of: 100) do |geo_areas|
ids = geo_areas.ids
Migrations::NormalizeGeoAreaJob.perform_later(ids)
progress.inc(ids.size)
end
progress.finish
# Update task as completed. If you remove the line below, the task will
# run with every deploy (or every time you call after_party:run).
AfterParty::TaskRecord
.create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
end
end

4
spec/controllers/champs/carte_controller_spec.rb
View file

@ -46,7 +46,7 @@ describe Champs::CarteController, type: :controller do
end
context 'error' do
let(:feature) { attributes_for(:geo_area, :invalid_right_hand_rule_polygon) }
let(:feature) { attributes_for(:geo_area, :invalid_point) }
let(:params) do
{
champ_id: champ.id,
@ -92,7 +92,7 @@ describe Champs::CarteController, type: :controller do
end
context 'error' do
let(:feature) { attributes_for(:geo_area, :invalid_right_hand_rule_polygon) }
let(:feature) { attributes_for(:geo_area, :invalid_point) }
it { expect(response.status).to eq 422 }
end

9
spec/factories/geo_area.rb
View file

@ -116,6 +116,15 @@ FactoryBot.define do
end
end
trait :invalid_point do
geometry do
{
"type": "Point",
"coordinates": [46.538476837725796]
}
end
end
trait :multi_polygon do
geometry do
{

57
spec/models/geo_area_spec.rb
View file

@ -23,36 +23,6 @@ RSpec.describe GeoArea, type: :model do
it { expect(geo_area.location).to eq("46°32'19\"N 2°25'42\"E") }
end
describe '#geometry' do
let(:geo_area) { build(:geo_area, :polygon, champ: nil) }
let(:polygon) do
{
"type" => "Polygon",
"coordinates" => [
[
[2.428439855575562, 46.538476837725796],
[2.4284291267395024, 46.53842148758162],
[2.4282521009445195, 46.53841410755813],
[2.42824137210846, 46.53847314771794],
[2.428284287452698, 46.53847314771794],
[2.428364753723145, 46.538487907747864],
[2.4284291267395024, 46.538491597754714],
[2.428439855575562, 46.538476837725796]
]
]
}
end
it { expect(geo_area.geometry).to eq(polygon) }
context 'polygon_with_extra_coordinate' do
let(:geo_area) { build(:geo_area, :polygon_with_extra_coordinate, champ: nil) }
before { geo_area.valid? }
it { expect(geo_area.geometry).to eq(polygon) }
end
end
describe 'validations' do
context 'geometry' do
subject! { geo_area.validate }
@ -62,11 +32,6 @@ RSpec.describe GeoArea, type: :model do
it { expect(geo_area.errors).not_to have_key(:geometry) }
end
context 'hourglass_polygon' do
let(:geo_area) { build(:geo_area, :hourglass_polygon, champ: nil) }
it { expect(geo_area.errors).to have_key(:geometry) }
end
context 'line_string' do
let(:geo_area) { build(:geo_area, :line_string, champ: nil) }
it { expect(geo_area.errors).not_to have_key(:geometry) }
@ -77,9 +42,9 @@ RSpec.describe GeoArea, type: :model do
it { expect(geo_area.errors).not_to have_key(:geometry) }
end
context 'invalid_right_hand_rule_polygon' do
let(:geo_area) { build(:geo_area, :invalid_right_hand_rule_polygon, champ: nil) }
it { expect(geo_area.errors).to have_key(:geometry) }
context "allow empty {}" do
let(:geo_area) { build(:geo_area, geometry: {}) }
it { expect(geo_area.errors).not_to have_key(:geometry) }
end
context "nil" do
@ -87,9 +52,19 @@ RSpec.describe GeoArea, type: :model do
it { expect(geo_area.errors).to have_key(:geometry) }
end
context "allow empty {}" do
let(:geo_area) { build(:geo_area, geometry: {}) }
it { expect(geo_area.errors).not_to have_key(:geometry) }
context 'invalid point' do
let(:geo_area) { build(:geo_area, :invalid_point, champ: nil) }
it { expect(geo_area.errors).to have_key(:geometry) }
end
context.skip 'invalid_right_hand_rule_polygon' do
let(:geo_area) { build(:geo_area, :invalid_right_hand_rule_polygon, champ: nil) }
it { expect(geo_area.errors).to have_key(:geometry) }
end
context.skip 'hourglass_polygon' do
let(:geo_area) { build(:geo_area, :hourglass_polygon, champ: nil) }
it { expect(geo_area.errors).to have_key(:geometry) }
end
end
end