diff --git a/package-lock.json b/package-lock.json
index 7c3ab40..4ebf32c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
"dependencies": {
"@beyonk/svelte-mapbox": "^8.1.4",
"html5-qrcode": "^2.3.0",
+ "mapbox": "^1.0.0-beta10",
"mapbox-gl": "^2.10.0",
"svelte-routing": "^1.6.0",
"yallist": "^4.0.0"
@@ -1218,6 +1219,15 @@
"node": ">=12"
}
},
+ "node_modules/mapbox": {
+ "version": "1.0.0-beta10",
+ "resolved": "https://registry.npmjs.org/mapbox/-/mapbox-1.0.0-beta10.tgz",
+ "integrity": "sha512-2goOXWE4r7dIYlol0xrReJD1s4l8rTBVTQ2/pcZv5tLnxPWIh8RT3cEDN3cDzDQMpsbQhgNgd7icRZSBL9WkxQ==",
+ "dependencies": {
+ "es6-promise": "^4.0.5",
+ "rest": "^2.0.0"
+ }
+ },
"node_modules/mapbox-gl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.10.0.tgz",
@@ -1247,6 +1257,11 @@
"vt-pbf": "^3.1.3"
}
},
+ "node_modules/mapbox/node_modules/es6-promise": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+ },
"node_modules/merge2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -1664,6 +1679,11 @@
"protocol-buffers-schema": "^3.3.1"
}
},
+ "node_modules/rest": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/rest/-/rest-2.0.0.tgz",
+ "integrity": "sha512-MmTKuTuLVARHNnpL1jJjohscJcY3vsaKNz+b2J5v32BcjIVyimKrNv8r8uygeFp9gf8Cm1erhxypdzRFFEPZOA=="
+ },
"node_modules/reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -2946,6 +2966,22 @@
"sourcemap-codec": "^1.4.8"
}
},
+ "mapbox": {
+ "version": "1.0.0-beta10",
+ "resolved": "https://registry.npmjs.org/mapbox/-/mapbox-1.0.0-beta10.tgz",
+ "integrity": "sha512-2goOXWE4r7dIYlol0xrReJD1s4l8rTBVTQ2/pcZv5tLnxPWIh8RT3cEDN3cDzDQMpsbQhgNgd7icRZSBL9WkxQ==",
+ "requires": {
+ "es6-promise": "^4.0.5",
+ "rest": "^2.0.0"
+ },
+ "dependencies": {
+ "es6-promise": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+ }
+ }
+ },
"mapbox-gl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.10.0.tgz",
@@ -3257,6 +3293,11 @@
"protocol-buffers-schema": "^3.3.1"
}
},
+ "rest": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/rest/-/rest-2.0.0.tgz",
+ "integrity": "sha512-MmTKuTuLVARHNnpL1jJjohscJcY3vsaKNz+b2J5v32BcjIVyimKrNv8r8uygeFp9gf8Cm1erhxypdzRFFEPZOA=="
+ },
"reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
diff --git a/package.json b/package.json
index f531719..5620889 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"dependencies": {
"@beyonk/svelte-mapbox": "^8.1.4",
"html5-qrcode": "^2.3.0",
+ "mapbox": "^1.0.0-beta10",
"mapbox-gl": "^2.10.0",
"svelte-routing": "^1.6.0",
"yallist": "^4.0.0"
diff --git a/src/lib/Components/game/Map/Map.svelte b/src/lib/Components/game/Map/Map.svelte
index 090a823..948a97e 100644
--- a/src/lib/Components/game/Map/Map.svelte
+++ b/src/lib/Components/game/Map/Map.svelte
@@ -3,7 +3,8 @@
import { createEventDispatcher } from 'svelte'
import { loop_guard } from 'svelte/internal'
const { GeolocateControl } = controls
- let mapComponent
+ export let mapComponent
+ $: console.log(mapComponent)
let geolocateControl
let className = ''
export { className as class }
@@ -15,19 +16,17 @@
export let radius = false
export let center = { lng: 0, lat: 0 }
export const geo = (e) => {
-
- geolocateControl.dispatchEvent('geolocate')
- if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition((position)=>{
- const { latitude, longitude } = position.coords
- user = { lat: latitude, lng: longitude }
- dispatch('move', user)
- });
- } else {
- alert("Can't load your location!")
- }
- };
-
+ geolocateControl.dispatchEvent('geolocate')
+ if (navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition((position) => {
+ const { latitude, longitude } = position.coords
+ user = { lat: latitude, lng: longitude }
+ dispatch('move', user)
+ })
+ } else {
+ alert("Can't load your location!")
+ }
+ }
@@ -39,20 +38,19 @@
on:ready={() => {
mapComponent.resize()
mapComponent.setCenter([center.lng, center.lat], 14)
-
}}
zoom={14}
>
-
- {
- console.log(e)
- const { latitude, longitude } = e.detail.coords
- user = { lat: latitude, lng: longitude }
- dispatch('move', user)
- }}
- />
+
+ {
+ console.log(e)
+ const { latitude, longitude } = e.detail.coords
+ user = { lat: latitude, lng: longitude }
+ dispatch('move', user)
+ }}
+ />
diff --git a/src/routes/map.svelte b/src/routes/map.svelte
index 2cc584f..2e4dfec 100644
--- a/src/routes/map.svelte
+++ b/src/routes/map.svelte
@@ -1,83 +1,110 @@
-
-
+
-
+
-
+