From 3986e10af2dbd3d34ef4026a5e12e0c5081e3e85 Mon Sep 17 00:00:00 2001
From: Nicolas Frattaroli <kleinnici@frattaroli.ch>
Date: Mon, 13 May 2013 15:38:54 +0200
Subject: [PATCH] Added option showlocationmarker

---
 docs/config.rst                       | 6 ++++++
 overviewer.py                         | 2 +-
 overviewer_core/assetmanager.py       | 4 ++--
 overviewer_core/data/js_src/views.js  | 2 +-
 overviewer_core/settingsDefinition.py | 1 +
 overviewer_core/tileset.py            | 3 ++-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/config.rst b/docs/config.rst
index b1047ac..02afe1d 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -529,6 +529,12 @@ values. The valid configuration keys are listed below.
 
     **Default:** Automatically set to most detailed zoom level
 
+``showlocationmarker``
+    Allows you to specify whether to show the location marker when accessing a URL
+    with coordinates specified.
+
+    **Default:** ``True``
+
 ``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
diff --git a/overviewer.py b/overviewer.py
index 2948eab..232f176 100755
--- a/overviewer.py
+++ b/overviewer.py
@@ -460,7 +460,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", "maxzoom"])
+        tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist", "showspawn", "overlay", "base", "poititle", "maxzoom", "showlocationmarker"])
         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/assetmanager.py b/overviewer_core/assetmanager.py
index abc50f2..be3b083 100644
--- a/overviewer_core/assetmanager.py
+++ b/overviewer_core/assetmanager.py
@@ -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
             }
 
 
diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js
index bbd75c1..56fa9f9 100644
--- a/overviewer_core/data/js_src/views.js
+++ b/overviewer_core/data/js_src/views.js
@@ -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"));
 
     }
 });
diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py
index 557c7cb..cffdd0a 100644
--- a/overviewer_core/settingsDefinition.py
+++ b/overviewer_core/settingsDefinition.py
@@ -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")),
diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py
index 251e701..825816a 100644
--- a/overviewer_core/tileset.py
+++ b/overviewer_core/tileset.py
@@ -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: