alessandro trinca tornidor
commited on
Commit
·
8735634
1
Parent(s):
d826f47
feat: remove ButtonMapSendRequest used in desktop mode to avoid wrong references on driver.js tour
Browse files- static/package.json +2 -1
- static/pnpm-lock.yaml +9 -32
- static/src/components/PagePredictionMap.vue +5 -22
- static/src/input.css +1 -1
static/package.json
CHANGED
|
@@ -11,6 +11,7 @@
|
|
| 11 |
"type": "module",
|
| 12 |
"dependencies": {
|
| 13 |
"@geoman-io/leaflet-geoman-free": "^2.18.3",
|
|
|
|
| 14 |
"leaflet": "^1.9.4",
|
| 15 |
"leaflet-providers": "^3.0.0",
|
| 16 |
"vue": "^3.5.22"
|
|
@@ -38,5 +39,5 @@
|
|
| 38 |
"snyk"
|
| 39 |
]
|
| 40 |
},
|
| 41 |
-
"packageManager": "pnpm@10.
|
| 42 |
}
|
|
|
|
| 11 |
"type": "module",
|
| 12 |
"dependencies": {
|
| 13 |
"@geoman-io/leaflet-geoman-free": "^2.18.3",
|
| 14 |
+
"driver.js": "^1.3.6",
|
| 15 |
"leaflet": "^1.9.4",
|
| 16 |
"leaflet-providers": "^3.0.0",
|
| 17 |
"vue": "^3.5.22"
|
|
|
|
| 39 |
"snyk"
|
| 40 |
]
|
| 41 |
},
|
| 42 |
+
"packageManager": "pnpm@10.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd"
|
| 43 |
}
|
static/pnpm-lock.yaml
CHANGED
|
@@ -11,6 +11,9 @@ importers:
|
|
| 11 |
'@geoman-io/leaflet-geoman-free':
|
| 12 |
specifier: ^2.18.3
|
| 13 |
version: 2.18.3(leaflet@1.9.4)
|
|
|
|
|
|
|
|
|
|
| 14 |
leaflet:
|
| 15 |
specifier: ^1.9.4
|
| 16 |
version: 1.9.4
|
|
@@ -622,9 +625,6 @@ packages:
|
|
| 622 |
'@turf/bbox@6.5.0':
|
| 623 |
resolution: {integrity: sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==}
|
| 624 |
|
| 625 |
-
'@turf/bbox@7.2.0':
|
| 626 |
-
resolution: {integrity: sha512-wzHEjCXlYZiDludDbXkpBSmv8Zu6tPGLmJ1sXQ6qDwpLE1Ew3mcWqt8AaxfTP5QwDNQa3sf2vvgTEzNbPQkCiA==}
|
| 627 |
-
|
| 628 |
'@turf/bearing@6.5.0':
|
| 629 |
resolution: {integrity: sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A==}
|
| 630 |
|
|
@@ -646,9 +646,6 @@ packages:
|
|
| 646 |
'@turf/helpers@6.5.0':
|
| 647 |
resolution: {integrity: sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==}
|
| 648 |
|
| 649 |
-
'@turf/helpers@7.2.0':
|
| 650 |
-
resolution: {integrity: sha512-cXo7bKNZoa7aC7ydLmUR02oB3IgDe7MxiPuRz3cCtYQHn+BJ6h1tihmamYDWWUlPHgSNF0i3ATc4WmDECZafKw==}
|
| 651 |
-
|
| 652 |
'@turf/invariant@6.5.0':
|
| 653 |
resolution: {integrity: sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==}
|
| 654 |
|
|
@@ -667,9 +664,6 @@ packages:
|
|
| 667 |
'@turf/meta@6.5.0':
|
| 668 |
resolution: {integrity: sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==}
|
| 669 |
|
| 670 |
-
'@turf/meta@7.2.0':
|
| 671 |
-
resolution: {integrity: sha512-igzTdHsQc8TV1RhPuOLVo74Px/hyPrVgVOTgjWQZzt3J9BVseCdpfY/0cJBdlSRI4S/yTmmHl7gAqjhpYH5Yaw==}
|
| 672 |
-
|
| 673 |
'@turf/nearest-point-on-line@6.5.0':
|
| 674 |
resolution: {integrity: sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg==}
|
| 675 |
|
|
@@ -846,6 +840,9 @@ packages:
|
|
| 846 |
detect-node@2.1.0:
|
| 847 |
resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
|
| 848 |
|
|
|
|
|
|
|
|
|
|
| 849 |
enhanced-resolve@5.18.3:
|
| 850 |
resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
|
| 851 |
engines: {node: '>=10.13.0'}
|
|
@@ -1332,9 +1329,6 @@ packages:
|
|
| 1332 |
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
|
| 1333 |
engines: {node: '>=8.0'}
|
| 1334 |
|
| 1335 |
-
tslib@2.8.1:
|
| 1336 |
-
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
|
| 1337 |
-
|
| 1338 |
type-check@0.4.0:
|
| 1339 |
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
|
| 1340 |
engines: {node: '>= 0.8.0'}
|
|
@@ -1840,13 +1834,6 @@ snapshots:
|
|
| 1840 |
'@turf/helpers': 6.5.0
|
| 1841 |
'@turf/meta': 6.5.0
|
| 1842 |
|
| 1843 |
-
'@turf/bbox@7.2.0':
|
| 1844 |
-
dependencies:
|
| 1845 |
-
'@turf/helpers': 7.2.0
|
| 1846 |
-
'@turf/meta': 7.2.0
|
| 1847 |
-
'@types/geojson': 7946.0.16
|
| 1848 |
-
tslib: 2.8.1
|
| 1849 |
-
|
| 1850 |
'@turf/bearing@6.5.0':
|
| 1851 |
dependencies:
|
| 1852 |
'@turf/helpers': 6.5.0
|
|
@@ -1882,11 +1869,6 @@ snapshots:
|
|
| 1882 |
|
| 1883 |
'@turf/helpers@6.5.0': {}
|
| 1884 |
|
| 1885 |
-
'@turf/helpers@7.2.0':
|
| 1886 |
-
dependencies:
|
| 1887 |
-
'@types/geojson': 7946.0.16
|
| 1888 |
-
tslib: 2.8.1
|
| 1889 |
-
|
| 1890 |
'@turf/invariant@6.5.0':
|
| 1891 |
dependencies:
|
| 1892 |
'@turf/helpers': 6.5.0
|
|
@@ -1926,11 +1908,6 @@ snapshots:
|
|
| 1926 |
dependencies:
|
| 1927 |
'@turf/helpers': 6.5.0
|
| 1928 |
|
| 1929 |
-
'@turf/meta@7.2.0':
|
| 1930 |
-
dependencies:
|
| 1931 |
-
'@turf/helpers': 7.2.0
|
| 1932 |
-
'@types/geojson': 7946.0.16
|
| 1933 |
-
|
| 1934 |
'@turf/nearest-point-on-line@6.5.0':
|
| 1935 |
dependencies:
|
| 1936 |
'@turf/bearing': 6.5.0
|
|
@@ -2116,6 +2093,8 @@ snapshots:
|
|
| 2116 |
|
| 2117 |
detect-node@2.1.0: {}
|
| 2118 |
|
|
|
|
|
|
|
| 2119 |
enhanced-resolve@5.18.3:
|
| 2120 |
dependencies:
|
| 2121 |
graceful-fs: 4.2.11
|
|
@@ -2276,7 +2255,7 @@ snapshots:
|
|
| 2276 |
|
| 2277 |
geojson-rbush@3.2.0:
|
| 2278 |
dependencies:
|
| 2279 |
-
'@turf/bbox':
|
| 2280 |
'@turf/helpers': 6.5.0
|
| 2281 |
'@turf/meta': 6.5.0
|
| 2282 |
'@types/geojson': 7946.0.8
|
|
@@ -2600,8 +2579,6 @@ snapshots:
|
|
| 2600 |
dependencies:
|
| 2601 |
is-number: 7.0.0
|
| 2602 |
|
| 2603 |
-
tslib@2.8.1: {}
|
| 2604 |
-
|
| 2605 |
type-check@0.4.0:
|
| 2606 |
dependencies:
|
| 2607 |
prelude-ls: 1.2.1
|
|
|
|
| 11 |
'@geoman-io/leaflet-geoman-free':
|
| 12 |
specifier: ^2.18.3
|
| 13 |
version: 2.18.3(leaflet@1.9.4)
|
| 14 |
+
driver.js:
|
| 15 |
+
specifier: ^1.3.6
|
| 16 |
+
version: 1.3.6
|
| 17 |
leaflet:
|
| 18 |
specifier: ^1.9.4
|
| 19 |
version: 1.9.4
|
|
|
|
| 625 |
'@turf/bbox@6.5.0':
|
| 626 |
resolution: {integrity: sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==}
|
| 627 |
|
|
|
|
|
|
|
|
|
|
| 628 |
'@turf/bearing@6.5.0':
|
| 629 |
resolution: {integrity: sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A==}
|
| 630 |
|
|
|
|
| 646 |
'@turf/helpers@6.5.0':
|
| 647 |
resolution: {integrity: sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==}
|
| 648 |
|
|
|
|
|
|
|
|
|
|
| 649 |
'@turf/invariant@6.5.0':
|
| 650 |
resolution: {integrity: sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==}
|
| 651 |
|
|
|
|
| 664 |
'@turf/meta@6.5.0':
|
| 665 |
resolution: {integrity: sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==}
|
| 666 |
|
|
|
|
|
|
|
|
|
|
| 667 |
'@turf/nearest-point-on-line@6.5.0':
|
| 668 |
resolution: {integrity: sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg==}
|
| 669 |
|
|
|
|
| 840 |
detect-node@2.1.0:
|
| 841 |
resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
|
| 842 |
|
| 843 |
+
driver.js@1.3.6:
|
| 844 |
+
resolution: {integrity: sha512-g2nNuu+tWmPpuoyk3ffpT9vKhjPz4NrJzq6mkRDZIwXCrFhrKdDJ9TX5tJOBpvCTBrBYjgRQ17XlcQB15q4gMg==}
|
| 845 |
+
|
| 846 |
enhanced-resolve@5.18.3:
|
| 847 |
resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
|
| 848 |
engines: {node: '>=10.13.0'}
|
|
|
|
| 1329 |
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
|
| 1330 |
engines: {node: '>=8.0'}
|
| 1331 |
|
|
|
|
|
|
|
|
|
|
| 1332 |
type-check@0.4.0:
|
| 1333 |
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
|
| 1334 |
engines: {node: '>= 0.8.0'}
|
|
|
|
| 1834 |
'@turf/helpers': 6.5.0
|
| 1835 |
'@turf/meta': 6.5.0
|
| 1836 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1837 |
'@turf/bearing@6.5.0':
|
| 1838 |
dependencies:
|
| 1839 |
'@turf/helpers': 6.5.0
|
|
|
|
| 1869 |
|
| 1870 |
'@turf/helpers@6.5.0': {}
|
| 1871 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1872 |
'@turf/invariant@6.5.0':
|
| 1873 |
dependencies:
|
| 1874 |
'@turf/helpers': 6.5.0
|
|
|
|
| 1908 |
dependencies:
|
| 1909 |
'@turf/helpers': 6.5.0
|
| 1910 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1911 |
'@turf/nearest-point-on-line@6.5.0':
|
| 1912 |
dependencies:
|
| 1913 |
'@turf/bearing': 6.5.0
|
|
|
|
| 2093 |
|
| 2094 |
detect-node@2.1.0: {}
|
| 2095 |
|
| 2096 |
+
driver.js@1.3.6: {}
|
| 2097 |
+
|
| 2098 |
enhanced-resolve@5.18.3:
|
| 2099 |
dependencies:
|
| 2100 |
graceful-fs: 4.2.11
|
|
|
|
| 2255 |
|
| 2256 |
geojson-rbush@3.2.0:
|
| 2257 |
dependencies:
|
| 2258 |
+
'@turf/bbox': 6.5.0
|
| 2259 |
'@turf/helpers': 6.5.0
|
| 2260 |
'@turf/meta': 6.5.0
|
| 2261 |
'@types/geojson': 7946.0.8
|
|
|
|
| 2579 |
dependencies:
|
| 2580 |
is-number: 7.0.0
|
| 2581 |
|
|
|
|
|
|
|
| 2582 |
type-check@0.4.0:
|
| 2583 |
dependencies:
|
| 2584 |
prelude-ls: 1.2.1
|
static/src/components/PagePredictionMap.vue
CHANGED
|
@@ -6,7 +6,7 @@
|
|
| 6 |
<div class="lg:border-r lg:col-span-3">
|
| 7 |
<div id="id-map-cont" class="">
|
| 8 |
<p class="hidden lg:block">{{ description }}</p>
|
| 9 |
-
<div class="w-full md:pt-1 md:pb-1
|
| 10 |
<ButtonMapSendRequest
|
| 11 |
id="id-button-submit"
|
| 12 |
class="h-8 text-sm font-extralight min-w-[180px] max-w-[180px]"
|
|
@@ -17,7 +17,7 @@
|
|
| 17 |
:send-m-l-request="sendMLRequest"
|
| 18 |
:waiting-string="waitingString"
|
| 19 |
/>
|
| 20 |
-
<span class="ml-2
|
| 21 |
<input type="checkbox" id="checkboxMapNavigationLocked" v-model="mapNavigationLocked" />
|
| 22 |
<span class="ml-2">
|
| 23 |
<label class="text-red-600" for="checkboxMapNavigationLocked" v-if="mapNavigationLocked">locked map navigation!</label>
|
|
@@ -26,23 +26,6 @@
|
|
| 26 |
</span>
|
| 27 |
</div>
|
| 28 |
<div id="map" class="map-predictions" />
|
| 29 |
-
<ButtonMapSendRequest
|
| 30 |
-
class="h-8 min-w-[240px] max-w-[240px] mt-2 mb-2 hidden sd:h-14 lg:block portrait:xl:block"
|
| 31 |
-
:current-base-map-name="currentBaseMapNameRef"
|
| 32 |
-
id="id-button-submit"
|
| 33 |
-
:map="map"
|
| 34 |
-
:prompts-array="promptsArrayRef"
|
| 35 |
-
:response-message="responseMessageRef"
|
| 36 |
-
:send-m-l-request="sendMLRequest"
|
| 37 |
-
:waiting-string="waitingString"
|
| 38 |
-
/>
|
| 39 |
-
<span class="hidden lg:block lg:ml-2">
|
| 40 |
-
<input type="checkbox" id="checkboxMapNavigationLocked" v-model="mapNavigationLocked" />
|
| 41 |
-
<span class="ml-2">
|
| 42 |
-
<label class="text-red-600" for="checkboxMapNavigationLocked" v-if="mapNavigationLocked">locked map navigation!</label>
|
| 43 |
-
<label class="text-blue-600" for="checkboxMapNavigationLocked" v-else>map navigation unlocked</label>
|
| 44 |
-
</span>
|
| 45 |
-
</span>
|
| 46 |
</div>
|
| 47 |
</div>
|
| 48 |
|
|
@@ -108,9 +91,9 @@ import {
|
|
| 108 |
} from 'leaflet'
|
| 109 |
import 'leaflet-providers'
|
| 110 |
import '@geoman-io/leaflet-geoman-free'
|
| 111 |
-
import { onMounted, onUpdated
|
| 112 |
-
//
|
| 113 |
-
import { driver } from "
|
| 114 |
|
| 115 |
import {
|
| 116 |
currentBaseMapNameRef,
|
|
|
|
| 6 |
<div class="lg:border-r lg:col-span-3">
|
| 7 |
<div id="id-map-cont" class="">
|
| 8 |
<p class="hidden lg:block">{{ description }}</p>
|
| 9 |
+
<div class="w-full md:pt-1 md:pb-1">
|
| 10 |
<ButtonMapSendRequest
|
| 11 |
id="id-button-submit"
|
| 12 |
class="h-8 text-sm font-extralight min-w-[180px] max-w-[180px]"
|
|
|
|
| 17 |
:send-m-l-request="sendMLRequest"
|
| 18 |
:waiting-string="waitingString"
|
| 19 |
/>
|
| 20 |
+
<span class="ml-2">
|
| 21 |
<input type="checkbox" id="checkboxMapNavigationLocked" v-model="mapNavigationLocked" />
|
| 22 |
<span class="ml-2">
|
| 23 |
<label class="text-red-600" for="checkboxMapNavigationLocked" v-if="mapNavigationLocked">locked map navigation!</label>
|
|
|
|
| 26 |
</span>
|
| 27 |
</div>
|
| 28 |
<div id="map" class="map-predictions" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
</div>
|
| 30 |
</div>
|
| 31 |
|
|
|
|
| 91 |
} from 'leaflet'
|
| 92 |
import 'leaflet-providers'
|
| 93 |
import '@geoman-io/leaflet-geoman-free'
|
| 94 |
+
import { onMounted, onUpdated } from 'vue'
|
| 95 |
+
// use directly driver.js npm package
|
| 96 |
+
import { driver } from "driver.js"
|
| 97 |
|
| 98 |
import {
|
| 99 |
currentBaseMapNameRef,
|
static/src/input.css
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
@import "./leaflet-custom.css";
|
| 4 |
@import "@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css";
|
| 5 |
/* workaround because of dist/ content not included in @trincadev/driver.js tag release tarball */
|
| 6 |
-
@import "
|
| 7 |
|
| 8 |
@layer base {
|
| 9 |
* {
|
|
|
|
| 3 |
@import "./leaflet-custom.css";
|
| 4 |
@import "@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css";
|
| 5 |
/* workaround because of dist/ content not included in @trincadev/driver.js tag release tarball */
|
| 6 |
+
@import "driver.js/dist/driver.css";
|
| 7 |
|
| 8 |
@layer base {
|
| 9 |
* {
|