From 36d58993a0bf947b1c4dcbcb5ae10a5a995cdbc3 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Wed, 9 Apr 2025 09:32:54 +0200
Subject: [PATCH 1/2] chore: add missing margin-bottom in importers

---
 .../umap/js/modules/importers/cadastrefr.js   | 26 ++++++++++---------
 .../umap/js/modules/importers/geodatamine.js  | 20 +++++++-------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/umap/static/umap/js/modules/importers/cadastrefr.js b/umap/static/umap/js/modules/importers/cadastrefr.js
index e9fd932f..ca0f071a 100644
--- a/umap/static/umap/js/modules/importers/cadastrefr.js
+++ b/umap/static/umap/js/modules/importers/cadastrefr.js
@@ -8,18 +8,20 @@ import { AutocompleteCommunes } from './communesfr.js'
 const TEMPLATE = `
   <h3>Cadastre</h3>
   <p>Importer les données cadastrales d’une commune française.</p>
-  <select name="theme">
-    <option value="batiments">Bâtiments</option>
-    <option value="communes">Communes</option>
-    <option value="feuilles">Feuilles</option>
-    <option value="lieux_dits">Lieux dits</option>
-    <option value="parcelles" selected>Parcelles</option>
-    <option value="prefixes_sections">Préfixes sections</option>
-    <option value="sections">Sections</option>
-    <option value="subdivisions_fiscales">Subdivisions fiscales</option>
-  </select>
-  <label id="boundary">
-  </label>
+  <div class="formbox">
+    <select name="theme">
+      <option value="batiments">Bâtiments</option>
+      <option value="communes">Communes</option>
+      <option value="feuilles">Feuilles</option>
+      <option value="lieux_dits">Lieux dits</option>
+      <option value="parcelles" selected>Parcelles</option>
+      <option value="prefixes_sections">Préfixes sections</option>
+      <option value="sections">Sections</option>
+      <option value="subdivisions_fiscales">Subdivisions fiscales</option>
+    </select>
+    <label id="boundary">
+    </label>
+    </div>
 `
 
 export class Importer {
diff --git a/umap/static/umap/js/modules/importers/geodatamine.js b/umap/static/umap/js/modules/importers/geodatamine.js
index 2a6e19c0..cd03b25e 100644
--- a/umap/static/umap/js/modules/importers/geodatamine.js
+++ b/umap/static/umap/js/modules/importers/geodatamine.js
@@ -16,15 +16,17 @@ const BOUNDARY_TYPES = {
 const TEMPLATE = `
   <h3>GeoDataMine</h3>
   <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
-  <select name="theme">
-    <option value="">${translate('Choose a theme')}</option>
-  </select>
-  <label>
-    <input type="checkbox" name="aspoint" />
-    ${translate('Symplify all geometries to points')}
-  </label>
-  <label id="boundary">
-  </label>
+  <div class="formbox">
+    <select name="theme">
+      <option value="">${translate('Choose a theme')}</option>
+    </select>
+    <label>
+      <input type="checkbox" name="aspoint" />
+      ${translate('Symplify all geometries to points')}
+    </label>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {

From 36e9433cf9e581c55493e1e09e20259916a88ad8 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Wed, 9 Apr 2025 15:44:36 +0200
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
---
 umap/static/umap/js/modules/importers/cadastrefr.js  | 2 +-
 umap/static/umap/js/modules/importers/geodatamine.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/umap/static/umap/js/modules/importers/cadastrefr.js b/umap/static/umap/js/modules/importers/cadastrefr.js
index ca0f071a..5d46390f 100644
--- a/umap/static/umap/js/modules/importers/cadastrefr.js
+++ b/umap/static/umap/js/modules/importers/cadastrefr.js
@@ -21,7 +21,7 @@ const TEMPLATE = `
     </select>
     <label id="boundary">
     </label>
-    </div>
+  </div>
 `
 
 export class Importer {
diff --git a/umap/static/umap/js/modules/importers/geodatamine.js b/umap/static/umap/js/modules/importers/geodatamine.js
index cd03b25e..12b3155a 100644
--- a/umap/static/umap/js/modules/importers/geodatamine.js
+++ b/umap/static/umap/js/modules/importers/geodatamine.js
@@ -22,7 +22,7 @@ const TEMPLATE = `
     </select>
     <label>
       <input type="checkbox" name="aspoint" />
-      ${translate('Symplify all geometries to points')}
+      ${translate('Simplify all geometries to points')}
     </label>
     <label id="boundary">
     </label>