LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Add option to configure maxzoom and appropriate documentation

Browse Source
This commit is contained in:
Thomas Lake
2012-11-21 21:28:45 +00:00
committed by Andrew Chin
parent c6d7a6d8fd
commit 223b326df1
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/config.rst
View File

@@ -509,6 +509,17 @@ values. The valid configuration keys are listed below.
**Default:** ``1`` **Default:** ``1``
``maxzoom``
This specifies the maximum zoom allowed by the zoom control on the web page.
.. note::
This does not change the number of zoom levels rendered, but allows
you to neglect uploading the larger and more detailed zoom levels if bandwidth
usage is an issue.
**Default:** Automatically set to most detailed zoom level
``base`` ``base``
Allows you to specify a remote location for the tile folder, useful if you Allows you to specify a remote location for the tile folder, useful if you
rsync your map's images to a remote server. Leave a trailing slash and point rsync your map's images to a remote server. Leave a trailing slash and point
@@ -516,7 +527,7 @@ values. The valid configuration keys are listed below.
tiles folder itself. For example, if the tile images start at tiles folder itself. For example, if the tile images start at
http://domain.com/map/world_day/ you want to set this to http://domain.com/map/ http://domain.com/map/world_day/ you want to set this to http://domain.com/map/
.. _option_texture_pack: .. _option_texturepath:
``texturepath`` ``texturepath``
This is a where a specific texture pack can be found to be used during this render. This is a where a specific texture pack can be found to be used during this render.

2
overviewer.py
View File

@@ -432,7 +432,7 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
# only pass to the TileSet the options it really cares about # only pass to the TileSet the options it really cares about
render['name'] = render_name # perhaps a hack. This is stored here for the asset manager render['name'] = render_name # perhaps a hack. This is stored here for the asset manager
tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn", "overlay","base", "poititle"]) tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist", "showspawn", "overlay", "base", "poititle", "maxzoom"])
tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this
tset = tileset.TileSet(w, rset, assetMrg, tex, tileSetOpts, tileset_dir) tset = tileset.TileSet(w, rset, assetMrg, tex, tileSetOpts, tileset_dir)
tilesets.append(tset) tilesets.append(tset)

1
overviewer_core/settingsDefinition.py
View File

@@ -85,6 +85,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"base": Setting(required=False, validator=validateStr, default=""), "base": Setting(required=False, validator=validateStr, default=""),
"poititle": Setting(required=False, validator=validateStr, default="Signs"), "poititle": Setting(required=False, validator=validateStr, default="Signs"),
"customwebassets": Setting(required=False, validator=validateWebAssetsPath, default=None), "customwebassets": Setting(required=False, validator=validateWebAssetsPath, default=None),
"maxzoom": Setting(required=False, validator=validateInt, default=None),
# Remove this eventually (once people update their configs) # Remove this eventually (once people update their configs)
"worldname": Setting(required=False, default=None, "worldname": Setting(required=False, default=None,
validator=error("The option 'worldname' is now called 'world'. Please update your config files")), validator=error("The option 'worldname' is now called 'world'. Please update your config files")),

2
overviewer_core/tileset.py
View File

@@ -519,7 +519,7 @@ class TileSet(object):
zoomLevels = self.treedepth, zoomLevels = self.treedepth,
minZoom = 0, minZoom = 0,
defaultZoom = self.options.get('defaultzoom'), defaultZoom = self.options.get('defaultzoom'),
maxZoom = self.treedepth, maxZoom = self.options.get('maxzoom', self.treedepth),
path = self.options.get('name'), path = self.options.get('name'),
base = self.options.get('base'), base = self.options.get('base'),
bgcolor = bgcolorformat(self.options.get('bgcolor')), bgcolor = bgcolorformat(self.options.get('bgcolor')),