Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove per world default zoom, use per map instead

Browse Source
This commit is contained in:
James Lyne 2022-02-27 20:27:34 +00:00
parent 4473b35f7d
commit 625e44a048
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Map.vue
View File

@ -204,8 +204,6 @@ export default defineComponent({
viewTarget.zoom = store.state.parsedUrl?.zoom;
} else if(typeof store.state.currentMap?.defaultZoom !== 'undefined') { //Map default zoom
viewTarget.zoom = store.state.currentMap?.defaultZoom;
}else if(typeof newValue.defaultZoom !== 'undefined') { //World default zoom
viewTarget.zoom = newValue.defaultZoom;
} else { //Global default zoom
viewTarget.zoom = store.state.configuration.defaultZoom;
}
@ -220,8 +218,6 @@ export default defineComponent({
if(viewTarget.zoom == null) {
if(typeof store.state.currentMap?.defaultZoom !== 'undefined') { //Map default zoom
viewTarget.zoom = store.state.currentMap?.defaultZoom;
} else if(typeof newValue.defaultZoom !== 'undefined') { //World default zoom
viewTarget.zoom = newValue.defaultZoom;
} else { //Global default zoom
viewTarget.zoom = store.state.configuration.defaultZoom;
}

4
src/index.d.ts vendored
View File

@ -152,12 +152,10 @@ interface LiveAtlasSortedPlayers extends Array<LiveAtlasPlayer> {
}
interface LiveAtlasWorldDefinition {
seaLevel: number;
name: string;
displayName: string;
dimension: LiveAtlasDimension;
center: Coordinate;
defaultZoom?: number;
seaLevel: number;
maps: Set<LiveAtlasMapDefinition>;
}

1
src/providers/OverviewerMapProvider.ts
View File

@ -103,7 +103,6 @@ export default class OverviewerMapProvider extends MapProvider {
displayName: world,
dimension: guessWorldDimension(world),
seaLevel: 64,
center: {x: 0, y: 64, z: 0},
maps: new Set<LiveAtlasMapDefinition>(),
});
});

5
src/providers/Pl3xmapMapProvider.ts
View File

@ -176,8 +176,6 @@ export default class Pl3xmapMapProvider extends MapProvider {
displayName: world.display_name || world.name,
dimension,
seaLevel: 0,
center: {x: worldResponse.spawn.x, y: 0, z: worldResponse.spawn.z},
defaultZoom: worldResponse.zoom.def || 1,
maps,
};
@ -198,7 +196,10 @@ export default class Pl3xmapMapProvider extends MapProvider {
nativeZoomLevels: worldResponse.zoom.max || 1,
extraZoomLevels: worldResponse.zoom.extra,
defaultZoom: worldResponse.zoom.def || 1,
tileUpdateInterval: worldResponse.tiles_update_interval ? worldResponse.tiles_update_interval * 1000 : undefined,
center: {x: worldResponse.spawn.x, y: 0, z: worldResponse.spawn.z},
})));
worlds.push(w);

11
src/util/dynmap.ts
View File

@ -98,11 +98,6 @@ export function buildWorlds(response: Configuration, config: DynmapUrlConfig): A
displayName: world.title || '',
dimension: guessWorldDimension(world.name),
seaLevel: world.sealevel || 64,
center: {
x: world.center.x || 0,
y: world.center.y || 0,
z: world.center.z || 0
},
maps: new Set(),
});
});
@ -148,6 +143,12 @@ export function buildWorlds(response: Configuration, config: DynmapUrlConfig): A
backgroundDay: map.backgroundday || '#000000',
backgroundNight: map.backgroundnight || '#000000',
center: {
x: world.center.x || 0,
y: world.center.y || 0,
z: world.center.z || 0
},
nativeZoomLevels,
extraZoomLevels: map.mapzoomin
})) as LiveAtlasMapDefinition;