Allow maps to be downloaded via dynmap tile coordinates

Author: ryanbester

controllers/download.py

@@ -108,7 +108,10 @@ def download(self):
                 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
+                from_tile_x = input_range['from_x']
+                from_tile_y = input_range['from_y']
+                to_tile_x = input_range['to_x']
+                to_tile_y = input_range['to_y']
             else:
                 self.view.display_error('Invalid coordinate mode')
                 return

core/container.py

@@ -107,7 +107,7 @@ class Controllers(containers.DeclarativeContainer):
         views.download_frame,
         download_mc_coords_controller,
         download_grid_ref_controller,
-        download_grid_ref_controller
+        download_dynmap_tile_controller
     )
 
     grid_ref_conv_controller = providers.Singleton(

views/download.py

@@ -170,6 +170,11 @@ def get_input(self) -> dict:
 
 class DownloadDynmapTileFrame(View):
     controller: DownloadDynmapTileController
+    from_x_txt: ttk.Entry
+    from_y_txt: ttk.Entry
+    to_x_txt: ttk.Entry
+    to_y_txt: ttk.Entry
+    zoom_txt: ttk.Entry
 
     def __init__(self):
         super().__init__()
@@ -178,12 +183,73 @@ def __init__(self):
     def build_view(self, parent, controller: DownloadDynmapTileController):
         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.from_x_txt = ttk.Entry(self.frame)
+            self.from_x_txt.grid(row=1, column=0, padx=7, pady=7, sticky='we')
+
+            self.from_y_txt = ttk.Entry(self.frame)
+            self.from_y_txt.grid(row=1, column=1, padx=7, pady=7, sticky='we')
+
+            to_lbl = ttk.Label(self.frame, text='To: ')
+            to_lbl.grid(row=2, column=0, padx=7, pady=7, columnspan=2)
+
+            self.to_x_txt = ttk.Entry(self.frame)
+            self.to_x_txt.grid(row=3, column=0, padx=7, pady=7, sticky='we')
+
+            self.to_y_txt = ttk.Entry(self.frame)
+            self.to_y_txt.grid(row=3, column=1, padx=7, pady=7, sticky='we')
+
+            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 {}
+        coords_input = {}
+
+        try:
+            coords_input['from_x'] = int(self.from_x_txt.get())
+        except ValueError:
+            raise ValueError('From X Coordinate must be an integer')
+
+        try:
+            coords_input['from_y'] = int(self.from_y_txt.get())
+        except ValueError:
+            raise ValueError('From Y Coordinate must be an integer')
+
+        try:
+            coords_input['to_x'] = int(self.to_x_txt.get())
+        except ValueError:
+            raise ValueError('To X Coordinate must be an integer')
+
+        try:
+            coords_input['to_y'] = int(self.to_y_txt.get())
+        except ValueError:
+            raise ValueError('To Y Coordinate must be an integer')
+
+        try:
+            coords_input['zoom'] = int(self.zoom_txt.get())
+        except ValueError:
+            raise ValueError('Zoom must be an integer')
+
+        return coords_input
 
 
 class DownloadFrame(View):