Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider geolocation errors for MMapGeolocationControl #41

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Consider geolocation errors for MMapGeolocationControl #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/controls/MMapGeolocationControl/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import './index.css';
* MMapGeolocationControl props
*/
type MMapGeolocationControlProps = {
/** Geolocation request callback */
/** Geolocation request success callback */
onGeolocatePosition?: (position: LngLat) => void;
/** Geolocation request error callback */
onGeolocateError?: () => void;
/** Data source id for geolocation placemark */
source?: string;
/** Easing function for map location animation */
Expand All @@ -19,19 +21,30 @@ type MMapGeolocationControlProps = {
duration?: number;
/** Map zoom after geolocate position */
zoom?: number;
/** Options for {@link mappable.geolocation.getPosition} */
positionOptions?: PositionOptions;
};

const defaultProps = Object.freeze({duration: 500});
const defaultProps = Object.freeze({
duration: 500,
positionOptions: {
enableHighAccuracy: true,
timeout: 5000,
maximumAge: 60000
}
});

type DefaultProps = typeof defaultProps;

const MMapGeolocationControlVuefyOptions: CustomVuefyOptions<MMapGeolocationControl> = {
props: {
onGeolocatePosition: Function as TVue.PropType<MMapGeolocationControlProps['onGeolocatePosition']>,
onGeolocateError: Function as TVue.PropType<MMapGeolocationControlProps['onGeolocateError']>,
source: String,
easing: [String, Object, Function] as TVue.PropType<EasingFunctionDescription>,
duration: {type: Number, default: defaultProps.duration},
zoom: {type: Number}
zoom: {type: Number},
positionOptions: {type: Object, default: defaultProps.positionOptions}
}
};

Expand Down Expand Up @@ -83,9 +96,7 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
private _updatePosition(pos: LngLat): void {
this._position = pos;

if (this._props.onGeolocatePosition) {
this._props.onGeolocatePosition(this._position);
}
this._props.onGeolocatePosition?.(this._position);

const map = this.root;
map?.update({
Expand All @@ -106,10 +117,15 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
this._setLoading(true);

mappable.geolocation
.getPosition({enableHighAccuracy: true, maximumAge: 60000})
.getPosition(this._props.positionOptions)
.then((position: {coords: LngLat; accuracy: number}) => {
this._setLoading(false);
this._updatePosition(position.coords);
})
.catch(() => {
this._props.onGeolocateError?.();
})
.finally(() => {
this._setLoading(false);
});
}

Expand Down
Loading