From 4d9030e8fbe8dcfd53ec2251930d1a600fc68762 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Thu, 1 Dec 2022 10:28:48 +0100
Subject: [PATCH 1/9] draft

---
 server/api/controller/settings.js | 2 ++
 server/helpers.js                 | 2 ++
 store/index.js                    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index b2f96bcc..f07acaa2 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -30,6 +30,8 @@ const defaultSettings = {
   allow_recurrent_event: false,
   recurrent_event_visible: false,
   allow_geolocation: true,
+  // geocoding_provider: '',
+  // tilelayer_provider: '',
   enable_federation: true,
   enable_resources: false,
   hide_boosts: true,
diff --git a/server/helpers.js b/server/helpers.js
index cc145b54..40508f8e 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -92,6 +92,8 @@ module.exports = {
       hide_thumbs: settings.hide_thumbs,
       hide_calendar: settings.hide_calendar,
       allow_geolocation: settings.allow_geolocation,
+      // geocoding_provider: settings.geocoding_provider,
+      // tilelayer_provider: settings.tilelayer_provider,
       footerLinks: settings.footerLinks,
       about: settings.about
     }
diff --git a/store/index.js b/store/index.js
index c4f58fa1..f90607d4 100644
--- a/store/index.js
+++ b/store/index.js
@@ -9,6 +9,8 @@ export const state = () => ({
     allow_recurrent_event: true,
     recurrent_event_visible: false,
     allow_geolocation: false,
+    // geocoding_provider: '',
+    // tilelayer_provider: '',
     enable_federation: false,
     enable_resources: false,
     hide_boosts: true,

From c096a616ba77b67bccb18a1b86722b43a2b6b215 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 2 Dec 2022 11:25:43 +0100
Subject: [PATCH 2/9] add filter by countrycodes, and allow to change
 geolocation providers

---
 components/Map.vue                |   4 +-
 components/admin/Geolocation.vue  | 157 +++++
 components/admin/Settings.vue     |  17 +-
 locales/en.json                   |  15 +-
 locales/it.json                   |  15 +-
 server/api/controller/place.js    |  13 +-
 server/api/controller/settings.js |   6 +-
 server/helpers.js                 |   6 +-
 server/helpers/geolocation.js     | 987 ++++++++++++++++++++++++++++++
 store/index.js                    |   6 +-
 10 files changed, 1210 insertions(+), 16 deletions(-)
 create mode 100644 components/admin/Geolocation.vue
 create mode 100644 server/helpers/geolocation.js

diff --git a/components/Map.vue b/components/Map.vue
index 38ef097c..4cd0b778 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -50,8 +50,8 @@ export default {
   data ({ $store }) {
     return {
       mdiWalk, mdiBike, mdiCar, mdiMapMarker,
-      url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-      attribution: '<a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
+      url: $store.state.settings.tilelayer_provider || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+      attribution: $store.state.settings.tilelayer_provider_attribution || "<a target=\"_blank\" href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors",
       zoom: 14,
       center: [this.event.place.latitude, this.event.place.longitude],
       marker: {
diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
new file mode 100644
index 00000000..f96f9cd9
--- /dev/null
+++ b/components/admin/Geolocation.vue
@@ -0,0 +1,157 @@
+<template lang="pug">
+v-card
+  v-card-title Geolocation settings
+  v-card-text
+    p.mb-8(v-html="$t('admin.geolocation_description')")
+    v-form(v-model='isValid')
+
+      v-text-field.mb-4(v-model='geocoding_provider'
+        @blur="save('geocoding_provider', geocoding_provider )"
+        :label="$t('admin.geocoding_provider')"
+        :hint="$t('admin.geocoding_provider_help')"
+        persistent-hint
+        :placeholder="geocoding_provider_default")
+
+      v-autocomplete.mb-4(v-model='geocoding_countrycodes'
+        @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
+        :label="$t('admin.geocoding_countrycodes')"
+        chips multiple persistent-hint
+        :items='countries'
+        item-value="code"
+        item-text="name"
+        :hint="$t('admin.geocoding_countrycodes_help')")
+
+      v-text-field.mb-4(v-model='tilelayer_provider'
+        @blur="save('tilelayer_provider', tilelayer_provider )"
+        :label="$t('admin.tilelayer_provider')"
+        :hint="$t('admin.tilelayer_provider_help')"
+        persistent-hint
+        :placeholder="tilelayer_provider_default")
+
+      v-text-field(v-model='tilelayer_provider_attribution'
+        @blur="save('tilelayer_provider_attribution', tilelayer_provider_attribution )"
+        :label="$t('admin.tilelayer_provider_attribution')"
+        placeholder="map data © OpenStreetMap contributors under ODbL")
+
+      clientOnly
+        div.h-8.w-8(id="leaflet-map")
+
+  v-card-actions
+    v-spacer
+    v-btn(color='primary' @click='testGeocodingProvider' :loading='testGeocodingLoading' outlined) {{$t('admin.geocoding_test_button')}}
+    v-btn(color='primary' @click='testTileLayerProvider' :loading='testTileLayerLoading' outlined :disabled="false" ) {{$t('admin.tilelayer_test_button')}}
+    v-btn(color='warning' @click="done" outlined) {{$t("common.ok")}}
+
+</template>
+<script>
+import { mapActions, mapState } from 'vuex'
+import { isoCountries } from '../../server/helpers/geolocation'
+import "leaflet/dist/leaflet.css"
+
+export default {
+  data ({ $store }) {
+    return {
+      isValid: false,
+      loading: false,
+      testGeocodingLoading: false,
+      testTileLayerLoading: false,
+      geocoding_provider: $store.state.settings.geocoding_provider || '',
+      geocoding_provider_default: "https://nominatim.openstreetmap.org/" ,
+      geocoding_countrycodes: $store.state.settings.geocoding_countrycodes || [],
+      tilelayer_provider: $store.state.settings.tilelayer_provider || '',
+      tilelayer_provider_attribution: $store.state.settings.tilelayer_provider_attribution || '',
+      tilelayer_provider_default: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+      countries: isoCountries,
+      mapTest: {},
+    }
+  },
+  created() {
+    if (process.client) {
+      const L = require('leaflet')
+    }
+  },
+  computed: {
+    ...mapState(['settings', 'events']),
+  },
+  methods: {
+    ...mapActions(['setSetting']),
+    async testGeocodingProvider () {
+      this.testGeocodingLoading = true
+      try {
+        const geolocation = await this.$axios.$get(`${this.geocoding_provider}search`, {timeout: 3000, params: {format: 'json', q: 'building', limit: 1}})
+        this.$root.$message(this.$t('admin.geocoding_test_success', { service_name: this.geocoding_provider }), { color: 'success' })
+      } catch (e) {
+        // console.error(e)
+        this.$root.$message(e, { color: 'error' })
+      }
+      this.testGeocodingLoading = false
+    },
+    async testTileLayerProvider () {
+      this.testTileLayerLoading = true
+      try {
+        // clean
+        // if (this.mapTest !== null) {
+        //   this.mapTest.off();
+        //   this.mapTest.remove();
+        // }
+        // init tilelayer
+        this.mapTest = L.map("leaflet-map").setView([40,40],10);
+        this.tileLayer = L.tileLayer(`${this.tilelayer_provider}`, {attribution: `${this.tilelayer_provider_attribution}`})
+        const tileLayer = await this.tileLayer.addTo(this.mapTest)
+
+
+        this.tileLayer.on('loading', function (event) {
+            console.log(event)
+            // this.mapTest.fireEvent('dataloading', event);
+        });
+
+        // this.tileLayer.on('load', function (event) {
+        //     // this.mapTest.fireEvent('dataload', event);
+        // });
+
+        // this.tileLayer.on('tileerror', function(error, tile) {
+        //     console.log(error);
+        //     console.log(tile);
+        // });
+        //
+        // this.tileLayer.on('tileabort', this.tileLayer.remove())
+        //
+        this.mapTest.off()
+        this.mapTest.remove()
+
+        // mapTest.on('dataload', handler)
+
+
+        // function handler(event) {
+        //   if (mapTest && mapTest.remove) {
+        //       mapTest.off();
+        //       mapTest.remove();
+        //   }
+        // }
+
+      } catch (e) {
+        console.error(e)
+        this.$root.$message(e.response && e.response.data, { color: 'error' })
+      }
+      this.testTileLayerLoading = false
+    },
+    save (key, value) {
+      if (this.settings[key] !== value) {
+        this.setSetting({ key, value })
+      }
+    },
+    done () {
+      this.$emit('close')
+    },
+    handlerLoad(event) {
+      // this.mapTest.fireEvent('dataload', (event) => {
+        this.$root.$message(this.$t('admin.tilelayer_test_success', { service_name: this.tilelayer_provider }), { color: 'success' })
+        if (this.mapTest !== null) {
+          this.mapTest.off();
+          this.mapTest.remove();
+        }
+    }
+
+  }
+}
+</script>
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index 938609b4..82eb3fd0 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -57,32 +57,41 @@ v-container
 
   v-card-actions
     v-btn(text @click='showSMTP=true')
-      <v-icon v-if='!settings.admin_email' color='error' v-text='mdiAlert'></v-icon> {{$t('admin.show_smtp_setup')}}
+      <v-icon v-if='!settings.admin_email' color='error' class="mr-2" v-text='mdiAlert'></v-icon> {{$t('admin.show_smtp_setup')}}
     v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}}
       v-icon(v-text='mdiArrowRight')
 
+  v-dialog(v-model='showGeolocationConfigs' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
+    Geolocation(@close='showGeolocationConfigs = false')
+
+  v-card-actions
+    v-btn(text @click='showGeolocationConfigs=true')
+      <v-icon v-if='!settings.admin_email' color='primary' class="mr-2" v-text='mdiMap'></v-icon> {{$t('admin.show_geolocation_setup')}}
+
 </template>
 <script>
 import SMTP from './SMTP.vue'
+import Geolocation from './Geolocation.vue'
 import { mapActions, mapState } from 'vuex'
 import moment from 'dayjs'
 import tzNames from './tz.json'
-import { mdiAlert, mdiArrowRight } from '@mdi/js'
+import { mdiAlert, mdiArrowRight, mdiMap } from '@mdi/js'
 const locales = require('../../locales/index')
 
 export default {
   props: {
     setup: { type: Boolean, default: false }
   },
-  components: { SMTP },
+  components: { SMTP, Geolocation },
   name: 'Settings',
   data ({ $store }) {
     return {
-      mdiAlert, mdiArrowRight,
+      mdiAlert, mdiArrowRight, mdiMap,
       title: $store.state.settings.title,
       description: $store.state.settings.description,
       locales: Object.keys(locales).map(locale => ({ value: locale, text: locales[locale] })),
       showSMTP: false,
+      showGeolocationConfigs: false,
     }
   },
   computed: {
diff --git a/locales/en.json b/locales/en.json
index fba85ba8..0aacdde1 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -268,7 +268,20 @@
     "blocked": "Blocked",
     "domain": "Domain",
     "known_users": "Known users",
-    "created_at": "Created at"
+    "created_at": "Created at",
+    "show_geolocation_setup": "Geolocation and map settings",
+    "geolocation_description": "<b>Define a provider for geocoding service</b>. Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <b>Nominatim</b> and <b>Photon</b>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [TermsofService]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [TermsofService]</a></li></ul><b>Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geocoding_provider": "Geocoding provider",
+    "geocoding_provider_help": "The default provider is Nominatim",
+    "geocoding_countrycodes": "Country codes",
+    "geocoding_countrycodes_help": "Allows you to set a filter to searches based on area codes",
+    "geocoding_test_button": "Test geocoding",
+    "geocoding_test_success": "The service {service_name} is available",
+    "tilelayer_provider": "Tilelayer provider",
+    "tilelayer_provider_help": "The default provider is  OpenStreetMap",
+    "tilelayer_provider_attribution": "Attribution",
+    "tilelayer_test_button": "Test tilelayer",
+    "tilelayer_test_success": "The service {service_name} is available"
   },
   "auth": {
     "not_confirmed": "Not confirmed yet…",
diff --git a/locales/it.json b/locales/it.json
index 05880c3e..4ce05899 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -257,7 +257,20 @@
     "header_image": "Immagine di intestazione",
     "hide_thumbs": "Nascondi immaginine",
     "hide_calendar": "Nascondi calendario",
-    "default_images": "Immagini preimpostate"
+    "default_images": "Immagini preimpostate",
+    "show_geolocation_setup": "Impostazioni geolocalizzazione e mappa",
+    "geolocation_description": "<b>Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>. Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <b>Nominatim</b> e <b>Photon</b>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [TermsofService]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [TermsofService]</a></li></ul><b>Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geocoding_provider": "Fornitore georeferenziazione",
+    "geocoding_provider_help": "Il fornitore di default è Nominatim",
+    "geocoding_countrycodes": "Codici territoriali",
+    "geocoding_countrycodes_help": "Permette di impostare un filtro alle ricerche basato su codici territori nazionali",
+    "geocoding_test_button": "Test geocoding",
+    "geocoding_test_success": "Il servizio {service_name} è raggiungibile",
+    "tilelayer_provider": "Fornitore tilelayer",
+    "tilelayer_provider_help": "Il fornitore di default è OpenStreetMap",
+    "tilelayer_provider_attribution": "Attribuzione",
+    "tilelayer_test_button": "Test tilelayer",
+    "tilelayer_test_success": "Il servizio {service_name} è raggiungibile"
   },
   "auth": {
     "not_confirmed": "Non ancora confermato…",
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 4a1b438d..e4e76a35 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -76,19 +76,28 @@ module.exports = {
 
   async _nominatim (req, res) {
     const details = req.params.place_details
+    const countrycodes = res.locals.settings.geocoding_countrycodes
+    const geocoding_provider = res.locals.settings.geocoding_provider
     // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
+    console.log(countrycodes)
+    console.log(geocoding_provider)
 
-    const ret = await axios.get(`${NOMINATIM_URL}`, {
+    const ret = await axios.get(`${res.locals.settings.geocoding_provider}`, {
       params: {
+        countrycodes: countrycodes || '',
         q: details,
         limit: 3,
         format: 'json',
         addressdetails: 1,
-        namedetails: 1
+        namedetails: 1,
       },
       headers: { 'User-Agent': 'gancio 1.6.0' }
     })
+    console.log(countrycodes)
+
+    console.log(ret)
     return res.json(ret.data)
+
   },
 
 }
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index f07acaa2..16019093 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -30,8 +30,10 @@ const defaultSettings = {
   allow_recurrent_event: false,
   recurrent_event_visible: false,
   allow_geolocation: true,
-  // geocoding_provider: '',
-  // tilelayer_provider: '',
+  geocoding_provider: 'https://nominatim.openstreetmap.org/',
+  geocoding_countrycodes: [],
+  tilelayer_provider: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+  tilelayer_provider_attribution: "<a target=\"_blank\" href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors",
   enable_federation: true,
   enable_resources: false,
   hide_boosts: true,
diff --git a/server/helpers.js b/server/helpers.js
index 40508f8e..edb28e79 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -92,8 +92,10 @@ module.exports = {
       hide_thumbs: settings.hide_thumbs,
       hide_calendar: settings.hide_calendar,
       allow_geolocation: settings.allow_geolocation,
-      // geocoding_provider: settings.geocoding_provider,
-      // tilelayer_provider: settings.tilelayer_provider,
+      geocoding_provider: settings.geocoding_provider,
+      geocoding_countrycodes: settings.geocoding_countrycodes,
+      tilelayer_provider: settings.tilelayer_provider,
+      tilelayer_provider_attribution: settings.tilelayer_provider_attribution,
       footerLinks: settings.footerLinks,
       about: settings.about
     }
diff --git a/server/helpers/geolocation.js b/server/helpers/geolocation.js
new file mode 100644
index 00000000..e1edaa88
--- /dev/null
+++ b/server/helpers/geolocation.js
@@ -0,0 +1,987 @@
+// Iso conversions
+
+var isoCountries = [
+    {
+      "code": "af",
+      "name": "Afghanistan"
+    },
+    {
+      "code": "ax",
+      "name": "Aland Islands"
+    },
+    {
+      "code": "al",
+      "name": "Albania"
+    },
+    {
+      "code": "dz",
+      "name": "Algeria"
+    },
+    {
+      "code": "as",
+      "name": "American Samoa"
+    },
+    {
+      "code": "ad",
+      "name": "Andorra"
+    },
+    {
+      "code": "ao",
+      "name": "Angola"
+    },
+    {
+      "code": "ai",
+      "name": "Anguilla"
+    },
+    {
+      "code": "aq",
+      "name": "Antarctica"
+    },
+    {
+      "code": "ag",
+      "name": "Antigua And Barbuda"
+    },
+    {
+      "code": "ar",
+      "name": "Argentina"
+    },
+    {
+      "code": "am",
+      "name": "Armenia"
+    },
+    {
+      "code": "aw",
+      "name": "Aruba"
+    },
+    {
+      "code": "au",
+      "name": "Australia"
+    },
+    {
+      "code": "at",
+      "name": "Austria"
+    },
+    {
+      "code": "az",
+      "name": "Azerbaijan"
+    },
+    {
+      "code": "bs",
+      "name": "Bahamas"
+    },
+    {
+      "code": "bh",
+      "name": "Bahrain"
+    },
+    {
+      "code": "bd",
+      "name": "Bangladesh"
+    },
+    {
+      "code": "bb",
+      "name": "Barbados"
+    },
+    {
+      "code": "by",
+      "name": "Belarus"
+    },
+    {
+      "code": "be",
+      "name": "Belgium"
+    },
+    {
+      "code": "bz",
+      "name": "Belize"
+    },
+    {
+      "code": "bj",
+      "name": "Benin"
+    },
+    {
+      "code": "bm",
+      "name": "Bermuda"
+    },
+    {
+      "code": "bt",
+      "name": "Bhutan"
+    },
+    {
+      "code": "bo",
+      "name": "Bolivia"
+    },
+    {
+      "code": "ba",
+      "name": "Bosnia And Herzegovina"
+    },
+    {
+      "code": "bw",
+      "name": "Botswana"
+    },
+    {
+      "code": "bv",
+      "name": "Bouvet Island"
+    },
+    {
+      "code": "br",
+      "name": "Brazil"
+    },
+    {
+      "code": "io",
+      "name": "British Indian Ocean Territory"
+    },
+    {
+      "code": "bn",
+      "name": "Brunei Darussalam"
+    },
+    {
+      "code": "bg",
+      "name": "Bulgaria"
+    },
+    {
+      "code": "bf",
+      "name": "Burkina Faso"
+    },
+    {
+      "code": "bi",
+      "name": "Burundi"
+    },
+    {
+      "code": "kh",
+      "name": "Cambodia"
+    },
+    {
+      "code": "cm",
+      "name": "Cameroon"
+    },
+    {
+      "code": "ca",
+      "name": "Canada"
+    },
+    {
+      "code": "cv",
+      "name": "Cape Verde"
+    },
+    {
+      "code": "ky",
+      "name": "Cayman Islands"
+    },
+    {
+      "code": "cf",
+      "name": "Central African Republic"
+    },
+    {
+      "code": "td",
+      "name": "Chad"
+    },
+    {
+      "code": "cl",
+      "name": "Chile"
+    },
+    {
+      "code": "cn",
+      "name": "China"
+    },
+    {
+      "code": "cx",
+      "name": "Christmas Island"
+    },
+    {
+      "code": "cc",
+      "name": "Cocos (Keeling) Islands"
+    },
+    {
+      "code": "co",
+      "name": "Colombia"
+    },
+    {
+      "code": "km",
+      "name": "Comoros"
+    },
+    {
+      "code": "cg",
+      "name": "Congo"
+    },
+    {
+      "code": "cd",
+      "name": "Congo, Democratic Republic"
+    },
+    {
+      "code": "ck",
+      "name": "Cook Islands"
+    },
+    {
+      "code": "cr",
+      "name": "Costa Rica"
+    },
+    {
+      "code": "ci",
+      "name": "Cote D'Ivoire"
+    },
+    {
+      "code": "hr",
+      "name": "Croatia"
+    },
+    {
+      "code": "cu",
+      "name": "Cuba"
+    },
+    {
+      "code": "cy",
+      "name": "Cyprus"
+    },
+    {
+      "code": "cz",
+      "name": "Czech Republic"
+    },
+    {
+      "code": "dk",
+      "name": "Denmark"
+    },
+    {
+      "code": "dj",
+      "name": "Djibouti"
+    },
+    {
+      "code": "dm",
+      "name": "Dominica"
+    },
+    {
+      "code": "do",
+      "name": "Dominican Republic"
+    },
+    {
+      "code": "ec",
+      "name": "Ecuador"
+    },
+    {
+      "code": "eg",
+      "name": "Egypt"
+    },
+    {
+      "code": "sv",
+      "name": "El Salvador"
+    },
+    {
+      "code": "gq",
+      "name": "Equatorial Guinea"
+    },
+    {
+      "code": "er",
+      "name": "Eritrea"
+    },
+    {
+      "code": "ee",
+      "name": "Estonia"
+    },
+    {
+      "code": "et",
+      "name": "Ethiopia"
+    },
+    {
+      "code": "fk",
+      "name": "Falkland Islands (Malvinas)"
+    },
+    {
+      "code": "fo",
+      "name": "Faroe Islands"
+    },
+    {
+      "code": "fj",
+      "name": "Fiji"
+    },
+    {
+      "code": "fi",
+      "name": "Finland"
+    },
+    {
+      "code": "fr",
+      "name": "France"
+    },
+    {
+      "code": "gf",
+      "name": "French Guiana"
+    },
+    {
+      "code": "pf",
+      "name": "French Polynesia"
+    },
+    {
+      "code": "tf",
+      "name": "French Southern Territories"
+    },
+    {
+      "code": "ga",
+      "name": "Gabon"
+    },
+    {
+      "code": "gm",
+      "name": "Gambia"
+    },
+    {
+      "code": "ge",
+      "name": "Georgia"
+    },
+    {
+      "code": "de",
+      "name": "Germany"
+    },
+    {
+      "code": "gh",
+      "name": "Ghana"
+    },
+    {
+      "code": "gi",
+      "name": "Gibraltar"
+    },
+    {
+      "code": "gr",
+      "name": "Greece"
+    },
+    {
+      "code": "gl",
+      "name": "Greenland"
+    },
+    {
+      "code": "gd",
+      "name": "Grenada"
+    },
+    {
+      "code": "gp",
+      "name": "Guadeloupe"
+    },
+    {
+      "code": "gu",
+      "name": "Guam"
+    },
+    {
+      "code": "gt",
+      "name": "Guatemala"
+    },
+    {
+      "code": "gg",
+      "name": "Guernsey"
+    },
+    {
+      "code": "gn",
+      "name": "Guinea"
+    },
+    {
+      "code": "gw",
+      "name": "Guinea-Bissau"
+    },
+    {
+      "code": "gy",
+      "name": "Guyana"
+    },
+    {
+      "code": "ht",
+      "name": "Haiti"
+    },
+    {
+      "code": "hm",
+      "name": "Heard Island & Mcdonald Islands"
+    },
+    {
+      "code": "va",
+      "name": "Holy See (Vatican City State)"
+    },
+    {
+      "code": "hn",
+      "name": "Honduras"
+    },
+    {
+      "code": "hk",
+      "name": "Hong Kong"
+    },
+    {
+      "code": "hu",
+      "name": "Hungary"
+    },
+    {
+      "code": "is",
+      "name": "Iceland"
+    },
+    {
+      "code": "in",
+      "name": "India"
+    },
+    {
+      "code": "id",
+      "name": "Indonesia"
+    },
+    {
+      "code": "ir",
+      "name": "Iran, Islamic Republic Of"
+    },
+    {
+      "code": "iq",
+      "name": "Iraq"
+    },
+    {
+      "code": "ie",
+      "name": "Ireland"
+    },
+    {
+      "code": "im",
+      "name": "Isle Of Man"
+    },
+    {
+      "code": "il",
+      "name": "Israel"
+    },
+    {
+      "code": "it",
+      "name": "Italy"
+    },
+    {
+      "code": "jm",
+      "name": "Jamaica"
+    },
+    {
+      "code": "jp",
+      "name": "Japan"
+    },
+    {
+      "code": "je",
+      "name": "Jersey"
+    },
+    {
+      "code": "jo",
+      "name": "Jordan"
+    },
+    {
+      "code": "kz",
+      "name": "Kazakhstan"
+    },
+    {
+      "code": "ke",
+      "name": "Kenya"
+    },
+    {
+      "code": "ki",
+      "name": "Kiribati"
+    },
+    {
+      "code": "kr",
+      "name": "Korea"
+    },
+    {
+      "code": "kw",
+      "name": "Kuwait"
+    },
+    {
+      "code": "kg",
+      "name": "Kyrgyzstan"
+    },
+    {
+      "code": "la",
+      "name": "Lao People's Democratic Republic"
+    },
+    {
+      "code": "lv",
+      "name": "Latvia"
+    },
+    {
+      "code": "lb",
+      "name": "Lebanon"
+    },
+    {
+      "code": "ls",
+      "name": "Lesotho"
+    },
+    {
+      "code": "lr",
+      "name": "Liberia"
+    },
+    {
+      "code": "ly",
+      "name": "Libyan Arab Jamahiriya"
+    },
+    {
+      "code": "li",
+      "name": "Liechtenstein"
+    },
+    {
+      "code": "lt",
+      "name": "Lithuania"
+    },
+    {
+      "code": "lu",
+      "name": "Luxembourg"
+    },
+    {
+      "code": "mo",
+      "name": "Macao"
+    },
+    {
+      "code": "mk",
+      "name": "Macedonia"
+    },
+    {
+      "code": "mg",
+      "name": "Madagascar"
+    },
+    {
+      "code": "mw",
+      "name": "Malawi"
+    },
+    {
+      "code": "my",
+      "name": "Malaysia"
+    },
+    {
+      "code": "mv",
+      "name": "Maldives"
+    },
+    {
+      "code": "ml",
+      "name": "Mali"
+    },
+    {
+      "code": "mt",
+      "name": "Malta"
+    },
+    {
+      "code": "mh",
+      "name": "Marshall Islands"
+    },
+    {
+      "code": "mq",
+      "name": "Martinique"
+    },
+    {
+      "code": "mr",
+      "name": "Mauritania"
+    },
+    {
+      "code": "mu",
+      "name": "Mauritius"
+    },
+    {
+      "code": "yt",
+      "name": "Mayotte"
+    },
+    {
+      "code": "mx",
+      "name": "Mexico"
+    },
+    {
+      "code": "fm",
+      "name": "Micronesia, Federated States Of"
+    },
+    {
+      "code": "md",
+      "name": "Moldova"
+    },
+    {
+      "code": "mc",
+      "name": "Monaco"
+    },
+    {
+      "code": "mn",
+      "name": "Mongolia"
+    },
+    {
+      "code": "me",
+      "name": "Montenegro"
+    },
+    {
+      "code": "ms",
+      "name": "Montserrat"
+    },
+    {
+      "code": "ma",
+      "name": "Morocco"
+    },
+    {
+      "code": "mz",
+      "name": "Mozambique"
+    },
+    {
+      "code": "mm",
+      "name": "Myanmar"
+    },
+    {
+      "code": "na",
+      "name": "Namibia"
+    },
+    {
+      "code": "nr",
+      "name": "Nauru"
+    },
+    {
+      "code": "np",
+      "name": "Nepal"
+    },
+    {
+      "code": "nl",
+      "name": "Netherlands"
+    },
+    {
+      "code": "an",
+      "name": "Netherlands Antilles"
+    },
+    {
+      "code": "nc",
+      "name": "New Caledonia"
+    },
+    {
+      "code": "nz",
+      "name": "New Zealand"
+    },
+    {
+      "code": "ni",
+      "name": "Nicaragua"
+    },
+    {
+      "code": "ne",
+      "name": "Niger"
+    },
+    {
+      "code": "ng",
+      "name": "Nigeria"
+    },
+    {
+      "code": "nu",
+      "name": "Niue"
+    },
+    {
+      "code": "nf",
+      "name": "Norfolk Island"
+    },
+    {
+      "code": "mp",
+      "name": "Northern Mariana Islands"
+    },
+    {
+      "code": "no",
+      "name": "Norway"
+    },
+    {
+      "code": "om",
+      "name": "Oman"
+    },
+    {
+      "code": "pk",
+      "name": "Pakistan"
+    },
+    {
+      "code": "pw",
+      "name": "Palau"
+    },
+    {
+      "code": "ps",
+      "name": "Palestinian Territory, Occupied"
+    },
+    {
+      "code": "pa",
+      "name": "Panama"
+    },
+    {
+      "code": "pg",
+      "name": "Papua New Guinea"
+    },
+    {
+      "code": "py",
+      "name": "Paraguay"
+    },
+    {
+      "code": "pe",
+      "name": "Peru"
+    },
+    {
+      "code": "ph",
+      "name": "Philippines"
+    },
+    {
+      "code": "pn",
+      "name": "Pitcairn"
+    },
+    {
+      "code": "pl",
+      "name": "Poland"
+    },
+    {
+      "code": "pt",
+      "name": "Portugal"
+    },
+    {
+      "code": "pr",
+      "name": "Puerto Rico"
+    },
+    {
+      "code": "qa",
+      "name": "Qatar"
+    },
+    {
+      "code": "re",
+      "name": "Reunion"
+    },
+    {
+      "code": "ro",
+      "name": "Romania"
+    },
+    {
+      "code": "ru",
+      "name": "Russian Federation"
+    },
+    {
+      "code": "rw",
+      "name": "Rwanda"
+    },
+    {
+      "code": "bl",
+      "name": "Saint Barthelemy"
+    },
+    {
+      "code": "sh",
+      "name": "Saint Helena"
+    },
+    {
+      "code": "kn",
+      "name": "Saint Kitts And Nevis"
+    },
+    {
+      "code": "lc",
+      "name": "Saint Lucia"
+    },
+    {
+      "code": "mf",
+      "name": "Saint Martin"
+    },
+    {
+      "code": "pm",
+      "name": "Saint Pierre And Miquelon"
+    },
+    {
+      "code": "vc",
+      "name": "Saint Vincent And Grenadines"
+    },
+    {
+      "code": "ws",
+      "name": "Samoa"
+    },
+    {
+      "code": "sm",
+      "name": "San Marino"
+    },
+    {
+      "code": "st",
+      "name": "Sao Tome And Principe"
+    },
+    {
+      "code": "sa",
+      "name": "Saudi Arabia"
+    },
+    {
+      "code": "sn",
+      "name": "Senegal"
+    },
+    {
+      "code": "rs",
+      "name": "Serbia"
+    },
+    {
+      "code": "sc",
+      "name": "Seychelles"
+    },
+    {
+      "code": "sl",
+      "name": "Sierra Leone"
+    },
+    {
+      "code": "sg",
+      "name": "Singapore"
+    },
+    {
+      "code": "sk",
+      "name": "Slovakia"
+    },
+    {
+      "code": "si",
+      "name": "Slovenia"
+    },
+    {
+      "code": "sb",
+      "name": "Solomon Islands"
+    },
+    {
+      "code": "so",
+      "name": "Somalia"
+    },
+    {
+      "code": "za",
+      "name": "South Africa"
+    },
+    {
+      "code": "gs",
+      "name": "South Georgia And Sandwich Isl."
+    },
+    {
+      "code": "es",
+      "name": "Spain"
+    },
+    {
+      "code": "lk",
+      "name": "Sri Lanka"
+    },
+    {
+      "code": "sd",
+      "name": "Sudan"
+    },
+    {
+      "code": "sr",
+      "name": "Suriname"
+    },
+    {
+      "code": "sj",
+      "name": "Svalbard And Jan Mayen"
+    },
+    {
+      "code": "sz",
+      "name": "Swaziland"
+    },
+    {
+      "code": "se",
+      "name": "Sweden"
+    },
+    {
+      "code": "ch",
+      "name": "Switzerland"
+    },
+    {
+      "code": "sy",
+      "name": "Syrian Arab Republic"
+    },
+    {
+      "code": "tw",
+      "name": "Taiwan"
+    },
+    {
+      "code": "tj",
+      "name": "Tajikistan"
+    },
+    {
+      "code": "tz",
+      "name": "Tanzania"
+    },
+    {
+      "code": "th",
+      "name": "Thailand"
+    },
+    {
+      "code": "tl",
+      "name": "Timor-Leste"
+    },
+    {
+      "code": "tg",
+      "name": "Togo"
+    },
+    {
+      "code": "tk",
+      "name": "Tokelau"
+    },
+    {
+      "code": "to",
+      "name": "Tonga"
+    },
+    {
+      "code": "tt",
+      "name": "Trinidad And Tobago"
+    },
+    {
+      "code": "tn",
+      "name": "Tunisia"
+    },
+    {
+      "code": "tr",
+      "name": "Turkey"
+    },
+    {
+      "code": "tm",
+      "name": "Turkmenistan"
+    },
+    {
+      "code": "tc",
+      "name": "Turks And Caicos Islands"
+    },
+    {
+      "code": "tv",
+      "name": "Tuvalu"
+    },
+    {
+      "code": "ug",
+      "name": "Uganda"
+    },
+    {
+      "code": "ua",
+      "name": "Ukraine"
+    },
+    {
+      "code": "ae",
+      "name": "United Arab Emirates"
+    },
+    {
+      "code": "gb",
+      "name": "United Kingdom"
+    },
+    {
+      "code": "us",
+      "name": "United States"
+    },
+    {
+      "code": "um",
+      "name": "United States Outlying Islands"
+    },
+    {
+      "code": "uy",
+      "name": "Uruguay"
+    },
+    {
+      "code": "uz",
+      "name": "Uzbekistan"
+    },
+    {
+      "code": "vu",
+      "name": "Vanuatu"
+    },
+    {
+      "code": "ve",
+      "name": "Venezuela"
+    },
+    {
+      "code": "vn",
+      "name": "Viet Nam"
+    },
+    {
+      "code": "vg",
+      "name": "Virgin Islands, British"
+    },
+    {
+      "code": "vi",
+      "name": "Virgin Islands, U.S."
+    },
+    {
+      "code": "wf",
+      "name": "Wallis And Futuna"
+    },
+    {
+      "code": "eh",
+      "name": "Western Sahara"
+    },
+    {
+      "code": "ye",
+      "name": "Yemen"
+    },
+    {
+      "code": "zm",
+      "name": "Zambia"
+    },
+    {
+      "code": "zw",
+      "name": "Zimbabwe"
+    }
+  ]
+
+
+module.exports = { isoCountries }
diff --git a/store/index.js b/store/index.js
index f90607d4..201504a9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -9,8 +9,10 @@ export const state = () => ({
     allow_recurrent_event: true,
     recurrent_event_visible: false,
     allow_geolocation: false,
-    // geocoding_provider: '',
-    // tilelayer_provider: '',
+    geocoding_provider: '',
+    geocoding_countrycodes: [],
+    tilelayer_provider: '',
+    tilelayer_provider_attribution: '',
     enable_federation: false,
     enable_resources: false,
     hide_boosts: true,

From f6ea3be74614ddff5d80b1c1b38297dad968e385 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 6 Dec 2022 00:03:53 +0100
Subject: [PATCH 3/9] geocoding and tilelayer tests are working also on setup,
 add support for photon

---
 components/WhereInput.vue         |  91 ++++++++++++++-----
 components/admin/Geolocation.vue  | 144 +++++++++++++++---------------
 components/admin/Places.vue       |   9 +-
 components/admin/Settings.vue     |   9 +-
 locales/en.json                   |   9 +-
 locales/it.json                   |  10 ++-
 server/api/controller/place.js    |  31 +++++--
 server/api/controller/settings.js |   1 +
 server/api/index.js               |   3 +-
 server/helpers.js                 |   1 +
 store/index.js                    |   1 +
 11 files changed, 192 insertions(+), 117 deletions(-)

diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 520b83b8..68517cc3 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -46,7 +46,7 @@ v-row.mb-4
       :items="addressList"
       :hint="$t('event.address_description' + (settings.allow_geolocation && '_osm'))")
       template(v-slot:message="{message, key}")
-        span(v-html='message' :key="key") 
+        span(v-html='message' :key="key")
       template(v-slot:item="{ item, attrs, on  }")
         v-list-item(v-bind='attrs' v-on='on')
           v-icon.pr-4(v-text='loadCoordinatesResultIcon(item)')
@@ -76,7 +76,7 @@ export default {
   props: {
     value: { type: Object, default: () => ({}) }
   },
-  data () {
+  data ( {$store} ) {
     return {
       mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch, mdiLatitude, mdiLongitude, mdiRoadVariant, mdiHome, mdiCityVariant,
       place: { },
@@ -91,7 +91,14 @@ export default {
         node: mdiMapMarker,
         relation: mdiCityVariant,
       },
-      nominatim_class: ['amenity', 'shop', 'tourism', 'leisure', 'building']
+      nominatim_class: ['amenity', 'shop', 'tourism', 'leisure', 'building'],
+      photon_osm_key: ['amenity', 'shop', 'tourism', 'leisure', 'building'],
+      photon_osm_type: {
+        'W': mdiRoadVariant,
+        'N': mdiMapMarker,
+        'R': mdiCityVariant,
+      },
+      geocoding_provider_type: $store.state.settings.geocoding_provider_type || 'Nominatim'
     }
   },
   computed: {
@@ -126,10 +133,17 @@ export default {
       }
     }, 100),
     loadCoordinatesResultIcon(item) {
-      if ( this.nominatim_class.includes(item.class)) {
-        return this.mdiHome
+      if (this.geocoding_provider_type == "Nominatim") {
+        if ( this.nominatim_class.includes(item.class)) {
+          return this.mdiHome
+        }
+        return this.nominatim_osm_type[item.type]
+      } else if (this.geocoding_provider_type == "Photon") {
+        if ( this.photon_osm_key.includes(item.class)) {
+          return this.mdiHome
+        }
+        return this.photon_osm_type[item.type]
       }
-      return this.nominatim_osm_type[item.type]
     },
     selectPlace (p) {
       if (!p) { return }
@@ -220,22 +234,55 @@ export default {
 
       if (searchCoordinates.length) {
         this.loading = true
-        const ret = await this.$axios.$get(`placeNominatim/${searchCoordinates}`)
-        if (ret && ret.length) {
-          this.addressList = ret.map(v => {
-            const name = get(v.namedetails, 'alt_name', get(v.namedetails, 'name'))
-            const address = v.display_name ? v.display_name.replace(name, '').replace(/^, ?/, '') : ''
-            return {
-              class: v.class,
-              type: v.osm_type,
-              lat: v.lat,
-              lon: v.lon,
-              name,
-              address
-            }
-          })
-        } else {
-          this.addressList = []
+        const ret = await this.$axios.$get(`placeOSM/${this.geocoding_provider_type}/${searchCoordinates}`)
+        if (this.geocoding_provider_type == "Nominatim") {
+          if (ret && ret.length) {
+            this.addressList = ret.map(v => {
+              const name = get(v.namedetails, 'alt_name', get(v.namedetails, 'name'))
+              const address = v.display_name ? v.display_name.replace(name, '').replace(/^, ?/, '') : ''
+              return {
+                class: v.class,
+                type: v.osm_type,
+                lat: v.lat,
+                lon: v.lon,
+                name,
+                address
+              }
+            })
+          } else {
+            this.addressList = []
+          }
+        } else if (this.geocoding_provider_type == "Photon") {
+          let photon_properties = ['housenumber', 'street', 'district', 'city', 'county', 'state', 'postcode', 'country']
+
+          if (ret) {
+            this.addressList = ret.features.map(v => {
+              let pre_name = v.properties.name || v.properties.street || ''
+              let pre_address = ''
+
+              photon_properties.forEach((item, i) => {
+                let last = i == (photon_properties.length - 1)
+                if (v.properties[item] && !last) {
+                  pre_address += v.properties[item]+', '
+                } else if (v.properties[item]) {
+                  pre_address += v.properties[item]
+                }
+              });
+
+              let name = pre_name
+              let address = pre_address
+              return {
+                class: v.properties.osm_key,
+                type: v.properties.osm_type,
+                lat: v.geometry.coordinates[1],
+                lon: v.geometry.coordinates[0],
+                name,
+                address
+              }
+            })
+          } else {
+            this.addressList = []
+          }
         }
         this.loading = false
       }
diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
index f96f9cd9..e5c1c67d 100644
--- a/components/admin/Geolocation.vue
+++ b/components/admin/Geolocation.vue
@@ -1,9 +1,17 @@
 <template lang="pug">
 v-card
-  v-card-title Geolocation settings
+  v-card-title Geolocation and Map settings
   v-card-text
-    p.mb-8(v-html="$t('admin.geolocation_description')")
-    v-form(v-model='isValid')
+    p.mb-6(v-html="$t('admin.geolocation_description')")
+
+    v-form
+      v-autocomplete.mb-4(v-model='geocoding_provider_type'
+        @blur="save('geocoding_provider_type', geocoding_provider_type )"
+        :label="$t('admin.geocoding_provider_type')"
+        :hint="$t('admin.geocoding_provider_type_help')"
+        persistent-hint
+        :items="geocoding_provider_type_items"
+        :placeholder="geocoding_provider_type_default")
 
       v-text-field.mb-4(v-model='geocoding_provider'
         @blur="save('geocoding_provider', geocoding_provider )"
@@ -12,11 +20,11 @@ v-card
         persistent-hint
         :placeholder="geocoding_provider_default")
 
-      v-autocomplete.mb-4(v-model='geocoding_countrycodes'
+      v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="geocoding_provider_type != null || geocoding_provider_type != 'Nominatim'"
         @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
         :label="$t('admin.geocoding_countrycodes')"
-        chips multiple persistent-hint
-        :items='countries'
+        :items="countries"
+        multiple chips small-chips persistent-hint
         item-value="code"
         item-text="name"
         :hint="$t('admin.geocoding_countrycodes_help')")
@@ -31,15 +39,14 @@ v-card
       v-text-field(v-model='tilelayer_provider_attribution'
         @blur="save('tilelayer_provider_attribution', tilelayer_provider_attribution )"
         :label="$t('admin.tilelayer_provider_attribution')"
-        placeholder="map data © OpenStreetMap contributors under ODbL")
+        :placeholder="tilelayer_provider_attribution_default")
 
-      clientOnly
-        div.h-8.w-8(id="leaflet-map")
+      div(id="leaflet-map-preview" max-height='10px')
 
   v-card-actions
     v-spacer
-    v-btn(color='primary' @click='testGeocodingProvider' :loading='testGeocodingLoading' outlined) {{$t('admin.geocoding_test_button')}}
-    v-btn(color='primary' @click='testTileLayerProvider' :loading='testTileLayerLoading' outlined :disabled="false" ) {{$t('admin.tilelayer_test_button')}}
+    v-btn(color='primary' @click='testGeocodingProvider' :loading='testGeocodingLoading' outlined ) {{$t('admin.geocoding_test_button')}}
+    v-btn(color='primary' @click='testTileLayerProvider' :loading='testTileLayerLoading' outlined ) {{$t('admin.tilelayer_test_button')}}
     v-btn(color='warning' @click="done" outlined) {{$t("common.ok")}}
 
 </template>
@@ -49,20 +56,26 @@ import { isoCountries } from '../../server/helpers/geolocation'
 import "leaflet/dist/leaflet.css"
 
 export default {
+  props: {
+    setup: { type: Boolean, default: false }
+  },
   data ({ $store }) {
     return {
-      isValid: false,
       loading: false,
       testGeocodingLoading: false,
       testTileLayerLoading: false,
+      geocoding_provider_type_items: ['Nominatim', 'Photon'],
+      geocoding_provider_type: $store.state.settings.geocoding_provider_type || '',
+      geocoding_provider_type_default: 'Nominatim',
       geocoding_provider: $store.state.settings.geocoding_provider || '',
-      geocoding_provider_default: "https://nominatim.openstreetmap.org/" ,
+      geocoding_provider_default: "https://nominatim.openstreetmap.org/search" ,
       geocoding_countrycodes: $store.state.settings.geocoding_countrycodes || [],
       tilelayer_provider: $store.state.settings.tilelayer_provider || '',
+      tilelayer_provider_default: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
       tilelayer_provider_attribution: $store.state.settings.tilelayer_provider_attribution || '',
-      tilelayer_provider_default: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+      tilelayer_provider_attribution_default: '<a target=\'_blank\' href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors',
       countries: isoCountries,
-      mapTest: {},
+      mapPreviewTest: null,
     }
   },
   created() {
@@ -70,69 +83,49 @@ export default {
       const L = require('leaflet')
     }
   },
-  computed: {
-    ...mapState(['settings', 'events']),
-  },
+  computed: mapState(['settings', 'events']),
   methods: {
     ...mapActions(['setSetting']),
     async testGeocodingProvider () {
       this.testGeocodingLoading = true
+      const geocodingProviderTest = this.geocoding_provider || this.geocoding_provider_default
+      const geocodingSoftwareTest = this.geocoding_provider_type || this.geocoding_provider_type_default
+      const geocodingQuery = 'building'
+
       try {
-        const geolocation = await this.$axios.$get(`${this.geocoding_provider}search`, {timeout: 3000, params: {format: 'json', q: 'building', limit: 1}})
-        this.$root.$message(this.$t('admin.geocoding_test_success', { service_name: this.geocoding_provider }), { color: 'success' })
+        if (geocodingSoftwareTest === 'Nominatim') {
+          const geolocation = await this.$axios.$get(`${geocodingProviderTest}`, {timeout: 3000, params: {q: `${geocodingQuery}`, format: 'json', limit: 1 }} )
+        } else if (geocodingSoftwareTest === 'Photon') {
+          const geolocation = await this.$axios.$get(`${geocodingProviderTest}`, {timeout: 3000, params: {q: `${geocodingQuery}`, limit: 1}} )
+        }
+
+        this.$root.$message(this.$t('admin.geocoding_test_success', { service_name: geocodingProviderTest }), { color: 'success' })
       } catch (e) {
-        // console.error(e)
-        this.$root.$message(e, { color: 'error' })
+        this.$root.$message(this.$t('admin.tilelayer_test_error', { service_name: geocodingProviderTest }), { color: 'error' })
       }
       this.testGeocodingLoading = false
     },
     async testTileLayerProvider () {
       this.testTileLayerLoading = true
-      try {
-        // clean
-        // if (this.mapTest !== null) {
-        //   this.mapTest.off();
-        //   this.mapTest.remove();
-        // }
-        // init tilelayer
-        this.mapTest = L.map("leaflet-map").setView([40,40],10);
-        this.tileLayer = L.tileLayer(`${this.tilelayer_provider}`, {attribution: `${this.tilelayer_provider_attribution}`})
-        const tileLayer = await this.tileLayer.addTo(this.mapTest)
+      const tileThis = this
+      const tileLayerTest = this.tilelayer_provider || this.tilelayer_provider_default
+      const tileLayerAttributionTest = this.tilelayer_provider_attribution || this.tilelayer_provider_attribution_default
 
-
-        this.tileLayer.on('loading', function (event) {
-            console.log(event)
-            // this.mapTest.fireEvent('dataloading', event);
-        });
-
-        // this.tileLayer.on('load', function (event) {
-        //     // this.mapTest.fireEvent('dataload', event);
-        // });
-
-        // this.tileLayer.on('tileerror', function(error, tile) {
-        //     console.log(error);
-        //     console.log(tile);
-        // });
-        //
-        // this.tileLayer.on('tileabort', this.tileLayer.remove())
-        //
-        this.mapTest.off()
-        this.mapTest.remove()
-
-        // mapTest.on('dataload', handler)
-
-
-        // function handler(event) {
-        //   if (mapTest && mapTest.remove) {
-        //       mapTest.off();
-        //       mapTest.remove();
-        //   }
-        // }
-
-      } catch (e) {
-        console.error(e)
-        this.$root.$message(e.response && e.response.data, { color: 'error' })
+      // init tilelayer
+      if (this.mapPreviewTest == null) {
+        this.mapPreviewTest = L.map("leaflet-map-preview").setView([40,40],10);
       }
+      this.tileLayer = L.tileLayer(`${tileLayerTest}`, {attribution: `${tileLayerAttributionTest}`})
+      this.tileLayer.addTo(this.mapPreviewTest)
+
+      // tilelayer events inherited from gridlayer https://leafletjs.com/reference.html#gridlayer
+      this.tileLayer.on('tileload', function (event) {
+          tileThis.tileLayerTestSucess(event, tileLayerTest)
+      });
+      this.tileLayer.on('tileerror', function(error, tile) {
+          tileThis.tileLayerTestError(event, tileLayerTest)
+          tileThis.tileLayer = null
+      });
       this.testTileLayerLoading = false
     },
     save (key, value) {
@@ -143,15 +136,22 @@ export default {
     done () {
       this.$emit('close')
     },
-    handlerLoad(event) {
-      // this.mapTest.fireEvent('dataload', (event) => {
-        this.$root.$message(this.$t('admin.tilelayer_test_success', { service_name: this.tilelayer_provider }), { color: 'success' })
-        if (this.mapTest !== null) {
-          this.mapTest.off();
-          this.mapTest.remove();
-        }
+    geocodingTestError(event, tileLayerTest) {
+      this.$root.$message(this.$t('admin.geocoding_test_error', { service_name: geocodingTest }), { color: 'error' })
+    },
+    tileLayerTestSucess(event, tileLayerTest) {
+      this.$root.$message(this.$t('admin.tilelayer_test_success', { service_name: tileLayerTest }), { color: 'success' })
+    },
+    tileLayerTestError(event, tileLayerTest) {
+      this.$root.$message(this.$t('admin.tilelayer_test_error', { service_name: tileLayerTest }), { color: 'error' })
     }
 
   }
 }
 </script>
+
+<style>
+#leaflet-map-preview {
+  height: 6rem;
+}
+</style>
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index 78a773f5..63e14ee5 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -84,7 +84,8 @@ export default {
         { value: 'address', text: this.$t('common.address') },
         { value: 'map', text: 'Map' },
         { value: 'actions', text: this.$t('common.actions'), align: 'right' }
-      ]
+      ],
+      geocoding_provider_type: $store.state.settings.geocoding_provider_type || 'Nominatim'
     }
   },
   async fetch() {
@@ -124,7 +125,7 @@ export default {
         this.place.latitude = this.place.longitude = null
       }
       this.$emit('input', { ...this.place })
-    },    
+    },
     searchAddress: debounce(async function(ev) {
       const pre_searchCoordinates = ev.target.value.trim().toLowerCase()
       // allow pasting coordinates lat/lon and lat,lon
@@ -159,7 +160,7 @@ export default {
 
       if (searchCoordinates.length) {
         this.loading = true
-        const ret = await this.$axios.$get(`placeNominatim/${searchCoordinates}`)
+        const ret = await this.$axios.$get(`placeOSM/${this.geocoding_provider_type}/${searchCoordinates}`)
         if (ret && ret.length) {
           this.addressList = ret.map(v => {
             const name = get(v.namedetails, 'alt_name', get(v.namedetails, 'name'))
@@ -176,7 +177,7 @@ export default {
         }
         this.loading = false
       }
-    }, 300)    
+    }, 300)
   }
 }
 </script>
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index 82eb3fd0..b8769034 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -54,20 +54,19 @@ v-container
 
   v-dialog(v-model='showSMTP' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
     SMTP(@close='showSMTP = false')
-
   v-card-actions
     v-btn(text @click='showSMTP=true')
       <v-icon v-if='!settings.admin_email' color='error' class="mr-2" v-text='mdiAlert'></v-icon> {{$t('admin.show_smtp_setup')}}
-    v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}}
-      v-icon(v-text='mdiArrowRight')
 
   v-dialog(v-model='showGeolocationConfigs' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
-    Geolocation(@close='showGeolocationConfigs = false')
-
+    Geolocation(setup, @close='showGeolocationConfigs = false')
   v-card-actions
     v-btn(text @click='showGeolocationConfigs=true')
       <v-icon v-if='!settings.admin_email' color='primary' class="mr-2" v-text='mdiMap'></v-icon> {{$t('admin.show_geolocation_setup')}}
 
+  v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}}
+    v-icon(v-text='mdiArrowRight')
+
 </template>
 <script>
 import SMTP from './SMTP.vue'
diff --git a/locales/en.json b/locales/en.json
index 0aacdde1..d7bd8c9e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -270,18 +270,23 @@
     "known_users": "Known users",
     "created_at": "Created at",
     "show_geolocation_setup": "Geolocation and map settings",
-    "geolocation_description": "<b>Define a provider for geocoding service</b>. Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <b>Nominatim</b> and <b>Photon</b>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [TermsofService]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [TermsofService]</a></li></ul><b>Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Define a provider for geocoding service</b>.<br>Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> and <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geocoding_provider_type": "Geocoding software",
+    "geocoding_provider_type_help": "The default software is Nominatim",
     "geocoding_provider": "Geocoding provider",
     "geocoding_provider_help": "The default provider is Nominatim",
     "geocoding_countrycodes": "Country codes",
     "geocoding_countrycodes_help": "Allows you to set a filter to searches based on area codes",
     "geocoding_test_button": "Test geocoding",
     "geocoding_test_success": "The service {service_name} is available",
+    "geocoding_test_success": "The geocoding service at {service_name} is working",
+    "geocoding_test_error": "The geocoding service is not reachable at {service_name}",
     "tilelayer_provider": "Tilelayer provider",
     "tilelayer_provider_help": "The default provider is  OpenStreetMap",
     "tilelayer_provider_attribution": "Attribution",
     "tilelayer_test_button": "Test tilelayer",
-    "tilelayer_test_success": "The service {service_name} is available"
+    "tilelayer_test_success": "The tilelayer service at {service_name} is working",
+    "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}"
   },
   "auth": {
     "not_confirmed": "Not confirmed yet…",
diff --git a/locales/it.json b/locales/it.json
index 4ce05899..d7876a71 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -259,18 +259,22 @@
     "hide_calendar": "Nascondi calendario",
     "default_images": "Immagini preimpostate",
     "show_geolocation_setup": "Impostazioni geolocalizzazione e mappa",
-    "geolocation_description": "<b>Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>. Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <b>Nominatim</b> e <b>Photon</b>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [TermsofService]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [TermsofService]</a></li></ul><b>Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geocoding_provider_type": "Software fornitore georeferenziazione",
+    "geocoding_provider_type_help": "Il software di default è Nominatim",
     "geocoding_provider": "Fornitore georeferenziazione",
     "geocoding_provider_help": "Il fornitore di default è Nominatim",
     "geocoding_countrycodes": "Codici territoriali",
     "geocoding_countrycodes_help": "Permette di impostare un filtro alle ricerche basato su codici territori nazionali",
     "geocoding_test_button": "Test geocoding",
-    "geocoding_test_success": "Il servizio {service_name} è raggiungibile",
+    "geocoding_test_success": "Il servizio di geocoding all'indirizzo {service_name} sta funzionando",
+    "geocoding_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}",
     "tilelayer_provider": "Fornitore tilelayer",
     "tilelayer_provider_help": "Il fornitore di default è OpenStreetMap",
     "tilelayer_provider_attribution": "Attribuzione",
     "tilelayer_test_button": "Test tilelayer",
-    "tilelayer_test_success": "Il servizio {service_name} è raggiungibile"
+    "tilelayer_test_success": "Il servizio di tilelayer all'indirizzo {service_name} sta funzionando",
+    "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}"
   },
   "auth": {
     "not_confirmed": "Non ancora confermato…",
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index e4e76a35..306510c5 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -6,6 +6,7 @@ const exportController = require('./export')
 const log = require('../../log')
 const { Op, where, col, fn, cast } = require('sequelize')
 const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search'
+const PHOTON_URL = 'https://photon.komoot.io/api/'
 const axios = require('axios')
 
 module.exports = {
@@ -76,15 +77,13 @@ module.exports = {
 
   async _nominatim (req, res) {
     const details = req.params.place_details
-    const countrycodes = res.locals.settings.geocoding_countrycodes
-    const geocoding_provider = res.locals.settings.geocoding_provider
+    const countrycodes = res.locals.settings.geocoding_countrycodes || ''
+    const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
     // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
-    console.log(countrycodes)
-    console.log(geocoding_provider)
 
-    const ret = await axios.get(`${res.locals.settings.geocoding_provider}`, {
+    const ret = await axios.get(`${geocoding_provider}`, {
       params: {
-        countrycodes: countrycodes || '',
+        countrycodes: countrycodes,
         q: details,
         limit: 3,
         format: 'json',
@@ -93,9 +92,25 @@ module.exports = {
       },
       headers: { 'User-Agent': 'gancio 1.6.0' }
     })
-    console.log(countrycodes)
 
-    console.log(ret)
+    // console.log(ret)
+    return res.json(ret.data)
+
+  },
+
+  async _photon (req, res) {
+    const details = req.params.place_details
+    const geocoding_provider = res.locals.settings.geocoding_provider || PHOTON_URL
+
+    const ret = await axios.get(`${geocoding_provider}`, {
+      params: {
+        q: details,
+        limit: 3,
+      },
+      headers: { 'User-Agent': 'gancio 1.6.0' }
+    })
+
+    // console.log(ret)
     return res.json(ret.data)
 
   },
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 16019093..87e1d058 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -30,6 +30,7 @@ const defaultSettings = {
   allow_recurrent_event: false,
   recurrent_event_visible: false,
   allow_geolocation: true,
+  geocoding_provider_type: 'Nominatim',
   geocoding_provider: 'https://nominatim.openstreetmap.org/',
   geocoding_countrycodes: [],
   tilelayer_provider: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
diff --git a/server/api/index.js b/server/api/index.js
index 1cc3f7fc..812fac98 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -165,7 +165,8 @@ if (config.status !== 'READY') {
   api.get('/place/all', isAdmin, placeController.getAll)
   api.get('/place/:placeName', cors, placeController.getEvents)
   api.get('/place', cors, placeController.search)
-  api.get('/placeNominatim/:place_details', cors, placeController._nominatim)
+  api.get('/placeOSM/Nominatim/:place_details', cors, placeController._nominatim)
+  api.get('/placeOSM/Photon/:place_details', cors, placeController._photon)
   api.put('/place', isAdmin, placeController.updatePlace)
 
   api.get('/tag', cors, tagController.search)
diff --git a/server/helpers.js b/server/helpers.js
index edb28e79..b6ce9a6c 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -92,6 +92,7 @@ module.exports = {
       hide_thumbs: settings.hide_thumbs,
       hide_calendar: settings.hide_calendar,
       allow_geolocation: settings.allow_geolocation,
+      geocoding_provider_type: settings.geocoding_provider_type,
       geocoding_provider: settings.geocoding_provider,
       geocoding_countrycodes: settings.geocoding_countrycodes,
       tilelayer_provider: settings.tilelayer_provider,
diff --git a/store/index.js b/store/index.js
index 201504a9..0c4ce0e6 100644
--- a/store/index.js
+++ b/store/index.js
@@ -9,6 +9,7 @@ export const state = () => ({
     allow_recurrent_event: true,
     recurrent_event_visible: false,
     allow_geolocation: false,
+    geocoding_provider_type: '',
     geocoding_provider: '',
     geocoding_countrycodes: [],
     tilelayer_provider: '',

From 9682b3e957d0314d9abdd5e3717ee980680af00f Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 6 Dec 2022 00:20:42 +0100
Subject: [PATCH 4/9] minor on geocoding_provider default settings

---
 locales/en.json                   | 2 +-
 locales/it.json                   | 2 +-
 server/api/controller/settings.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index d68d0b44..d333c602 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -272,7 +272,7 @@
     "known_users": "Known users",
     "created_at": "Created at",
     "show_geolocation_setup": "Geolocation and map settings",
-    "geolocation_description": "<b>1. Define a provider for geocoding service</b>.<br>Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> and <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Define a provider for geocoding service</b>.<br>Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> and <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Geocoding software",
     "geocoding_provider_type_help": "The default software is Nominatim",
     "geocoding_provider": "Geocoding provider",
diff --git a/locales/it.json b/locales/it.json
index c3c7d9bd..d97ea82c 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -264,7 +264,7 @@
     "known_users": "Utenti conosciuti",
     "created_at": "Creato il",
     "show_geolocation_setup": "Impostazioni geolocalizzazione e mappa",
-    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/ <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Software fornitore georeferenziazione",
     "geocoding_provider_type_help": "Il software di default è Nominatim",
     "geocoding_provider": "Fornitore georeferenziazione",
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 41ca7311..9b7fd9ec 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -32,7 +32,7 @@ const defaultSettings = {
   recurrent_event_visible: false,
   allow_geolocation: true,
   geocoding_provider_type: 'Nominatim',
-  geocoding_provider: 'https://nominatim.openstreetmap.org/',
+  geocoding_provider: 'https://nominatim.openstreetmap.org/search',
   geocoding_countrycodes: [],
   tilelayer_provider: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
   tilelayer_provider_attribution: "<a target=\"_blank\" href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors",

From 84e6795e4e59864f1affbe087ed778eceb8a778f Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 6 Dec 2022 01:28:42 +0100
Subject: [PATCH 5/9] fix geolocation-countrycodes were disabled, fix
 admin/places use of current geocoding provider

---
 components/admin/Geolocation.vue |  2 +-
 components/admin/Places.vue      | 63 +++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
index e5c1c67d..f55ea8ab 100644
--- a/components/admin/Geolocation.vue
+++ b/components/admin/Geolocation.vue
@@ -20,7 +20,7 @@ v-card
         persistent-hint
         :placeholder="geocoding_provider_default")
 
-      v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="geocoding_provider_type != null || geocoding_provider_type != 'Nominatim'"
+      v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="!(geocoding_provider_type === null || geocoding_provider_type === 'Nominatim')"
         @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
         :label="$t('admin.geocoding_countrycodes')"
         :items="countries"
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index 63e14ee5..152fff48 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -68,7 +68,7 @@ import debounce from 'lodash/debounce'
 import get from 'lodash/get'
 
 export default {
-  data() {
+  data( {$store} ) {
     return {
       mdiPencil, mdiChevronRight, mdiChevronLeft, mdiMagnify, mdiEye, mdiMapSearch, mdiChevronDown,
       loading: false,
@@ -161,19 +161,54 @@ export default {
       if (searchCoordinates.length) {
         this.loading = true
         const ret = await this.$axios.$get(`placeOSM/${this.geocoding_provider_type}/${searchCoordinates}`)
-        if (ret && ret.length) {
-          this.addressList = ret.map(v => {
-            const name = get(v.namedetails, 'alt_name', get(v.namedetails, 'name'))
-            const address = v.display_name ? v.display_name.replace(name, '').replace(/^, ?/, '') : ''
-            return {
-              lat: v.lat,
-              lon: v.lon,
-              name,
-              address
-            }
-          })
-        } else {
-          this.addressList = []
+        if (this.geocoding_provider_type == "Nominatim") {
+          if (ret && ret.length) {
+            this.addressList = ret.map(v => {
+              const name = get(v.namedetails, 'alt_name', get(v.namedetails, 'name'))
+              const address = v.display_name ? v.display_name.replace(name, '').replace(/^, ?/, '') : ''
+              return {
+                class: v.class,
+                type: v.osm_type,
+                lat: v.lat,
+                lon: v.lon,
+                name,
+                address
+              }
+            })
+          } else {
+            this.addressList = []
+          }
+        } else if (this.geocoding_provider_type == "Photon") {
+          let photon_properties = ['housenumber', 'street', 'district', 'city', 'county', 'state', 'postcode', 'country']
+
+          if (ret) {
+            this.addressList = ret.features.map(v => {
+              let pre_name = v.properties.name || v.properties.street || ''
+              let pre_address = ''
+
+              photon_properties.forEach((item, i) => {
+                let last = i == (photon_properties.length - 1)
+                if (v.properties[item] && !last) {
+                  pre_address += v.properties[item]+', '
+                } else if (v.properties[item]) {
+                  pre_address += v.properties[item]
+                }
+              });
+
+              let name = pre_name
+              let address = pre_address
+              return {
+                class: v.properties.osm_key,
+                type: v.properties.osm_type,
+                lat: v.geometry.coordinates[1],
+                lon: v.geometry.coordinates[0],
+                name,
+                address
+              }
+            })
+          } else {
+            this.addressList = []
+          }
         }
         this.loading = false
       }

From d466094be69af3fc48dbf1530f29185f777d8043 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 6 Dec 2022 23:28:29 +0100
Subject: [PATCH 6/9] use user-agent version from package.json

---
 server/api/controller/place.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 306510c5..14a73946 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -3,6 +3,8 @@ const Event = require('../models/event')
 const eventController = require('./event')
 const exportController = require('./export')
 
+const { version } = require('../../../package.json')
+
 const log = require('../../log')
 const { Op, where, col, fn, cast } = require('sequelize')
 const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search'
@@ -78,6 +80,7 @@ module.exports = {
   async _nominatim (req, res) {
     const details = req.params.place_details
     const countrycodes = res.locals.settings.geocoding_countrycodes || ''
+    console.error(countrycodes)
     const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
     // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
 
@@ -90,7 +93,7 @@ module.exports = {
         addressdetails: 1,
         namedetails: 1,
       },
-      headers: { 'User-Agent': 'gancio 1.6.0' }
+      headers: { 'User-Agent': `gancio ${version}` }
     })
 
     // console.log(ret)
@@ -107,7 +110,7 @@ module.exports = {
         q: details,
         limit: 3,
       },
-      headers: { 'User-Agent': 'gancio 1.6.0' }
+      headers: { 'User-Agent': `gancio ${version}` }
     })
 
     // console.log(ret)

From 851fce0a905f6ad67c8e4b9d2a4f67e1a5194f72 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 6 Dec 2022 23:53:14 +0100
Subject: [PATCH 7/9] move geocoding / map settings into separate tab

---
 components/admin/Geolocation.vue | 75 ++++++++++++++++++--------------
 components/admin/Settings.vue    |  7 +--
 pages/Admin.vue                  |  7 +++
 3 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
index f55ea8ab..8c1c954e 100644
--- a/components/admin/Geolocation.vue
+++ b/components/admin/Geolocation.vue
@@ -5,60 +5,69 @@ v-card
     p.mb-6(v-html="$t('admin.geolocation_description')")
 
     v-form
-      v-autocomplete.mb-4(v-model='geocoding_provider_type'
-        @blur="save('geocoding_provider_type', geocoding_provider_type )"
-        :label="$t('admin.geocoding_provider_type')"
-        :hint="$t('admin.geocoding_provider_type_help')"
-        persistent-hint
-        :items="geocoding_provider_type_items"
-        :placeholder="geocoding_provider_type_default")
+      v-row
+        v-col(md=3)
+          v-autocomplete.mb-4(v-model='geocoding_provider_type'
+            @blur="save('geocoding_provider_type', geocoding_provider_type )"
+            :label="$t('admin.geocoding_provider_type')"
+            :hint="$t('admin.geocoding_provider_type_help')"
+            persistent-hint
+            :items="geocoding_provider_type_items"
+            :placeholder="geocoding_provider_type_default")
 
-      v-text-field.mb-4(v-model='geocoding_provider'
-        @blur="save('geocoding_provider', geocoding_provider )"
-        :label="$t('admin.geocoding_provider')"
-        :hint="$t('admin.geocoding_provider_help')"
-        persistent-hint
-        :placeholder="geocoding_provider_default")
+        v-col(md=5)
+          v-text-field.mb-4(v-model='geocoding_provider'
+            @blur="save('geocoding_provider', geocoding_provider )"
+            :label="$t('admin.geocoding_provider')"
+            :hint="$t('admin.geocoding_provider_help')"
+            persistent-hint
+            :placeholder="geocoding_provider_default")
 
-      v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="!(geocoding_provider_type === null || geocoding_provider_type === 'Nominatim')"
-        @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
-        :label="$t('admin.geocoding_countrycodes')"
-        :items="countries"
-        multiple chips small-chips persistent-hint
-        item-value="code"
-        item-text="name"
-        :hint="$t('admin.geocoding_countrycodes_help')")
+        v-col(md=4)
+          v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="!(geocoding_provider_type === null || geocoding_provider_type === 'Nominatim')"
+            @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
+            :label="$t('admin.geocoding_countrycodes')"
+            :items="countries"
+            multiple chips small-chips persistent-hint
+            item-value="code"
+            item-text="name"
+            :hint="$t('admin.geocoding_countrycodes_help')")
+      
+      v-row
+        v-col(md=6)
+          v-text-field.mb-4(v-model='tilelayer_provider'
+            @blur="save('tilelayer_provider', tilelayer_provider )"
+            :label="$t('admin.tilelayer_provider')"
+            :hint="$t('admin.tilelayer_provider_help')"
+            persistent-hint
+            :placeholder="tilelayer_provider_default")
 
-      v-text-field.mb-4(v-model='tilelayer_provider'
-        @blur="save('tilelayer_provider', tilelayer_provider )"
-        :label="$t('admin.tilelayer_provider')"
-        :hint="$t('admin.tilelayer_provider_help')"
-        persistent-hint
-        :placeholder="tilelayer_provider_default")
-
-      v-text-field(v-model='tilelayer_provider_attribution'
-        @blur="save('tilelayer_provider_attribution', tilelayer_provider_attribution )"
-        :label="$t('admin.tilelayer_provider_attribution')"
-        :placeholder="tilelayer_provider_attribution_default")
+        v-col(md=6)
+          v-text-field(v-model='tilelayer_provider_attribution'
+            @blur="save('tilelayer_provider_attribution', tilelayer_provider_attribution )"
+            :label="$t('admin.tilelayer_provider_attribution')"
+            :placeholder="tilelayer_provider_attribution_default")
 
       div(id="leaflet-map-preview" max-height='10px')
+      //- Map
 
   v-card-actions
     v-spacer
     v-btn(color='primary' @click='testGeocodingProvider' :loading='testGeocodingLoading' outlined ) {{$t('admin.geocoding_test_button')}}
     v-btn(color='primary' @click='testTileLayerProvider' :loading='testTileLayerLoading' outlined ) {{$t('admin.tilelayer_test_button')}}
-    v-btn(color='warning' @click="done" outlined) {{$t("common.ok")}}
 
 </template>
 <script>
 import { mapActions, mapState } from 'vuex'
 import { isoCountries } from '../../server/helpers/geolocation'
+// import Map from '~/components/Map'
 import "leaflet/dist/leaflet.css"
 
 export default {
   props: {
     setup: { type: Boolean, default: false }
   },
+  // components: { Map },
   data ({ $store }) {
     return {
       loading: false,
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index 68d07d9f..4bb3cd97 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -58,16 +58,11 @@ v-container
 
   v-dialog(v-model='showSMTP' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
     SMTP(@close='showSMTP = false')
+
   v-card-actions
     v-btn(text @click='showSMTP=true')
       <v-icon v-if='!settings.admin_email' color='error' class="mr-2" v-text='mdiAlert'></v-icon> {{$t('admin.show_smtp_setup')}}
 
-  v-dialog(v-model='showGeolocationConfigs' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
-    Geolocation(setup, @close='showGeolocationConfigs = false')
-  v-card-actions
-    v-btn(text @click='showGeolocationConfigs=true')
-      <v-icon v-if='!settings.admin_email' color='primary' class="mr-2" v-text='mdiMap'></v-icon> {{$t('admin.show_geolocation_setup')}}
-
   v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}}
     v-icon(v-text='mdiArrowRight')
 
diff --git a/pages/Admin.vue b/pages/Admin.vue
index 10fbde84..9a2512f7 100644
--- a/pages/Admin.vue
+++ b/pages/Admin.vue
@@ -25,6 +25,12 @@ v-container.container.pa-0.pa-md-3
       v-tab(href='#places') {{$t('common.places')}}
       v-tab-item(value='places')
         Places
+      
+      //- GEOCODING / MAPS
+      v-tab(href='#geolocation' v-if='settings.allow_geolocation') {{$t('admin.geolocation')}}
+      v-tab-item(value='geolocation')
+        Geolocation
+            
 
       //- Collections
       v-tab(href='#collections') {{$t('common.collections')}}
@@ -71,6 +77,7 @@ export default {
     Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
     Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
     Collections: () => import(/* webpackChunkName: "admin" */'../components/admin/Collections'),
+    Geolocation: () => import(/* webpackChunkName: "admin" */'../components/admin/Geolocation.vue'),
     Federation: () => import(/* webpackChunkName: "admin" */'../components/admin/Federation.vue'),
     Moderation: () => import(/* webpackChunkName: "admin" */'../components/admin/Moderation.vue'),
     Plugin: () => import(/* webpackChunkName: "admin" */'../components/admin/Plugin.vue'),

From e83c1a3a4ae33a1e187f20243aac13cb482145c3 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 7 Dec 2022 09:52:15 +0100
Subject: [PATCH 8/9] fix geocoding countrycodes filter

---
 server/api/controller/place.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 14a73946..f84b0d76 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -79,14 +79,13 @@ module.exports = {
 
   async _nominatim (req, res) {
     const details = req.params.place_details
-    const countrycodes = res.locals.settings.geocoding_countrycodes || ''
-    console.error(countrycodes)
+    const countrycodes = res.locals.settings.geocoding_countrycodes || []
     const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
     // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
 
     const ret = await axios.get(`${geocoding_provider}`, {
       params: {
-        countrycodes: countrycodes,
+        countrycodes: countrycodes.join(','),
         q: details,
         limit: 3,
         format: 'json',
@@ -96,7 +95,6 @@ module.exports = {
       headers: { 'User-Agent': `gancio ${version}` }
     })
 
-    // console.log(ret)
     return res.json(ret.data)
 
   },

From c942002d0280f549c77f71572188ad02f224a77f Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 7 Dec 2022 10:16:55 +0100
Subject: [PATCH 9/9] minor

---
 components/admin/Geolocation.vue | 7 +++++--
 locales/en.json                  | 5 ++---
 locales/it.json                  | 8 ++++----
 pages/Admin.vue                  | 5 +++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
index 8c1c954e..0be71eff 100644
--- a/components/admin/Geolocation.vue
+++ b/components/admin/Geolocation.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 v-card
-  v-card-title Geolocation and Map settings
+  v-card-title {{$t('admin.geolocation')}}
   v-card-text
     p.mb-6(v-html="$t('admin.geolocation_description')")
 
@@ -25,6 +25,7 @@ v-card
 
         v-col(md=4)
           v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="!(geocoding_provider_type === null || geocoding_provider_type === 'Nominatim')"
+            :append-icon='mdiChevronDown'
             @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
             :label="$t('admin.geocoding_countrycodes')"
             :items="countries"
@@ -60,6 +61,7 @@ v-card
 <script>
 import { mapActions, mapState } from 'vuex'
 import { isoCountries } from '../../server/helpers/geolocation'
+import { mdiChevronDown } from '@mdi/js'
 // import Map from '~/components/Map'
 import "leaflet/dist/leaflet.css"
 
@@ -70,6 +72,7 @@ export default {
   // components: { Map },
   data ({ $store }) {
     return {
+      mdiChevronDown,
       loading: false,
       testGeocodingLoading: false,
       testTileLayerLoading: false,
@@ -161,6 +164,6 @@ export default {
 
 <style>
 #leaflet-map-preview {
-  height: 6rem;
+  height: 20rem;
 }
 </style>
diff --git a/locales/en.json b/locales/en.json
index d333c602..86918dc7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -271,7 +271,6 @@
     "domain": "Domain",
     "known_users": "Known users",
     "created_at": "Created at",
-    "show_geolocation_setup": "Geolocation and map settings",
     "geolocation_description": "<b>1. Define a provider for geocoding service</b>.<br>Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> and <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Geocoding software",
     "geocoding_provider_type_help": "The default software is Nominatim",
@@ -280,7 +279,6 @@
     "geocoding_countrycodes": "Country codes",
     "geocoding_countrycodes_help": "Allows you to set a filter to searches based on area codes",
     "geocoding_test_button": "Test geocoding",
-    "geocoding_test_success": "The service {service_name} is available",
     "geocoding_test_success": "The geocoding service at {service_name} is working",
     "geocoding_test_error": "The geocoding service is not reachable at {service_name}",
     "tilelayer_provider": "Tilelayer provider",
@@ -288,7 +286,8 @@
     "tilelayer_provider_attribution": "Attribution",
     "tilelayer_test_button": "Test tilelayer",
     "tilelayer_test_success": "The tilelayer service at {service_name} is working",
-    "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}"
+    "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}",
+    "geolocation": "Geolocation"
   },
   "auth": {
     "not_confirmed": "Not confirmed yet…",
diff --git a/locales/it.json b/locales/it.json
index d97ea82c..10640c20 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -138,7 +138,7 @@
     "updated": "Evento aggiornato",
     "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.",
     "address_description": "A che indirizzo?",
-    "address_description_osm": "A che indirizzo? ((<a href='http://osm.org/copyright'>OpenStreetMap</a>)",
+    "address_description_osm": "A che indirizzo? (<a href='http://osm.org/copyright'>OpenStreetMap</a>)",
     "coordinates_search_description": "Puoi ricercare il posto per nome, o incollare la coppia di coordinate.",
     "confirmed": "Evento confermato",
     "not_found": "Evento non trovato",
@@ -263,8 +263,7 @@
     "domain": "Domini",
     "known_users": "Utenti conosciuti",
     "created_at": "Creato il",
-    "show_geolocation_setup": "Impostazioni geolocalizzazione e mappa",
-    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/search [<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Terms of Service</a>]</li><li>https://photon.komoot.io/api/ [<a href=\"https://photon.komoot.io/\">Terms of Service</a>]</li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Software fornitore georeferenziazione",
     "geocoding_provider_type_help": "Il software di default è Nominatim",
     "geocoding_provider": "Fornitore georeferenziazione",
@@ -279,7 +278,8 @@
     "tilelayer_provider_attribution": "Attribuzione",
     "tilelayer_test_button": "Test tilelayer",
     "tilelayer_test_success": "Il servizio di tilelayer all'indirizzo {service_name} sta funzionando",
-    "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}"
+    "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}",
+    "geolocation": "Geo e mappe"
   },
   "auth": {
     "not_confirmed": "Non ancora confermato…",
diff --git a/pages/Admin.vue b/pages/Admin.vue
index 9a2512f7..4597fa86 100644
--- a/pages/Admin.vue
+++ b/pages/Admin.vue
@@ -29,7 +29,8 @@ v-container.container.pa-0.pa-md-3
       //- GEOCODING / MAPS
       v-tab(href='#geolocation' v-if='settings.allow_geolocation') {{$t('admin.geolocation')}}
       v-tab-item(value='geolocation')
-        Geolocation
+        client-only(placeholder='Loading...')
+          Geolocation
             
 
       //- Collections
@@ -77,7 +78,7 @@ export default {
     Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
     Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
     Collections: () => import(/* webpackChunkName: "admin" */'../components/admin/Collections'),
-    Geolocation: () => import(/* webpackChunkName: "admin" */'../components/admin/Geolocation.vue'),
+    [process.client && 'Geolocation']: () => import(/* webpackChunkName: "admin" */'../components/admin/Geolocation.vue'),
     Federation: () => import(/* webpackChunkName: "admin" */'../components/admin/Federation.vue'),
     Moderation: () => import(/* webpackChunkName: "admin" */'../components/admin/Moderation.vue'),
     Plugin: () => import(/* webpackChunkName: "admin" */'../components/admin/Plugin.vue'),