refactor: adjust frame percentages, introduce LayoutPlan, and comment redundant drawing logic

Author: rajman01

cadastral.py

@@ -13,8 +13,8 @@ def __init__(self, **kwargs):
         if self.type != PlanType.CADASTRAL:
             raise ValueError("CadastralPlan must have type PlanType.CADASTRAL")
 
-        self._frame_x_percent = 0.35
-        self._frame_y_percent = 0.8
+        self._frame_x_percent = 0.55
+        self._frame_y_percent = 1.0
         self._bounding_box = self.get_bounding_box()
         self._frame_coords = self._setup_frame_coords()
         self._coord_dict = {coord.id: coord for coord in self.coordinates}
@@ -138,9 +138,9 @@ def draw_frames(self):
         frame_right, frame_top = max_x + margin_x, max_y + margin_y
         self._drawer.draw_frame(frame_left, frame_bottom, frame_right, frame_top)
 
-        offset_x, offset_y = max(width, height) * (self._frame_x_percent + 0.03), max(height, width) * (self._frame_y_percent + 0.03)
-        self._drawer.draw_frame(min_x - offset_x, min_y - offset_y,
-                          max_x + offset_x, max_y + offset_y)
+        # offset_x, offset_y = max(width, height) * (self._frame_x_percent + 0.03), max(height, width) * (self._frame_y_percent + 0.03)
+        # self._drawer.draw_frame(min_x - offset_x, min_y - offset_y,
+        #                   max_x + offset_x, max_y + offset_y)
 
     def draw_title_block(self):
         """Add title block to the frame."""

dxf.py

@@ -11,9 +11,8 @@
 import zipfile
 from upload import upload_file
 from ezdxf import bbox, colors
-import subprocess
 import math
-from typing import List, Tuple, Dict, Optional, Union
+from typing import List, Tuple
 
 
 

layout.py

@@ -0,0 +1,8 @@
+from models.plan import PlanProps, PlanType
+
+
+class LayoutPlan(PlanProps):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        if self.type != PlanType.LAYOUT:
+            raise ValueError("LayoutPlan must have type PlanType.LAYOUT")

topographic.py

@@ -22,8 +22,8 @@ def __init__(self, **kwargs):
         if self.type != PlanType.TOPOGRAPHIC:
             raise ValueError("TopographicPlan must have type PlanType.TOPOGRAPHIC")
 
-        self._frame_x_percent = 0.35
-        self._frame_y_percent = 0.8
+        self._frame_x_percent = 0.55
+        self._frame_y_percent = 1.0
         self._bounding_box = self.get_bounding_box()
         self._frame_coords = self._setup_frame_coords()
         self._boundary_dict = {coord.id: coord for coord in self.topographic_boundary.coordinates}
@@ -177,10 +177,10 @@ def draw_frames(self):
         frame_right, frame_top = max_x + margin_x, max_y + margin_y
         self._drawer.draw_frame(frame_left, frame_bottom, frame_right, frame_top)
 
-        offset_x, offset_y = max(width, height) * (self._frame_x_percent + 0.03), max(height, width) * (
-                    self._frame_y_percent + 0.03)
-        self._drawer.draw_frame(min_x - offset_x, min_y - offset_y,
-                                max_x + offset_x, max_y + offset_y)
+        # offset_x, offset_y = max(width, height) * (self._frame_x_percent + 0.03), max(height, width) * (
+        #             self._frame_y_percent + 0.03)
+        # self._drawer.draw_frame(min_x - offset_x, min_y - offset_y,
+        #                         max_x + offset_x, max_y + offset_y)
 
     def draw_title_block(self):
         """Add title block to the frame."""