Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Expand maximum zoom level from 16 to 32

Browse source
This commit is contained in:
Mike Primm 2022-03-10 02:24:27 -06:00
parent 5a61a5e9e9
commit 4fd176058c
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java
View file

@ -55,7 +55,7 @@ public class AWSS3MapStorage extends MapStorage {
String baseURI; String baseURI;
if (zoom > 0) { if (zoom > 0) {
baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y; baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y;
} }
else { else {
baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y; baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y;

2
DynmapCore/src/main/java/org/dynmap/storage/filetree/FileTreeMapStorage.java
View file

@ -44,7 +44,7 @@ public class FileTreeMapStorage extends MapStorage {
super(world, map, x, y, zoom, var); super(world, map, x, y, zoom, var);
String baseURI; String baseURI;
if (zoom > 0) { if (zoom > 0) {
baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y; baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y;
} }
else { else {
baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y; baseURI = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y;

2
DynmapCore/src/main/java/org/dynmap/storage/mysql/MySQLMapStorage.java
View file

@ -62,7 +62,7 @@ public class MySQLMapStorage extends MapStorage {
mapkey = getMapKey(world, map, var); mapkey = getMapKey(world, map, var);
if (zoom > 0) { if (zoom > 0) {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt();
} }
else { else {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt();

2
DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java
View file

@ -64,7 +64,7 @@ public class PostgreSQLMapStorage extends MapStorage {
mapkey = getMapKey(world, map, var); mapkey = getMapKey(world, map, var);
if (zoom > 0) { if (zoom > 0) {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt();
} }
else { else {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt();

2
DynmapCore/src/main/java/org/dynmap/storage/sqllte/SQLiteMapStorage.java
View file

@ -46,7 +46,7 @@ public class SQLiteMapStorage extends MapStorage {
mapkey = getMapKey(world, map, var); mapkey = getMapKey(world, map, var);
if (zoom > 0) { if (zoom > 0) {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt();
} }
else { else {
uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt(); uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt();

2
DynmapCore/src/main/resources/extracted/web/js/dynmaputils.js
View file

@ -237,7 +237,7 @@ var DynmapTileLayer = L.TileLayer.extend({
// Some helper functions. // Some helper functions.
zoomprefix: function(amount) { zoomprefix: function(amount) {
return 'zzzzzzzzzzzzzzzzzzzzzz'.substr(0, amount); return 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'.substr(0, amount);
}, },
getTileInfo: function(coords) { getTileInfo: function(coords) {

2
DynmapCore/src/main/resources/extracted/web/js/hdmap.js
View file

@ -48,7 +48,7 @@ var HDMapType = DynmapTileLayer.extend({
// amount == 0 -> '' // amount == 0 -> ''
// amount == 1 -> 'z_' // amount == 1 -> 'z_'
// amount == 2 -> 'zz_' // amount == 2 -> 'zz_'
return 'zzzzzzzzzzzzzzzzzzzzzz'.substr(0, amount) + (amount === 0 ? '' : '_'); return 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'.substr(0, amount) + (amount === 0 ? '' : '_');
} }
}); });