More tests and fixes on carte champ

app/helpers/champ_helper.rb

@@ -6,13 +6,7 @@ module ChampHelper
 
   def geo_data(champ)
     # rubocop:disable Rails/OutputSafety
-    raw({
+    raw(champ.to_render_data.to_json)
-      position: champ.position,
-      selection: champ.value.present? ? JSON.parse(champ.value) : [],
-      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
 end

app/javascript/shared/carte.js

@@ -71,18 +71,17 @@ export function drawParcellesAgricoles(
 }
 
 export function drawUserSelection(map, { selection }, editable = false) {
-  let hasSelection = selection && selection.length > 0;
+  if (selection) {
+    const coordinates = toLatLngs(selection);
 
     if (editable) {
-    if (hasSelection) {
+      coordinates.forEach(polygon => map.freeDraw.create(polygon));
-      selection.forEach(polygon => map.freeDraw.create(polygon));
+      const polygon = map.freeDraw.all()[0];
-      let polygon = map.freeDraw.all()[0];
       if (polygon) {
         map.fitBounds(polygon.getBounds());
       }
-    }
+    } else {
-  } else if (hasSelection) {
+      const polygon = L.polygon(coordinates, {
-    const polygon = L.polygon(selection, {
         color: 'red',
         zIndex: 3
       }).addTo(map);
@@ -90,6 +89,7 @@ export function drawUserSelection(map, { selection }, editable = false) {
       map.fitBounds(polygon.getBounds());
     }
   }
+}
 
 export function geocodeAddress(map, query) {
   getJSON('/address/geocode', { request: query }).then(data => {
@@ -125,6 +125,12 @@ export function addFreeDrawEvents(map, selector) {
   });
 }
 
+function toLatLngs({ coordinates }) {
+  return coordinates.map(polygon =>
+    polygon[0].map(point => ({ lng: point[0], lat: point[1] }))
+  );
+}
+
 function findInput(selector) {
   return typeof selector === 'string'
     ? document.querySelector(selector)

app/models/champs/carte_champ.rb

@@ -44,24 +44,38 @@ class Champs::CarteChamp < Champ
   end
 
   def geo_json
-    @geo_json ||= value.blank? ? nil : JSON.parse(value)
+    @geo_json ||= begin
-  end
+      parsed_value = value.blank? ? nil : JSON.parse(value)
-
-  def user_geometry
       # We used to store in the value column a json array with coordinates.
-    if geo_json.is_a?(Array)
+      if parsed_value.is_a?(Array)
+        # Empty array is sent instead of blank to distinguish between empty and error
+        if parsed_value.empty?
+          nil
+        else
           # If it is a coordinates array, format it as a GEO-JSON
-      JSON.parse(GeojsonService.to_json_polygon_for_selection_utilisateur(geo_json))
+          JSON.parse(GeojsonService.to_json_polygon_for_selection_utilisateur(parsed_value))
+        end
       else
         # It is already a GEO-JSON
-      geo_json
+        parsed_value
       end
     end
+  end
+
+  def to_render_data
+    {
+      position: position,
+      selection: geo_json,
+      quartiersPrioritaires: quartiers_prioritaires? ? quartiers_prioritaires.as_json(except: :properties) : [],
+      cadastres: cadastres? ? cadastres.as_json(except: :properties) : [],
+      parcellesAgricoles: parcelles_agricoles? ? parcelles_agricoles.as_json(except: :properties) : []
+    }
+  end
 
   def user_geo_area
     if geo_json.present?
       GeoArea.new(
-        geometry: user_geometry,
+        geometry: geo_json,
         source: GeoArea.sources.fetch(:selection_utilisateur)
       )
     end

app/serializers/champ_serializer.rb

@@ -14,7 +14,9 @@ class ChampSerializer < ActiveModel::Serializer
     when GeoArea
       object.geometry.to_json
     when Champs::CarteChamp
-      object.user_geometry.to_json
+      if object.geo_json.present?
+        object.geo_json.to_json
+      end
     when Champs::DecimalNumberChamp
       if object.value.present?
         object.value.to_f

spec/controllers/champs/carte_controller_spec.rb

@@ -41,7 +41,7 @@ describe Champs::CarteController, type: :controller do
         expect(assigns(:error)).to eq(nil)
         expect(champ.reload.value).to eq(nil)
         expect(champ.reload.geo_areas).to eq([])
-        expect(response.body).to include("DS.drawMapData(\".carte-1\", {\"position\":{\"lon\":\"2.428462\",\"lat\":\"46.538192\",\"zoom\":\"13\"},\"selection\":[],\"quartiersPrioritaires\":[],\"cadastres\":[],\"parcellesAgricoles\":[]});")
+        expect(response.body).to include("DS.drawMapData(\".carte-1\", {\"position\":{\"lon\":\"2.428462\",\"lat\":\"46.538192\",\"zoom\":\"13\"},\"selection\":null,\"quartiersPrioritaires\":[],\"cadastres\":[],\"parcellesAgricoles\":[]});")
       }
     end
 

spec/models/champs/carte_champ_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Champs::CarteChamp do
+  let(:champ) { Champs::CarteChamp.new(value: value) }
+  let(:value) { '' }
+  let(:geo_json) { GeojsonService.to_json_polygon_for_selection_utilisateur(coordinates) }
+  let(:coordinates) { [[{ "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(:parsed_geo_json) { JSON.parse(geo_json) }
+
+  describe '#to_render_data' do
+    subject { champ.to_render_data }
+
+    let(:render_data) {
+      {
+        position: champ.position,
+        selection: selection,
+        cadastres: [],
+        parcellesAgricoles: [],
+        quartiersPrioritaires: []
+      }
+    }
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+
+      let(:selection) { nil }
+
+      it { is_expected.to eq(render_data) }
+    end
+
+    context 'when the value is blank' do
+      let(:value) { '' }
+
+      let(:selection) { nil }
+
+      it { is_expected.to eq(render_data) }
+    end
+
+    context 'when the value is empty array' do
+      let(:value) { '[]' }
+
+      let(:selection) { nil }
+
+      it { is_expected.to eq(render_data) }
+    end
+
+    context 'when the value is coordinates' do
+      let(:value) { coordinates.to_json }
+
+      let(:selection) { parsed_geo_json }
+
+      it { is_expected.to eq(render_data) }
+    end
+
+    context 'when the value is geojson' do
+      let(:value) { geo_json }
+
+      let(:selection) { parsed_geo_json }
+
+      it { is_expected.to eq(render_data) }
+    end
+  end
+end

spec/serializers/champ_serializer_spec.rb

@@ -30,23 +30,45 @@ describe ChampSerializer do
 
       let(:serialized_champ) {
         {
-          type_de_champ: {
+          type_de_champ: serialized_type_de_champ,
+          value: serialized_value
+        }
+      }
+      let(:serialized_type_de_champ) {
+        {
           description: serialized_description,
           id: serialized_id,
           libelle: serialized_libelle,
           order_place: serialized_order_place,
           type_champ: serialized_type_champ
-          },
+        }
-          geo_areas: serialized_geo_areas,
-          value: geo_json
-        }.compact
       }
       let(:serialized_id) { -1 }
       let(:serialized_description) { "" }
       let(:serialized_order_place) { -1 }
-      let(:serialized_geo_areas) { nil }
+      let(:serialized_value) { geo_json }
 
       context 'and geo_area is selection_utilisateur' do
+        context 'value is empty' do
+          context 'when value is nil' do
+            let(:value) { nil }
+
+            it { expect(champ.user_geo_area).to be_nil }
+          end
+
+          context 'when value is empty array' do
+            let(:value) { '[]' }
+
+            it { expect(champ.user_geo_area).to be_nil }
+          end
+
+          context 'when value is blank' do
+            let(:value) { '' }
+
+            it { expect(champ.user_geo_area).to be_nil }
+          end
+        end
+
         context 'old_api' do
           let(:serialized_libelle) { "user geometry" }
           let(:serialized_type_champ) { "user_geometry" }
@@ -68,7 +90,13 @@ describe ChampSerializer do
 
         context 'new_api' do
           let(:geo_area) { nil }
-          let(:serialized_geo_areas) { [] }
+          let(:serialized_champ) {
+            {
+              type_de_champ: serialized_type_de_champ,
+              geo_areas: [],
+              value: serialized_value
+            }
+          }
           let(:serialized_id) { champ.type_de_champ.stable_id }
           let(:serialized_description) { champ.description }
           let(:serialized_order_place) { champ.order_place }
@@ -86,6 +114,27 @@ describe ChampSerializer do
 
             it { expect(subject).to eq(serialized_champ) }
           end
+
+          context 'when value is nil' do
+            let(:value) { nil }
+            let(:serialized_value) { nil }
+
+            it { expect(subject).to eq(serialized_champ) }
+          end
+
+          context 'when value is empty array' do
+            let(:value) { '[]' }
+            let(:serialized_value) { nil }
+
+            it { expect(subject).to eq(serialized_champ) }
+          end
+
+          context 'when value is blank' do
+            let(:value) { '' }
+            let(:serialized_value) { nil }
+
+            it { expect(subject).to eq(serialized_champ) }
+          end
         end
       end