From 223b326df11106fa339fbabdfe7d6b8e125a9d8e Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Wed, 21 Nov 2012 21:28:45 +0000 Subject: [PATCH] Add option to configure maxzoom and appropriate documentation --- docs/config.rst | 13 ++++++++++++- overviewer.py | 2 +- overviewer_core/settingsDefinition.py | 1 + overviewer_core/tileset.py | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/config.rst b/docs/config.rst index 3238995..2284bc9 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -509,6 +509,17 @@ values. The valid configuration keys are listed below. **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`` 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 @@ -516,7 +527,7 @@ values. The valid configuration keys are listed below. 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/ -.. _option_texture_pack: +.. _option_texturepath: ``texturepath`` This is a where a specific texture pack can be found to be used during this render. diff --git a/overviewer.py b/overviewer.py index fd167cd..612f1c9 100755 --- a/overviewer.py +++ b/overviewer.py @@ -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 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 tset = tileset.TileSet(w, rset, assetMrg, tex, tileSetOpts, tileset_dir) tilesets.append(tset) diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index ce04dc1..a9c62c1 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -85,6 +85,7 @@ renders = Setting(required=True, default=util.OrderedDict(), "base": Setting(required=False, validator=validateStr, default=""), "poititle": Setting(required=False, validator=validateStr, default="Signs"), "customwebassets": Setting(required=False, validator=validateWebAssetsPath, default=None), + "maxzoom": Setting(required=False, validator=validateInt, default=None), # Remove this eventually (once people update their configs) "worldname": Setting(required=False, default=None, validator=error("The option 'worldname' is now called 'world'. Please update your config files")), diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index 683cb2e..e3416ff 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -519,7 +519,7 @@ class TileSet(object): zoomLevels = self.treedepth, minZoom = 0, defaultZoom = self.options.get('defaultzoom'), - maxZoom = self.treedepth, + maxZoom = self.options.get('maxzoom', self.treedepth), path = self.options.get('name'), base = self.options.get('base'), bgcolor = bgcolorformat(self.options.get('bgcolor')),