0

Added option showlocationmarker

This commit is contained in:
Nicolas Frattaroli
2013-05-13 15:38:54 +02:00
parent 0783cdbee7
commit 3986e10af2
6 changed files with 13 additions and 5 deletions

View File

@@ -95,7 +95,7 @@ directory.
'queryMarker': 'http://google-maps-icons.googlecode.com/files/regroup.png'
}
dump['CONST']['mapDivId'] = 'mcmap'
dump['CONST']['regionStrokeWeight'] = 2
dump['CONST']['regionStrokeWeight'] = 2 # Obselete
dump['CONST']['UPPERLEFT'] = world.UPPER_LEFT;
dump['CONST']['UPPERRIGHT'] = world.UPPER_RIGHT;
dump['CONST']['LOWERLEFT'] = world.LOWER_LEFT;
@@ -122,7 +122,7 @@ directory.
'mapType': True,
'overlays': True,
'coordsBox': True,
'searchBox': True
'searchBox': True # Lolwat. Obselete
}

View File

@@ -571,7 +571,7 @@ overviewer.views.LocationIconView = Backbone.View.extend({
'icon': overviewerConfig.CONST.image.queryMarker,
'visible': false
});
overviewer.collections.locationMarker.setVisible(true);
overviewer.collections.locationMarker.setVisible(overviewer.mapView.options.currentTileSet.get("showlocationmarker"));
}
});

View File

@@ -87,6 +87,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"customwebassets": Setting(required=False, validator=validateWebAssetsPath, default=None),
"maxzoom": Setting(required=False, validator=validateInt, default=None),
"manualpois": Setting(required=False, validator=validateManualPOIs, default=[]),
"showlocationmarker": Setting(required=False, validator=validateBool, default=True),
# 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")),

View File

@@ -528,7 +528,8 @@ class TileSet(object):
last_rendertime = self.max_chunk_mtime,
imgextension = self.imgextension,
isOverlay = isOverlay,
poititle = self.options.get("poititle")
poititle = self.options.get("poititle"),
showlocationmarker = self.options.get("showlocationmarker")
)
if isOverlay: