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

Fix double / issues in Overviewer URLs. Fixes #454.

Browse Source
This commit is contained in:
James Lyne 2022-06-17 11:38:38 +01:00
parent 30e5322ad7
commit 89e6fcf33d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/providers/OverviewerMapProvider.ts
View File

@ -114,7 +114,7 @@ export default class OverviewerMapProvider extends MapProvider {
} }
const world = worlds.get(tileset.world) as LiveAtlasWorldDefinition, const world = worlds.get(tileset.world) as LiveAtlasWorldDefinition,
baseUrl = `${this.config}${tileset.base}/${tileset.path}`, baseUrl = tileset.base ? `${this.config}${tileset.base}/${tileset.path}` : this.config + tileset.path,
prefix = tileset.base, prefix = tileset.base,
imageFormat = tileset.imgextension, imageFormat = tileset.imgextension,
nativeZoomLevels = tileset.zoomLevels, nativeZoomLevels = tileset.zoomLevels,
@ -209,7 +209,7 @@ export default class OverviewerMapProvider extends MapProvider {
hidden: true, hidden: true,
priority: 0, priority: 0,
tileLayerOptions: { tileLayerOptions: {
baseUrl: `${this.config}${tileset.base}/${tileset.path}`, baseUrl: tileset.base ? `${this.config}${tileset.base}/${tileset.path}` : this.config + tileset.path,
tileSize, tileSize,
prefix: tileset.base, prefix: tileset.base,
imageFormat: tileset.imgextension, imageFormat: tileset.imgextension,
@ -277,14 +277,14 @@ export default class OverviewerMapProvider extends MapProvider {
//markers.js - If present, maps marker sets to specific maps //markers.js - If present, maps marker sets to specific maps
//markersDB.js - If present, contains markers for each marker set //markersDB.js - If present, contains markers for each marker set
//additional files - i.e. regions.js, can add extra marker sets and/or markers //additional files - i.e. regions.js, can add extra marker sets and/or markers
const response = await OverviewerMapProvider.getText(`${this.config}/baseMarkers.js`, this.markersAbort.signal), const response = await OverviewerMapProvider.getText(`${this.config}baseMarkers.js`, this.markersAbort.signal),
//Don't need to run this JS as getting the filenames from injectMarkerScript calls is enough //Don't need to run this JS as getting the filenames from injectMarkerScript calls is enough
files = response.matchAll(this.markersRegex); files = response.matchAll(this.markersRegex);
let markerSets: any = {}, markers: any = {}, result: any; let markerSets: any = {}, markers: any = {}, result: any;
for(const file of files) { for(const file of files) {
let code = await OverviewerMapProvider.getText(`${this.config}/${file[1]}`, this.markersAbort.signal); let code = await OverviewerMapProvider.getText(`${this.config}${file[1]}`, this.markersAbort.signal);
switch(file[1]) { switch(file[1]) {
//Contains list of marker sets per map in markers object //Contains list of marker sets per map in markers object