Add support for downloading maps from JourneyMap

Author: ryanbester

controllers/download.py

@@ -6,6 +6,7 @@
 from core.dynmap import Dynmap
 from core.dynmapcoords import DynmapCoords
 from core.gridref import GridRef
+from core.journeymap import JourneyMap
 from core.map import Map
 from core.state import State
 from models.config import Config
@@ -132,14 +133,55 @@ def download(self):
             except Exception:
                 self.view.display_error('Failed to download tiles')
                 return
+        elif user_input['source'] == 'JourneyMap':
+            if user_input['coord_mode'] == 'mc':
+                from_region_x = int(input_range['from_x']) >> 4 >> 5
+                from_region_y = int(input_range['from_z']) >> 4 >> 5
+                to_region_x = int(input_range['to_x']) >> 4 >> 5
+                to_region_y = int(input_range['to_z']) >> 4 >> 5
+            elif user_input['coord_mode'] == 'grid':
+                try:
+                    from_region_x, from_region_y = GridRef.grid_ref_to_mc(input_range['from'])
+                except ValueError as e:
+                    self.view.display_error('From grid reference: {}'.format(str(e)))
+                    return
+
+                try:
+                    to_region_x, to_region_y = GridRef.grid_ref_to_mc(input_range['to'])
+                except ValueError as e:
+                    self.view.display_error('To grid reference: {}'.format(str(e)))
+                    return
+            elif user_input['coord_mode'] == 'dynmap':
+                self.view.display_error('Dynmap tile coordinates cannot be used with JourneyMap source')
+                return
+            else:
+                self.view.display_error('Invalid coordinate mode')
+                return
+
+            low_region_x = min(from_region_x, to_region_x)
+            low_region_y = min(from_region_y, to_region_y)
+            high_region_x = max(from_region_x, to_region_x)
+            high_region_y = max(from_region_y, to_region_y)
 
             try:
-                Map.stitch(tiles_dir, user_input['output_dir'], stitch_args, self.update_progress)
+                stitch_args = JourneyMap.download_tiles(tiles_dir, self.state.selected_server.journeymap_url,
+                                                        user_input['map_id'], input_range['zoom'], low_region_x,
+                                                        low_region_y, high_region_x, high_region_y,
+                                                        self.update_progress)
             except Exception:
-                self.view.display_error('Failed to stitch tiles')
+                self.view.display_error('Failed to download tiles')
                 return
+        else:
+            self.view.display_error('Invalid source')
+            return
+
+        try:
+            Map.stitch(tiles_dir, user_input['output_dir'], stitch_args, self.update_progress)
+        except Exception:
+            self.view.display_error('Failed to stitch tiles')
+            return
 
-            self.update_progress('Idle', 0, 1)
+        self.update_progress('Idle', 0, 1)
 
     def update_progress(self, message: str, i, total):
         self.progress_msg = message

core/dynmap.py

@@ -9,7 +9,7 @@
 import validators
 
 from models.server import Server
-from models.tilestitchargs import TileStitchArgs
+from models.tilestitchargs import TileStitchArgs, YMode
 
 
 class Dynmap:
@@ -71,4 +71,4 @@ def download_tiles(tiles_dir: str, dynmap_url: str, world_name: str, map_name: s
                 url = dynmap_url + Dynmap.get_tile_path(world_name, map_name, zoom, x, y)
                 urllib.request.urlretrieve(url, os.path.join(tiles_dir, '{}_{}.jpg'.format(x, y)))
 
-        return TileStitchArgs(from_x, from_y, to_x, to_y, 128, 128, diff)
+        return TileStitchArgs(from_x, from_y, to_x, to_y, 128, 128, diff, YMode.DYNMAP)

core/journeymap.py

@@ -0,0 +1,30 @@
+import os
+import urllib
+from urllib import request
+
+from models.tilestitchargs import TileStitchArgs, YMode
+
+
+class JourneyMap:
+    @staticmethod
+    def get_tile_path(map_type: str, zoom: int, region_x: float, region_y: float):
+        return '/tiles/tile.png?x={}&z={}&dimension=minecraft:overworld&mapTypeString={}&zoom={}'.format(int(region_x),
+                                                                                                         int(region_y),
+                                                                                                         map_type, zoom)
+
+    @staticmethod
+    def download_tiles(tiles_dir: str, journeymap_url: str, map_type: str, zoom: int, from_x, from_y, to_x, to_y,
+                       progress_callback=None) -> TileStitchArgs:
+        diff = 1
+        total = ((to_x - from_x) / diff + 1) * ((to_y - from_y) / diff + 1)
+        i = 0
+        for x in range(from_x, to_x + 1, diff):
+            for y in range(from_y, to_y + 1, diff):
+                i += 1
+                if progress_callback is not None:
+                    progress_callback('Downloading ({} of {})'.format(i, int(total)), i, total)
+
+                url = journeymap_url + JourneyMap.get_tile_path(map_type, zoom, x, y)
+                urllib.request.urlretrieve(url, os.path.join(tiles_dir, '{}_{}.jpg'.format(x, y)))
+
+        return TileStitchArgs(from_x, from_y, to_x, to_y, 512, 512, diff, YMode.JOURNEYMAP)

core/map.py

@@ -2,7 +2,7 @@
 
 from PIL import Image
 
-from models.tilestitchargs import TileStitchArgs
+from models.tilestitchargs import TileStitchArgs, YMode
 
 
 class Map:
@@ -28,6 +28,14 @@ def stitch(tiles_dir: str, output_dir: str, args: TileStitchArgs, progress_callb
 
                 tile = Image.open(os.path.join(tiles_dir, '{}_{}.jpg'.format(x, y)))
                 tile_img = tile.copy()
-                img.paste(tile_img, (int(img_x), int(height - img_y - args.tile_height)))
+
+                if args.y_mode == YMode.DYNMAP:
+                    y_location = int(height - img_y - args.tile_height)
+                elif args.y_mode == YMode.JOURNEYMAP:
+                    y_location = int(img_y)
+                else:
+                    raise ValueError("Y Mode invalid")
+
+                img.paste(tile_img, (int(img_x), y_location))
 
         img.save(os.path.join(output_dir, 'map.png'))

models/tilestitchargs.py

@@ -1,4 +1,10 @@
 from dataclasses import dataclass
+from enum import Enum
+
+
+class YMode(Enum):
+    DYNMAP = 0,
+    JOURNEYMAP = 1
 
 
 @dataclass(init=True)
@@ -10,3 +16,4 @@ class TileStitchArgs:
     tile_width: int
     tile_height: int
     diff: int
+    y_mode: YMode