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

Merge pull request #3071 from tchak/fix-champ-cart-again

Browse source 
Do not send error json to backend - it doesn’t need it and it creates bad data
This commit is contained in:
Paul Chavard 2018-11-27 11:50:24 +01:00 committed by GitHub
commit d7b5030be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ class Champs::CarteController < ApplicationController
geo_areas = [] geo_areas = []
geo_json = geo_json.blank? ? [] : JSON.parse(geo_json) geo_json = geo_json.blank? ? [] : JSON.parse(geo_json)
if geo_json.first == ["error", "TooManyPolygons"] if geo_json.empty?
@error = true @error = true
@champ.value = nil @champ.value = nil
@champ.geo_areas = [] @champ.geo_areas = []

2
app/javascript/shared/carte.js
View file

@ -115,7 +115,7 @@ export function addFreeDrawEvents(map, selector) {
} else if (polygonArea(latLngs) < 300000) { } else if (polygonArea(latLngs) < 300000) {
input.value = JSON.stringify(latLngs); input.value = JSON.stringify(latLngs);
} else { } else {
input.value = '{ "error": "TooManyPolygons" }'; input.value = '';
} }
fire(input, 'change'); fire(input, 'change');

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

@ -50,7 +50,7 @@ describe Champs::CarteController, type: :controller do
context 'when error' do context 'when error' do
let(:geojson) { [[{ "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 }]] } let(:geojson) { [[{ "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 }]] }
let(:selection) { { error: "TooManyPolygons" } } let(:selection) { '' }
it { it {
expect(champ.reload.value).to eq(nil) expect(champ.reload.value).to eq(nil)