From cff608c06f6a08d8f09141f838e96582247ab038 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Wed, 22 Feb 2023 03:11:58 +0100
Subject: [PATCH] move event.locations to more unique event.online_locations,
 various fixes on insertion workflow, improved locale messages

---
 components/MapEdit.vue                        |  8 +-
 components/WhereInput.vue                     | 77 ++++++++++---------
 components/WhereInputAdvanced.vue             | 35 +++++----
 components/admin/Places.vue                   | 32 ++++----
 locales/en.json                               | 18 ++---
 pages/add/_edit.vue                           | 12 +--
 pages/event/_slug.vue                         | 12 +--
 server/api/controller/event.js                |  4 +-
 server/api/index.js                           |  3 +-
 server/api/models/event.js                    |  2 +-
 ....js => 20221215110244-online_locations.js} |  4 +-
 11 files changed, 105 insertions(+), 102 deletions(-)
 rename server/migrations/{20221215110244-event-locations.js => 20221215110244-online_locations.js} (74%)

diff --git a/components/MapEdit.vue b/components/MapEdit.vue
index c60b2d39..d0c8bb3a 100644
--- a/components/MapEdit.vue
+++ b/components/MapEdit.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 client-only(placeholder='Loading...' )
-  LMap(ref="map"
+  LMap(ref="mapEdit"
       id="leaflet-map"
       :zoom="zoom"
       :options="{attributionControl: false}"
@@ -34,7 +34,7 @@ export default {
       mdiWalk, mdiBike, mdiCar, mdiMapMarker,
       url: $store.state.settings.tilelayer_provider || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
       attribution: $store.state.settings.tilelayer_provider_attribution || "<a target=\"_blank\" href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors",
-      zoom: 14,
+      zoom: 16,
       center: [this.place.latitude, this.place.longitude],
       marker: {
         address: this.place.address,
@@ -54,8 +54,8 @@ export default {
     });
 
     setTimeout(() => {
-      if (this.$refs.map && this.$refs.map.mapObject ) {
-        this.$refs.map.mapObject.invalidateSize();
+      if (this.$refs.mapEdit && this.$refs.mapEdit.mapObject ) {
+        this.$refs.mapEdit.mapObject.invalidateSize();
       }
     }, 200);
   }
diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 481889b8..f1a9f5b3 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -25,22 +25,8 @@ v-row.mb-4
 
   v-col(cols=12 md=6)
     v-row.mx-0.my-0.align-center.justify-center
-      v-combobox.mr-4(v-model="virtualLocations" v-if="settings.allow_event_only_online && value.name === 'online'"
-        :prepend-icon='mdiLink'
-        :hint="$t('event.online_locations_help')"
-        :label="$t('event.online_locations_url')"
-        clearable chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint
-        :delimiters="[',', ';', '; ']"
-        :items="virtualLocations"
-        @change='selectLocations')
-        template(v-slot:selection="{ item, on, attrs, selected, parent }")
-          v-chip(v-bind="attrs" close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)'
-            :input-value="selected" label small) {{ item }}
-        template(v-slot:append)
-          v-icon(v-text='mdiCog' :disabled='!value.name' @click="whereInputAdvancedDialog = true")
-      
-      v-text-field.mr-4(v-if="value.name !== 'online'"
-        ref='address'
+
+      v-text-field.mr-4(ref='address' v-if="value.name !== 'online'"
         v-model='value.address'
         :prepend-icon='mdiMap'
         :disabled='disableAddress'
@@ -52,12 +38,27 @@ v-row.mb-4
           v-icon(v-text='mdiCog' :disabled='!(value.name && settings.allow_event_also_online) && !(value.isNew && settings.allow_geolocation)'
             @click="whereInputAdvancedDialog = true")
 
+      v-combobox.mr-4(v-model="onlineLocations" v-if="settings.allow_event_only_online && value.name === 'online'"
+        :prepend-icon='mdiLink'
+        :hint="$t('event.online_locations_help')"
+        :label="$t('event.online_locations_url')"
+        clearable chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint
+        :delimiters="[',', ';', '; ']"
+        :items="onlineLocations"
+        @change='selectLocations')
+        template(v-slot:selection="{ item, index, on, attrs, selected, parent }")
+          v-chip(v-bind="attrs" :outlined='index !== 0'
+            close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)'
+            :input-value="selected" label small) {{ item }}
+        template(v-slot:append)
+          v-icon(v-text='mdiCog' :disabled='!value.name' @click="whereInputAdvancedDialog = true") 
+
     v-dialog(v-model='whereInputAdvancedDialog' :key="whereAdvancedId" destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly' dense)
       WhereInputAdvanced(ref='whereAdvanced' :place.sync='value' :event='event' @close='whereInputAdvancedDialog = false && this.$refs.address.blur()'
-        :virtualLocations.sync="virtualLocations"
+        :onlineLocations.sync="onlineLocations"
         :event_only_online_value.sync='event_only_online'
-        @update:onlineEvent="changeOnlineEvent"
-        @update:virtualLocations="selectLocations"
+        @update:onlineEvent="changeEventOnlyOnline"
+        @update:onlineLocations="selectLocations"
         )
 
     
@@ -85,7 +86,7 @@ export default {
       disableAddress: true,
       whereInputAdvancedDialog: false,
       hideWhereInputAdvancedDialogButton: !$store.state.settings.allow_event_also_online && !$store.state.settings.allow_geolocation,
-      virtualLocations: this.event.locations || [],
+      onlineLocations: this.event.online_locations || [],
       event_only_online: (this.value.name === 'online') ? true : false,
       whereAdvancedId: 1
     }
@@ -173,38 +174,42 @@ export default {
           }
           // Prevent to provide link for 'event only online' if not allowed: reset locations
           if (!this.settings.allow_event_only_online && this.place.name === 'online') {
-            this.event.locations = []
+            this.event.online_locations = []
           }
           this.disableAddress = false
           this.$refs.place.blur()
-          this.$refs.address.focus()
+          this.$nextTick(() => { this.$refs.address.focus() })
         }
       }
       this.$emit('input', { ...this.place })
     },
     selectLocations () {
-      this.event.locations = []
-      // Insert up to 3 online location: the main one and 2 fallback
-      if (this.virtualLocations && this.virtualLocations.length > 3) {
-        this.$nextTick(() => this.virtualLocations.pop())
-      }
-      this.virtualLocations && this.virtualLocations.forEach((item, i) => {
-        if (!item.startsWith('http')) {
-          this.virtualLocations[i] = `https://${item}`
+      this.event.online_locations = []
+
+      if (this.onlineLocations) {
+        // Insert up to 3 online location: the main one and 2 fallback
+        if (this.onlineLocations.length > 3) {
+          this.$nextTick(() => this.onlineLocations = this.onlineLocations.slice(0, 3))
         }
-        this.event.locations[i] = {'type': 'virtualLocation', 'url': this.virtualLocations[i] }
-      })
+        // Remove duplicates
+        this.$nextTick(() => this.onlineLocations = [...new Set(this.onlineLocations)])
+        
+        this.onlineLocations.forEach((item, i) => {
+          if (!item.startsWith('http')) { this.onlineLocations[i] = `https://${item}` }
+          this.event.online_locations[i] = this.onlineLocations[i]
+        })
+      }
     },
-    changeOnlineEvent(v) {
+    changeEventOnlyOnline(v) {
       this.event_only_online = v
       // console.log(this.event_only_online)
       if (this.event_only_online) { this.place.name = this.place.address = 'online' }
-      if (!this.event_only_online) { this.place.name = this.place.address = '' }
+      if (!this.event_only_online) { this.place.name = this.place.address = ''; this.onlineLocations = [] }
       this.place.latitude = null
       this.place.longitude = null
 
-      // update virtualLocations
-      this.event.locations && this.selectLocations()
+      // Update onlineLocations
+      this.event.online_locations && this.selectLocations()
       this.$emit('input', { ...this.place })
     },
   }
diff --git a/components/WhereInputAdvanced.vue b/components/WhereInputAdvanced.vue
index 3f396629..a405ec4d 100644
--- a/components/WhereInputAdvanced.vue
+++ b/components/WhereInputAdvanced.vue
@@ -4,31 +4,32 @@ v-card
   v-card-subtitle {{ $t('event.where_advanced_options_description') }}
 
   v-card-text(v-if='settings.allow_event_also_online')
-    v-switch.mt-0.mb-4(v-model='event_only_online_update' 
+    v-switch.mt-0.mb-0(v-model='event_only_online_update' 
       v-if='settings.allow_event_only_online'
       persistent-hint
-      :label="$t('event.event_only_online_label')"
-      :hint="$t('event.event_only_online_help')")
+      :label="$t('event.event_only_online_label')")
 
-    v-combobox.mt-0.mb-0.mr-4.my-5(v-model="virtualLocations_update" 
+    v-combobox.mt-0.mb-0.mr-4.my-5(v-model="onlineLocations_update" 
       v-if="place.name !== 'online' && settings.allow_event_also_online"
       :prepend-icon='mdiLink'
-      :hint="$t('event.additional_online_locations_help')"
-      :label="$t('event.additional_online_locations')"
+      :hint="$t('event.online_locations_help')"
+      :label="$t('event.online_locations')"
       clearable chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint
       :delimiters="[',', ';', '; ']"
-      :items="virtualLocations_update")
-      template(v-slot:selection="{ item, on, attrs, selected, parent }")
-        v-chip(v-bind="attrs" close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)'
+      :items="onlineLocations_update")
+      template(v-slot:selection="{ item, index, on, attrs, selected, parent }")
+        v-chip(v-bind="attrs" :outlined='index !== 0'
+          close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)'
           :input-value="selected" label small) {{ item }}
 
   v-divider(v-if='showGeocoded && showOnline')
 
   v-card-text.mt-5(v-if='showGeocoded')
     v-combobox(ref='geocodedAddress' v-if="settings.allow_geolocation && place.name !== 'online' || (!settings.allow_event_only_online && place.name === 'online')"
+      v-focus
       :prepend-icon='mdiMapSearch'
       @input.native='searchAddress'
-      :label="$t('common.search_address')"
+      :label="$t('common.search_coordinates')"
       :value='place.geocodedAddress'
       item-text='address'
       persistent-hint hide-no-data clearable no-filter
@@ -47,13 +48,13 @@ v-card
             v-list-item-subtitle(v-text='`${item.address}`')
 
     v-row.mt-4
-      v-col.py-0(cols=12 md=6)
+      v-col.py-0(cols=12 sm=6)
         v-text-field(v-model="place.latitude"
           :prepend-icon='mdiLatitude'
           :disabled="!settings.allow_geolocation || place.name === 'online'"
           :label="$t('common.latitude')"
           :rules="$validators.latitude")
-      v-col.py-0(cols=12 md=6)
+      v-col.py-0(cols=12 sm=6)
         v-text-field(v-model="place.longitude"
           :prepend-icon='mdiLongitude'
           :disabled="!settings.allow_geolocation || place.name === 'online'"
@@ -82,7 +83,7 @@ export default {
     place: { type: Object, default: () => ({}) },
     event: { type: Object, default: () => null },
     event_only_online_value: { type: Boolean, default: false },
-    virtualLocations: { type: Array, default: [] }
+    onlineLocations: { type: Array, default: [] }
   },
   components: {
     [process.client && 'MapEdit']: () => import('@/components/MapEdit.vue')
@@ -92,7 +93,7 @@ export default {
       mdiMap, mdiLatitude, mdiLongitude, mdiCog, mdiLink, mdiCloseCircle,
       mdiMapMarker, mdiMapSearch, mdiRoadVariant, mdiHome, mdiCityVariant,
       showOnline: $store.state.settings.allow_event_also_online,
-      showGeocoded: $store.state.settings.allow_geolocation && this.place.isNew,
+      showGeocoded: $store.state.settings.allow_geolocation && this.place.isNew && this.place.name !== 'online',
       event_only_online: this.place.name === 'online',
       mapEdit: 1,
       addressList: [],
@@ -117,10 +118,10 @@ export default {
         this.close()
       }
     },
-    virtualLocations_update: {
-      get () { return this.virtualLocations },
+    onlineLocations_update: {
+      get () { return this.onlineLocations },
       set (value) {
-        this.$emit('update:virtualLocations', value)
+        this.$emit('update:onlineLocations', value)
       }
     },
   },
diff --git a/components/admin/Places.vue b/components/admin/Places.vue
index 083052f4..4a78c476 100644
--- a/components/admin/Places.vue
+++ b/components/admin/Places.vue
@@ -30,7 +30,7 @@ v-container
             :disabled="!(settings.allow_geolocation && place.name !== 'online')"
             :prepend-icon='mdiMapSearch'
             @input.native='searchAddress'
-            :label="$t('common.search_address')"
+            :label="$t('common.search_coordinates')"
             :value='place.latitude && place.longitude && place.geocodedAddress'
             persistent-hint hide-no-data clearable no-filter
             :loading='loading'
@@ -40,10 +40,10 @@ v-container
             :hint="$t('event.address_description_osm')")
             template(v-slot:message="{message, key}")
               span(v-html='message' :key="key")
-            template(v-slot:item="{ item, attrs, on  }")
+            template(v-slot:item="{ item, attrs, on, selected  }")
               v-list-item(v-bind='attrs' v-on='on')
                 v-icon.pr-4(v-text='loadCoordinatesResultIcon(item)')
-                v-list-item-content(two-line v-if='item')
+                v-list-item-content(two-line v-if='item' :input-value="selected" )
                   v-list-item-title(v-text='item.name')
                   v-list-item-subtitle(v-text='`${item.address}`')
 
@@ -62,7 +62,7 @@ v-container
                 :label="$t('common.longitude')"
                 :rules="$validators.longitude")
           
-          MapEdit.mt-4(:place='place' :key="mapEdit" v-if="settings.allow_geolocation && place.name !== 'online' && place.latitude && place.longitude")     
+          MapEdit.mt-4(:place.sync='place' :key="dialog" v-if="settings.allow_geolocation && place.name !== 'online' && place.latitude && place.longitude")     
 
       v-card-actions
         v-spacer
@@ -79,7 +79,7 @@ v-container
       :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }'
       :search='search')
       template(v-slot:item.map='{ item }')
-        span {{item.latitude && item.longitude && 'YEP' }}
+        v-icon(v-if='item.latitude && item.longitude' v-text='mdiMapMarker')
       template(v-slot:item.actions='{ item }')
         v-btn(@click='editPlace(item)' color='primary' icon)
           v-icon(v-text='mdiPencil')
@@ -116,7 +116,6 @@ export default {
         { value: 'map', text: 'Map' },
         { value: 'actions', text: this.$t('common.actions'), align: 'right' }
       ],
-      geocoding_provider_type: $store.state.settings.geocoding_provider_type || 'Nominatim',
       currentGeocodingProvider: geolocation.getGeocodingProvider($store.state.settings.geocoding_provider_type),
       prevAddress: '',
       iconsMapper: {
@@ -124,11 +123,12 @@ export default {
         'mdiRoadVariant': mdiRoadVariant,
         'mdiMapMarker': mdiMapMarker,
         'mdiCityVariant': mdiCityVariant
-      },
+      }
     }
   },
   async fetch() {
     this.places = await this.$axios.$get('/places')
+    this.places.splice(this.places.findIndex((p) => p.name === 'online' ), 1)
   },
   computed: {
     ...mapState(['settings']),
@@ -140,7 +140,6 @@ export default {
       if (this.settings.allow_geolocation) {
         this.prevAddress = ''
         this.place.geocodedAddress = ''
-        this.mapEdit++
         this.place.latitude = item.latitude
         this.place.longitude = item.longitude
       }
@@ -157,22 +156,27 @@ export default {
     },
     selectAddress (v) {
       let currentAddress = this.place.address
+      this.place.geocodedAddress = ''
+      this.dialog++
+
       if (!v) { return }
       if (typeof v === 'object') {
         this.place.latitude = v.lat
         this.place.longitude = v.lon
         this.place.geocodedAddress = v.address
         this.place.address = v.address
-        if (currentAddress === this.prevAddress) {
-          console.log('here')
-          this.place.address = currentAddress
-        }
       } else {
         this.place.address = v
         this.place.latitude = this.place.longitude = null
       }
+      if (currentAddress == '' || currentAddress == this.prevAddress) {
+        this.place.address = this.place.geocodedAddress
+      } else {
+        this.place.address = currentAddress
+      }
+
+      this.prevAddress = this.place.geocodedAddress
       this.$emit('input', { ...this.place })
-      this.prevAddress = this.geocodedAddress
     },
     searchAddress: debounce(async function(ev) {
       const pre_searchCoordinates = ev.target.value.trim().toLowerCase()
@@ -180,7 +184,7 @@ export default {
 
       if (searchCoordinates.length) {
         this.loading = true
-        const ret = await this.$axios.$get(`placeOSM/${this.geocoding_provider_type}/${searchCoordinates}`)
+        const ret = await this.$axios.$get(`placeOSM/${this.currentGeocodingProvider.commonName}/${searchCoordinates}`)
         this.addressList = this.currentGeocodingProvider.mapQueryResults(ret)
         this.loading = false
       }
diff --git a/locales/en.json b/locales/en.json
index 7176098f..515bb9ae 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -101,7 +101,7 @@
     "recurring_event_actions": "Recurring event actions",
     "latitude": "Latitude",
     "longitude": "Longitude",
-    "search_address": "Search address"
+    "search_coordinates": "Search coordinates"
   },
   "login": {
     "description": "By logging in you can publish new events.",
@@ -143,7 +143,7 @@
     "updated": "Event updated",
     "where_description": "Where's the event? If not present you can create it.",
     "address_description": "What is the address?",
-    "address_description_osm": "What is the address? (<a href='http://osm.org/copyright'>OpenStreetMap</a> contributors)",
+    "address_description_osm": "Search tiping the address. (<a href='http://osm.org/copyright'>OpenStreetMap</a> contributors)",
     "confirmed": "Event confirmed",
     "not_found": "Could not find event",
     "remove_confirmation": "Are you sure you want to remove this event?",
@@ -183,19 +183,15 @@
     "remove_media_confirmation": "Do you confirm the image removal?",
     "download_flyer": "Download flyer",
     "where_advanced_options": "Place - Advanced options",
-    "where_advanced_options_description": "Define here additional place properties to the event",
+    "where_advanced_options_description": "Define here additional place properties",
     "event_only_online": "Online event",
-    "event_only_online_label": "Event only online",
-    "event_only_online_help": "For online-only event, the default place name 'online' is applied",
+    "event_only_online_label": "The event is only online",
     "event_also_online": "Partecipate remotely",
+    "online_locations": "Online locations",
+    "online_locations_help": "For instance a url to a videconference room, and a fallback url (max. 3)",
     "online_locations_url": "Online locations",
     "online_locations_fallback_urls": "Fallback links",
-    "additional_online_locations": "Additional online locations",
-    "additional_online_locations_help": "Online locations, for instance a url to a videconference room",
-    "address_geocoded_disclaimer": "Didn't you found the address or housenumber you are looking for? The <a target=\"_blank\" href=\"https://www.openstreetmap.org/\">OpenStreetMap</a> project is open to contributions. If you have Android, we recommend <a target=\"_blank\" href=\"https://f-droid.org/en/packages/de.westnordost.streetcomplete/\">StreetComplete</a> ",
-    "address_overwrite": "Overwrite Address",
-    "address_overwrite_help": "Overwrite the geocoded address, for instance to add missing housenumber or a floor information",
-    "online_locations_help": "Online locations, for instance a url to a videconference room"
+    "address_geocoded_disclaimer": "If you cannot find the <strong>street address</strong> or the <strong>housenumber</strong> you are looking for in the geocoding results, you can manually insert them in the 'Address' field without loose the coordinates. Consider also that the <a target=\"_blank\" href=\"https://www.openstreetmap.org/\">OpenStreetMap</a> project is open to contributions. If you have Android, we recommend <a target=\"_blank\" href=\"https://f-droid.org/en/packages/de.westnordost.streetcomplete/\">StreetComplete</a> "
   },
   "admin": {
     "place_description": "If you have gotten the place or address wrong, you can change it.<br/>All current and past events associated with this place will change address.",
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 3ab62f6f..58ea5af7 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -127,7 +127,7 @@ export default {
       data.event.place.address = event.place.address || ''
       data.event.place.latitude = event.place.latitude || ''
       data.event.place.longitude = event.place.longitude || ''
-      data.event.locations = event.locations || []
+      data.event.online_locations = event.online_locations || []
       const from = dayjs.unix(event.start_datetime).tz()
       const due = event.end_datetime && dayjs.unix(event.end_datetime).tz()
       data.date = {
@@ -157,7 +157,7 @@ export default {
       openImportDialog: false,
       event: {
         place: { name: '', address: '', latitude: null, longitude: null },
-        locations: [],
+        online_locations: [],
         title: '',
         description: '',
         tags: [],
@@ -245,12 +245,8 @@ export default {
         formData.append('place_longitude', this.event.place.longitude || '')
       }
 
-      if (this.event.locations.length) {
-        this.event.locations.forEach(location => formData.append('locations[]', location.url))
-      } else {
-        // delete
-        this.event.locations = []
-        formData.append('locations', this.event.locations )
+      if (this.event.online_locations) { 
+        this.event.online_locations.forEach(l => formData.append('online_locations[]', l)) 
       }
 
       formData.append('description', this.event.description)
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 3f5fc48a..38261ed6 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -37,19 +37,19 @@ v-container#event.pa-0.pa-sm-2
                 outlined :key='tag' :to='`/tag/${encodeURIComponent(tag)}`') {{tag}}
 
             //- online events
-            v-divider(v-if='onlineSectionEnabled && event.locations && event.locations.length')
-            div(v-if='onlineSectionEnabled && event.locations && event.locations.length')
+            v-divider(v-if='onlineSectionEnabled && event.online_locations && event.online_locations.length')
+            div(v-if='onlineSectionEnabled && event.online_locations && event.online_locations.length')
               v-card-text.text-caption.pb-0(v-text="event.place.name === 'online' && $t('event.event_only_online') || $t('event.event_also_online') ")
-              v-list-item(target='_blank' :href='`${event.locations[0]}`')
+              v-list-item(target='_blank' :href='`${event.online_locations[0]}`')
                 v-list-item-icon
                   v-icon.my-auto(v-text='mdiMonitorAccount')
                 v-list-item-content.py-0
-                  v-list-item-title.text-caption(v-text='`${event.locations[0]}`')
-            div(v-if='onlineSectionEnabled && event.locations && event.locations.length > 1')
+                  v-list-item-title.text-caption(v-text='`${event.online_locations[0]}`')
+            div(v-if='onlineSectionEnabled && event.online_locations && event.online_locations.length > 1')
               v-card-text.text-caption.pt-0.pb-0(v-text="$t('event.online_locations_fallback_urls')")
               v-list-item
                 v-list-item-content
-                  v-chip(v-for='(item, index) in event.locations' v-if="index > 0" target='_blank' :href="`${item}`" 
+                  v-chip(v-for='(item, index) in event.online_locations' v-if="index > 0" target='_blank' :href="`${item}`" 
                     v-bind:key="index" small label v-text="`${item}`" outlined )
 
             v-divider
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 4eabf379..e30ba3a8 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -401,7 +401,7 @@ const eventController = {
         multidate: body.multidate,
         start_datetime: body.start_datetime,
         end_datetime: body.end_datetime,
-        locations: body.locations,
+        online_locations: body.online_locations,
         recurrent,
         // publish this event only if authenticated
         is_visible: !!req.user
@@ -486,7 +486,7 @@ const eventController = {
         multidate: body.multidate,
         start_datetime: body.start_datetime || event.start_datetime,
         end_datetime: body.end_datetime || null,
-        locations: body.locations,
+        online_locations: body.online_locations,
         recurrent
       }
 
diff --git a/server/api/index.js b/server/api/index.js
index ffa81011..559aa9b5 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -100,7 +100,7 @@ module.exports = () => {
      * @param {string}  [query] - search for this string
      * @param {array} [tags] - List of tags
      * @param {array} [places] - List of places id
-     * @param {array} [locations] - List of locations
+     * @param {array} [online_locations] - List of online locations
      * @param {integer} [max] - Limit events
      * @param {boolean} [show_recurrent] - Show also recurrent events (default: as choosen in admin settings)
      * @param {integer} [page] - Pagination
@@ -124,6 +124,7 @@ module.exports = () => {
      * @param {string} [place_address] - the address of the place
      * @param {float} [place_latitude] - the latitude of the place
      * @param {float} [place_longitude] - the longitude of the place
+     * @param {array} online_locations - List of online locations
      * @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 d94426e1..c4cec337 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -38,7 +38,7 @@ module.exports = (sequelize, DataTypes) => {
     recurrent: DataTypes.JSON,
     likes: { type: DataTypes.JSON, defaultValue: [] },
     boost: { type: DataTypes.JSON, defaultValue: [] },
-    locations: { type: DataTypes.JSON, defaultValue: [] }
+    online_locations: { type: DataTypes.JSON, defaultValue: [] }
   })
   
   Event.prototype.toAP = function (username, locale, to = []) {
diff --git a/server/migrations/20221215110244-event-locations.js b/server/migrations/20221215110244-online_locations.js
similarity index 74%
rename from server/migrations/20221215110244-event-locations.js
rename to server/migrations/20221215110244-online_locations.js
index 469d1f25..e1d1f9ff 100644
--- a/server/migrations/20221215110244-event-locations.js
+++ b/server/migrations/20221215110244-online_locations.js
@@ -10,7 +10,7 @@ module.exports = {
      */
      return Promise.all(
       [
-        await queryInterface.addColumn('events', 'locations', { type: Sequelize.JSON }),
+        await queryInterface.addColumn('events', 'online_locations', { type: Sequelize.JSON }),
       ])
   },
 
@@ -23,7 +23,7 @@ module.exports = {
      */
      return Promise.all(
       [
-        await queryInterface.removeColumn('events', 'locations'),
+        await queryInterface.removeColumn('events', 'online_locations'),
       ])
   }
 };