Merge branch 'main' of gitlab.com:openKMITL/micromobility-navigation

This commit is contained in:
NekoVari 2023-09-22 12:58:31 +07:00
commit 54caf6d3ef

View file

@ -14,30 +14,52 @@
<v-app-bar scroll-threshold="0" <v-app-bar scroll-threshold="0"
class="mx-auto px-auto" class="mx-auto px-auto"
> >
<div class="flex-grow-1">
<v-text-field <v-text-field
v-model="searchQuery" v-model="searchQuery"
@keyup.enter="performSearch" @keyup.enter="performSearch"
@input="performSearch" @input="performSearch"
@click="toggleSearchBar()"
density="compact" density="compact"
variant="solo" variant="solo"
prepend-inner-icon="mdi-magnify" prepend-inner-icon="mdi-magnify"
single-line single-line
hide-details hide-details
></v-text-field> ></v-text-field>
<v-btn icon> </div>
<v-btn icon @click="showSearchBar = !showSearchBar">
<v-icon>mdi-crosshairs-gps</v-icon> <v-icon>mdi-crosshairs-gps</v-icon>
</v-btn> </v-btn>
</v-app-bar> </v-app-bar>
</v-layout> </v-layout>
<div v-if="searchResults.length > 0" class="search-results"> <!-- <div v-if="searchResults.length > 0" class="search-results">
<ul> <ul>
<li v-for="result in searchResults" :key="result.place_id" @click="moveToLocation(result)"> <li v-for="result in searchResults" :key="result.place_id" @click="moveToLocation(result)">
{{ result.display_name }} {{ result.display_name }}
</li> </li>
</ul> </ul>
</div> </div> -->
<v-list v-if="searchResults.length > 0 && !showSearchBar" class="search-results">
<v-list-item
v-for="result in searchResults"
:key="result.place_id"
@click="moveToLocation(result),toggleSearchBar()"
>
<v-list-item-icon>
<v-icon>mdi-map-marker</v-icon>
</v-list-item-icon>
{{ result.display_name }}
</v-list-item>
</v-list>
<!-- <map/> --> <!-- <map/> -->
<ol-map <ol-map
:loadTilesWhileAnimating="true" :loadTilesWhileAnimating="true"
@ -84,14 +106,17 @@ const popupData = ref(null);
//search //search
const searchQuery = ref(""); const searchQuery = ref("");
const searchResults = ref([]); const searchResults = ref([]);
const showSearchBar = ref(false);
const toggleSearchBar = () => {
showSearchBar.value = !showSearchBar.value;
};
const moveToLocation = (result) => { const moveToLocation = (result) => {
// Extract latitude and longitude from the selected result
const lat = parseFloat(result.lat); const lat = parseFloat(result.lat);
const lon = parseFloat(result.lon); const lon = parseFloat(result.lon);
// Update the center coordinates to move the camera to the selected location
center.value = [lon, lat]; center.value = [lon, lat];
showSearchBar.value = false;
}; };
const performSearch = async () => { const performSearch = async () => {
@ -100,14 +125,12 @@ const performSearch = async () => {
`https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(searchQuery.value)}` `https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(searchQuery.value)}`
); );
// Process the search results and limit to, let's say, 5 results
searchResults.value = response.data.slice(0, 5); searchResults.value = response.data.slice(0, 5);
} catch (error) { } catch (error) {
console.error("Error fetching search results:", error); console.error("Error fetching search results:", error);
} }
}; };
//Show API //Show API
const handleMapClick = async event => { const handleMapClick = async event => {
const clickedCoordinate = event.coordinate; const clickedCoordinate = event.coordinate;