Merge pull request #299 from mikeprimm/hdrender

Add support for compass rose in all 8 cardinal directions

src/main/java/org/dynmap/DynmapPlugin.java

@@ -75,7 +75,7 @@ public class DynmapPlugin extends JavaPlugin {
 
     /* Add/Replace branches in configuration tree with contribution from a separate file */
     @SuppressWarnings("unchecked")
-    private void mergeConfigurationBranch(ConfigurationNode cfgnode, String branch, boolean replace_existing) {
+    private void mergeConfigurationBranch(ConfigurationNode cfgnode, String branch, boolean replace_existing, boolean islist) {
         Object srcbranch = cfgnode.getObject(branch);
         if(srcbranch == null)
             return;
@@ -86,9 +86,9 @@ public class DynmapPlugin extends JavaPlugin {
             return;
         }
         /* If list, merge by "name" attribute */
-        if((srcbranch instanceof List) && (destbranch instanceof List)) {
-            List<ConfigurationNode> dest = (List<ConfigurationNode>)destbranch;
-            List<ConfigurationNode> src = (List<ConfigurationNode>)srcbranch;
+        if(islist) {
+            List<ConfigurationNode> dest = configuration.getNodes(branch);
+            List<ConfigurationNode> src = cfgnode.getNodes(branch);
             /* Go through new records : see what to do with each */
             for(ConfigurationNode node : src) {
                 String name = node.getString("name", null);
@@ -96,7 +96,7 @@ public class DynmapPlugin extends JavaPlugin {
                 /* Walk destination - see if match */
                 boolean matched = false;
                 for(ConfigurationNode dnode : dest) {
-                    String dname = node.getString("name", null);
+                    String dname = dnode.getString("name", null);
                     if(dname == null) continue;
                     if(dname.equals(name)) {    /* Match? */
                         if(replace_existing) {
@@ -112,11 +112,12 @@ public class DynmapPlugin extends JavaPlugin {
                     dest.add(node);
                 }
             }
+            configuration.put(branch,dest);
         }
         /* If configuration node, merge by key */
-        else if((srcbranch instanceof ConfigurationNode) && (destbranch instanceof ConfigurationNode)) {
-            ConfigurationNode src = (ConfigurationNode)srcbranch;
-            ConfigurationNode dest = (ConfigurationNode)destbranch;
+        else {
+            ConfigurationNode src = cfgnode.getNode(branch);
+            ConfigurationNode dest = configuration.getNode(branch);
             for(String key : src.keySet()) {    /* Check each contribution */
                 if(dest.containsKey(key)) { /* Exists? */
                     if(replace_existing) {  /* If replacing, do so */
@@ -173,7 +174,7 @@ public class DynmapPlugin extends JavaPlugin {
             org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
             cfg.load();
             ConfigurationNode cn = new ConfigurationNode(cfg);
-            mergeConfigurationBranch(cn, "worlds", true);
+            mergeConfigurationBranch(cn, "worlds", true, true);
         }
         else {
             try {
@@ -192,7 +193,7 @@ public class DynmapPlugin extends JavaPlugin {
             org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
             cfg.load();
             ConfigurationNode cn = new ConfigurationNode(cfg);
-            mergeConfigurationBranch(cn, "templates", false);
+            mergeConfigurationBranch(cn, "templates", false, false);
         }
 
         /* Now, process custom-templates.txt - these are user supplied, so override anything matcing */
@@ -201,7 +202,7 @@ public class DynmapPlugin extends JavaPlugin {
             org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
             cfg.load();
             ConfigurationNode cn = new ConfigurationNode(cfg);
-            mergeConfigurationBranch(cn, "templates", true);
+            mergeConfigurationBranch(cn, "templates", true, false);
         }
         else {
             try {

src/main/java/org/dynmap/flat/FlatMap.java

@@ -518,6 +518,7 @@ public class FlatMap extends MapType {
         s(o, "backgroundday", c.getString("backgroundday"));
         s(o, "backgroundnight", c.getString("backgroundnight"));
         s(o, "bigmap", this.isBigWorldMap(world));
+        s(o, "compassview", "S");   /* Always from south */
         a(worldObject, "maps", o);
     }
 }

src/main/java/org/dynmap/hdmap/IsoHDPerspective.java

@@ -928,6 +928,7 @@ public class IsoHDPerspective implements HDPerspective {
         return name;
     }
 
+    private static String[] directions = { "N", "NE", "E", "SE", "S", "SW", "W", "NW" };
     @Override
     public void addClientConfiguration(JSONObject mapObject) {
         s(mapObject, "perspective", name);
@@ -936,5 +937,8 @@ public class IsoHDPerspective implements HDPerspective {
         s(mapObject, "scale", scale);
         s(mapObject, "worldtomap", world_to_map.toJSON());
         s(mapObject, "maptoworld", map_to_world.toJSON());
+        int dir = ((360 + (int)(22.5+azimuth)) / 45) % 8;;
+        s(mapObject, "compassview", directions[dir]);
+
     }
 }

src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java

@@ -579,6 +579,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
         s(o, "backgroundday", c.getString("backgroundday"));
         s(o, "backgroundnight", c.getString("backgroundnight"));
         s(o, "bigmap", map.isBigWorldMap(world));
+        s(o, "compassview", "SE");   /* Always from southeast */
         a(worldObject, "maps", o);
     }
 }

web/css/dynmap_style.css

@@ -565,31 +565,57 @@
  * Compass
  */
 
-.compass {
+.compass, .compass_NE, .compass_SE, .compass_NW, .compass_SW {
     display: block;
     position: absolute;
     z-index: 10;
-
     top: 20px;
     right: 32px;
-
     height: 84px;
     width: 83px;
-
     background-repeat: no-repeat;
+}
+
+.compass, .compass_SE {
     background-image: url(../images/compass.png);
 }
 
-.compass_flat {
+.compass_NE {
+    background-image: url(../images/compass_NE.png);
+}
+
+.compass_NW {
+    background-image: url(../images/compass_NW.png);
+}
+
+.compass_SW {
+    background-image: url(../images/compass_SW.png);
+}
+
+.compass_flat, .compass_N, .compass_E, .compass_W, .compass_S {
 	top: 10px;
 	right: 21px;
 
 	height: 105px;
 	width: 105px;
+}
 
+.compass_flat, .compass_S {
 	background-image: url(../images/compass_flat.png);
 }
 
+.compass_N {
+	background-image: url(../images/compass_N.png);
+}
+
+.compass_E {
+	background-image: url(../images/compass_E.png);
+}
+
+.compass_W {
+	background-image: url(../images/compass_W.png);
+}
+
 /*******************
  * Chat
  */

web/js/map.js

@@ -292,7 +292,6 @@ DynMap.prototype = {
 		
 		var updateHeight = function() {
 			playerlist.height(sidebar.innerHeight() - (playerlist.offset().top - worldlist.offset().top) - 64); // here we need a fix to avoid the static value, but it works fine this way :P
-			console.log('scrollheight=' + playerlist.scrollHeight() + ', height=' + playerlist.height());
 			var scrollable = playerlist.scrollHeight() < playerlist.height();
 			upbtn.toggle(scrollable);
 			downbtn.toggle(scrollable);
@@ -357,8 +356,10 @@ DynMap.prototype = {
 		}
 		$(me).trigger('mapchanging');
 		if (me.maptype) {
+			$('.compass').removeClass('compass_' + me.maptype.compassview);
 			$('.compass').removeClass('compass_' + me.maptype.name);
 		}
+		$('.compass').addClass('compass_' + map.compassview);
 		$('.compass').addClass('compass_' + map.name);
 		var worldChanged = me.world !== map.world;
 		var projectionChanged = me.map.getProjection() !== map.projection;