From 85567cae42854ce6232493fab66c161d313c5d92 Mon Sep 17 00:00:00 2001 From: Fabian Norman Date: Wed, 25 Apr 2012 19:42:18 -0700 Subject: [PATCH 1/4] Initial changes to add the base option to the config file. --- overviewer_core/settingsDefinition.py | 1 + overviewer_core/tileset.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index d2e357c..91c2e9b 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -80,6 +80,7 @@ renders = Setting(required=True, default=util.OrderedDict(), "changelist": Setting(required=False, validator=validateStr, default=None), "markers": Setting(required=False, validator=validateMarkers, default=[]), "showspawn": Setting(required=False, validator=validateBool, default=True), + "base": Setting(required=False, validator=validateStr, default=None), # Remove this eventually (once people update their configs) "worldname": Setting(required=False, default=None, diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index ab25a2a..4fa769f 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -513,7 +513,7 @@ class TileSet(object): defaultZoom = 1, maxZoom = self.treedepth, path = self.options.get('name'), - base = '', + base = self.options.get('base'), bgcolor = bgcolorformat(self.options.get('bgcolor')), world = self.options.get('worldname_orig') + (" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''), From d25f5824040c530685db1c33af8edffb3def9ea2 Mon Sep 17 00:00:00 2001 From: Fabian Norman Date: Wed, 25 Apr 2012 19:56:48 -0700 Subject: [PATCH 2/4] Base setting, one more change (last?) --- overviewer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer.py b/overviewer.py index 986d59a..c31b51c 100755 --- a/overviewer.py +++ b/overviewer.py @@ -401,7 +401,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", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn"]) + tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn","base"]) tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this tset = tileset.TileSet(rset, assetMrg, tex, tileSetOpts, tileset_dir) tilesets.append(tset) From 4fe87de247c5b2af9611f0756851540f078526ef Mon Sep 17 00:00:00 2001 From: Fabian Norman Date: Wed, 25 Apr 2012 23:42:19 -0700 Subject: [PATCH 3/4] Updated docs. --- docs/config.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/config.rst b/docs/config.rst index 042ae0d..fe97059 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -432,6 +432,13 @@ values. The valid configuration keys are listed below. **Default:** ``#1a1a1a`` +``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 + to the location that contains the tile folders for each render, not the + 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: ``texturepath`` From e69717f476920a3a38b350c36bdfaaddc1d909c8 Mon Sep 17 00:00:00 2001 From: Fabian Norman Date: Wed, 2 May 2012 00:43:53 -0700 Subject: [PATCH 4/4] Prevent null being set in overviewerConfig.js --- overviewer_core/settingsDefinition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index 91c2e9b..44af092 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -80,7 +80,7 @@ renders = Setting(required=True, default=util.OrderedDict(), "changelist": Setting(required=False, validator=validateStr, default=None), "markers": Setting(required=False, validator=validateMarkers, default=[]), "showspawn": Setting(required=False, validator=validateBool, default=True), - "base": Setting(required=False, validator=validateStr, default=None), + "base": Setting(required=False, validator=validateStr, default=""), # Remove this eventually (once people update their configs) "worldname": Setting(required=False, default=None,