Added defaultzoom config option
This commit is contained in:
@@ -71,6 +71,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
|
||||
"imgformat": Setting(required=True, validator=validateImgFormat, default="png"),
|
||||
"imgquality": Setting(required=False, validator=validateImgQuality, default=95),
|
||||
"bgcolor": Setting(required=True, validator=validateBGColor, default="1a1a1a"),
|
||||
"defaultzoom": Setting(required=True, validator=validateDefaultZoom, default=1),
|
||||
"optimizeimg": Setting(required=True, validator=validateOptImg, default=0),
|
||||
"nomarkers": Setting(required=False, validator=validateBool, default=None),
|
||||
"texturepath": Setting(required=False, validator=validateTexturePath, default=None),
|
||||
|
||||
@@ -208,6 +208,12 @@ def validateObserver(observer):
|
||||
else:
|
||||
raise ValidationException("%r does not look like an observer" % repr(observer))
|
||||
|
||||
def validateDefaultZoom(z):
|
||||
if z > 0:
|
||||
return int(z)
|
||||
else:
|
||||
raise ValidationException("The default zoom is set below 1")
|
||||
|
||||
def make_dictValidator(keyvalidator, valuevalidator):
|
||||
"""Compose and return a dict validator -- a validator that validates each
|
||||
key and value in a dictionary.
|
||||
|
||||
@@ -517,7 +517,7 @@ class TileSet(object):
|
||||
d = dict(name = self.options.get('title'),
|
||||
zoomLevels = self.treedepth,
|
||||
minZoom = 0,
|
||||
defaultZoom = 1,
|
||||
defaultZoom = self.options.get('defaultzoom'),
|
||||
maxZoom = self.treedepth,
|
||||
path = self.options.get('name'),
|
||||
base = self.options.get('base'),
|
||||
@@ -528,6 +528,7 @@ class TileSet(object):
|
||||
imgextension = self.imgextension,
|
||||
isOverlay = isOverlay
|
||||
)
|
||||
|
||||
if isOverlay:
|
||||
d.update({"tilesets": self.options.get("overlay")})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user