Skip to content

Commit

Permalink
added suggestion from #34
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-green-io committed Feb 9, 2021
1 parent 447470a commit 36b1d55
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0.html).

# [2.0.4] - 2020-02-09
### Added
- `--disablezoomsort` to skip sorting by zoom level, only by updated time #34

# [2.0.3] - 2020-12-19
### Fixed
- exact same banners are shown on map #30
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# papyri version 2.0.3
# papyri version 2.0.4

Papyri is a Minecraft map item web presenter. It will show all maps and banners created on a server positioned and scaled properly, creating a mosaic of your world as explored with maps. Since many maps can be created of the same area, Papyri will prioritize rendering so that maps with higher detail are rendered on top of maps of lower detail and maps at the same detail are rendered in order from oldest updated to newest updated.

Expand Down Expand Up @@ -34,6 +34,7 @@ optional arguments:
include maps that have unlimited tracking on, this
includes older maps from previous Minecraft versions
and treasure maps in +1.13
--disablezoomsort don't sort maps by zoom level before rendering, newer maps of higher zoom level will cover lower level maps
--output OUTPUT output path for web stuff
--copytemplate copy default index.html and assets (do this if a new
release changes the tempalte)
Expand Down
10 changes: 6 additions & 4 deletions papyri.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
__copyright__ = "Copyright 2020, Tesseract Designs"
__credits__ = ["Jason Green"]
__license__ = "MIT"
__version__ = "2.0.3"
__version__ = "2.0.4"
__maintainer__ = "Jason Green"
__email__ = "[email protected]"
__status__ = "release"
Expand Down Expand Up @@ -455,7 +455,7 @@ def getMapPngs(mapPngFolder):
return mapPngList


def mergeToLevel4(mapPngFolder, outputFolder):
def mergeToLevel4(mapPngFolder, outputFolder, disablezoomsort):
"""pastes all maps to render onto a intermediate zoom level 4 map"""
# what are we calling these crazy things

Expand Down Expand Up @@ -494,8 +494,9 @@ def mergeToLevel4(mapPngFolder, outputFolder):

mapTuples = coords[1]

if not disablezoomsort:
# sort them, import for the rendering order
mapTuples.sort(key=lambda x: x.scale, reverse=True)
mapTuples.sort(key=lambda x: x.scale, reverse=True)

# create the level 4 images
level4MapPng = Image.new("RGBA", (2048, 2048))
Expand Down Expand Up @@ -647,6 +648,7 @@ def main():
parser.add_argument('--world', help="location of your world folder or save folder", required=True)
parser.add_argument('--type', help="server type, bedrock or java", choices=["java", "bds"], required=True)
parser.add_argument('--includeunlimitedtracking', help="include maps that have unlimited tracking on, this includes older maps from previous Minecraft versions and treasure maps in +1.13", action="store_true")
parser.add_argument('--disablezoomsort', help="don't sort maps by zoom level before rendering, newer maps of higher zoom level will cover lower level maps", action="store_true")
#parser.add_argument('--overlaymca', help="generate the regionfile overlay (Java only)", action="store_true")
parser.add_argument('--output', help="output path for web stuff", required=True)
parser.add_argument('--copytemplate', help="copy default index.html and assets (do this if a new release changes the tempalte)", action="store_true")
Expand Down Expand Up @@ -676,7 +678,7 @@ def main():
latestMaps = makeMaps(args.world, mapsOutput, serverType=args.type, unlimitedTracking=args.includeunlimitedtracking)

# make the level 4 maps
mergeToLevel4(mapsOutput, mergedMapsOutput)
mergeToLevel4(mapsOutput, mergedMapsOutput, disablezoomsort=args.disablezoomsort)

# create the tiles for the lowest zoom level
genZoom17Tiles(mergedMapsOutput, tileOutput)
Expand Down

0 comments on commit 36b1d55

Please sign in to comment.