Merge pull request #218 from KenEucker/develop

v3.2.7

functions/common/methods.ts

@@ -1375,6 +1375,7 @@ export const setNewBikeTagPost = async (
     /// Zero out the gps for the new location, as the GPS of a newly posted tag is the current/previous tag found location
     newBikeTagPost.gps = { lat: 0, long: 0, alt: 0 }
     /// Update the current BikeTag with the winning tag found information
+    previousBikeTag.gps = winningBikeTagPost.gps
     previousBikeTag.foundImageUrl = winningBikeTagPost.foundImageUrl
     previousBikeTag.foundTime = winningBikeTagPost.foundTime
     previousBikeTag.foundLocation = winningBikeTagPost.foundLocation

functions/profile.ts

@@ -38,7 +38,7 @@ const profileHandler: Handler = async (event) => {
         const success = dataIsArray ? data?.length : !!data
         const profileFound = success ? (dataIsString ? JSON.parse(data) : data) : null
 
-        console.log({ profileFound })
+        // console.log({ profileFound })
         if (profileFound) {
           body = await getBikeTagPlayerProfile(profileFound, authorized, true)
         } else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "biketag-vue",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "license": "AGPL-3.0-or-later",
   "scripts": {
     "lint": "npm run lint:js && npm run lint:style",
@@ -23,7 +23,7 @@
     "@vueuse/head": "^0.7.5",
     "ajv": "^8.10.0",
     "autoprefixer": "^10.4.4",
-    "biketag": "^3.2.6",
+    "biketag": "^3.2.7",
     "bootstrap": "^5.1.3",
     "bootstrap-vue-next": "^0.15.5",
     "crypto-js": "^4.1.1",

src/components/QueueFound.vue

@@ -91,9 +91,8 @@
           <template #title> Location: {{ getLocation }} </template>
           <p v-if="locationDisabled">{{ t('pages.round.image_first') }}</p>
           <bike-tag-map
-            v-if="isGps"
             variant="play/input"
-            :gps="gps"
+            :gps="isGps ? gps : getGame?.boundary?.lat ? getGame?.boundary : undefined"
             :start="center"
             @dragend="updateMarker"
           />
@@ -109,8 +108,16 @@
         <b-modal
           v-model="confirmInBoundary"
           class="confirm-modal"
-          :title="t('pages.round.missing_gps_alert.title')"
+          :title="t('pages.round.location_oustide_boundary_alert.title')"
           @ok="confirmedBoundary = true"
+        >
+          <p>{{ t('pages.round.location_oustide_boundary_alert.body') }}</p>
+        </b-modal>
+        <b-modal
+          v-model="confirmNoGPS"
+          class="confirm-modal"
+          :title="t('pages.round.missing_gps_alert.title')"
+          @ok="confirmedNoGPS = true"
         >
           <p>{{ t('pages.round.missing_gps_alert.body') }}</p>
         </b-modal>
@@ -176,6 +183,8 @@ const toast = inject('toast')
 const { t } = useI18n()
 const boundary = ref({})
 const isInBoundary = ref(false)
+const confirmNoGPS = ref(false)
+const confirmedNoGPS = ref(false)
 const confirmInBoundary = ref(false)
 const confirmedBoundary = ref(false)
 let auth0 = isAuthenticationEnabled() ? useAuth0() : undefined
@@ -204,6 +213,9 @@ const hideModal = () => (showModal.value = false)
 const onSubmit = async (e) => {
   e.preventDefault()
   uploadInProgress.value = true
+  const gpsIsDefault =
+    gps.value.lat === getGame.value?.boundary.lat && gps.value.lng === getGame.value?.boundary.lng
+
   /// Attempts to fix the tagnumber === #NaN issue
   if (!getCurrentBikeTag?.tagnumber) {
     await store.setTags()
@@ -213,13 +225,18 @@ const onSubmit = async (e) => {
 
   if (!location.value?.length) {
     toast.open({
-      message: 'Please add your Found Location',
+      message: 'Please add a Found Location description',
       type: 'error',
       duration: 10000,
       position: 'top',
     })
     uploadInProgress.value = false
     return
+  } else if (confirmedNoGPS.value === false && gpsIsDefault) {
+    confirmNoGPS.value = true
+    confirmedNoGPS.value = true
+    uploadInProgress.value = false
+    return
   }
 
   if (calculateInBoundary()) {
@@ -295,7 +312,7 @@ const onSubmit = async (e) => {
     return
   }
   if (location.value?.length == 0) {
-    if (gps.value.lat == null) {
+    if (!gps.value.lat) {
       debug('location must be set')
       uploadInProgress.value = false
       return
@@ -319,11 +336,13 @@ const onSubmit = async (e) => {
     foundLocation: location.value,
     tagnumber: getCurrentBikeTag.value?.tagnumber ?? 0,
     game: getGameName.value,
-    gps: {
-      lat: gps.value.lat,
-      long: gps.value.lng,
-      alt: gps.value.alt,
-    },
+    gps: !gpsIsDefault
+      ? {
+          lat: gps.value.lat,
+          long: gps.value.lng,
+          alt: gps.value.alt,
+        }
+      : {},
     inBoundary: isInBoundary.value,
   }
   uploadInProgress.value = false
@@ -344,6 +363,7 @@ const changeLocation = (e) => {
 const setPlace = (e) => {
   gps.value['lat'] = round(e.geometry.location.lat())
   gps.value['lng'] = round(e.geometry.location.lng())
+  console.log('setPlace', { gps: gps.value })
   center.value = { ...gps.value }
   location.value = inputDOM.value.value.split(',')[0]
   if (isGpsDefault.value) {
@@ -353,6 +373,7 @@ const setPlace = (e) => {
 const updateMarker = (e) => {
   gps.value['lat'] = round(e.latLng.lat())
   gps.value['lng'] = round(e.latLng.lng())
+
   if (isGpsDefault.value) {
     isGpsDefault.value = false
   }
@@ -421,11 +442,17 @@ const setImage = async (event) => {
               lng: round(GPSData.longitude),
             }
             isGpsDefault.value = false
-          } else {
-            gps.value = getGame.value?.boundary
+            center.value = { ...gps.value }
+          } else if (getGame.value?.boundary.lat && getGame.value?.boundary.lng) {
+            gps.value = {
+              lat: getGame.value?.boundary.lat,
+              lng: getGame.value?.boundary.lng,
+            }
             isGpsDefault.value = true
+            center.value = { ...gps.value }
+          } else {
+            isGpsDefault.value = false
           }
-          center.value = { ...gps.value }
           location.value = ''
         }
       }

src/i18n/locales/en-US.json

@@ -134,9 +134,13 @@
       "reset_tag": "Reset tag submission",
       "user_agree": "By uploading content to BikeTag, you agree to the terms of use set by the BikeTag Project",
       "image_first": "Please upload your image first!",
-      "missing_gps_alert": {
+      "location_oustide_boundary_alert": {
         "title": "Confirm location outside the limits",
         "body": "The chosen location is outside the suggested game boundaries. Are you sure you want to continue?"
+      },
+      "missing_gps_alert": {
+        "title": "Confirm no GPS data?",
+        "body": "You have selected an image with no GPS data, and without moving the pin on the map we won't know where this tag is located. Please consider moving the pin on the map, or selecting a location from the autopopulated choices."
       }
     },
     "howto": {

src/store/index.ts

@@ -82,7 +82,7 @@ export const useStore = defineStore('store', {
     async getRegionPolygon(region: any) {
       try {
         if (this.regionPolyon) return this.regionPolyon
-        else if (!region) {
+        else if (!region?.description?.length) {
           return
         }
 
@@ -297,7 +297,7 @@ export const useStore = defineStore('store', {
       const names = this.leaderboard.map((p) => p.name)
       return client.players({ names, cached }, gameOpts as any).then(async (d) => {
         if (Array.isArray(d)) {
-          d.forEach(this.SET_PLAYER)
+          d.forEach((p) => this.SET_PLAYER(p))
         }
       })
     },

src/views/Player.vue

@@ -180,6 +180,7 @@ watch(
 
 // mounted
 onMounted(async () => {
+  await store.setPlayers() // ensure the players are set before fetching THIS player's additional profile info
   store.fetchPlayerProfile(playerName.value)
 })
 </script>