merge-upstream-5.0.1 #66
|
|
@ -21,20 +21,17 @@
|
|||
/>
|
||||
<full-address-auto-complete
|
||||
:resultType="AddressSearchType.ADMINISTRATIVE"
|
||||
v-model="location"
|
||||
v-model="address"
|
||||
:hide-map="true"
|
||||
:hide-selected="true"
|
||||
:default-text="locationDefaultText"
|
||||
:default-text="addressDefaultText"
|
||||
labelClass="sr-only"
|
||||
:placeholder="t('e.g. Nantes, Berlin, Cork, …')"
|
||||
v-on:update:modelValue="modelValueUpdate"
|
||||
>
|
||||
<o-dropdown v-model="distance" position="bottom-right" v-if="distance">
|
||||
<template #trigger>
|
||||
<o-button
|
||||
icon-left="map-marker-distance"
|
||||
:title="t('Select distance')"
|
||||
/>
|
||||
<o-button :title="t('Select distance')">{{ distanceText }}</o-button>
|
||||
</template>
|
||||
<o-dropdown-item
|
||||
v-for="distance_item in distanceList"
|
||||
|
|
@ -56,8 +53,8 @@ import { IAddress } from "@/types/address.model";
|
|||
import { AddressSearchType } from "@/types/enums";
|
||||
import {
|
||||
addressToLocation,
|
||||
getLocationFromLocal,
|
||||
storeLocationInLocal,
|
||||
getAddressFromLocal,
|
||||
storeAddressInLocal,
|
||||
} from "@/utils/location";
|
||||
import { computed, defineAsyncComponent } from "vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
|
|
@ -69,8 +66,8 @@ const FullAddressAutoComplete = defineAsyncComponent(
|
|||
);
|
||||
|
||||
const props = defineProps<{
|
||||
location: IAddress | null;
|
||||
locationDefaultText?: string | null;
|
||||
address: IAddress | null;
|
||||
addressDefaultText?: string | null;
|
||||
search: string;
|
||||
distance: number | null;
|
||||
fromLocalStorage?: boolean | false;
|
||||
|
|
@ -80,26 +77,27 @@ const router = useRouter();
|
|||
const route = useRoute();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(event: "update:location", location: IAddress | null): void;
|
||||
(event: "update:address", address: IAddress | null): void;
|
||||
(event: "update:search", newSearch: string): void;
|
||||
(event: "update:distance", newDistance: number): void;
|
||||
(event: "submit"): void;
|
||||
}>();
|
||||
|
||||
const location = computed({
|
||||
const address = computed({
|
||||
get(): IAddress | null {
|
||||
if (props.location) {
|
||||
return props.location;
|
||||
console.debug("-- get address --", props);
|
||||
if (props.address) {
|
||||
return props.address;
|
||||
}
|
||||
if (props.fromLocalStorage) {
|
||||
return getLocationFromLocal();
|
||||
return getAddressFromLocal();
|
||||
}
|
||||
return null;
|
||||
},
|
||||
set(newLocation: IAddress | null) {
|
||||
emit("update:location", newLocation);
|
||||
set(newAddress: IAddress | null) {
|
||||
emit("update:address", newAddress);
|
||||
if (props.fromLocalStorage) {
|
||||
storeLocationInLocal(newLocation);
|
||||
storeAddressInLocal(newAddress);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -122,75 +120,31 @@ const distance = computed({
|
|||
},
|
||||
});
|
||||
|
||||
const distanceList = computed(() => {
|
||||
return [
|
||||
{
|
||||
distance: 5,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 5,
|
||||
},
|
||||
5
|
||||
),
|
||||
},
|
||||
{
|
||||
distance: 10,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 10,
|
||||
},
|
||||
10
|
||||
),
|
||||
},
|
||||
{
|
||||
distance: 25,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 25,
|
||||
},
|
||||
25
|
||||
),
|
||||
},
|
||||
{
|
||||
distance: 50,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 50,
|
||||
},
|
||||
50
|
||||
),
|
||||
},
|
||||
{
|
||||
distance: 100,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 100,
|
||||
},
|
||||
100
|
||||
),
|
||||
},
|
||||
{
|
||||
distance: 150,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 150,
|
||||
},
|
||||
150
|
||||
),
|
||||
},
|
||||
];
|
||||
const distanceText = computed(() => {
|
||||
return distance.value + " km";
|
||||
});
|
||||
|
||||
console.debug("initial", distance.value, search.value, location.value);
|
||||
const distanceList = computed(() => {
|
||||
const distances = [];
|
||||
[5, 10, 25, 50, 100, 150].forEach((value) => {
|
||||
distances.push({
|
||||
distance: value,
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: value,
|
||||
},
|
||||
value
|
||||
),
|
||||
});
|
||||
});
|
||||
return distances;
|
||||
});
|
||||
|
||||
const modelValueUpdate = (newlocation: IAddress | null) => {
|
||||
emit("update:location", newlocation);
|
||||
console.debug("initial", distance.value, search.value, address.value);
|
||||
|
||||
const modelValueUpdate = (newaddress: IAddress | null) => {
|
||||
emit("update:address", newaddress);
|
||||
};
|
||||
|
||||
const submit = () => {
|
||||
|
|
@ -205,10 +159,9 @@ const submit = () => {
|
|||
if (search.value != "") {
|
||||
search_query.search = search.value;
|
||||
}
|
||||
if (location.value) {
|
||||
const { lat, lon } = addressToLocation(location.value);
|
||||
search_query.locationName =
|
||||
location.value.locality ?? location.value.region;
|
||||
if (address.value) {
|
||||
const { lat, lon } = addressToLocation(address.value);
|
||||
search_query.locationName = address.value.locality ?? address.value.region;
|
||||
search_query.lat = lat;
|
||||
search_query.lon = lon;
|
||||
if (distance.value != null) {
|
||||
|
|
|
|||
|
|
@ -1360,6 +1360,7 @@
|
|||
"Keyword, event title, group name, etc.": "Keyword, event title, group name, etc.",
|
||||
"Go!": "Go!",
|
||||
"Explore!": "Explore!",
|
||||
"Select distance": "Select distance",
|
||||
"Join {instance}, a Mobilizon instance": "Join {instance}, a Mobilizon instance",
|
||||
"Open user menu": "Open user menu",
|
||||
"Open main menu": "Open main menu",
|
||||
|
|
|
|||
|
|
@ -1028,6 +1028,7 @@
|
|||
"Select a radius": "Sélectionnez un rayon",
|
||||
"Select a timezone": "Selectionnez un fuseau horaire",
|
||||
"Select all resources": "Sélectionner toutes les ressources",
|
||||
"Select distance": "Sélectionner la distance",
|
||||
"Select languages": "Choisissez une langue",
|
||||
"Select the activities for which you wish to receive an email or a push notification.": "Sélectionnez les activités pour lesquelles vous souhaitez recevoir un email ou une notification push.",
|
||||
"Select this resource": "Sélectionner cette ressource",
|
||||
|
|
|
|||
|
|
@ -9,9 +9,19 @@ const GEOHASH_DEPTH = 9; // put enough accuracy, radius will be used anyway
|
|||
export const addressToLocation = (
|
||||
address: IAddress
|
||||
): LocationType | undefined => {
|
||||
if (!address.geom) return undefined;
|
||||
if (!address.geom)
|
||||
return {
|
||||
lon: undefined,
|
||||
lat: undefined,
|
||||
name: undefined,
|
||||
};
|
||||
const arr = address.geom.split(";");
|
||||
if (arr.length < 2) return undefined;
|
||||
if (arr.length < 2)
|
||||
return {
|
||||
lon: undefined,
|
||||
lat: undefined,
|
||||
name: undefined,
|
||||
};
|
||||
return {
|
||||
lon: parseFloat(arr[0]),
|
||||
lat: parseFloat(arr[1]),
|
||||
|
|
@ -19,6 +29,17 @@ export const addressToLocation = (
|
|||
};
|
||||
};
|
||||
|
||||
export const locationToAddress = (location: LocationType): IAddress | null => {
|
||||
if (location.lon && location.lat) {
|
||||
const new_add = new Address();
|
||||
new_add.geom = location.lon.toString() + ";" + location.lat.toString();
|
||||
new_add.description = location.name || "";
|
||||
console.debug("locationToAddress", location, new_add);
|
||||
return new_add;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
export const coordsToGeoHash = (
|
||||
lat: number | undefined,
|
||||
lon: number | undefined,
|
||||
|
|
@ -38,44 +59,24 @@ export const geoHashToCoords = (
|
|||
return latitude && longitude ? { latitude, longitude } : undefined;
|
||||
};
|
||||
|
||||
export const storeLocationInLocal = (location: IAddress | null): undefined => {
|
||||
if (location) {
|
||||
window.localStorage.setItem("location", JSON.stringify(location));
|
||||
export const storeAddressInLocal = (address: IAddress | null): undefined => {
|
||||
if (address) {
|
||||
window.localStorage.setItem("address", JSON.stringify(address));
|
||||
} else {
|
||||
window.localStorage.removeItem("location");
|
||||
window.localStorage.removeItem("address");
|
||||
}
|
||||
};
|
||||
|
||||
export const getLocationFromLocal = (): IAddress | null => {
|
||||
const locationString = window.localStorage.getItem("location");
|
||||
if (!locationString) {
|
||||
export const getAddressFromLocal = (): IAddress | null => {
|
||||
const addressString = window.localStorage.getItem("address");
|
||||
if (!addressString) {
|
||||
return null;
|
||||
}
|
||||
const location = JSON.parse(locationString) as IAddress;
|
||||
if (!location.description || !location.geom) {
|
||||
const address = JSON.parse(addressString) as IAddress;
|
||||
if (!address.description || !address.geom) {
|
||||
return null;
|
||||
}
|
||||
return location;
|
||||
};
|
||||
|
||||
export const storeRadiusInLocal = (radius: number | null): undefined => {
|
||||
if (radius) {
|
||||
window.localStorage.setItem("radius", radius.toString());
|
||||
} else {
|
||||
window.localStorage.removeItem("radius");
|
||||
}
|
||||
};
|
||||
|
||||
export const getRadiusFromLocal = (): IAddress | null => {
|
||||
const locationString = window.localStorage.getItem("location");
|
||||
if (!locationString) {
|
||||
return null;
|
||||
}
|
||||
const location = JSON.parse(locationString) as IAddress;
|
||||
if (!location.description || !location.geom) {
|
||||
return null;
|
||||
}
|
||||
return location;
|
||||
return address;
|
||||
};
|
||||
|
||||
export const storeUserLocationAndRadiusFromUserSettings = (
|
||||
|
|
@ -84,18 +85,13 @@ export const storeUserLocationAndRadiusFromUserSettings = (
|
|||
if (location) {
|
||||
const latlon = geoHashToCoords(location.geohash);
|
||||
if (latlon) {
|
||||
storeLocationInLocal({
|
||||
storeAddressInLocal({
|
||||
...new Address(),
|
||||
geom: `${latlon.longitude};${latlon.latitude}`,
|
||||
description: location.name || "",
|
||||
type: "administrative",
|
||||
});
|
||||
}
|
||||
if (location.range) {
|
||||
storeRadiusInLocal(location.range);
|
||||
} else {
|
||||
console.debug("user has not set a radius");
|
||||
}
|
||||
} else {
|
||||
console.debug("user has not set a location");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,11 +28,12 @@
|
|||
<!-- Search fields -->
|
||||
<search-fields
|
||||
v-model:search="search"
|
||||
v-model:location="location"
|
||||
v-model:address="userAddress"
|
||||
v-model:distance="distance"
|
||||
:locationDefaultText="userLocation?.name"
|
||||
v-on:update:location="updateLocation"
|
||||
v-on:update:address="updateAddress"
|
||||
:fromLocalStorage="true"
|
||||
:addressDefaultText="userLocation?.name"
|
||||
:key="increated"
|
||||
/>
|
||||
<!-- Categories preview -->
|
||||
<categories-preview />
|
||||
|
|
@ -185,7 +186,13 @@ import CategoriesPreview from "@/components/Home/CategoriesPreview.vue";
|
|||
import UnloggedIntroduction from "@/components/Home/UnloggedIntroduction.vue";
|
||||
import SearchFields from "@/components/Home/SearchFields.vue";
|
||||
import { useHead } from "@unhead/vue";
|
||||
import { addressToLocation, geoHashToCoords } from "@/utils/location";
|
||||
import {
|
||||
addressToLocation,
|
||||
geoHashToCoords,
|
||||
getAddressFromLocal,
|
||||
locationToAddress,
|
||||
storeAddressInLocal,
|
||||
} from "@/utils/location";
|
||||
import { useServerProvidedLocation } from "@/composition/apollo/config";
|
||||
import { ABOUT } from "@/graphql/config";
|
||||
import { IConfig } from "@/types/config.model";
|
||||
|
|
@ -238,13 +245,14 @@ const currentUserParticipations = computed(
|
|||
() => loggedUser.value?.participations.elements
|
||||
);
|
||||
|
||||
const location = ref(null);
|
||||
const increated = ref(0);
|
||||
const address = ref(null);
|
||||
const search = ref("");
|
||||
const noLocation = ref(false);
|
||||
const noAddress = ref(false);
|
||||
const current_distance = ref(null);
|
||||
|
||||
watch(location, (newLoc, oldLoc) =>
|
||||
console.debug("LOCATION UPDATED from", { ...oldLoc }, " to ", { ...newLoc })
|
||||
watch(address, (newAdd, oldAdd) =>
|
||||
console.debug("ADDRESS UPDATED from", { ...oldAdd }, " to ", { ...newAdd })
|
||||
);
|
||||
|
||||
const isToday = (date: string): boolean => {
|
||||
|
|
@ -401,13 +409,13 @@ const { result: reverseGeocodeResult } = useQuery<{
|
|||
}));
|
||||
|
||||
const userSettingsLocation = computed(() => {
|
||||
const address = reverseGeocodeResult.value?.reverseGeocode[0];
|
||||
const placeName = address?.locality ?? address?.region ?? address?.country;
|
||||
const location = reverseGeocodeResult.value?.reverseGeocode[0];
|
||||
const placeName = location?.locality ?? location?.region ?? location?.country;
|
||||
return {
|
||||
lat: coords.value?.latitude,
|
||||
lon: coords.value?.longitude,
|
||||
name: placeName,
|
||||
picture: address?.pictureInfo,
|
||||
picture: location?.pictureInfo,
|
||||
isIPLocation: coords.value?.isIPLocation,
|
||||
};
|
||||
});
|
||||
|
|
@ -433,16 +441,20 @@ const currentUserLocation = computed(() => {
|
|||
|
||||
const userLocation = computed(() => {
|
||||
console.debug("new userLocation");
|
||||
if (noLocation.value) {
|
||||
if (noAddress.value) {
|
||||
return {
|
||||
lon: null,
|
||||
lat: null,
|
||||
name: null,
|
||||
};
|
||||
}
|
||||
if (location.value) {
|
||||
if (address.value) {
|
||||
console.debug("userLocation is typed location");
|
||||
return addressToLocation(location.value);
|
||||
return addressToLocation(address.value);
|
||||
}
|
||||
const local_address = getAddressFromLocal();
|
||||
if (local_address) {
|
||||
return addressToLocation(local_address);
|
||||
}
|
||||
if (
|
||||
!userSettingsLocation.value ||
|
||||
|
|
@ -454,9 +466,36 @@ const userLocation = computed(() => {
|
|||
return userSettingsLocation.value;
|
||||
});
|
||||
|
||||
const userAddress = computed({
|
||||
get(): IAddress | null {
|
||||
if (noAddress.value) {
|
||||
return null;
|
||||
}
|
||||
if (address.value) {
|
||||
return address.value;
|
||||
}
|
||||
const local_address = getAddressFromLocal();
|
||||
if (local_address) {
|
||||
return local_address;
|
||||
}
|
||||
if (
|
||||
!userSettingsLocation.value ||
|
||||
(userSettingsLocation.value?.isIPLocation &&
|
||||
currentUserLocation.value?.name)
|
||||
) {
|
||||
return locationToAddress(currentUserLocation.value);
|
||||
}
|
||||
return locationToAddress(userSettingsLocation.value);
|
||||
},
|
||||
set(newAddress: IAddress | null) {
|
||||
address.value = newAddress;
|
||||
noAddress.value = newAddress == null;
|
||||
},
|
||||
});
|
||||
|
||||
const distance = computed({
|
||||
get(): number | null {
|
||||
if (noLocation.value || !userLocation.value?.name) {
|
||||
if (noAddress.value || !userLocation.value?.name) {
|
||||
return null;
|
||||
} else if (current_distance.value == null) {
|
||||
return userLocation.value?.isIPLocation ? 150 : 25;
|
||||
|
|
@ -528,8 +567,13 @@ const performGeoLocation = () => {
|
|||
);
|
||||
};
|
||||
|
||||
const updateLocation = (newlocation: IAddress | null) => {
|
||||
noLocation.value = newlocation == null;
|
||||
const updateAddress = (newAddress: IAddress | null) => {
|
||||
if (address.value?.geom != newAddress?.geom || newAddress == null) {
|
||||
increated.value += 1;
|
||||
storeAddressInLocal(newAddress);
|
||||
}
|
||||
address.value = newAddress;
|
||||
noAddress.value = newAddress == null;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
<search-fields
|
||||
class="md:ml-10 mr-2"
|
||||
v-model:search="search"
|
||||
v-model:location="location"
|
||||
:locationDefaultText="locationName"
|
||||
v-model:address="address"
|
||||
v-model:distance="radius"
|
||||
:addressDefaultText="addressName"
|
||||
:fromLocalStorage="true"
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -155,43 +156,6 @@
|
|||
</template>
|
||||
</filter-section>
|
||||
|
||||
<filter-section
|
||||
v-show="!isOnline"
|
||||
v-model:opened="searchFilterSectionsOpenStatus.eventDistance"
|
||||
:title="t('Distance')"
|
||||
>
|
||||
<template #options>
|
||||
<fieldset class="flex flex-col">
|
||||
<legend class="sr-only">{{ t("Distance") }}</legend>
|
||||
<div
|
||||
v-for="distanceOption in eventDistance"
|
||||
:key="distanceOption.id"
|
||||
>
|
||||
<input
|
||||
:id="distanceOption.id"
|
||||
v-model="distance"
|
||||
type="radio"
|
||||
name="eventDistance"
|
||||
:value="distanceOption.id"
|
||||
class="w-4 h-4 border-gray-300 focus:ring-2 focus:ring-blue-300 dark:focus:ring-blue-600 dark:focus:bg-blue-600 dark:bg-gray-700 dark:border-gray-600"
|
||||
/>
|
||||
<label
|
||||
:for="distanceOption.id"
|
||||
class="cursor-pointer ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"
|
||||
>{{ distanceOption.label }}</label
|
||||
>
|
||||
</div>
|
||||
</fieldset>
|
||||
</template>
|
||||
<template #preview>
|
||||
<span
|
||||
class="bg-blue-100 text-blue-800 text-sm font-semibold p-0.5 rounded dark:bg-blue-200 dark:text-blue-800 grow-0"
|
||||
>
|
||||
{{ eventDistance.find(({ id }) => id === distance)?.label }}
|
||||
</span>
|
||||
</template>
|
||||
</filter-section>
|
||||
|
||||
<filter-section
|
||||
v-show="contentType !== 'GROUPS'"
|
||||
v-model:opened="searchFilterSectionsOpenStatus.eventCategory"
|
||||
|
|
@ -620,7 +584,7 @@
|
|||
:contentType="contentType"
|
||||
:latitude="latitude"
|
||||
:longitude="longitude"
|
||||
:locationName="locationName"
|
||||
:locationName="addressName"
|
||||
@map-updated="setBounds"
|
||||
:events="searchEvents"
|
||||
:groups="searchGroups"
|
||||
|
|
@ -697,25 +661,25 @@ const EventMarkerMap = defineAsyncComponent(
|
|||
|
||||
const search = useRouteQuery("search", "");
|
||||
const searchDebounced = refDebounced(search, 1000);
|
||||
const locationName = useRouteQuery("locationName", null);
|
||||
const location = ref<IAddress | null>(null);
|
||||
const addressName = useRouteQuery("locationName", null);
|
||||
const address = ref<IAddress | null>(null);
|
||||
|
||||
watch(location, (newLocation) => {
|
||||
console.debug("location change", newLocation);
|
||||
if (newLocation?.geom) {
|
||||
latitude.value = parseFloat(newLocation?.geom.split(";")[1]);
|
||||
longitude.value = parseFloat(newLocation?.geom.split(";")[0]);
|
||||
locationName.value = newLocation?.description;
|
||||
console.debug("set location", [
|
||||
watch(address, (newAddress: IAddress) => {
|
||||
console.debug("address change", newAddress);
|
||||
if (newAddress?.geom) {
|
||||
latitude.value = parseFloat(newAddress?.geom.split(";")[1]);
|
||||
longitude.value = parseFloat(newAddress?.geom.split(";")[0]);
|
||||
addressName.value = newAddress?.description;
|
||||
console.debug("set address", [
|
||||
latitude.value,
|
||||
longitude.value,
|
||||
locationName.value,
|
||||
addressName.value,
|
||||
]);
|
||||
} else {
|
||||
console.debug("location emptied");
|
||||
console.debug("address emptied");
|
||||
latitude.value = undefined;
|
||||
longitude.value = undefined;
|
||||
locationName.value = null;
|
||||
addressName.value = null;
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -759,9 +723,6 @@ const groupPage = useRouteQuery("groupPage", 1, integerTransformer);
|
|||
const latitude = useRouteQuery("lat", undefined, floatTransformer);
|
||||
const longitude = useRouteQuery("lon", undefined, floatTransformer);
|
||||
|
||||
// TODO
|
||||
// This should be updated with getRadiusFromLocal if we want to use user's
|
||||
// preferences
|
||||
const distance = useRouteQuery("distance", "10_km");
|
||||
const when = useRouteQuery("when", "any");
|
||||
const contentType = useRouteQuery(
|
||||
|
|
@ -946,75 +907,6 @@ const contentTypeMapping = computed(() => {
|
|||
}
|
||||
});
|
||||
|
||||
const eventDistance = computed(() => {
|
||||
return [
|
||||
{
|
||||
id: "anywhere",
|
||||
label: t("Any distance"),
|
||||
},
|
||||
{
|
||||
id: "5_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 5,
|
||||
},
|
||||
5
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "10_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 10,
|
||||
},
|
||||
10
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "25_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 25,
|
||||
},
|
||||
25
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "50_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 50,
|
||||
},
|
||||
50
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "100_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 100,
|
||||
},
|
||||
100
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "150_km",
|
||||
label: t(
|
||||
"{number} kilometers",
|
||||
{
|
||||
number: 150,
|
||||
},
|
||||
150
|
||||
),
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
const eventStatuses = computed(() => {
|
||||
return [
|
||||
{
|
||||
|
|
@ -1049,7 +941,14 @@ const geoHashLocation = computed(() =>
|
|||
coordsToGeoHash(latitude.value, longitude.value)
|
||||
);
|
||||
|
||||
const radius = computed(() => Number.parseInt(distance.value.slice(0, -3)));
|
||||
const radius = computed({
|
||||
get(): number | null {
|
||||
return Number.parseInt(distance.value.slice(0, -3));
|
||||
},
|
||||
set(newRadius: number) {
|
||||
distance.value = newRadius.toString() + "_km";
|
||||
},
|
||||
});
|
||||
|
||||
const longEvents = computed(() => {
|
||||
if (contentType.value === ContentType.EVENTS) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue