From ae5bc9746cd446dc732993ab0a43a20989b3eaca Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Thu, 6 Mar 2025 17:03:13 +0100
Subject: [PATCH] feat: allow to import full geometries from search results

Co-authored-by: David Larlet <david@larlet.fr>
---
 umap/static/umap/js/modules/data/layer.js |  2 ++
 umap/static/umap/js/modules/global.js     |  6 ++++-
 umap/static/umap/js/umap.controls.js      | 31 ++++++++++++++++++++---
 umap/static/umap/map.css                  |  2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/umap/static/umap/js/modules/data/layer.js b/umap/static/umap/js/modules/data/layer.js
index 281c6e02..a7fb4603 100644
--- a/umap/static/umap/js/modules/data/layer.js
+++ b/umap/static/umap/js/modules/data/layer.js
@@ -332,6 +332,7 @@ export class DataLayer extends ServerStored {
         .parse(raw, this.options.remoteData.format)
         .then((geojson) => this.fromGeoJSON(geojson))
         .catch((error) => {
+          console.debug(error)
           Alert.error(
             translate('Cannot parse remote data for layer "{layer}" with url "{url}"', {
               layer: this.getName(),
@@ -532,6 +533,7 @@ export class DataLayer extends ServerStored {
         return data
       })
       .catch((error) => {
+        console.debug(error)
         Alert.error(translate('Import failed: invalid data'))
       })
   }
diff --git a/umap/static/umap/js/modules/global.js b/umap/static/umap/js/modules/global.js
index d6502b2f..4ef04502 100644
--- a/umap/static/umap/js/modules/global.js
+++ b/umap/static/umap/js/modules/global.js
@@ -1,5 +1,9 @@
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
-import { AjaxAutocomplete, AjaxAutocompleteMultiple, AutocompleteDatalist } from './autocomplete.js'
+import {
+  AjaxAutocomplete,
+  AjaxAutocompleteMultiple,
+  AutocompleteDatalist,
+} from './autocomplete.js'
 import Help from './help.js'
 import { ServerRequest } from './request.js'
 import { SCHEMA } from './schema.js'
diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 438f2235..7a35cde6 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -430,10 +430,14 @@ U.Search = L.PhotonSearch.extend({
   },
 
   formatResult: function (feature, el) {
-    const [tools, { button }] = U.Utils.loadTemplateWithRefs(`
-      <span class="search-result-tools"><button type="button" title="${L._('Save this location as new feature')}" data-ref=button><i class="icon icon-24 icon-marker"></i></button></span>
+    const [tools, { point, geom }] = U.Utils.loadTemplateWithRefs(`
+      <span class="search-result-tools">
+        <button type="button" title="${L._('Save this geometry as a new feature')}" data-ref=geom><i class="icon icon-16 icon-polygon"></i></button>
+        <button type="button" title="${L._('Save this place as a new feature')}" data-ref=point><i class="icon icon-16 icon-marker"></i></button>
+      </span>
     `)
-    button.addEventListener('mousedown', (event) => {
+    geom.hidden = !['R', 'W'].includes(feature.properties.osm_type)
+    point.addEventListener('mousedown', (event) => {
       event.stopPropagation()
       const datalayer = this.map._umap.defaultEditDataLayer()
       const marker = datalayer.makeFeature(feature)
@@ -441,6 +445,27 @@ U.Search = L.PhotonSearch.extend({
       marker.edit()
       this.map._umap.panel.close()
     })
+    geom.addEventListener('mousedown', async (event) => {
+      event.stopPropagation()
+      const osm_id = feature.properties.osm_id
+      const types = {
+        R: 'relation',
+        W: 'way',
+        N: 'node',
+      }
+      const osm_type = types[feature.properties.osm_type]
+      if (!osm_type || !osm_id) return
+      const url = `https://www.openstreetmap.org/api/0.6/${osm_type}/${osm_id}/full`
+      const response = await this.map._umap.request.get(url)
+      if (response?.ok) {
+        const importer = this.map._umap.importer
+        importer.build()
+        importer.format = 'osm'
+        importer.raw = await response.text()
+        importer.submit()
+        this.map._umap.panel.close()
+      }
+    })
     el.appendChild(tools)
     this._formatResult(feature, el)
   },
diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css
index 84d2d9e9..c78baa4d 100644
--- a/umap/static/umap/map.css
+++ b/umap/static/umap/map.css
@@ -303,7 +303,7 @@ ul.photon-autocomplete {
     display: none;
 }
 .photon-autocomplete li.on .search-result-tools {
-    display: block;
+    display: flex;
 }