midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add location locking functionality

Browse source
This commit is contained in:
pietervdvn 2021-03-14 20:14:51 +01:00
parent 94c0b8667a
commit 19582853f5
5 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Customizations/JSON/LayerConfig.ts
View file

@ -49,6 +49,8 @@ export default class LayerConfig {
tagRenderings: TagRenderingConfig [];
private readonly configuration_warnings : string[] = []
constructor(json: LayerConfigJson,
context?: string) {
context = context + "." + json.id;

3
Customizations/JSON/LayoutConfig.ts
View file

@ -31,6 +31,7 @@ export default class LayoutConfig {
};
public readonly hideFromOverview: boolean;
public readonly lockLocation: boolean | [[number,number],[number, number]];
public readonly enableUserBadge: boolean;
public readonly enableShareScreen: boolean;
public readonly enableMoreQuests: boolean;
@ -149,7 +150,7 @@ export default class LayoutConfig {
}
this.hideFromOverview = json.hideFromOverview ?? false;
this.lockLocation = json.lockLocation ?? false;
this.enableUserBadge = json.enableUserBadge ?? true;
this.enableShareScreen = json.enableShareScreen ?? true;
this.enableMoreQuests = json.enableMoreQuests ?? true;

7
Customizations/JSON/LayoutConfigJson.ts
View file

@ -158,6 +158,13 @@ export interface LayoutConfigJson {
*/
hideFromOverview?: boolean;
/**
* If set to true, the basemap will not scroll outside of the area visible on initial zoom.
* If set to [[lat0, lon0], [lat1, lon1]], the map will not scroll outside of those bounds.
* Off by default, which will enable panning to the entire world
*/
lockLocation?: boolean | [[number, number], [number, number]];
enableUserBadge?: boolean;
enableShareScreen?: boolean;
enableMoreQuests?: boolean;

4
Customizations/JSON/TagRenderingConfig.ts
View file

@ -16,6 +16,8 @@ export default class TagRenderingConfig {
readonly question?: Translation;
readonly condition?: TagsFilter;
readonly configuration_warnings : string[] = []
readonly freeform?: {
readonly key: string,
readonly type: string,
@ -152,7 +154,7 @@ export default class TagRenderingConfig {
for (const expectedKey of keys) {
if(usedKeys.indexOf(expectedKey) < 0){
const msg = `${context}.mappings[${i}]: This mapping only defines values for ${usedKeys.join(', ')}, but it should also give a value for ${expectedKey}`
console.warn(msg)
this.configuration_warnings.push(msg)
}
}
}

19
InitUiElements.ts
View file

@ -276,7 +276,7 @@ export class InitUiElements {
const copyrightNotice =
new ScrollableFullScreen(
() => Translations.t.general.attribution.attributionTitle.Clone(),
() => new Combine([
() => new Combine([
Translations.t.general.attribution.attributionContent,
"<br/>",
new Attribution(undefined, undefined, State.state.layoutToUse, undefined)
@ -335,6 +335,7 @@ export class InitUiElements {
const attr = new Attribution(State.state.locationControl, State.state.osmConnection.userDetails, State.state.layoutToUse,
State.state.leafletMap);
const bm = new Basemap("leafletDiv",
State.state.locationControl,
State.state.backgroundLayer,
@ -342,6 +343,22 @@ export class InitUiElements {
attr
);
State.state.leafletMap.setData(bm.map);
const layout = State.state.layoutToUse.data
if (layout.lockLocation) {
const tile = Utils.embedded_tile(layout.startLat, layout.startLon, layout.startZoom - 1)
const bounds = Utils.tile_bounds(tile.z, tile.x, tile.y)
// We use the bounds to get a sense of distance for this zoom level
const latDiff = bounds[0][0] - bounds[1][0]
const lonDiff = bounds[0][1] - bounds[1][1]
console.warn("Locking the bounds to ", bounds)
bm.map.setMaxBounds(
[[ layout.startLat - latDiff, layout.startLon - lonDiff ],
[ layout.startLat + latDiff, layout.startLon + lonDiff ],
]
);
bm.map.setMinZoom(layout.startZoom)
}
}
private static InitLayers() {