From ee790f86ed231941bcc0fbc2b6e97d6b0ba173b6 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Tue, 2 Aug 2011 21:51:00 -0500
Subject: [PATCH] Fix marker position logic and zoom range calculation on Kzed
 and Flat

---
 src/main/java/org/dynmap/flat/FlatMap.java                | 1 +
 src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java | 1 +
 web/js/flatmap.js                                         | 3 +--
 web/js/kzedmaps.js                                        | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/dynmap/flat/FlatMap.java b/src/main/java/org/dynmap/flat/FlatMap.java
index c3c62497..e8f501b3 100644
--- a/src/main/java/org/dynmap/flat/FlatMap.java
+++ b/src/main/java/org/dynmap/flat/FlatMap.java
@@ -536,6 +536,7 @@ public class FlatMap extends MapType {
         s(o, "backgroundnight", c.getString("backgroundnight"));
         s(o, "bigmap", this.isBigWorldMap(world));
         s(o, "mapzoomin", c.getInteger("mapzoomin", 3));
+        s(o, "mapzoomout", world.getExtraZoomOutLevels());
         s(o, "compassview", "S");   /* Always from south */
         a(worldObject, "maps", o);
     }
diff --git a/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java b/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
index a0b71f7d..a80bcc38 100644
--- a/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
+++ b/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
@@ -587,6 +587,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
         s(o, "backgroundnight", c.getString("backgroundnight"));
         s(o, "bigmap", map.isBigWorldMap(world));
         s(o, "mapzoomin", c.getInteger("mapzoomin", 3));
+        s(o, "mapzoomout", world.getExtraZoomOutLevels()+1);
         s(o, "compassview", "SE");   /* Always from southeast */
         a(worldObject, "maps", o);
     }
diff --git a/web/js/flatmap.js b/web/js/flatmap.js
index cc4d8209..f1eedd1f 100644
--- a/web/js/flatmap.js
+++ b/web/js/flatmap.js
@@ -14,8 +14,7 @@ var FlatMapType = DynmapTileLayer.extend({
 		errorTileUrl: 'images/blank.png'		
 	},
 	initialize: function(options) {
-		options.maxzoomout = options.mapzoomout || options.world.extrazoomout;
-		options.maxZoom = options.mapzoomin + options.maxzoomout;
+		options.maxZoom = options.mapzoomin + options.mapzoomout;
 		L.Util.setOptions(this, options);
 		this.projection = new FlatProjection({mapzoomout: options.mapzoomout});
 	},
diff --git a/web/js/kzedmaps.js b/web/js/kzedmaps.js
index 500490c6..4459e90a 100644
--- a/web/js/kzedmaps.js
+++ b/web/js/kzedmaps.js
@@ -20,7 +20,6 @@ var KzedMapType = DynmapTileLayer.extend({
 		errorTileUrl: 'images/blank.png'
 	},
 	initialize: function(options) {
-		options.mapzoomout = options.mapzoomout || options.world.extrazoomout;
 		options.maxZoom = options.mapzoomin + options.mapzoomout;
 		L.Util.setOptions(this, options);
 		this.projection = new KzedProjection({mapzoomout: this.options.mapzoomout});