Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Look up tile server info in homeserver's .well-known area #7623

Merged
merged 9 commits into from
Jan 27, 2022
Merged

Look up tile server info in homeserver's .well-known area #7623

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4572b38
Look up tile server info in homeserver's .well-known area
andybalaam Jan 25, 2022
8201f17
Fix crash if well-known entry is missing on homeserver
andybalaam Jan 25, 2022
c51d7de
Remove map tile server fallback and better handle missing config
andybalaam Jan 25, 2022
0613a3e
Merge branch 'develop' into psf-578-use-well-known
andybalaam Jan 25, 2022
6bb8d82
Update map style when .well-known config changes
andybalaam Jan 26, 2022
5c8320e
Merge develop into psf-578-use-well-known (using imerge)
andybalaam Jan 26, 2022
e49c8a2
Respond to review comments
andybalaam Jan 27, 2022
41ad515
Merge develop into psf-578-use-well-known (using imerge)
andybalaam Jan 27, 2022
25710d6
Update src/components/views/location/LocationPicker.tsx
andybalaam Jan 27, 2022
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
9 changes: 3 additions & 6 deletions src/components/views/location/LocationPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ interface IState {
class LocationPicker extends React.Component<IProps, IState> {
public static contextType = MatrixClientContext;
public context!: React.ContextType<typeof MatrixClientContext>;
private map?: maplibregl.Map;
private geolocate?: maplibregl.GeolocateControl;
private marker?: maplibregl.Marker;
private map?: maplibregl.Map= null;
andybalaam marked this conversation as resolved.
Show resolved Hide resolved
private geolocate?: maplibregl.GeolocateControl = null;
private marker?: maplibregl.Marker = null;

constructor(props: IProps) {
super(props);
Expand All @@ -64,9 +64,6 @@ class LocationPicker extends React.Component<IProps, IState> {
position: undefined,
error: undefined,
};
this.map = null;
this.geolocate = null;
this.marker = null;
}

private getMarkerId = () => {
Expand Down
3 changes: 1 addition & 2 deletions src/components/views/messages/MLocationBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
private coords: GeolocationCoordinates;
private bodyId: string;
private markerId: string;
private map?: maplibregl.Map;
private map?: maplibregl.Map = null;

constructor(props: IBodyProps) {
super(props);
Expand All @@ -60,7 +60,6 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
this.bodyId = `mx_MLocationBody_${idSuffix}`;
this.markerId = `mx_MLocationBody_marker_${idSuffix}`;
this.coords = parseGeoUri(locationEventGeoUri(this.props.mxEvent));
this.map = null;

this.state = {
error: undefined,
Expand Down