From dcdefec6de005a41f00196cfdad50bfb84570e75 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 2 Sep 2022 08:32:13 +0200
Subject: [PATCH 01/10] add geolocalization

---
 components/WhereInput.vue                     | 62 +++++++++++++++++--
 components/admin/Places.vue                   | 14 +++++
 components/admin/Settings.vue                 |  8 +++
 locales/en.json                               |  4 ++
 pages/add/_edit.vue                           |  3 +-
 server/api/controller/event.js                | 28 +++++----
 server/api/controller/place.js                | 17 ++++-
 server/api/controller/settings.js             |  1 +
 server/api/index.js                           | 10 +--
 server/api/models/place.js                    |  3 +-
 .../20220706090946-place-details.js           | 25 ++++++++
 store/index.js                                |  1 +
 12 files changed, 150 insertions(+), 26 deletions(-)
 create mode 100644 server/migrations/20220706090946-place-details.js

diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 900d5f6f..aea64c3a 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -30,11 +30,30 @@ v-row
       :label="$t('common.address')"
       @change="changeAddress"
       :value="value.address")
+    v-combobox.mr-4(ref='detailsView' v-if='settings.allow_geolocalization'
+      :prepend-icon='mdiMapSearch'
+      :disabled='disableDetails'
+      @input.native='searchCoordinates'
+      :label="$t('common.coordinates')"
+      :value='value.detailsView'
+      persistent-hint hide-no-data clearable no-filter
+      :loading='loading'
+      @change='selectDetails'
+      @focus='searchCoordinates'
+      :items="detailsList"
+      :hint="$t('event.coordinates_description')")
+      template(v-slot:item="{ item, attrs, on  }")
+        v-list-item(v-bind='attrs' v-on='on')
+          v-list-item-content(two-line v-if='item')
+            v-list-item-title(v-text='item.display_name')
+            v-list-item-subtitle(v-text='`${item.lat}`+`,`+`${item.lon}`')
+    v-text-field(ref='details' v-show='false' v-if='settings.allow_geolocalization')
 
 </template>
 <script>
-import { mdiMap, mdiMapMarker, mdiPlus } from '@mdi/js'
+import { mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch } from '@mdi/js'
 import debounce from 'lodash/debounce'
+import { mapState } from 'vuex'
 
 export default {
   name: 'WhereInput',
@@ -43,14 +62,20 @@ export default {
   },
   data () {
     return {
-      mdiMap, mdiMapMarker, mdiPlus,
+      mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch,
       place: { },
       placeName: '',
       places: [],
-      disableAddress: true
+      disableAddress: true,
+      details: { },
+      detailsView: '',
+      detailsList: [],
+      disableDetails: true,
+      loading: false
     }
   },
   computed: {
+    ...mapState(['settings']),
     filteredPlaces () {
       if (!this.placeName) { return this.places }
       const placeName = this.placeName.trim().toLowerCase()
@@ -85,6 +110,9 @@ export default {
       if (typeof p === 'object' && !p.create) {
         this.place.name = p.name.trim()
         this.place.address = p.address
+        if (this.settings.allow_geolocalization) {
+          this.place.details = p.details
+        }
         this.place.id = p.id
         this.disableAddress = true
       } else { // this is a new place
@@ -100,6 +128,9 @@ export default {
         } else {
           delete this.place.id
           this.place.address = ''
+          if (this.settings.allow_geolocalization) {
+            this.place.details = p.details
+          }
           this.disableAddress = false
           this.$refs.place.blur()
           this.$refs.address.focus()
@@ -110,7 +141,30 @@ export default {
     changeAddress (v) {
       this.place.address = v
       this.$emit('input', { ...this.place })
-    }
+      this.disableDetails = false
+    },
+    selectDetails (v) {
+      if (!v) { return }
+      if (typeof v === 'object') {
+        this.place.detailsView = v.lat+', '+v.lon
+        let c = {}
+        c.lat = v.lat
+        c.lon = v.lon
+        if (typeof c === 'object') {
+          this.place.details = JSON.stringify(c)
+        }
+      }
+      this.$emit('input', { ...this.place })
+    },
+    searchCoordinates: debounce(async function(ev) {
+      this.loading = true
+      const searchCoordinates = ev.target.value.trim().toLowerCase()
+      // this.detailsList = await this.$axios.$get(`placeNominatim?search=${searchCoordinates}`)
+      this.detailsList = await this.$axios.$get(`https://nominatim.openstreetmap.org/search?limit=3&format=json&namedetails=1&q=${searchCoordinates}` )
+      if (this.detailsList) {
+        this.loading = false;
+      }
+    }, 300),
   }
 }
 </script>
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index 4e9b0d14..a68ca498 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -25,6 +25,13 @@ v-container
             v-model='place.address'
             :placeholder='$t("common.address")')
 
+          v-textarea(v-if="settings.allow_geolocalization"
+            row-height="15"
+            :disabled="true"
+            :label="$t('common.details')"
+            v-model='place.details'
+            :placeholder='$t("common.details")')
+
       v-card-actions
           v-spacer
           v-btn(@click='dialog=false' color='warning') {{$t('common.cancel')}}
@@ -47,6 +54,7 @@ v-container
 </template>
 <script>
 import { mdiPencil, mdiChevronLeft, mdiChevronRight, mdiMagnify, mdiEye } from '@mdi/js'
+import { mapState } from 'vuex'
 
 export default {
   data () {
@@ -68,10 +76,16 @@ export default {
   async fetch () {
     this.places = await this.$axios.$get('/place/all')
   },
+  computed: {
+    ...mapState(['settings']),
+  },
   methods: {
     editPlace (item) {
       this.place.name = item.name
       this.place.address = item.address
+      if (this.settings.allow_geolocalization) {
+        this.place.details = JSON.parse(item.details)
+      }
       this.place.id = item.id
       this.dialog = true
     },
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index 32bd7757..d3091f4e 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -48,6 +48,10 @@ v-container
       inset
       :label="$t('admin.recurrent_event_visible')")
 
+    v-switch.mt-1(v-model='allow_geolocalization'
+      inset
+      :label="$t('admin.allow_geolocalization')")
+
   v-dialog(v-model='showSMTP' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
     SMTP(@close='showSMTP = false')
 
@@ -107,6 +111,10 @@ export default {
       get () { return this.settings.recurrent_event_visible },
       set (value) { this.setSetting({ key: 'recurrent_event_visible', value }) }
     },
+    allow_geolocalization: {
+      get () { return this.settings.allow_geolocalization },
+      set (value) { this.setSetting({ key: 'allow_geolocalization', value }) }
+    },
     filteredTimezones () {
       const current_timezone = moment.tz.guess()
       tzNames.unshift(current_timezone)
diff --git a/locales/en.json b/locales/en.json
index 7ead1f87..aae3a2e8 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -6,6 +6,8 @@
         "send": "Send",
         "where": "Where",
         "address": "Address",
+        "coordinates": "Coordinates",
+        "details": "Details",
         "when": "When",
         "what": "What",
         "media": "Media",
@@ -129,6 +131,7 @@
         "added_anon": "Event added, but has yet to be confirmed.",
         "updated": "Event updated",
         "where_description": "Where's the event? If not present you can create it.",
+        "coordinates_description": "You can search the place by name, or paste the coordinates separated by comma: lat,lon",
         "confirmed": "Event confirmed",
         "not_found": "Could not find event",
         "remove_confirmation": "Are you sure you want to remove this event?",
@@ -182,6 +185,7 @@
         "allow_registration_description": "Allow open registrations?",
         "allow_anon_event": "Allow anonymous events (has to be confirmed)?",
         "allow_recurrent_event": "Allow recurring events",
+        "allow_geolocalization": "Allow geolocalization of events",
         "recurrent_event_visible": "Show recurring events by default",
         "federation": "Federation / ActivityPub",
         "enable_federation": "Turn on federation",
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 092b4d54..cbfafa86 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -135,7 +135,7 @@ export default {
       valid: false,
       openImportDialog: false,
       event: {
-        place: { name: '', address: '' },
+        place: { name: '', address: '', details: {} },
         title: '',
         description: '',
         tags: [],
@@ -214,6 +214,7 @@ export default {
       }
       formData.append('place_name', this.event.place.name)
       formData.append('place_address', this.event.place.address)
+      formData.append('place_details', this.event.place.details)
       formData.append('description', this.event.description)
       formData.append('multidate', !!this.date.multidate)
       formData.append('start_datetime', dayjs(this.date.from).unix())
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index bb2849cf..8d7b41c5 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -44,7 +44,7 @@ const eventController = {
       order: [[Sequelize.col('w'), 'DESC']],
       where: {
         tag: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('tag')), 'LIKE', '%' + search + '%'),
-      },      
+      },
       attributes: [['tag','label'], [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('tag.tag')), 'INTEGER'), 'w']],
       include: [{ model: Event, where: { is_visible: true }, attributes: [], through: { attributes: [] }, required: true }],
       group: ['tag.tag'],
@@ -110,7 +110,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
       ],
       replacements,
       limit: 30,
@@ -192,7 +192,7 @@ const eventController = {
         },
         include: [
           { model: Tag, required: false, attributes: ['tag'], through: { attributes: [] } },
-          { model: Place, attributes: ['name', 'address', 'id'] },
+          { model: Place, attributes: ['name', 'address', 'details', 'id'] },
           {
             model: Resource,
             where: !is_admin && { hidden: false },
@@ -222,7 +222,7 @@ const eventController = {
         recurrent: null,
         [Op.or]: [
           { start_datetime: { [Op.gt]: event.start_datetime } },
-          { 
+          {
             start_datetime: event.start_datetime,
             id: { [Op.gt]: event.id }
           }
@@ -239,7 +239,7 @@ const eventController = {
         recurrent: null,
         [Op.or]: [
           { start_datetime: { [Op.lt]: event.start_datetime } },
-          { 
+          {
             start_datetime: event.start_datetime,
             id: { [Op.lt]: event.id }
           }
@@ -405,7 +405,8 @@ const eventController = {
           }
           place = await Place.create({
             name: body.place_name,
-            address: body.place_address
+            address: body.place_address,
+            details: body.place_details
           })
         }
       }
@@ -559,13 +560,14 @@ const eventController = {
           }
           place = await Place.create({
             name: body.place_name,
-            address: body.place_address
+            address: body.place_address,
+            details: body.place_details
           })
         }
       }
 
       await event.setPlace(place)
-      
+
       // create/assign tags
       let tags = []
       if (body.tags) {
@@ -624,7 +626,7 @@ const eventController = {
 
   /**
    * Method to search for events with pagination and filtering
-   * @returns 
+   * @returns
    */
   async _select ({
     start = dayjs().unix(),
@@ -665,7 +667,7 @@ const eventController = {
 
     const replacements = []
     if (tags && places) {
-      where[Op.and] = [ 
+      where[Op.and] = [
         { placeId: places ? places.split(',') : []},
         Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=${Col('event.id')} AND LOWER(${Col('tagTag')}) in (?)`))
       ]
@@ -679,10 +681,10 @@ const eventController = {
 
     let pagination = {}
     if (limit) {
-      pagination = { 
+      pagination = {
         limit,
         offset: limit * page,
-      } 
+      }
     }
 
     const events = await Event.findAll({
@@ -698,7 +700,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
       ],
       ...pagination,
       replacements
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 1c9b32ae..b63debde 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -5,6 +5,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?limit=3&format=geocodejson&accept-language=it&q='
 
 module.exports = {
 
@@ -60,7 +61,7 @@ module.exports = {
           { address: where(fn('LOWER', col('address')), 'LIKE', '%' + search + '%')},
         ]
       },
-      attributes: ['name', 'address', 'id'],
+      attributes: ['name', 'address', 'details', 'id'],
       include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }],
       group: ['place.id'],
       raw: true,
@@ -70,6 +71,16 @@ module.exports = {
 
     // TOFIX: don't know why limit does not work
     return res.json(places.slice(0, 10))
-  }  
+  },
 
-}
\ No newline at end of file
+  // async _nominatim (req, res) {
+  //   const details = req.params.place_details
+  //   const ret = await axios.get(`${NOMINATIM_URL}${details}`, { headers: { 'User-Agent': 'gancio 0.20' } })
+  //   debug(`${NOMINATIM_URL}${details}`)
+  //   debug(ret.status)
+  //   debug(ret.statusText)
+  //   debug(ret.data)
+  //   return ret
+  // },
+
+}
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index db13d036..99b779e8 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -29,6 +29,7 @@ const defaultSettings = {
   allow_anon_event: true,
   allow_recurrent_event: false,
   recurrent_event_visible: false,
+  allow_geolocalization: false,
   enable_federation: true,
   enable_resources: false,
   hide_boosts: true,
diff --git a/server/api/index.js b/server/api/index.js
index 8a014cf6..e5d2900e 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -89,16 +89,16 @@ if (config.status !== 'READY') {
    * @param {integer} [end] - end timestamp (optional)
    * @param {array} [tags] - List of tags
    * @param {array} [places] - List of places id
-   * @param {integer} [max] - Limit events 
+   * @param {integer} [max] - Limit events
    * @param {boolean} [show_recurrent] - Show also recurrent events (default: as choosen in admin settings)
    * @param {integer} [page] - Pagination
    * @param {boolean} [older] - select <= start instead of >=
-   * @example ***Example***  
-   * [https://demo.gancio.org/api/events](https://demo.gancio.org/api/events)  
+   * @example ***Example***
+   * [https://demo.gancio.org/api/events](https://demo.gancio.org/api/events)
    * [usage example](https://framagit.org/les/gancio/-/blob/master/webcomponents/src/GancioEvents.svelte#L18-42)
    */
 
-   api.get('/events', cors, eventController.select)  
+   api.get('/events', cors, eventController.select)
 
   /**
    * Add a new event
@@ -110,6 +110,7 @@ if (config.status !== 'READY') {
    * @param {string} description - event's description (html accepted and sanitized)
    * @param {string} place_name - the name of the place
    * @param {string} [place_address] - the address of the place
+   * @param {array} [place_details] - the details of the place
    * @param {integer} start_datetime - start timestamp
    * @param {integer} multidate - is a multidate event?
    * @param {array} tags - List of tags
@@ -160,6 +161,7 @@ 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.put('/place', isAdmin, placeController.updatePlace)
 
   api.get('/tag', cors, tagController.search)
diff --git a/server/api/models/place.js b/server/api/models/place.js
index e8ef6e90..c77ac402 100644
--- a/server/api/models/place.js
+++ b/server/api/models/place.js
@@ -10,7 +10,8 @@ Place.init({
     index: true,
     allowNull: false
   },
-  address: DataTypes.STRING
+  address: DataTypes.STRING,
+  details: DataTypes.JSON
 }, { sequelize, modelName: 'place' })
 
 module.exports = Place
diff --git a/server/migrations/20220706090946-place-details.js b/server/migrations/20220706090946-place-details.js
new file mode 100644
index 00000000..3dfaf31d
--- /dev/null
+++ b/server/migrations/20220706090946-place-details.js
@@ -0,0 +1,25 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    /**
+     * Add altering commands here.
+     *
+     * Example:
+     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
+     */
+     return queryInterface.addColumn('places', 'details', { type: Sequelize.JSON })
+
+  },
+
+  async down (queryInterface, Sequelize) {
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+     return queryInterface.removeColumn('places', 'details')
+
+  }
+};
diff --git a/store/index.js b/store/index.js
index c8b75b4d..3d7b644e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -8,6 +8,7 @@ export const state = () => ({
     allow_anon_event: true,
     allow_recurrent_event: true,
     recurrent_event_visible: false,
+    allow_geolocalization: false,
     enable_federation: false,
     enable_resources: false,
     hide_boosts: true,

From 6e182b5de188aff7012a745f50ac655c290dd027 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Thu, 8 Sep 2022 20:37:20 +0200
Subject: [PATCH 02/10] rename gelocation, and move the request to nominatim
 server side

---
 components/WhereInput.vue         | 17 ++++++++++-------
 components/admin/Places.vue       |  4 ++--
 components/admin/Settings.vue     | 10 +++++-----
 locales/en.json                   |  2 +-
 server/api/controller/place.js    | 17 +++++++----------
 server/api/controller/settings.js |  2 +-
 server/api/index.js               |  2 +-
 store/index.js                    |  2 +-
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index aea64c3a..088e39fe 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -30,7 +30,7 @@ v-row
       :label="$t('common.address')"
       @change="changeAddress"
       :value="value.address")
-    v-combobox.mr-4(ref='detailsView' v-if='settings.allow_geolocalization'
+    v-combobox.mr-4(ref='detailsView' v-if='settings.allow_geolocation'
       :prepend-icon='mdiMapSearch'
       :disabled='disableDetails'
       @input.native='searchCoordinates'
@@ -47,7 +47,7 @@ v-row
           v-list-item-content(two-line v-if='item')
             v-list-item-title(v-text='item.display_name')
             v-list-item-subtitle(v-text='`${item.lat}`+`,`+`${item.lon}`')
-    v-text-field(ref='details' v-show='false' v-if='settings.allow_geolocalization')
+    v-text-field(ref='details' v-show='false' v-if='settings.allow_geolocation')
 
 </template>
 <script>
@@ -110,7 +110,7 @@ export default {
       if (typeof p === 'object' && !p.create) {
         this.place.name = p.name.trim()
         this.place.address = p.address
-        if (this.settings.allow_geolocalization) {
+        if (this.settings.allow_geolocation) {
           this.place.details = p.details
         }
         this.place.id = p.id
@@ -128,7 +128,7 @@ export default {
         } else {
           delete this.place.id
           this.place.address = ''
-          if (this.settings.allow_geolocalization) {
+          if (this.settings.allow_geolocation) {
             this.place.details = p.details
           }
           this.disableAddress = false
@@ -158,9 +158,12 @@ export default {
     },
     searchCoordinates: debounce(async function(ev) {
       this.loading = true
-      const searchCoordinates = ev.target.value.trim().toLowerCase()
-      // this.detailsList = await this.$axios.$get(`placeNominatim?search=${searchCoordinates}`)
-      this.detailsList = await this.$axios.$get(`https://nominatim.openstreetmap.org/search?limit=3&format=json&namedetails=1&q=${searchCoordinates}` )
+      const pre_searchCoordinates = ev.target.value.trim().toLowerCase()
+      // allow pasting coordinates lat/lon
+      const searchCoordinates = pre_searchCoordinates.replace('/', ',')
+      if (searchCoordinates.length) {
+        this.detailsList = await this.$axios.$get(`placeNominatim/${searchCoordinates}`)
+      }
       if (this.detailsList) {
         this.loading = false;
       }
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index a68ca498..4ce11cea 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -25,7 +25,7 @@ v-container
             v-model='place.address'
             :placeholder='$t("common.address")')
 
-          v-textarea(v-if="settings.allow_geolocalization"
+          v-textarea(v-if="settings.allow_geolocation"
             row-height="15"
             :disabled="true"
             :label="$t('common.details')"
@@ -83,7 +83,7 @@ export default {
     editPlace (item) {
       this.place.name = item.name
       this.place.address = item.address
-      if (this.settings.allow_geolocalization) {
+      if (this.settings.allow_geolocation) {
         this.place.details = JSON.parse(item.details)
       }
       this.place.id = item.id
diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue
index d3091f4e..9471af43 100644
--- a/components/admin/Settings.vue
+++ b/components/admin/Settings.vue
@@ -48,9 +48,9 @@ v-container
       inset
       :label="$t('admin.recurrent_event_visible')")
 
-    v-switch.mt-1(v-model='allow_geolocalization'
+    v-switch.mt-1(v-model='allow_geolocation'
       inset
-      :label="$t('admin.allow_geolocalization')")
+      :label="$t('admin.allow_geolocation')")
 
   v-dialog(v-model='showSMTP' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly')
     SMTP(@close='showSMTP = false')
@@ -111,9 +111,9 @@ export default {
       get () { return this.settings.recurrent_event_visible },
       set (value) { this.setSetting({ key: 'recurrent_event_visible', value }) }
     },
-    allow_geolocalization: {
-      get () { return this.settings.allow_geolocalization },
-      set (value) { this.setSetting({ key: 'allow_geolocalization', value }) }
+    allow_geolocation: {
+      get () { return this.settings.allow_geolocation },
+      set (value) { this.setSetting({ key: 'allow_geolocation', value }) }
     },
     filteredTimezones () {
       const current_timezone = moment.tz.guess()
diff --git a/locales/en.json b/locales/en.json
index aae3a2e8..63522495 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -185,7 +185,7 @@
         "allow_registration_description": "Allow open registrations?",
         "allow_anon_event": "Allow anonymous events (has to be confirmed)?",
         "allow_recurrent_event": "Allow recurring events",
-        "allow_geolocalization": "Allow geolocalization of events",
+        "allow_geolocation": "Allow geolocation of events",
         "recurrent_event_visible": "Show recurring events by default",
         "federation": "Federation / ActivityPub",
         "enable_federation": "Turn on federation",
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index b63debde..d82c208d 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -5,7 +5,8 @@ const exportController = require('./export')
 
 const log = require('../../log')
 const { Op, where, col, fn, cast } = require('sequelize')
-const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search?limit=3&format=geocodejson&accept-language=it&q='
+const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search?limit=3&format=json&namedetails=1&q='
+const axios = require('axios')
 
 module.exports = {
 
@@ -73,14 +74,10 @@ module.exports = {
     return res.json(places.slice(0, 10))
   },
 
-  // async _nominatim (req, res) {
-  //   const details = req.params.place_details
-  //   const ret = await axios.get(`${NOMINATIM_URL}${details}`, { headers: { 'User-Agent': 'gancio 0.20' } })
-  //   debug(`${NOMINATIM_URL}${details}`)
-  //   debug(ret.status)
-  //   debug(ret.statusText)
-  //   debug(ret.data)
-  //   return ret
-  // },
+  async _nominatim (req, res) {
+    const details = req.params.place_details
+    const ret = await axios.get(`${NOMINATIM_URL}${details}`, { headers: { 'User-Agent': 'gancio 0.20' } })
+    return res.json(ret.data)
+  },
 
 }
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 99b779e8..c6faddfa 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -29,7 +29,7 @@ const defaultSettings = {
   allow_anon_event: true,
   allow_recurrent_event: false,
   recurrent_event_visible: false,
-  allow_geolocalization: false,
+  allow_geolocation: false,
   enable_federation: true,
   enable_resources: false,
   hide_boosts: true,
diff --git a/server/api/index.js b/server/api/index.js
index e5d2900e..97c67c53 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -161,7 +161,7 @@ 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('/placeNominatim/:place_details', cors, placeController._nominatim)
   api.put('/place', isAdmin, placeController.updatePlace)
 
   api.get('/tag', cors, tagController.search)
diff --git a/store/index.js b/store/index.js
index 3d7b644e..f2fbfa3d 100644
--- a/store/index.js
+++ b/store/index.js
@@ -8,7 +8,7 @@ export const state = () => ({
     allow_anon_event: true,
     allow_recurrent_event: true,
     recurrent_event_visible: false,
-    allow_geolocalization: false,
+    allow_geolocation: false,
     enable_federation: false,
     enable_resources: false,
     hide_boosts: true,

From 838d1988ad01c3ee85d4e60c5ddff375179a86d9 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Sun, 18 Sep 2022 23:15:22 +0200
Subject: [PATCH 03/10] init show map and routes

---
 components/Map.vue             | 138 +++++++++++++++++++++++++++++++++
 components/WhereInput.vue      |   2 +-
 locales/en.json                |   3 +-
 package.json                   |   2 +
 pages/event/_slug.vue          |  15 +++-
 server/api/controller/event.js |  10 +--
 server/api/models/event.js     |   3 +-
 yarn.lock                      |  12 ++-
 8 files changed, 171 insertions(+), 14 deletions(-)
 create mode 100644 components/Map.vue

diff --git a/components/Map.vue b/components/Map.vue
new file mode 100644
index 00000000..69ec5e4d
--- /dev/null
+++ b/components/Map.vue
@@ -0,0 +1,138 @@
+<template lang="pug">
+v-container
+  LMap(ref="map"
+      id="leaflet-map"
+      :zoom="zoom"
+      :center="center")
+    LTileLayer(
+        :url="url"
+        :attribution="attribution")
+    LMarker(
+      v-for="item in markers"
+      :key="item.id"
+      :lat-lng="item.position"
+      :visible="item.visible"
+      :draggable="item.draggable")
+
+  v-row.my-4.d-flex.justify-center
+    v-btn.ml-2(icon large :href="routeByWalk()")
+      v-icon(v-text='mdiWalk' color='white')
+    v-btn.ml-2(icon large :href="routeByBike()")
+      v-icon(v-text='mdiBike' color='white')
+    v-btn.ml-2(icon large :href="routeByBus()")
+      v-icon(v-text='mdiBus' color='white')
+    v-btn.ml-2(icon large :href="routeByCar()")
+      v-icon(v-text='mdiCar' color='white')
+
+
+
+</template>
+<script>
+
+import "leaflet/dist/leaflet.css";
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet';
+import dayjs from 'dayjs';
+import { mapActions, mapState } from 'vuex'
+import { Icon } from 'leaflet';
+import { mdiWalk, mdiBike, mdiCar, mdiBus } from '@mdi/js'
+
+export default {
+   components: {
+     LMap,
+     LTileLayer,
+     LMarker,
+     LPopup
+   },
+   data ({ $store }) {
+     return {
+       mdiWalk, mdiBike, mdiCar, mdiBus,
+       // url: "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png",
+       url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+       attribution:
+         '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
+       zoom: 10,
+       center: [42, 12],
+       markers: [],
+       osm_navigation: 'https://www.openstreetmap.org/directions?from=&to=',
+       routingType: [
+         {foot: "engine=fossgis_osrm_foot"},
+         {bike: "engine=fossgis_osrm_bike"},
+         {transit: null},
+         {car: "engine=fossgis_osrm_car"},
+       ]
+     }
+   },
+   props: {
+     event: { type: Object, default: () => ({}) }
+   },
+   mounted() {
+     delete Icon.Default.prototype._getIconUrl;
+     Icon.Default.mergeOptions({
+       iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+       iconUrl: require('leaflet/dist/images/marker-icon.png'),
+       shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+     });
+
+     setTimeout(() => {
+       this.$refs.map.mapObject.invalidateSize();
+     }, 200);
+   },
+   computed: {
+     ...mapState(['settings']),
+   },
+   methods: {
+     ...mapActions(['setSetting']),
+
+     routeByWalk() {
+       console.log(this.$root.$event)
+       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+     },
+     routeByBike() {
+       console.log(this.event.place)
+       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+     },
+     routeByBus() {
+       console.log(this.$root)
+       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+     },
+     routeByCar() {
+       console.log(this.$root)
+       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+     },
+     route() {
+
+     }
+     // loadMarker(d) {
+     //   this.event = JSON.stringify(d);
+     //
+     //   let newMarker = [{
+     //     id: d.id,
+     //     title: d.title,
+     //     event: JSON.stringify(d),
+     //     description: d.description,
+     //     place: d.place,
+     //     tags: d.tags,
+     //     multidate: d.multidate,
+     //     start_datetime: d.start_datetime,
+     //     end_datetime: d.end_datetime,
+     //     position: { lat: d.place.details.geometry.coordinates[1], lng: d.place.details.geometry.coordinates[0] },
+     //     draggable: false,
+     //     visible: true
+     //   }]
+     //
+     //   this.markers.push.apply(this.markers, newMarker)
+     // },
+
+   }
+}
+</script>
+
+<style>
+  #leaflet-map {
+    height: 55vh;
+    width: 100%;
+    border-radius: .5rem;
+    border: 1px solid #fff;
+    z-index: 1;
+  }
+</style>
diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 088e39fe..75d41da2 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -47,7 +47,7 @@ v-row
           v-list-item-content(two-line v-if='item')
             v-list-item-title(v-text='item.display_name')
             v-list-item-subtitle(v-text='`${item.lat}`+`,`+`${item.lon}`')
-    v-text-field(ref='details' v-show='false' v-if='settings.allow_geolocation')
+    v-text-field(ref='details' v-if='settings.allow_geolocation')
 
 </template>
 <script>
diff --git a/locales/en.json b/locales/en.json
index 63522495..838d3915 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -90,7 +90,8 @@
         "max_events": "N. max events",
         "label": "Label",
         "collections": "Collections",
-        "close": "Close"
+        "close": "Close",
+        "show_map": "Show map"
     },
     "login": {
         "description": "By logging in you can publish new events.",
diff --git a/package.json b/package.json
index 776596b4..556fd960 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "ics": "^2.37.0",
     "jsdom": "^20.0.0",
     "jsonwebtoken": "^8.5.1",
+    "leaflet": "^1.8.0",
     "linkify-html": "^3.0.4",
     "linkifyjs": "3.0.5",
     "lodash": "^4.17.21",
@@ -74,6 +75,7 @@
     "umzug": "^2.3.0",
     "v-calendar": "^2.4.1",
     "vue-i18n": "^8.26.7",
+    "vue2-leaflet": "^2.7.1",
     "vuetify": "2.6.9",
     "winston": "^3.8.1",
     "winston-daily-rotate-file": "^4.7.1",
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 08292aa7..431ba257 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -20,7 +20,7 @@ v-container#event.pa-0.pa-sm-2
               v-icon.float-right(v-if='event.parentId' color='success' v-text='mdiRepeat')
               .title.text-h5.mb-5
                 strong.p-name.text--primary(itemprop="name") {{event.title}}
-              
+
               time.dt-start.text-h6(:datetime='event.start_datetime|unixFormat("YYYY-MM-DD HH:mm")' itemprop="startDate" :content="event.start_datetime|unixFormat('YYYY-MM-DDTHH:mm')")
                 v-icon(v-text='mdiCalendar')
                 strong.ml-2 {{event|when}}
@@ -32,6 +32,11 @@ v-container#event.pa-0.pa-sm-2
                 v-icon(v-text='mdiMapMarker')
                 nuxt-link.vcard.ml-2.p-name.text-decoration-none(itemprop="name" :to='`/place/${event.place.name}`') {{event.place && event.place.name}}
                 .text-subtitle-1.p-street-address(itemprop='address') {{event.place && event.place.address}}
+                v-btn.mt-2(small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
+                v-dialog(v-model='mapModal' :fullscreen='$vuetify.breakpoint.xsOnly' destroy-on-close)
+                  v-card
+                    client-only(placeholder='Loading...' )
+                      Map(:event='event')
 
             //- tags, hashtags
             v-card-text.pt-0(v-if='event.tags && event.tags.length')
@@ -50,7 +55,7 @@ v-container#event.pa-0.pa-sm-2
                 v-icon(v-text='mdiCalendarExport')
               v-btn.ml-2(v-if='hasMedia' large icon :title="$t('event.download_flyer')" color='primary' :aria-label="$t('event.download_flyer')"
                 :href='event | mediaURL("download")')
-                v-icon(v-text='mdiFileDownloadOutline')                
+                v-icon(v-text='mdiFileDownloadOutline')
 
       .p-description.text-body-1.pa-3.rounded(v-if='hasMedia && event.description' itemprop='description' v-html='event.description')
 
@@ -145,7 +150,8 @@ export default {
   components: {
     EventAdmin,
     EmbedEvent,
-    MyPicture
+    MyPicture,
+    [process.client && 'Map']: () => import('@/components/Map.vue')
   },
   async asyncData ({ $axios, params, error }) {
     try {
@@ -163,7 +169,8 @@ export default {
       event: {},
       showEmbed: false,
       showResources: false,
-      selectedResource: { data: { attachment: [] } }
+      selectedResource: { data: { attachment: [] } },
+      mapModal: false
     }
   },
   head () {
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 39225cb8..23180051 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -34,7 +34,7 @@ const eventController = {
           Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('address')), 'LIKE', '%' + search + '%')
         ]
       },
-      attributes: [['name', 'label'], 'address', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']],
+      attributes: [['name', 'label'], 'address', 'details', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']],
       include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }],
       group: ['place.id'],
       raw: true
@@ -110,7 +110,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
       ],
       replacements,
       limit: 30,
@@ -192,7 +192,7 @@ const eventController = {
         },
         include: [
           { model: Tag, required: false, attributes: ['tag'], through: { attributes: [] } },
-          { model: Place, attributes: ['name', 'address', 'id'] },
+          { model: Place, attributes: ['name', 'address', 'details', 'id'] },
           {
             model: Resource,
             where: !is_admin && { hidden: false },
@@ -626,7 +626,7 @@ const eventController = {
 
   /**
    * Method to search for events with pagination and filtering
-   * @returns 
+   * @returns
    */
   async _select({
     start = dayjs().unix(),
@@ -700,7 +700,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
       ],
       ...pagination,
       replacements
diff --git a/server/api/models/event.js b/server/api/models/event.js
index 659287e1..3e539db1 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -105,7 +105,8 @@ Event.prototype.toAP = function (username, locale, to = []) {
     endTime: this.end_datetime ? dayjs.unix(this.end_datetime).tz().locale(locale).format() : null,
     location: {
       name: this.place.name,
-      address: this.place.address
+      address: this.place.address,
+      details: this.place.details
     },
     attachment,
     tag: tags && tags.map(tag => ({
diff --git a/yarn.lock b/yarn.lock
index a1aef80c..82b3fd8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7342,6 +7342,11 @@ launch-editor@^2.6.0:
     picocolors "^1.0.0"
     shell-quote "^1.7.3"
 
+leaflet@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e"
+  integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -12396,6 +12401,11 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@^2.7.0:
   version "2.7.10"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.10.tgz#ae516cc6c88e1c424754468844218fdd5e280f40"
@@ -12463,10 +12473,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"

From 0fb39b2c07859b7274b322964a1613cba73bb84f Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Mon, 19 Sep 2022 05:13:57 +0200
Subject: [PATCH 04/10] added place.latitude and place.longitude, fix routes

---
 components/Map.vue                            | 127 ++++++++----------
 components/WhereInput.vue                     |  86 +++++++++---
 components/admin/Places.vue                   |  21 ++-
 locales/en.json                               |   5 +-
 pages/add/_edit.vue                           |   5 +-
 pages/event/_slug.vue                         |   3 +-
 server/api/controller/event.js                |  14 +-
 server/api/controller/place.js                |   2 +-
 server/api/index.js                           |   3 +-
 server/api/models/event.js                    |   3 +-
 server/api/models/place.js                    |   3 +-
 .../20220706090946-place-details.js           |  14 +-
 12 files changed, 168 insertions(+), 118 deletions(-)

diff --git a/components/Map.vue b/components/Map.vue
index 69ec5e4d..8b9ae21d 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -1,40 +1,42 @@
 <template lang="pug">
-v-container
-  LMap(ref="map"
-      id="leaflet-map"
-      :zoom="zoom"
-      :center="center")
-    LTileLayer(
-        :url="url"
-        :attribution="attribution")
-    LMarker(
-      v-for="item in markers"
-      :key="item.id"
-      :lat-lng="item.position"
-      :visible="item.visible"
-      :draggable="item.draggable")
-
-  v-row.my-4.d-flex.justify-center
-    v-btn.ml-2(icon large :href="routeByWalk()")
-      v-icon(v-text='mdiWalk' color='white')
-    v-btn.ml-2(icon large :href="routeByBike()")
-      v-icon(v-text='mdiBike' color='white')
-    v-btn.ml-2(icon large :href="routeByBus()")
-      v-icon(v-text='mdiBus' color='white')
-    v-btn.ml-2(icon large :href="routeByCar()")
-      v-icon(v-text='mdiCar' color='white')
-
+client-only(placeholder='Loading...' )
+  v-container
+    LMap(ref="map"
+        id="leaflet-map"
+        :zoom="zoom"
+        :center="center")
+      LTileLayer(
+          :url="url"
+          :attribution="attribution")
+      LMarker(
+        v-for="item in markers"
+        @add="openPopup"
+        :key="item.id"
+        :lat-lng="item.coordinates")
+        LPopup(:content="item.address")
 
+    v-row.my-4.d-flex.flex-column.align-center
+      .text-h6
+        v-icon(v-text='mdiMapMarker' )
+        nuxt-link.ml-2.p-name.text-decoration-none(v-text="event.place.name" :to='`/place/${event.place.name}`')
+        v-text.mx-2(v-text="`${event.place.address}`")
+      v-text.my-4(v-text="$t('common.getting_there')")
+      v-row
+        v-btn.ml-2(icon large :href="routeByWalk()")
+          v-icon(v-text='mdiWalk' color='white')
+        v-btn.ml-2(icon large :href="routeByBike()")
+          v-icon(v-text='mdiBike' color='white')
+        v-btn.ml-2(icon large :href="routeByCar()")
+          v-icon(v-text='mdiCar' color='white')
 
 </template>
 <script>
 
 import "leaflet/dist/leaflet.css";
 import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet';
-import dayjs from 'dayjs';
 import { mapActions, mapState } from 'vuex'
 import { Icon } from 'leaflet';
-import { mdiWalk, mdiBike, mdiCar, mdiBus } from '@mdi/js'
+import { mdiWalk, mdiBike, mdiCar, mdiMapMarker } from '@mdi/js'
 
 export default {
    components: {
@@ -45,21 +47,25 @@ export default {
    },
    data ({ $store }) {
      return {
-       mdiWalk, mdiBike, mdiCar, mdiBus,
+       mdiWalk, mdiBike, mdiCar, mdiMapMarker,
        // url: "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png",
        url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
        attribution:
          '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
-       zoom: 10,
-       center: [42, 12],
-       markers: [],
+       zoom: 14,
+       center: [this.event.place.latitude, this.event.place.longitude],
+       markers: [
+         {
+           address: this.event.place.address,
+           coordinates: {lat: this.event.place.latitude, lon: this.event.place.longitude}
+         }
+       ],
        osm_navigation: 'https://www.openstreetmap.org/directions?from=&to=',
-       routingType: [
-         {foot: "engine=fossgis_osrm_foot"},
-         {bike: "engine=fossgis_osrm_bike"},
-         {transit: null},
-         {car: "engine=fossgis_osrm_car"},
-       ]
+       routingType: {
+         foot: "engine=fossgis_osrm_foot",
+         bike: "engine=fossgis_osrm_bike",
+         car: "engine=fossgis_osrm_car"
+       }
      }
    },
    props: {
@@ -82,46 +88,23 @@ export default {
    },
    methods: {
      ...mapActions(['setSetting']),
-
+     openPopup(event) {
+        this.$nextTick(() => {
+          event.target.openPopup();
+        });
+      },
+     route (routingTypes) {
+       return this.osm_navigation+this.event.place.latitude+','+this.event.place.longitude+'&'+routingTypes
+     },
      routeByWalk() {
-       console.log(this.$root.$event)
-       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+       return this.route(this.routingType.foot)
      },
      routeByBike() {
-       console.log(this.event.place)
-       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
-     },
-     routeByBus() {
-       console.log(this.$root)
-       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+       return this.route(this.routingType.bike)
      },
      routeByCar() {
-       console.log(this.$root)
-       // return this.osm_navigation+this.$root.event.place.details+'&'+this.routingType.bike
+       return this.route(this.routingType.car)
      },
-     route() {
-
-     }
-     // loadMarker(d) {
-     //   this.event = JSON.stringify(d);
-     //
-     //   let newMarker = [{
-     //     id: d.id,
-     //     title: d.title,
-     //     event: JSON.stringify(d),
-     //     description: d.description,
-     //     place: d.place,
-     //     tags: d.tags,
-     //     multidate: d.multidate,
-     //     start_datetime: d.start_datetime,
-     //     end_datetime: d.end_datetime,
-     //     position: { lat: d.place.details.geometry.coordinates[1], lng: d.place.details.geometry.coordinates[0] },
-     //     draggable: false,
-     //     visible: true
-     //   }]
-     //
-     //   this.markers.push.apply(this.markers, newMarker)
-     // },
 
    }
 }
@@ -131,7 +114,7 @@ export default {
   #leaflet-map {
     height: 55vh;
     width: 100%;
-    border-radius: .5rem;
+    border-radius: .3rem;
     border: 1px solid #fff;
     z-index: 1;
   }
diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 75d41da2..fcde2108 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -30,28 +30,38 @@ v-row
       :label="$t('common.address')"
       @change="changeAddress"
       :value="value.address")
-    v-combobox.mr-4(ref='detailsView' v-if='settings.allow_geolocation'
-      :prepend-icon='mdiMapSearch'
-      :disabled='disableDetails'
-      @input.native='searchCoordinates'
-      :label="$t('common.coordinates')"
-      :value='value.detailsView'
-      persistent-hint hide-no-data clearable no-filter
-      :loading='loading'
-      @change='selectDetails'
-      @focus='searchCoordinates'
-      :items="detailsList"
-      :hint="$t('event.coordinates_description')")
-      template(v-slot:item="{ item, attrs, on  }")
-        v-list-item(v-bind='attrs' v-on='on')
-          v-list-item-content(two-line v-if='item')
-            v-list-item-title(v-text='item.display_name')
-            v-list-item-subtitle(v-text='`${item.lat}`+`,`+`${item.lon}`')
-    v-text-field(ref='details' v-if='settings.allow_geolocation')
+  v-col(cols=12 md=6 v-if='settings.allow_geolocation')
+    v-combobox.mr-4(ref='detailsView'
+          :prepend-icon='mdiMapSearch'
+          :disabled='disableDetails'
+          @input.native='searchCoordinates'
+          :label="$t('common.coordinates')"
+          :value='value.detailsView'
+          persistent-hint hide-no-data clearable no-filter
+          :loading='loading'
+          @change='selectDetails'
+          @focus='searchCoordinates'
+          :items="detailsList"
+          :hint="$t('event.coordinates_description')")
+          template(v-slot:item="{ item, attrs, on  }")
+            v-list-item(v-bind='attrs' v-on='on')
+              v-list-item-content(two-line v-if='item')
+                v-list-item-title(v-text='item.display_name')
+                v-list-item-subtitle(v-text='`${item.lat}`+`,`+`${item.lon}`')
+  v-col(cols=12 md=3 v-if='settings.allow_geolocation')
+    v-text-field(ref='latitude' :value='value.latitude'
+          :prepend-icon='mdiLatitude'
+          :disabled='disableDetails'
+          :label="$t('common.latitude')" )
+  v-col(cols=12 md=3 v-if='settings.allow_geolocation')
+    v-text-field(ref='longitude' :value='value.longitude'
+          :prepend-icon='mdiLongitude'
+          :disabled='disableDetails'
+          :label="$t('common.longitude')")
 
 </template>
 <script>
-import { mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch } from '@mdi/js'
+import { mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch, mdiLatitude, mdiLongitude } from '@mdi/js'
 import debounce from 'lodash/debounce'
 import { mapState } from 'vuex'
 
@@ -62,7 +72,7 @@ export default {
   },
   data () {
     return {
-      mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch,
+      mdiMap, mdiMapMarker, mdiPlus, mdiMapSearch, mdiLatitude, mdiLongitude,
       place: { },
       placeName: '',
       places: [],
@@ -112,6 +122,8 @@ export default {
         this.place.address = p.address
         if (this.settings.allow_geolocation) {
           this.place.details = p.details
+          this.place.latitude = p.latitude
+          this.place.longitude = p.longitude
         }
         this.place.id = p.id
         this.disableAddress = true
@@ -130,6 +142,8 @@ export default {
           this.place.address = ''
           if (this.settings.allow_geolocation) {
             this.place.details = p.details
+            this.place.latitude = p.latitude
+            this.place.longitude = p.longitude
           }
           this.disableAddress = false
           this.$refs.place.blur()
@@ -152,6 +166,8 @@ export default {
         c.lon = v.lon
         if (typeof c === 'object') {
           this.place.details = JSON.stringify(c)
+          this.place.latitude = v.lat
+          this.place.longitude = v.lon
         }
       }
       this.$emit('input', { ...this.place })
@@ -161,6 +177,36 @@ export default {
       const pre_searchCoordinates = ev.target.value.trim().toLowerCase()
       // allow pasting coordinates lat/lon
       const searchCoordinates = pre_searchCoordinates.replace('/', ',')
+      // console.log(pre_searchCoordinates)
+
+      var regex_coords_comma = "-?[1-9][0-9]*(\\.[0-9]+)?,\\s*-?[1-9][0-9]*(\\.[0-9]+)?";
+      var regex_coords_slash = "-?[1-9][0-9]*(\\.[0-9]+)?/\\s*-?[1-9][0-9]*(\\.[0-9]+)?";
+
+      const setCoords = (v) => {
+        this.place.latitude = v[0].trim()
+        this.place.longitude = v[1].trim()
+
+        if (this.place.latitude < -90 || this.place.latitude > 90) {
+          // non existent
+        }
+        if (this.place.latitude < -180 || this.place.latitude > 180) {
+          // non existent
+        }
+        
+        this.loading = false;
+      }
+
+      if (pre_searchCoordinates.match(regex_coords_comma)) {
+        let v = pre_searchCoordinates.split(",")
+        setCoords(v)
+        return
+      }
+      if (pre_searchCoordinates.match(regex_coords_slash)) {
+        let v = pre_searchCoordinates.split("/")
+        setCoords(v)
+        return
+      }
+
       if (searchCoordinates.length) {
         this.detailsList = await this.$axios.$get(`placeNominatim/${searchCoordinates}`)
       }
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index 1aa6e9b4..4fab04e9 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -25,12 +25,18 @@ v-container
             v-model='place.address'
             :placeholder='$t("common.address")')
 
-          v-textarea(v-if="settings.allow_geolocation"
-            row-height="15"
-            :disabled="true"
-            :label="$t('common.details')"
-            v-model='place.details'
-            :placeholder='$t("common.details")')
+          v-text-field(v-if="settings.allow_geolocation"
+            :rules="[$validators.required('common.latitude')]"
+            :label="$t('common.latitude')"
+            v-model='place.latitude'
+            :placeholder='$t("common.latitude")')
+
+          v-text-field(v-if="settings.allow_geolocation"
+            :rules="[$validators.required('common.longitude')]"
+            :label="$t('common.longitude')"
+            v-model='place.longitude'
+            :placeholder='$t("common.longitude")')
+
 
       v-card-actions
         v-spacer
@@ -84,7 +90,8 @@ export default {
       this.place.name = item.name
       this.place.address = item.address
       if (this.settings.allow_geolocation) {
-        this.place.details = JSON.parse(item.details)
+        this.place.latitude = item.latitude
+        this.place.longitude = item.longitude
       }
       this.place.id = item.id
       this.dialog = true
diff --git a/locales/en.json b/locales/en.json
index 838d3915..c54d770c 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -91,7 +91,10 @@
         "label": "Label",
         "collections": "Collections",
         "close": "Close",
-        "show_map": "Show map"
+        "show_map": "Show map",
+        "latitude": "Latitude",
+        "longitude": "Longitude",
+        "getting_there": "Getting there"
     },
     "login": {
         "description": "By logging in you can publish new events.",
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index cbfafa86..c18a7ad1 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -135,7 +135,7 @@ export default {
       valid: false,
       openImportDialog: false,
       event: {
-        place: { name: '', address: '', details: {} },
+        place: { name: '', address: '', latitude: null, longitude: null },
         title: '',
         description: '',
         tags: [],
@@ -214,7 +214,8 @@ export default {
       }
       formData.append('place_name', this.event.place.name)
       formData.append('place_address', this.event.place.address)
-      formData.append('place_details', this.event.place.details)
+      formData.append('place_latitude', this.event.place.latitude)
+      formData.append('place_longitude', this.event.place.longitude)
       formData.append('description', this.event.description)
       formData.append('multidate', !!this.date.multidate)
       formData.append('start_datetime', dayjs(this.date.from).unix())
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 431ba257..5e3b1d85 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -35,8 +35,7 @@ v-container#event.pa-0.pa-sm-2
                 v-btn.mt-2(small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
                 v-dialog(v-model='mapModal' :fullscreen='$vuetify.breakpoint.xsOnly' destroy-on-close)
                   v-card
-                    client-only(placeholder='Loading...' )
-                      Map(:event='event')
+                    Map(:event='event')
 
             //- tags, hashtags
             v-card-text.pt-0(v-if='event.tags && event.tags.length')
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 23180051..23bca50d 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -34,7 +34,7 @@ const eventController = {
           Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('address')), 'LIKE', '%' + search + '%')
         ]
       },
-      attributes: [['name', 'label'], 'address', 'details', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']],
+      attributes: [['name', 'label'], 'address', 'latitude', 'longitude', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']],
       include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }],
       group: ['place.id'],
       raw: true
@@ -110,7 +110,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] }
       ],
       replacements,
       limit: 30,
@@ -192,7 +192,7 @@ const eventController = {
         },
         include: [
           { model: Tag, required: false, attributes: ['tag'], through: { attributes: [] } },
-          { model: Place, attributes: ['name', 'address', 'details', 'id'] },
+          { model: Place, attributes: ['name', 'address', 'latitude', 'longitude', 'id'] },
           {
             model: Resource,
             where: !is_admin && { hidden: false },
@@ -406,7 +406,8 @@ const eventController = {
           place = await Place.create({
             name: body.place_name,
             address: body.place_address,
-            details: body.place_details
+            latitude: body.place_latitude,
+            longitude: body.place_longitude
           })
         }
       }
@@ -561,7 +562,8 @@ const eventController = {
           place = await Place.create({
             name: body.place_name,
             address: body.place_address,
-            details: body.place_details
+            latitude: body.place_latitude,
+            longitude: body.place_longitude
           })
         }
       }
@@ -700,7 +702,7 @@ const eventController = {
           attributes: ['tag'],
           through: { attributes: [] }
         },
-        { model: Place, required: true, attributes: ['id', 'name', 'address', 'details'] }
+        { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] }
       ],
       ...pagination,
       replacements
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index d82c208d..c2f7e6a7 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -62,7 +62,7 @@ module.exports = {
           { address: where(fn('LOWER', col('address')), 'LIKE', '%' + search + '%')},
         ]
       },
-      attributes: ['name', 'address', 'details', 'id'],
+      attributes: ['name', 'address', 'latitude', 'longitude', 'id'],
       include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }],
       group: ['place.id'],
       raw: true,
diff --git a/server/api/index.js b/server/api/index.js
index 97c67c53..bc3f088a 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -110,7 +110,8 @@ if (config.status !== 'READY') {
    * @param {string} description - event's description (html accepted and sanitized)
    * @param {string} place_name - the name of the place
    * @param {string} [place_address] - the address of the place
-   * @param {array} [place_details] - the details of the place
+   * @param {float} [place_latitude] - the latitude of the place
+   * @param {float} [place_longitude] - the longitude of the place
    * @param {integer} start_datetime - start timestamp
    * @param {integer} multidate - is a multidate event?
    * @param {array} tags - List of tags
diff --git a/server/api/models/event.js b/server/api/models/event.js
index 3e539db1..75d2067f 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -106,7 +106,8 @@ Event.prototype.toAP = function (username, locale, to = []) {
     location: {
       name: this.place.name,
       address: this.place.address,
-      details: this.place.details
+      latitude: this.place.latitude,
+      longitude: this.place.longitude
     },
     attachment,
     tag: tags && tags.map(tag => ({
diff --git a/server/api/models/place.js b/server/api/models/place.js
index c77ac402..0294599b 100644
--- a/server/api/models/place.js
+++ b/server/api/models/place.js
@@ -11,7 +11,8 @@ Place.init({
     allowNull: false
   },
   address: DataTypes.STRING,
-  details: DataTypes.JSON
+  latitude: DataTypes.FLOAT,
+  longitude: DataTypes.FLOAT,
 }, { sequelize, modelName: 'place' })
 
 module.exports = Place
diff --git a/server/migrations/20220706090946-place-details.js b/server/migrations/20220706090946-place-details.js
index 3dfaf31d..c4c4374e 100644
--- a/server/migrations/20220706090946-place-details.js
+++ b/server/migrations/20220706090946-place-details.js
@@ -8,8 +8,11 @@ module.exports = {
      * Example:
      * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
      */
-     return queryInterface.addColumn('places', 'details', { type: Sequelize.JSON })
-
+     return Promise.all(
+      [
+        await queryInterface.addColumn('places', 'latitude', { type: Sequelize.FLOAT }),
+        await queryInterface.addColumn('places', 'longitude', { type: Sequelize.FLOAT })
+      ])
   },
 
   async down (queryInterface, Sequelize) {
@@ -19,7 +22,10 @@ module.exports = {
      * Example:
      * await queryInterface.dropTable('users');
      */
-     return queryInterface.removeColumn('places', 'details')
-
+     return Promise.all(
+      [
+        await queryInterface.removeColumn('places', 'latitude'),
+        await queryInterface.removeColumn('places', 'longitude')
+      ])
   }
 };

From d55a2c3a3babb48eb3cb1e7abef2fdb68f84c467 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 18 Oct 2022 16:49:54 +0200
Subject: [PATCH 05/10] allowgeoloc: don't show show-map button if event has no
 coords

---
 pages/event/_slug.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 5e3b1d85..b60bd31d 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -32,7 +32,7 @@ v-container#event.pa-0.pa-sm-2
                 v-icon(v-text='mdiMapMarker')
                 nuxt-link.vcard.ml-2.p-name.text-decoration-none(itemprop="name" :to='`/place/${event.place.name}`') {{event.place && event.place.name}}
                 .text-subtitle-1.p-street-address(itemprop='address') {{event.place && event.place.address}}
-                v-btn.mt-2(small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
+                v-btn.mt-2(v-if='event.place.latitude && event.place.longitude' small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
                 v-dialog(v-model='mapModal' :fullscreen='$vuetify.breakpoint.xsOnly' destroy-on-close)
                   v-card
                     Map(:event='event')

From ddf5f295d3ae3293724baaa994b0dff13e4bd857 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 28 Oct 2022 04:34:11 +0200
Subject: [PATCH 06/10] allowgeoloc: add links of routes by type in event map
 dialog

---
 components/Map.vue | 50 ++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/components/Map.vue b/components/Map.vue
index 8b9ae21d..19ed9fe0 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -22,11 +22,11 @@ client-only(placeholder='Loading...' )
         v-text.mx-2(v-text="`${event.place.address}`")
       v-text.my-4(v-text="$t('common.getting_there')")
       v-row
-        v-btn.ml-2(icon large :href="routeByWalk()")
+        v-btn.ml-2(icon large :href="routeBy('foot')")
           v-icon(v-text='mdiWalk' color='white')
-        v-btn.ml-2(icon large :href="routeByBike()")
+        v-btn.ml-2(icon large :href="routeBy('bike')")
           v-icon(v-text='mdiBike' color='white')
-        v-btn.ml-2(icon large :href="routeByCar()")
+        v-btn.ml-2(icon large :href="routeBy('car')")
           v-icon(v-text='mdiCar' color='white')
 
 </template>
@@ -48,7 +48,6 @@ export default {
    data ({ $store }) {
      return {
        mdiWalk, mdiBike, mdiCar, mdiMapMarker,
-       // url: "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png",
        url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
        attribution:
          '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
@@ -60,12 +59,7 @@ export default {
            coordinates: {lat: this.event.place.latitude, lon: this.event.place.longitude}
          }
        ],
-       osm_navigation: 'https://www.openstreetmap.org/directions?from=&to=',
-       routingType: {
-         foot: "engine=fossgis_osrm_foot",
-         bike: "engine=fossgis_osrm_bike",
-         car: "engine=fossgis_osrm_car"
-       }
+       routingProvider: 'openstreetmap'
      }
    },
    props: {
@@ -93,19 +87,31 @@ export default {
           event.target.openPopup();
         });
       },
-     route (routingTypes) {
-       return this.osm_navigation+this.event.place.latitude+','+this.event.place.longitude+'&'+routingTypes
-     },
-     routeByWalk() {
-       return this.route(this.routingType.foot)
-     },
-     routeByBike() {
-       return this.route(this.routingType.bike)
-     },
-     routeByCar() {
-       return this.route(this.routingType.car)
-     },
 
+      routeBy(routingType) {
+        const lat = this.event.place.latitude
+        const lon = this.event.place.longitude
+        switch (this.routingProvider) {
+          case 'google_maps':
+            const routingTypes = {
+              foot: "dirflg=w",
+              bike: "dirflg=b",
+              transit: "dirflg=r",
+              car: "driving"
+            }
+            return `https://maps.google.com/?saddr=Current+Location&daddr=${lat},${lon}&${routingTypes[routingType]}`;
+          case 'openstreetmap':
+          default: {
+            const routingTypes = {
+              foot: "engine=fossgis_osrm_foot",
+              bike: "engine=fossgis_osrm_bike",
+              transit: null,
+              car: "engine=fossgis_osrm_car"
+            }
+            return `https://www.openstreetmap.org/directions?from=&to=${lat},${lon}&${routingTypes[routingType]}#map=14/${lat}/${lon}`
+          }
+        }
+     },
    }
 }
 </script>

From 6a7205ed3462a26c2025d79d4ead2ac86dce57db Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 28 Oct 2022 04:36:39 +0200
Subject: [PATCH 07/10] allowgeoloc: trim placename before submit as issue 189
 reported

---
 pages/add/_edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index c18a7ad1..1e9377d3 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -212,7 +212,7 @@ export default {
       if (this.event.place.id) {
         formData.append('place_id', this.event.place.id)
       }
-      formData.append('place_name', this.event.place.name)
+      formData.append('place_name', this.event.place.name.trim())
       formData.append('place_address', this.event.place.address)
       formData.append('place_latitude', this.event.place.latitude)
       formData.append('place_longitude', this.event.place.longitude)

From ca6a0ea58f699e97898fe1fa8c8daa0692e78e4b Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 28 Oct 2022 08:27:47 +0200
Subject: [PATCH 08/10] center map in dialog delaying popup, add validation of
 coordinates in /add, fix loading feedback in searchCoordinates field

---
 components/Map.vue        | 157 ++++++++++++++++++++------------------
 components/WhereInput.vue |  30 ++++----
 pages/event/_slug.vue     |   2 +-
 3 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/components/Map.vue b/components/Map.vue
index 19ed9fe0..9846c9cc 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -19,8 +19,8 @@ client-only(placeholder='Loading...' )
       .text-h6
         v-icon(v-text='mdiMapMarker' )
         nuxt-link.ml-2.p-name.text-decoration-none(v-text="event.place.name" :to='`/place/${event.place.name}`')
-        v-text.mx-2(v-text="`${event.place.address}`")
-      v-text.my-4(v-text="$t('common.getting_there')")
+        p.mx-2(v-text="`${event.place.address}`")
+      p.my-4(v-text="$t('common.getting_there')")
       v-row
         v-btn.ml-2(icon large :href="routeBy('foot')")
           v-icon(v-text='mdiWalk' color='white')
@@ -32,87 +32,94 @@ client-only(placeholder='Loading...' )
 </template>
 <script>
 
-import "leaflet/dist/leaflet.css";
-import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet';
+import "leaflet/dist/leaflet.css"
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
 import { mapActions, mapState } from 'vuex'
-import { Icon } from 'leaflet';
+import { Icon } from 'leaflet'
 import { mdiWalk, mdiBike, mdiCar, mdiMapMarker } from '@mdi/js'
 
 export default {
-   components: {
-     LMap,
-     LTileLayer,
-     LMarker,
-     LPopup
-   },
-   data ({ $store }) {
-     return {
-       mdiWalk, mdiBike, mdiCar, mdiMapMarker,
-       url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-       attribution:
-         '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
-       zoom: 14,
-       center: [this.event.place.latitude, this.event.place.longitude],
-       markers: [
-         {
-           address: this.event.place.address,
-           coordinates: {lat: this.event.place.latitude, lon: this.event.place.longitude}
-         }
-       ],
-       routingProvider: 'openstreetmap'
+  components: {
+    LMap,
+    LTileLayer,
+    LMarker,
+    LPopup
+  },
+  data ({ $store }) {
+  return {
+    mdiWalk, mdiBike, mdiCar, mdiMapMarker,
+    url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution:
+     '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
+    zoom: 14,
+    center: [this.event.place.latitude, this.event.place.longitude],
+    markers: [
+     {
+       address: this.event.place.address,
+       coordinates: {lat: this.event.place.latitude, lon: this.event.place.longitude}
      }
-   },
-   props: {
-     event: { type: Object, default: () => ({}) }
-   },
-   mounted() {
-     delete Icon.Default.prototype._getIconUrl;
-     Icon.Default.mergeOptions({
-       iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
-       iconUrl: require('leaflet/dist/images/marker-icon.png'),
-       shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
-     });
+    ],
+    routingProvider: 'openstreetmap',
+    }
+  },
+  props: {
+    event: { type: Object, default: () => ({}) }
+  },
+  mounted() {
+    delete Icon.Default.prototype._getIconUrl;
+    Icon.Default.mergeOptions({
+      iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+      iconUrl: require('leaflet/dist/images/marker-icon.png'),
+      shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+    });
 
-     setTimeout(() => {
-       this.$refs.map.mapObject.invalidateSize();
-     }, 200);
-   },
-   computed: {
-     ...mapState(['settings']),
-   },
-   methods: {
-     ...mapActions(['setSetting']),
-     openPopup(event) {
-        this.$nextTick(() => {
-          event.target.openPopup();
-        });
-      },
-
-      routeBy(routingType) {
-        const lat = this.event.place.latitude
-        const lon = this.event.place.longitude
-        switch (this.routingProvider) {
-          case 'google_maps':
-            const routingTypes = {
-              foot: "dirflg=w",
-              bike: "dirflg=b",
-              transit: "dirflg=r",
-              car: "driving"
-            }
-            return `https://maps.google.com/?saddr=Current+Location&daddr=${lat},${lon}&${routingTypes[routingType]}`;
-          case 'openstreetmap':
-          default: {
-            const routingTypes = {
-              foot: "engine=fossgis_osrm_foot",
-              bike: "engine=fossgis_osrm_bike",
-              transit: null,
-              car: "engine=fossgis_osrm_car"
-            }
-            return `https://www.openstreetmap.org/directions?from=&to=${lat},${lon}&${routingTypes[routingType]}#map=14/${lat}/${lon}`
-          }
+    setTimeout(() => {
+      this.$refs.map.mapObject.invalidateSize();
+    }, 200);
+  },
+  computed: {
+    ...mapState(['settings']),
+  },
+  methods: {
+    ...mapActions(['setSetting']),
+    openPopup(event) {
+      setTimeout(() => {
+        event.target.openPopup();
+      }, 200);
+    },
+    mountLocateControl() {
+      this.$refs.map.mapObject.locate({
+        locateOptions: {
+          maxZoom: 10
         }
+      });
+      this.$refs.map.mapObject.MyLocate();
+    },
+    routeBy(routingType) {
+      const lat = this.event.place.latitude
+      const lon = this.event.place.longitude
+      switch (this.routingProvider) {
+        case 'google_maps':
+          const routingTypes = {
+            foot: "dirflg=w",
+            bike: "dirflg=b",
+            transit: "dirflg=r",
+            car: "driving"
+          }
+          return `https://maps.google.com/?saddr=Current+Location&daddr=${lat},${lon}&${routingTypes[routingType]}`;
+        case 'openstreetmap':
+        default: {
+          const routingTypes = {
+            foot: "engine=fossgis_osrm_foot",
+            bike: "engine=fossgis_osrm_bike",
+            transit: null,
+            car: "engine=fossgis_osrm_car"
+          }
+          return `https://www.openstreetmap.org/directions?from=&to=${lat},${lon}&${routingTypes[routingType]}#map=14/${lat}/${lon}`
+        }
+      }
      },
-   }
+  }
 }
 </script>
 
diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index fcde2108..fa9ec92d 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -173,27 +173,24 @@ export default {
       this.$emit('input', { ...this.place })
     },
     searchCoordinates: debounce(async function(ev) {
-      this.loading = true
       const pre_searchCoordinates = ev.target.value.trim().toLowerCase()
-      // allow pasting coordinates lat/lon
+      // allow pasting coordinates lat/lon and lat,lon
       const searchCoordinates = pre_searchCoordinates.replace('/', ',')
-      // console.log(pre_searchCoordinates)
-
       var regex_coords_comma = "-?[1-9][0-9]*(\\.[0-9]+)?,\\s*-?[1-9][0-9]*(\\.[0-9]+)?";
       var regex_coords_slash = "-?[1-9][0-9]*(\\.[0-9]+)?/\\s*-?[1-9][0-9]*(\\.[0-9]+)?";
 
       const setCoords = (v) => {
-        this.place.latitude = v[0].trim()
-        this.place.longitude = v[1].trim()
-
-        if (this.place.latitude < -90 || this.place.latitude > 90) {
-          // non existent
+        const lat = v[0].trim()
+        const lon = v[1].trim()
+        // check coordinates are valid
+        if ((lat < 90 && lat > -90)
+        && (lon < 180 && lon > -180)) {
+          this.place.latitude = lat
+          this.place.longitude = lon
+        } else {
+          this.$root.$message("Non existent coordinates", { color: 'error' })
+          return
         }
-        if (this.place.latitude < -180 || this.place.latitude > 180) {
-          // non existent
-        }
-        
-        this.loading = false;
       }
 
       if (pre_searchCoordinates.match(regex_coords_comma)) {
@@ -208,10 +205,9 @@ export default {
       }
 
       if (searchCoordinates.length) {
+        this.loading = true
         this.detailsList = await this.$axios.$get(`placeNominatim/${searchCoordinates}`)
-      }
-      if (this.detailsList) {
-        this.loading = false;
+        this.loading = false
       }
     }, 300),
   }
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index b60bd31d..3cc1f86a 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -32,7 +32,7 @@ v-container#event.pa-0.pa-sm-2
                 v-icon(v-text='mdiMapMarker')
                 nuxt-link.vcard.ml-2.p-name.text-decoration-none(itemprop="name" :to='`/place/${event.place.name}`') {{event.place && event.place.name}}
                 .text-subtitle-1.p-street-address(itemprop='address') {{event.place && event.place.address}}
-                v-btn.mt-2(v-if='event.place.latitude && event.place.longitude' small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
+                v-btn.mt-2(v-if='settings.allow_geolocation && event.place.latitude && event.place.longitude' small v-text="$t('common.show_map')" :aria-label="$t('common.show_map')" @click="mapModal = true")
                 v-dialog(v-model='mapModal' :fullscreen='$vuetify.breakpoint.xsOnly' destroy-on-close)
                   v-card
                     Map(:event='event')

From 7fdc6ca07f9957126ae2ac183c522722384d99c7 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 11 Nov 2022 06:01:50 +0100
Subject: [PATCH 09/10] allowgeoloc: add translations, fix padding in
 whereinput, center text in show-map dialog

---
 components/Map.vue        |   2 +-
 components/WhereInput.vue |   8 +-
 locales/ca.json           |   9 +-
 locales/de.json           |   9 +-
 locales/en.json           |   4 +-
 locales/es.json           |   9 +-
 locales/fr.json           |   9 +-
 locales/gl.json           |   9 +-
 locales/it.json           |   9 +-
 locales/nb.json           |   9 +-
 package.json              |   6 +-
 tests/app.test.js         |   6 ++
 yarn.lock                 | 186 +++++++++++++++++++++++++++++++++++---
 13 files changed, 245 insertions(+), 30 deletions(-)

diff --git a/components/Map.vue b/components/Map.vue
index 9846c9cc..0bad64d9 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -15,7 +15,7 @@ client-only(placeholder='Loading...' )
         :lat-lng="item.coordinates")
         LPopup(:content="item.address")
 
-    v-row.my-4.d-flex.flex-column.align-center
+    v-row.my-4.d-flex.flex-column.align-center.text-center
       .text-h6
         v-icon(v-text='mdiMapMarker' )
         nuxt-link.ml-2.p-name.text-decoration-none(v-text="event.place.name" :to='`/place/${event.place.name}`')
diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index fa9ec92d..ff617924 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -1,5 +1,5 @@
-<template lang="pug">
-v-row
+event.coordinates_search<template lang="pug">
+v-row.mb-4
   v-col(cols=12 md=6)
     v-combobox(ref='place'
       :rules="[$validators.required('common.where')]"
@@ -35,14 +35,14 @@ v-row
           :prepend-icon='mdiMapSearch'
           :disabled='disableDetails'
           @input.native='searchCoordinates'
-          :label="$t('common.coordinates')"
+          :label="$t('event.coordinates_search')"
           :value='value.detailsView'
           persistent-hint hide-no-data clearable no-filter
           :loading='loading'
           @change='selectDetails'
           @focus='searchCoordinates'
           :items="detailsList"
-          :hint="$t('event.coordinates_description')")
+          :hint="$t('event.coordinates_search_description')")
           template(v-slot:item="{ item, attrs, on  }")
             v-list-item(v-bind='attrs' v-on='on')
               v-list-item-content(two-line v-if='item')
diff --git a/locales/ca.json b/locales/ca.json
index 25467f93..c0ccd6a7 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -89,7 +89,11 @@
         "max_events": "Nre. màx. d'activitats",
         "close": "Tanca",
         "blobs": "Blobs",
-        "collections": "Coŀleccions"
+        "collections": "Coŀleccions",
+        "show_map": "Mostra el mapa",
+        "latitude": "Latitud",
+        "longitude": "Longitud",
+        "getting_there": "Com arribar"
     },
     "login": {
         "description": "Amb la sessió iniciada pots afegir activitats noves.",
@@ -128,6 +132,8 @@
         "added": "S'ha afegit l'activitat",
         "added_anon": "S'ha afegit l'activitat però encara ha de ser confirmada.",
         "where_description": "On es farà? Si no està posat, escriu-ho i prem Enter.",
+        "coordinates_search": "Cerca de coordenades",
+        "coordinates_search_description": "Podeu cercar el lloc pel nom o enganxar el parell de coordenades",
         "confirmed": "S'ha confirmat l'activitat",
         "not_found": "No s'ha trobat l'activitat",
         "remove_confirmation": "Segur que vols esborrar l'activitat?",
@@ -179,6 +185,7 @@
         "allow_registration_description": "Vols deixar el registre obert?",
         "allow_anon_event": "Vols permetre activitats anònimes (s'han de confirmar manualment)?",
         "allow_recurrent_event": "Habilitar activitats periòdiques",
+        "allow_geolocation": "Habilitar la geolocalització d' esdeveniments",
         "recurrent_event_visible": "Mostra per defecte les activitats periòdiques",
         "federation": "Federació / ActivityPub",
         "enable_federation": "Activa la federació",
diff --git a/locales/de.json b/locales/de.json
index 1761976b..250f8d7b 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -88,7 +88,11 @@
         "associate": "Partner:in",
         "collections": "Sammlungen",
         "max_events": "Maximale Anzahl an Veranstaltungen",
-        "close": "Schließe"
+        "close": "Schließe",
+        "show_map": "Karte anzeigen",
+        "latitude": "Breite",
+        "longitude": "Länge",
+        "getting_there": "Anreise"
     },
     "admin": {
         "delete_footer_link_confirm": "Möchtest du diesen Link löschen?",
@@ -155,6 +159,7 @@
         "enable_federation": "Federation aktivieren",
         "allow_anon_event": "Kann man auch anonyme Veranstaltungen (vorausgesetzt, diese werden genehmigt) eintragen?",
         "allow_registration_description": "Möchtest du die Registrierung aktivieren?",
+        "allow_geolocation": "Aktivieren der Ereignis-Geolokalisierung",
         "federation": "Föderation / ActivityPub",
         "enable_federation_help": "Bei Aktivierung kann diese Instanz vom Fediverse aus verfolgt werden",
         "add_instance": "Instanz hinzufügen",
@@ -229,6 +234,8 @@
         "remove_recurrent_confirmation": "Bist du dir sicher, dass du diese wiederkehrende Veranstaltung entfernen möchtest?\nFrühere Veranstaltungen werden beibehalten, aber es werden keine zukünftigen Veranstaltungen mehr hinzugefügt.",
         "anon_description": "Du kannst eine Veranstaltung hinzufügen, ohne dich zu registrieren oder anzumelden,\nmusst dann aber warten, bis jemand es liest und bestätigt, dass es eine zulässige Veranstaltung ist.\nEs ist nicht möglich, den Eintrag zu verändern.<br/><br/>\nDu kannst dich stattdessen <a href='/login'>anmelden</a> oder <a href='/register'>registrieren</a>. In diesem Fall solltest du so schnell wie möglich eine Antwort erhalten. ",
         "where_description": "Wo ist die Veranstaltung? Wenn der Ort noch nicht beschrieben wurde, kannst du ihn selbst eintragen.",
+        "coordinates_search": "Suche nach Koordinaten",
+        "coordinates_search_description": "Sie können den Ort anhand des Namens suchen oder das Koordinatenpaar einfügen.",
         "follow_me_description": "Eine Möglichkeit, über die hier auf {title} veröffentlichten Veranstaltungen auf dem Laufenden zu bleiben, besteht darin, dem Account <u>{account}</u> aus dem Fediverse zu folgen, zum Beispiel über Mastodon, und von dort aus eventuell Ressourcen für eine Veranstaltung hinzuzufügen.<br/><br/>\nWenn Du noch nie von Mastodon und dem Fediverse gehört hast, empfehlen wir dir, diesen Artikel <a href='https://www.savjee.be/videos/simply-explained/mastodon-and-fediverse-explained/'> zu lesen</a>.<br/><br/>Gib unten deine Instanz ein (z.B. mastodon.social)",
         "media_description": "Du kannst (optional) einen Flyer hinzufügen",
         "edit_recurrent": "Bearbeite eine sich wiederholende Veranstaltung :",
diff --git a/locales/en.json b/locales/en.json
index c54d770c..01815899 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -6,7 +6,6 @@
         "send": "Send",
         "where": "Where",
         "address": "Address",
-        "coordinates": "Coordinates",
         "details": "Details",
         "when": "When",
         "what": "What",
@@ -135,7 +134,8 @@
         "added_anon": "Event added, but has yet to be confirmed.",
         "updated": "Event updated",
         "where_description": "Where's the event? If not present you can create it.",
-        "coordinates_description": "You can search the place by name, or paste the coordinates separated by comma: lat,lon",
+        "coordinates_search": "Coordinates search",
+        "coordinates_search_description": "You can search for the place by name, or paste the coordinate pair",
         "confirmed": "Event confirmed",
         "not_found": "Could not find event",
         "remove_confirmation": "Are you sure you want to remove this event?",
diff --git a/locales/es.json b/locales/es.json
index f23670bd..b9e86e6c 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -87,7 +87,11 @@
         "reset": "Reset",
         "theme": "Tema",
         "label": "Etiqueta",
-        "max_events": "Número de eventos máximo"
+        "max_events": "Número de eventos máximo",
+        "show_map": "Mostrar mapa",
+        "latitude": "Latitud",
+        "longitude": "Longitud",
+        "getting_there": "Cómo llegar"
     },
     "login": {
         "description": "Entrando podrás publicar nuevos eventos.",
@@ -126,6 +130,8 @@
         "added": "Evento agregado",
         "added_anon": "Evento agregado, será confirmado cuanto antes.",
         "where_description": "¿Dónde es? Si el lugar no está, escribilo.",
+        "coordinates_search": "Buscar coordenadas",
+        "coordinates_search_description": "Puede buscar el lugar por nombre o pegar el par de coordenadas.",
         "confirmed": "Evento confirmado",
         "not_found": "Evento no encontrado",
         "remove_confirmation": "¿Estás seguro/a de querér eliminar este evento?",
@@ -174,6 +180,7 @@
         "allow_anon_event": "¿Se pueden ingresar eventos anónimos (sujeto a confirmación)?",
         "allow_comments": "Habilitar comentarios",
         "allow_recurrent_event": "Habilitar eventos fijos",
+        "allow_geolocation": "Habilitar la geolocalización de eventos",
         "recurrent_event_visible": "Eventos fijos visibles por defecto",
         "federation": "Federación / ActivityPub",
         "enable_federation": "Habilitar la federación",
diff --git a/locales/fr.json b/locales/fr.json
index ab9fbea2..cc487d57 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -89,7 +89,11 @@
         "max_events": "Nb. max d'événements",
         "blobs": "Blobs",
         "close": "Fermer",
-        "collections": "Collections"
+        "collections": "Collections",
+        "show_map": "Afficher la carte",
+        "latitude": "Latitude",
+        "longitude": "Longitude",
+        "getting_there": "Comment s'y rendre"
     },
     "event": {
         "follow_me_description": "Une des manières de rester informé sur les évènements publiés ici sur {title}\nest de suivre le compte <u>{account}</u> sur le fediverse, par exemple via Mastodon, et pourquoi pas d'ajouter des ressources à un évènement à partir de là.<br/><br/>\nSi vous n'avez jamais entendu parler de Mastodon and du fediverse, nous vous recommandons de lire <a href='https://www.savjee.be/videos/simply-explained/mastodon-and-fediverse-explained/'>cet article (en anglais)</a>.<br/><br/>Saisissez votre nom d'instance ci-dessous (par ex. mastodon.social)",
@@ -119,6 +123,8 @@
         "not_found": "Impossible de trouver l'évènement",
         "confirmed": "Évènement confirmé",
         "where_description": "Où est l'évènement ? S'il n'apparaît pas, vous pouvez le créer.",
+        "coordinates_search": "Recherche de coordonnées",
+        "coordinates_search_description": "Vous pouvez rechercher le lieu par son nom ou coller la paire de coordonnées",
         "added_anon": "Évènement ajouté, mais il doit encore être confirmé.",
         "added": "Évènement ajouté",
         "media_description": "Vous pouvez ajouter un tract (facultatif)",
@@ -204,6 +210,7 @@
         "allow_recurrent_event": "Autoriser les évènements récurrents",
         "allow_anon_event": "Autoriser les évènements anonymes (doivent être confirmés) ?",
         "allow_registration_description": "Autoriser l'ouverture des inscriptions ?",
+        "allow_geolocation": "Autoriser la géolocalisation des événements",
         "user_create_ok": "Utilisateur créé",
         "user_remove_ok": "Utilisateur supprimé",
         "delete_user_confirm": "Êtes-vous sûr·e de vouloir supprimer {user} ?",
diff --git a/locales/gl.json b/locales/gl.json
index 2761b181..6cab9cf1 100644
--- a/locales/gl.json
+++ b/locales/gl.json
@@ -89,7 +89,11 @@
         "tags": "Cancelos",
         "close": "Pechar",
         "blobs": "Blobs",
-        "collections": "Coleccións"
+        "collections": "Coleccións",
+        "show_map": "Mostrar mapa",
+        "latitude": "Latitude",
+        "longitude": "Longitude",
+        "getting_there": "Chegar lá"
     },
     "recover": {
         "not_valid_code": "Algo fallou."
@@ -114,6 +118,8 @@
         "saved": "Evento gardado",
         "updated": "Evento actualizado",
         "where_description": "Onde será o evento? Se non existe podes crealo.",
+        "coordinates_search": "Procurar coordenadas",
+        "coordinates_search_description": "Pode procurar o lugar pelo nome ou colar o par de coordenadas.",
         "not_found": "Non atopamos o evento",
         "show_recurrent": "eventos recurrentes",
         "show_past": "tamén eventos previos",
@@ -187,6 +193,7 @@
         "resources": "Recursos",
         "allow_registration_description": "Permitir o rexistro libre?",
         "allow_anon_event": "Permitir eventos anónimos (haberá que confirmalos)?",
+        "allow_geolocation": "Permitir a geolocalização de eventos",
         "event_confirm_description": "Aquí podes confirmar os eventos engadidos por usuarias anónimas",
         "remove_admin": "Eliminar admin",
         "delete_user": "Eliminar",
diff --git a/locales/it.json b/locales/it.json
index 53c5a401..1851df01 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -87,7 +87,11 @@
         "import": "Importa",
         "max_events": "N. massimo eventi",
         "label": "Etichetta",
-        "collections": "Bolle"
+        "collections": "Bolle",
+        "show_map": "Show map",
+        "latitude": "Latitudine",
+        "longitude": "Longitudine",
+        "getting_there": "Come arrivare"
     },
     "login": {
         "description": "Entrando puoi pubblicare nuovi eventi.",
@@ -128,6 +132,8 @@
         "added_anon": "Evento aggiunto, verrà confermato quanto prima.",
         "updated": "Evento aggiornato",
         "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.",
+        "coordinates_search": "Ricerca coordinate",
+        "coordinates_search_description": "Puoi ricercare il posto per nome, o incollare la coppia di coordinate.",
         "confirmed": "Evento confermato",
         "not_found": "Evento non trovato",
         "remove_confirmation": "Vuoi eliminare questo evento?",
@@ -178,6 +184,7 @@
         "allow_registration_description": "Vuoi abilitare la registrazione?",
         "allow_anon_event": "Si possono inserire eventi anonimi (previa conferma)?",
         "allow_recurrent_event": "Abilita eventi ricorrenti",
+        "allow_geolocation": "Abilita la geolocalizzazione degli eventi",
         "recurrent_event_visible": "Appuntamenti ricorrenti visibili di default",
         "federation": "Federazione / ActivityPub",
         "enable_federation": "Abilita la federazione",
diff --git a/locales/nb.json b/locales/nb.json
index 2b634ace..7ed008d6 100644
--- a/locales/nb.json
+++ b/locales/nb.json
@@ -81,6 +81,7 @@
         "allow_recurrent_event": "Tillat gjentagende hendelser",
         "allow_anon_event": "Tillat anonyme hendelser (må bekreftes)?",
         "allow_registration_description": "Tillat selv-registrering?",
+        "allow_geolocation": "Tillat geolokalisering av hendelser",
         "event_confirm_description": "Du kan bekrefte hendelser som oppføres av anonyme brukere her",
         "place_description": "Hvis du har valgt feil sted eller adresse, kan du endre det. <br/>Alle nåværende og foregående hendelser tilknyttet dette stedet vil endre adresse."
     },
@@ -119,6 +120,8 @@
         "recurrent_2w_days": "En {days} annenhver",
         "multidate_description": "Er det en festival? Velg når den starter og slutter",
         "where_description": "Hvor finner hendelsen sted? Hvis den ikke finnes kan du opprette den.",
+        "coordinates_search": "Søk etter koordinater",
+        "coordinates_search_description": "Du kan søke etter sted etter navn, eller lime inn koordinatparet.",
         "added_anon": "Hendelse lagt til, men ikke bekreftet enda.",
         "added": "Hendelse lagt til",
         "media_description": "Du kan legge til et flygeblad (valgfritt)",
@@ -232,7 +235,11 @@
         "federation": "Føderasjon",
         "n_resources": "ingen ressurs|én ressurs|{n} ressurser",
         "associate": "Tilknytt",
-        "import": "Importer"
+        "import": "Importer",
+        "show_map": "Vis kart",
+        "latitude": "breddegrad",
+        "longitude": "Lengdegrad",
+        "getting_there": "Slik kommer du deg dit"
     },
     "about": "\n  <p><a href='https://gancio.org'>Gancio</a> er en delt agenda for lokale gemenskaper.</p>\n  ",
     "validators": {
diff --git a/package.json b/package.json
index 21e88d3d..c86fd7d1 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,8 @@
     "https-proxy-agent": "^5.0.1",
     "ical.js": "^1.5.0",
     "ics": "^2.40.0",
-    "jsdom": "^20.0.0",
+    "jest-environment-jsdom": "^29.3.1",
+    "jsdom": "^20.0.2",
     "jsonwebtoken": "^8.5.1",
     "leaflet": "^1.8.0",
     "linkify-html": "^4.0.0",
@@ -99,6 +100,9 @@
     "glob-parent": "^5.1.2",
     "moment": "^2.29.2"
   },
+  "jest": {
+    "testEnvironment": "jsdom"
+  },
   "bin": {
     "gancio": "server/cli.js"
   },
diff --git a/tests/app.test.js b/tests/app.test.js
index b4dcfd6c..43f34069 100644
--- a/tests/app.test.js
+++ b/tests/app.test.js
@@ -4,11 +4,17 @@ const path = require('path')
 
 const admin = { username: 'admin', password: 'test', grant_type: 'password', client_id: 'self' }
 
+var util= require('util');
+var encoder = new util.TextEncoder('utf-8');
+
+jest.useFakeTimers()
+
 let token
 let app
 let places = []
 
 beforeAll(async () => {
+
   switch (process.env.DB) {
     case 'mariadb':
       process.env.config_path = path.resolve(__dirname, './seeds/config.mariadb.json')
diff --git a/yarn.lock b/yarn.lock
index 288a491b..b3fc2f16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1084,6 +1084,16 @@
     "@types/node" "*"
     jest-mock "^29.1.1"
 
+"@jest/environment@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6"
+  integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==
+  dependencies:
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/node" "*"
+    jest-mock "^29.3.1"
+
 "@jest/expect-utils@^29.1.0":
   version "29.1.0"
   resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.1.0.tgz#598cc7fea83b1bf84249b3b98683575cee888894"
@@ -1111,6 +1121,18 @@
     jest-mock "^29.1.1"
     jest-util "^29.1.0"
 
+"@jest/fake-timers@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67"
+  integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==
+  dependencies:
+    "@jest/types" "^29.3.1"
+    "@sinonjs/fake-timers" "^9.1.2"
+    "@types/node" "*"
+    jest-message-util "^29.3.1"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
+
 "@jest/globals@^29.1.1":
   version "29.1.1"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.1.1.tgz#017cffa0e79b35e7197b229d852c9ad35ed4be5c"
@@ -1221,6 +1243,18 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jest/types@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
+  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -1900,6 +1934,15 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/jsdom@^20.0.0":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
+  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -1967,6 +2010,11 @@
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
   integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
 
+"@types/tough-cookie@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
 "@types/uglify-js@*":
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.0.tgz#95271e7abe0bf7094c60284f76ee43232aef43b9"
@@ -2323,12 +2371,20 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
+  dependencies:
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
+
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.2.0:
+acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -2348,6 +2404,11 @@ acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
+acorn@^8.1.0, acorn@^8.8.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -4272,6 +4333,11 @@ decimal.js@^10.3.1:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.1.tgz#be75eeac4a2281aace80c1a8753587c27ef053e7"
   integrity sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw==
 
+decimal.js@^10.4.1:
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
+  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -6819,6 +6885,20 @@ jest-each@^29.1.0:
     jest-util "^29.1.0"
     pretty-format "^29.1.0"
 
+jest-environment-jsdom@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639"
+  integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==
+  dependencies:
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/jsdom" "^20.0.0"
+    "@types/node" "*"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
+    jsdom "^20.0.0"
+
 jest-environment-node@^29.1.1:
   version "29.1.1"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.1.1.tgz#10f1782b74e17fcf782ff51df79f2b0cee135851"
@@ -6888,6 +6968,21 @@ jest-message-util@^29.1.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb"
+  integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.3.1"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.3.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^29.1.1:
   version "29.1.1"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.1.1.tgz#b5475d07a8db6d39fe73e960ca94a3ac761afe0d"
@@ -6897,6 +6992,15 @@ jest-mock@^29.1.1:
     "@types/node" "*"
     jest-util "^29.1.0"
 
+jest-mock@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e"
+  integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==
+  dependencies:
+    "@jest/types" "^29.3.1"
+    "@types/node" "*"
+    jest-util "^29.3.1"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
@@ -7027,6 +7131,18 @@ jest-util@^29.1.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
+  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
+  dependencies:
+    "@jest/types" "^29.3.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-validate@^29.1.0:
   version "29.1.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.1.0.tgz#5e2ba89d7d6b3e4d3ece34024f317e956a5c85c0"
@@ -7157,6 +7273,38 @@ jsdom@^20.0.0:
     ws "^8.8.0"
     xml-name-validator "^4.0.0"
 
+jsdom@^20.0.2:
+  version "20.0.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db"
+  integrity sha512-AHWa+QO/cgRg4N+DsmHg1Y7xnz+8KU3EflM0LVDTdmrYOc1WWTSkOjtpUveQH+1Bqd5rtcVnb/DuxV/UjDO4rA==
+  dependencies:
+    abab "^2.0.6"
+    acorn "^8.8.0"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
+    cssstyle "^2.3.0"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.1"
+    domexception "^4.0.0"
+    escodegen "^2.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^3.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.9.0"
+    xml-name-validator "^4.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -8533,7 +8681,7 @@ nuxt-edge@2.16.0-27720022.54e852f:
     "@nuxt/vue-renderer-edge" "2.16.0-27720022.54e852f"
     "@nuxt/webpack-edge" "2.16.0-27720022.54e852f"
 
-nwsapi@^2.2.0:
+nwsapi@^2.2.0, nwsapi@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
   integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
@@ -8879,7 +9027,7 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^7.0.0:
+parse5@^7.0.0, parse5@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
   integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
@@ -9823,6 +9971,15 @@ pretty-format@^29.1.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da"
+  integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-time@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e"
@@ -10777,11 +10934,6 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -11895,7 +12047,7 @@ totalist@^1.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
-tough-cookie@^4.0.0:
+tough-cookie@^4.0.0, tough-cookie@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
   integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
@@ -12484,10 +12636,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
@@ -12726,11 +12876,12 @@ winston-transport@^4.4.0, winston-transport@^4.5.0:
     readable-stream "^3.6.0"
     triple-beam "^1.3.0"
 
-winston@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.1.tgz#76f15b3478cde170b780234e0c4cf805c5a7fb57"
-  integrity sha512-r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w==
+winston@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50"
+  integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==
   dependencies:
+    "@colors/colors" "1.5.0"
     "@dabh/diagnostics" "^2.0.2"
     async "^3.2.3"
     is-stream "^2.0.0"
@@ -12824,6 +12975,11 @@ ws@^8.8.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
   integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
 
+ws@^8.9.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"

From 7e3815cc7e4f3a57bdfe918030b72e00b5fb45c4 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 11 Nov 2022 06:15:34 +0100
Subject: [PATCH 10/10] allowgeoloc: remove tests drafts

---
 tests/app.test.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/app.test.js b/tests/app.test.js
index 43f34069..87b24897 100644
--- a/tests/app.test.js
+++ b/tests/app.test.js
@@ -4,11 +4,6 @@ const path = require('path')
 
 const admin = { username: 'admin', password: 'test', grant_type: 'password', client_id: 'self' }
 
-var util= require('util');
-var encoder = new util.TextEncoder('utf-8');
-
-jest.useFakeTimers()
-
 let token
 let app
 let places = []