Allow maps to be downloaded via grid reference

Author: ryanbester

controllers/download.py

@@ -5,6 +5,7 @@
 from controllers.controller import Controller
 from core.dynmap import Dynmap
 from core.dynmapcoords import DynmapCoords
+from core.gridref import GridRef
 from core.map import Map
 from core.state import State
 from models.config import Config
@@ -81,25 +82,60 @@ def download(self):
                                                                input_range['to_x'], input_range['to_y'],
                                                                input_range['to_z']
                                                                )
-
-                map_id = user_input['map_id'].split(' - ')
-                world_name, map_name = map_id[0], map_id[1]
-
+            elif user_input['coord_mode'] == 'grid':
                 try:
-                    stitch_args = Dynmap.download_tiles(tiles_dir, self.state.selected_server.dynmap_url, world_name,
-                                                        map_name,
-                                                        input_range['zoom'], from_tile_x, from_tile_y,
-                                                        to_tile_x, to_tile_y, self.update_progress)
-                except Exception:
-                    self.view.display_error('Failed to download tiles')
+                    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:
-                    Map.stitch(tiles_dir, user_input['output_dir'], stitch_args, self.update_progress)
-                except Exception:
-                    self.view.display_error('Failed to stitch tiles')
+                    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
 
+                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)
+
+                from_x = (low_region_x << 5) << 4
+                from_y = (low_region_y << 5) << 4
+                to_x = (((high_region_x + 1 << 5) - 1) + 1 << 4) - 1
+                to_y = (((high_region_y + 1 << 5) - 1) + 1 << 4) - 1
+
+                from_tile_x, from_tile_y = DynmapCoords.mc_to_tile(map_obj, input_range['zoom'], from_x, 64, from_y)
+                to_tile_x, to_tile_y = DynmapCoords.mc_to_tile(map_obj, input_range['zoom'], to_x, 64, to_y)
+            elif user_input['coord_mode'] == 'dynmap':
+                pass
+            else:
+                self.view.display_error('Invalid coordinate mode')
+                return
+
+            low_tile_x = min(from_tile_x, to_tile_x)
+            low_tile_y = min(from_tile_y, to_tile_y)
+            high_tile_x = max(from_tile_x, to_tile_x)
+            high_tile_y = max(from_tile_y, to_tile_y)
+
+            map_id = user_input['map_id'].split(' - ')
+            world_name, map_name = map_id[0], map_id[1]
+
+            try:
+                stitch_args = Dynmap.download_tiles(tiles_dir, self.state.selected_server.dynmap_url, world_name,
+                                                    map_name,
+                                                    input_range['zoom'], low_tile_x, low_tile_y,
+                                                    high_tile_x, high_tile_y, self.update_progress)
+            except Exception:
+                self.view.display_error('Failed to download tiles')
+                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)
 
     def update_progress(self, message: str, i, total):

views/download.py

@@ -114,6 +114,9 @@ def get_input(self) -> dict:
 
 class DownloadGridRefFrame(View):
     controller: DownloadGridRefController
+    grid_ref_from_txt: ttk.Entry
+    grid_ref_to_txt: ttk.Entry
+    zoom_txt: ttk.Entry
 
     def __init__(self):
         super().__init__()
@@ -122,12 +125,47 @@ def __init__(self):
     def build_view(self, parent, controller: DownloadGridRefController):
         self.controller = controller
 
+        # Create the view if it's being shown for the first time
+        if self.frame is None:
+            self.frame = ttk.Frame(parent)
+
+            self.frame.columnconfigure(index=0, weight=1)
+            self.frame.columnconfigure(index=1, weight=1)
+
+            from_lbl = ttk.Label(self.frame, text='From: ')
+            from_lbl.grid(row=0, column=0, padx=7, pady=7, columnspan=2)
+
+            self.grid_ref_from_txt = ttk.Entry(self.frame)
+            self.grid_ref_from_txt.grid(row=1, column=0, padx=7, pady=7, sticky='we', columnspan=2)
+
+            to_lbl = ttk.Label(self.frame, text='To: ')
+            to_lbl.grid(row=2, column=0, padx=7, pady=7, columnspan=2)
+
+            self.grid_ref_to_txt = ttk.Entry(self.frame)
+            self.grid_ref_to_txt.grid(row=3, column=0, padx=7, pady=7, sticky='we', columnspan=2)
+
+            zoom_lbl = ttk.Label(self.frame, text='Zoom: ')
+            zoom_lbl.grid(row=4, column=0, padx=7, pady=7)
+
+            self.zoom_txt = ttk.Entry(self.frame)
+            self.zoom_txt.grid(row=4, column=1, padx=7, pady=7, sticky='we')
+            self.zoom_txt.insert(0, '0')
+
+        self.frame.grid(row=2, column=0, columnspan=3, padx=0, pady=0, sticky='nsew')
+
     def hide_view(self):
         if self.frame is not None:
             self.frame.grid_forget()
 
     def get_input(self) -> dict:
-        return {}
+        grid_ref_input = {'from': self.grid_ref_from_txt.get(), 'to': self.grid_ref_to_txt.get()}
+
+        try:
+            grid_ref_input['zoom'] = int(self.zoom_txt.get())
+        except ValueError:
+            raise ValueError('Zoom must be an integer')
+
+        return grid_ref_input
 
 
 class DownloadDynmapTileFrame(View):