Mapper Frontend: routing to feature

src/mapper/package.json

@@ -45,6 +45,7 @@
 		"@electric-sql/client": "^0.8.0",
 		"@electric-sql/pglite": "^0.2.14",
 		"@hotosm/ui": "0.2.0-b5",
+		"@maplibre/maplibre-gl-directions": "^0.7.1",
 		"@tiptap/core": "^2.10.3",
 		"@tiptap/pm": "^2.10.3",
 		"@tiptap/starter-kit": "^2.10.3",

src/mapper/src/assets/maplibre-directions.ts

@@ -0,0 +1,68 @@
+// snapline: line from waypoint to road
+export const layers = [
+	{
+		id: 'maplibre-gl-directions-snapline',
+		type: 'line',
+		source: 'maplibre-gl-directions',
+		layout: {
+			'line-cap': 'round',
+			'line-join': 'round',
+		},
+		paint: {
+			'line-dasharray': [2, 2],
+			'line-color': '#000000',
+			'line-opacity': 0.65,
+			'line-width': 2,
+		},
+		filter: ['==', ['get', 'type'], 'SNAPLINE'],
+	},
+
+	// primary route
+	{
+		id: 'maplibre-gl-directions-routeline',
+		type: 'line',
+		source: 'maplibre-gl-directions',
+		layout: {
+			'line-cap': 'butt',
+			'line-join': 'round',
+		},
+		paint: {
+			'line-width': 12,
+			'line-opacity': 1,
+			'line-color': '#4285f4',
+		},
+		filter: ['==', ['get', 'route'], 'SELECTED'],
+	},
+
+	// alternative route
+	{
+		id: 'maplibre-gl-directions-alt-routeline',
+		type: 'line',
+		source: 'maplibre-gl-directions',
+		layout: {
+			'line-cap': 'butt',
+			'line-join': 'round',
+		},
+		paint: {
+			'line-width': 12,
+			'line-opacity': 0.8,
+			'line-color': '#547fff',
+		},
+		filter: ['==', ['get', 'route'], 'ALT'],
+	},
+
+	// only apply icon-style to the destination waypoint as we have icon for the origin
+	{
+		id: 'maplibre-gl-directions-waypoint',
+		type: 'symbol',
+		source: 'maplibre-gl-directions',
+		layout: {
+			'icon-image': 'location',
+			'icon-anchor': 'bottom',
+			'icon-ignore-placement': true,
+			'icon-overlap': 'always',
+			'icon-size': 0.5,
+		},
+		filter: ['all', ['==', ['get', 'type'], 'WAYPOINT'], ['==', ['get', 'category'], 'DESTINATION']],
+	},
+];

src/mapper/src/lib/components/dialog-entities-actions.svelte

@@ -19,6 +19,8 @@
 	const selectedEntity = $derived(
 		entitiesStore.entitiesStatusList?.find((entity) => entity.osmid === selectedEntityOsmId),
 	);
+	const selectedEntityCoordinate = $derived(entitiesStore.selectedEntityCoordinate);
+	const entityToNavigate = $derived(entitiesStore.entityToNavigate);
 
 	const mapFeature = () => {
 		const xformId = projectData?.odk_form_id;
@@ -43,6 +45,13 @@
 			alertStore.setAlert({ message: 'Requires a mobile phone with ODK Collect.', variant: 'warning' });
 		}
 	};
+
+	const navigateToEntity = () => {
+		if (!entitiesStore.toggleGeolocation) {
+			entitiesStore.setToggleGeolocation(true);
+		}
+		entitiesStore.setEntityToNavigate(selectedEntityCoordinate);
+	};
 </script>
 
 {#if isTaskActionModalOpen && selectedTab === 'map' && selectedEntity}
@@ -68,7 +77,6 @@
 				<div class="flex items-center justify-between">
 					<p class="text-[#333] text-xl font-barlow-semibold">Feature {selectedEntity?.osmid}</p>
 					<sl-button
-						loading={entitiesStore.syncEntityStatusLoading}
 						onclick={async () => {
 							await entitiesStore.syncEntityStatus(projectData?.id);
 						}}
@@ -78,8 +86,14 @@
 						role="button"
 						tabindex="0"
 						size="small"
-						class="secondary w-fit ml-auto"
+						class="link w-fit ml-auto"
+						disabled={entitiesStore.syncEntityStatusLoading}
 					>
+						<hot-icon
+							slot="prefix"
+							name="arrow-repeat"
+							class={`!text-[1rem] cursor-pointer duration-200 ${entitiesStore.syncEntityStatusLoading && 'animate-spin'}`}
+						></hot-icon>
 						<span class="font-barlow-medium text-SM uppercase">SYNC STATUS</span>
 					</sl-button>
 				</div>
@@ -92,24 +106,47 @@
 					</p>
 				</div>
 				{#if selectedEntity?.status !== 'SURVEY_SUBMITTED'}
-					<sl-button
-						loading={entitiesStore.updateEntityStatusLoading}
-						variant="default"
-						size="small"
-						class="primary"
-						onclick={() => {
-							mapFeature();
-						}}
-						onkeydown={(e: KeyboardEvent) => {
-							if (e.key === 'Enter') {
+					<div class="flex gap-2">
+						<sl-button
+							disabled={entityToNavigate?.entityId === selectedEntity?.osmid}
+							variant="default"
+							size="small"
+							class="secondary flex-grow"
+							onclick={() => {
+								navigateToEntity();
+							}}
+							onkeydown={(e: KeyboardEvent) => {
+								if (e.key === 'Enter') {
+									navigateToEntity();
+								}
+							}}
+							role="button"
+							tabindex="0"
+						>
+							<hot-icon slot="prefix" name="direction" class="!text-[1rem] cursor-pointer duration-200"></hot-icon>
+							<span class="font-barlow-medium text-sm">NAVIGATE HERE</span>
+						</sl-button>
+						<sl-button
+							loading={entitiesStore.updateEntityStatusLoading}
+							variant="default"
+							size="small"
+							class="primary flex-grow"
+							onclick={() => {
 								mapFeature();
-							}
-						}}
-						role="button"
-						tabindex="0"
-					>
-						<span class="font-barlow-medium text-sm">MAP FEATURE IN ODK</span>
-					</sl-button>
+							}}
+							onkeydown={(e: KeyboardEvent) => {
+								if (e.key === 'Enter') {
+									mapFeature();
+								}
+							}}
+							role="button"
+							tabindex="0"
+						>
+							<hot-icon slot="prefix" name="location" class="!text-[1rem] text-white cursor-pointer duration-200"
+							></hot-icon>
+							<span class="font-barlow-medium text-sm">MAP FEATURE IN ODK</span>
+						</sl-button>
+					</div>
 				{/if}
 			</div>
 		</div>