feat: a bit of cleanup in map.js

This commit is contained in:
TheClashFruit 2023-11-28 18:38:23 +01:00 committed by TheClashFruit's Forgejo
parent bfd6326be6
commit 50e7be7627
Signed by untrusted user who does not match committer: Forgejo
GPG key ID: E59A305B48F15D31

View file

@ -1,7 +1,5 @@
L.TileLayer.CRSSLayer = L.TileLayer.extend({ L.TileLayer.CRSSLayer = L.TileLayer.extend({
getTileUrl: function(coordinate) { getTileUrl: function(coordinate) {
console.log(coordinate);
const tileX = coordinate.x; const tileX = coordinate.x;
const tileY = coordinate.y; const tileY = coordinate.y;
@ -23,7 +21,7 @@ L.tileLayer.crssLayer = function(templateUrl, options) {
} }
let mapLayer = L.tileLayer.crssLayer('https://cdn.theclashfruit.me/crss/map_new/{xd}/{yd}/tile.{x}.{y}.png', { let mapLayer = L.tileLayer.crssLayer('https://cdn.theclashfruit.me/crss/map_new/{xd}/{yd}/tile.{x}.{y}.png', {
attribution: '&copy; <a href="https://crss.blurryface.xyz/">CRSS</a> players', attribution: '&copy; <a href="https://crss.blurryface.xyz/">CRSS</a> Players | Tiles With <a href="https://unmined.net/">uNmINeD</a>.',
tileSize: 256, tileSize: 256,
@ -43,7 +41,7 @@ let ropMarkers = L.layerGroup([
.bindPopup('Info Centre') .bindPopup('Info Centre')
]); ]);
let rorMarkers = L.layerGroup([ let drrMarkers = L.layerGroup([
]); ]);
@ -61,13 +59,25 @@ let playerMarkers = L.layerGroup([
console.log(L.CRS.Simple.infinite) console.log(L.CRS.Simple.infinite)
let map = L.map('map', { let map = L.map('map', {
layers: [mapLayer, miscMarkers, ropMarkers, rorMarkers, playerMarkers], layers: [
mapLayer,
miscMarkers,
ropMarkers,
drrMarkers,
playerMarkers
],
preferCanvas: true, preferCanvas: true,
crs: L.Util.extend(L.CRS.Simple, { crs: L.Util.extend(L.CRS.Simple, {
transformation: new L.Transformation(1, 0, 1, 0), transformation: new L.Transformation(1, 0, 1, 0),
projection: L.Projection.LonLat projection: L.Projection.LonLat
}), }),
}).setView([ parseInt(center.split(';')[1]), parseInt(center.split(';')[0])], 2); }).setView([
parseInt(center.split(';')[1]),
parseInt(center.split(';')[0])
], 2);
let baseMaps = { let baseMaps = {
"Overworld": mapLayer "Overworld": mapLayer
@ -77,7 +87,7 @@ let overlayMaps = {
"Players": playerMarkers, "Players": playerMarkers,
"Miscellaneous Markers": miscMarkers, "Miscellaneous Markers": miscMarkers,
"Markers in RoP": ropMarkers, "Markers in RoP": ropMarkers,
"Markers in DRoR": rorMarkers, "Markers in DRR": drrMarkers,
}; };
let layerControl = L.control.layers(baseMaps, overlayMaps).addTo(map); let layerControl = L.control.layers(baseMaps, overlayMaps).addTo(map);
@ -114,7 +124,6 @@ const updatePlayerPos = (players) =>{
popupAnchor: [0, -14] popupAnchor: [0, -14]
}); });
const marker = L.marker([player.location.z, player.location.x], { icon: playerIcon }) const marker = L.marker([player.location.z, player.location.x], { icon: playerIcon })
.bindPopup(`${player.displayName} (${Math.floor(player.location.x)}; ${Math.floor(player.location.y)}; ${Math.floor(player.location.z)})`); .bindPopup(`${player.displayName} (${Math.floor(player.location.x)}; ${Math.floor(player.location.y)}; ${Math.floor(player.location.z)})`);