From cd067adfdce0df903b157c3d9fd2bb1981424f4f Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 23 Dec 2011 13:27:36 +0800
Subject: [PATCH] Fix issue with white blank tiles at edge of JPG rendered maps

---
 src/main/java/org/dynmap/DynmapWorld.java | 22 +++++++++++++++-------
 src/main/java/org/dynmap/hdmap/HDMap.java |  4 ++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/dynmap/DynmapWorld.java b/src/main/java/org/dynmap/DynmapWorld.java
index 39023142..8b39efa3 100644
--- a/src/main/java/org/dynmap/DynmapWorld.java
+++ b/src/main/java/org/dynmap/DynmapWorld.java
@@ -388,6 +388,7 @@ public class DynmapWorld {
         int width = 128, height = 128;
         BufferedImage zIm = null;
         DynmapBufferedImage kzIm = null;
+        boolean blank = true;
         int[] argb = new int[width*height];
         int step = pd.stepsize << pd.zoomlevel;
         int ztx = tx;
@@ -415,6 +416,7 @@ public class DynmapWorld {
                 if(im != null) {
                     im.getRGB(0, 0, width, height, argb, 0, width);    /* Read data */
                     im.flush();
+                    blank = false;
                     /* Do binlinear scale to 64x64 */
                     int off = 0;
                     for(int y = 0; y < height; y += 2) {
@@ -434,17 +436,15 @@ public class DynmapWorld {
                     /* blit scaled rendered tile onto zoom-out tile */
                     zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
                 }
-                else if((pd.background != 0) && (pd.fmt != ImageFormat.FORMAT_PNG)) {
+                else {
                     Arrays.fill(argb, pd.background);
-                    /* blit scaled rendered tile onto zoom-out tile */
-                    zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
                 }
             }
-            else if((pd.background != 0) && (pd.fmt != ImageFormat.FORMAT_PNG)) {
+            else {
                 Arrays.fill(argb, pd.background);
-                /* blit scaled rendered tile onto zoom-out tile */
-                zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
             }
+            /* blit scaled rendered tile onto zoom-out tile */
+            zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
         }
         FileLockManager.getWriteLock(zf);
         try {
@@ -456,7 +456,15 @@ public class DynmapWorld {
             int tilex = ztx/step/2;
             int tiley = zty/step/2;
             String key = world.getName()+".z"+pd.zoomprefix+pd.baseprefix;
-            if((!zf.exists()) || (crc != mm.hashman.getImageHashCode(key, null, tilex, tiley))) {
+            if(blank) {
+                if(zf.exists()) {
+                    zf.delete();
+                    hashman.updateHashCode(key, null, tilex, tiley, -1);
+                    MapManager.mapman.pushUpdate(this.world, new Client.Tile(zfname));
+                    enqueueZoomOutUpdate(zf, pd.zoomlevel+1);
+                }
+            }
+            else if((!zf.exists()) || (crc != mm.hashman.getImageHashCode(key, null, tilex, tiley))) {
                 try {
                     if(!zf.getParentFile().exists())
                         zf.getParentFile().mkdirs();
diff --git a/src/main/java/org/dynmap/hdmap/HDMap.java b/src/main/java/org/dynmap/hdmap/HDMap.java
index 8439ce27..034d41ec 100644
--- a/src/main/java/org/dynmap/hdmap/HDMap.java
+++ b/src/main/java/org/dynmap/hdmap/HDMap.java
@@ -122,6 +122,10 @@ public class HDMap extends MapType {
         if(c != null) {
             bgcolornight = parseColor(c);
         }
+        if(imgformat != ImageFormat.FORMAT_PNG) {   /* If JPG, set background color opacity */
+            bgcolorday |= 0xFF000000;
+            bgcolornight |= 0xFF000000;
+        }
     }
 
     public HDShader getShader() { return shader; }