diff --git a/src/components/AscGISMap.vue b/src/components/AscGISMap.vue index bfe0e9c..ec1eb0b 100644 --- a/src/components/AscGISMap.vue +++ b/src/components/AscGISMap.vue @@ -163,19 +163,8 @@ function reattachAndResizeMap(retry = 0) { mapView.value.container = activeContainer } - // เรียก resize() อย่างปลอดภัยด้วยการตรวจสอบว่ามี method นี้หรือไม่ - try { - if (typeof mapView.value.resize === 'function') { - mapView.value.resize() - } - } catch (error) { - console.warn('Map resize failed:', error) - } - - if (typeof mapView.value.requestRender === 'function') { - mapView.value.requestRender?.() - } - + mapView.value.resize() + mapView.value.requestRender?.() mapView.value .goTo( { @@ -296,11 +285,7 @@ async function initializeMap() { geometry: userPoint, symbol: userSymbol, }) - - // เพิ่มการตรวจสอบความปลอดภัยก่อนเข้าถึง graphics - if (mapView.value && mapView.value.graphics && !mapView.value.destroyed) { - mapView.value.graphics.add(userGraphic) - } + mapView.value.graphics.add(userGraphic) // Get POI place ยิงไปขอที่ server ของกทม.ก่อน // await axios // .get( @@ -396,22 +381,12 @@ async function initializeMap() { geometry: poiPoint, symbol: poiSymbol, }) - - // เพิ่มการตรวจสอบความปลอดภัยก่อนเข้าถึง graphics และ goTo - if (mapView.value && !mapView.value.destroyed) { - if (mapView.value.graphics) { - mapView.value.graphics.add(poiGraphic) - } - // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI - if (typeof mapView.value.goTo === 'function') { - mapView.value.goTo({ - target: [userPoint, poiPoint], - zoom: zoomMap.value, - }).catch(() => { - // Ignore goTo errors - }) - } - } + mapView.value.graphics.add(poiGraphic) + // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI + mapView.value.goTo({ + target: [userPoint, poiPoint], + zoom: zoomMap.value, + }) updateLocation(latitude, longitude, poiPlaceName.value) }) diff --git a/src/stores/socket.ts b/src/stores/socket.ts index 28c1e3b..be2ceee 100644 --- a/src/stores/socket.ts +++ b/src/stores/socket.ts @@ -1,4 +1,3 @@ -import { ref } from 'vue' import config from '@/app.config' import { getToken } from '@/plugins/auth' import { defineStore } from 'pinia' @@ -11,7 +10,6 @@ interface sockeBackup { export const useSocketStore = defineStore('socket', () => { let socket: Socket - const notificationCounter = ref(0); async function init() { socket = io(new URL(config.API.socket).origin, { @@ -21,7 +19,6 @@ export const useSocketStore = defineStore('socket', () => { socket.on('socket-notification', (payload) => { let body: sockeBackup = JSON.parse(payload) - notificationCounter.value++ notifyStatus(body.message, body.success) }) } @@ -97,5 +94,5 @@ export const useSocketStore = defineStore('socket', () => { init() - return { notificationCounter } + return {} }) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 84a3e77..9b76ae3 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -11,7 +11,6 @@ import { import { useQuasar } from 'quasar' import { format } from 'date-fns' import Camera from 'simple-vue-camera' -import { storeToRefs } from 'pinia' import config from '@/app.config' import http from '@/plugins/http' @@ -19,7 +18,6 @@ import { useCounterMixin } from '@/stores/mixin' import { usePermissions } from '@/composables/usePermissions' import { usePrivacyStore } from '@/stores/privacy' import { usePositionKeycloakStore } from '@/stores/positionKeycloak' -import { useSocketStore } from '@/stores/socket' import type { FormRef, OptionReason } from '@/interface/response/checkin' @@ -34,8 +32,6 @@ const { syncPermissionStates, requestCameraPermission, } = usePermissions() -const socketStore = useSocketStore() -const { notificationCounter } = storeToRefs(socketStore) const privacyStore = usePrivacyStore() const positionKeycloakStore = usePositionKeycloakStore() const MOCK_CHECK_DELAY_MS = 800 @@ -638,18 +634,19 @@ async function fetchCheckStatus() { /** inQueue เป็น true */ isDisabledCheckTime.value = true msgCheckTime.value = 'ระบบกำลังประมวลผล' - // if (intervalId.value === undefined) { - // intervalId.value = setInterval(async () => { - // try { - // await fetchCheckStatus() - // } catch (error) { - // console.error('Error in interval fetchCheckStatus:', error) - // // หยุด interval ถ้าเกิด error - // stopChecking() - // } - // }, 3000) - // console.log('startChecking called, intervalId:', intervalId.value) - // } + if (intervalId.value === undefined) { + intervalId.value = setInterval(async () => { + try { + await fetchCheckStatus() + } catch (error) { + console.error('Error in interval fetchCheckStatus:', error) + // หยุด interval ถ้าเกิด error + stopChecking() + } + }, 3000) + console.log('startChecking called, intervalId:', intervalId.value) + } + // hideLoader() } else { /** inQueue เป็น false */ isDisabledCheckTime.value = false @@ -1251,11 +1248,6 @@ watch( } } ) - -/** Watch notification counter on socket */ -watch(notificationCounter, () => { - startChecking() -})