wip

Author: rajman01

app.py

@@ -4,7 +4,7 @@
 
 from dxf import SurveyDXFManager
 from models.plan import PlanProps
-from utils import polygon_orientation, line_normals, line_direction
+from utils import polygon_orientation, line_normals, line_direction, html_to_mtext
 
 app = Flask(__name__)
 app.config["SECRET_KEY"] = "secret"
@@ -22,7 +22,7 @@ def generate_cadastral_plan():
     extent = plan.get_extent()
     beacon_size = extent * 0.02
 
-    drawer = SurveyDXFManager(plan_name=plan.name, scale=plan.scale)
+    drawer = SurveyDXFManager(plan_name=plan.name, scale=plan.get_drawing_scale())
     drawer.setup_beacon_style(type_=plan.beacon_type, size=beacon_size or 1.0)
     drawer.setup_font(plan.font)
 
@@ -81,7 +81,6 @@ def generate_cadastral_plan():
 
                 drawer.add_text(f"{leg.distance:.2f} m", mid_x, mid_y, angle=text_angle, height=label_height)
                 ld = line_direction(angle_deg)
-                print(leg.from_.id, leg.to.id, ld)
                 if ld == "left → right":
                     drawer.add_text(f"{leg.bearing.degrees}°", first_x, first_y, angle=text_angle, height=label_height)
                     drawer.add_text(f"{leg.bearing.minutes}'", last_x, last_y, angle=text_angle, height=label_height)
@@ -96,21 +95,31 @@ def generate_cadastral_plan():
     height = max_y - min_y
 
     # Draw frame
-    margin_x = max(width, height) * 0.4
-    margin_y = max(height, width) * 0.75
-    drawer.draw_frame(min_x - margin_x, min_y - margin_y, max_x + margin_x, max_y + margin_y)
+    margin_x = max(width, height) * 0.35
+    margin_y = max(height, width) * 0.7
+    frame_left = min_x - margin_x
+    frame_bottom = min_y - margin_y
+    frame_right = max_x + margin_x
+    frame_top = max_y + margin_y
+    drawer.draw_frame(frame_left, frame_bottom, frame_right,frame_top)
 
     # offset frame
-    offset_x = max(width, height) * 0.43
-    offset_y = max(height, width) * 0.78
+    offset_x = max(width, height) * 0.38
+    offset_y = max(height, width) * 0.73
     drawer.draw_frame(min_x - offset_x, min_y - offset_y, max_x + offset_x, max_y + offset_y)
 
     # add title block
-    box_width = (max_x + margin_x) - (min_x - margin_x) * 0.6
-    title_x = ((min_x - margin_x) + (max_x + margin_x)) / 2
-    title_y = (max_y + margin_y) - (margin_y * 0.15)
-    text_height = plan.font_size or ((max_y + margin_y) - (min_y - margin_y)) * 0.02
-    drawer.add_title(plan.title.upper(), title_x, title_y, width=box_width, height=text_height)
+    # Calculate center position for title
+    frame_width = frame_right - frame_left
+    frame_center_x = frame_left + (frame_width / 2)
+
+    # Title positioning
+    title_y = frame_top - (margin_y * 0.2)  # 5 units below the top of frame
+    title_height = plan.font_size  # Height of title text
+    title_width = frame_width * 0.6  # Use 60% of frame width for title box
+
+    drawer.add_title(html_to_mtext(plan.build_title()), frame_center_x, title_y, title_width, title_height)
+
 
     drawer.save_dxf()
     return jsonify({"message": "Cadastral plan generated", "filename": plan.name}), 200

dxf.py

@@ -6,6 +6,7 @@
 import matplotlib.pyplot as plt
 from ezdxf.addons.drawing import Frontend, RenderContext
 from ezdxf.addons.drawing.matplotlib import MatplotlibBackend
+from ezdxf.tools.text import MTextEditor
 
 class SurveyDXFManager:
     def __init__(self, plan_name: str = "Survey Plan", scale: float = 1.0):
@@ -140,23 +141,23 @@ def add_text(self, text: str, x: float, y: float, angle: float = 0.0, height: fl
             align=TextEntityAlignment.MIDDLE_CENTER
         )
 
-    def add_title(self, text: str, x: float, y: float, width: float, height: float = 1.0):
-        print(width)
-        """Add title text at given coordinates with optional rotation"""
-        mtext = self.msp.add_mtext(text, dxfattribs={'layer': 'TITLE_BLOCK', 'style': 'SURVEY_TEXT'})
-        mtext.set_location((x * self.scale, y * self.scale))
-        mtext.dxf.char_height = height * self.scale
-        mtext.dxf.width = 60
-        mtext.dxf.attachment_point = 2  # top center
-        # mtext.dxf.paragraphs = MTextParagraphAlignment.JUSTIFIED
+    def add_title(self, text: str, x: float, y: float, width: float, title_height: float = 1.0):
+        title_mtext = self.msp.add_mtext(
+            text=f"{MTextEditor.UNDERLINE_START}{text}{MTextEditor.UNDERLINE_STOP}",
+            dxfattribs={'layer': 'TITLE_BLOCK', 'style': 'SURVEY_TEXT'},
+        )
+        title_mtext.set_location((x * self.scale, y * self.scale))
+        title_mtext.dxf.attachment_point = ezdxf.enums.MTextEntityAlignment.TOP_CENTER
+        title_mtext.dxf.char_height = title_height * self.scale
+        title_mtext.dxf.width = width * self.scale
 
     def draw_frame(self, min_x, min_y, max_x, max_y):
         """Draw a rectangle given min and max coordinates"""
         self.msp.add_lwpolyline([
-            (min_x * self.scale, min_y* self.scale),
-            (max_x* self.scale, min_y* self.scale),
-            (max_x* self.scale, max_y* self.scale),
-            (min_x* self.scale, max_y* self.scale)
+            (min_x * self.scale, min_y * self.scale),
+            (max_x * self.scale, min_y * self.scale),
+            (max_x * self.scale, max_y * self.scale),
+            (min_x * self.scale, max_y * self.scale)
         ], close=True, dxfattribs={
             'layer': 'FRAME',
         })

models/plan.py

@@ -2,6 +2,7 @@
 from typing import List, Optional, Union
 from datetime import datetime
 from pydantic import BaseModel, Field
+from bs4 import BeautifulSoup
 
 # ---------- Enums ----------
 class PlanType(str, Enum):
@@ -78,13 +79,18 @@ class PlanProps(BaseModel):
     state: str = ""
     plan_number: str = ""
     origin: PlanOrigin = PlanOrigin.UTM_ZONE_31
-    scale: float = 1
+    scale: float = 1000
     beacon_type: BeaconType = BeaconType.NONE
     personel_name: str = ""
     surveyor_name: str = ""
     forward_computation_data: Optional[ForwardComputationData] = None
     traverse_computation_data: Optional[TraverseComputationData] = None
 
+    def get_drawing_scale(self):
+        if not self.scale:
+            return 1.0
+        return 1000 / self.scale
+
     def get_extent(self) -> float:
         # get bounding box
         min_x, min_y, max_x, max_y = self.get_bounding_box()
@@ -107,3 +113,29 @@ def get_bounding_box(self) -> Optional[tuple]:
         min_y, max_y = min(ys), max(ys)
 
         return min_x, min_y, max_x, max_y
+
+    def build_title(self) -> str:
+        soup = BeautifulSoup(self.title.upper(), "html.parser")
+
+        if self.address:
+            p1 = soup.new_tag("p")
+            p1.string = self.address.upper()
+            soup.append(p1)
+
+        if self.local_govt:
+            p2 = soup.new_tag("p")
+            p2.string = self.local_govt.upper()
+            soup.append(p2)
+
+        if self.state:
+            p3 = soup.new_tag("p")
+            p3.string = f"{self.state.upper()} STATE"
+            soup.append(p3)
+
+        if self.scale:
+            p4 = soup.new_tag("p")
+            p4.string = f"SCALE :- 1 : {int(self.scale)}"
+            soup.append(p4)
+
+        return soup.prettify()
+

pl.py

@@ -0,0 +1,41 @@
+from bs4 import BeautifulSoup, Tag
+from ezdxf.tools.text import MTextEditor
+
+
+def html_to_mtext(html_text: str):
+    if not html_text:
+        return ""
+
+    soup = BeautifulSoup(html_text, "html.parser")
+    editor = MTextEditor()
+
+    def parse_tag(tag):
+        for child in tag.children:
+            if isinstance(child, str):  # Plain text
+                editor.append(child)
+            else:
+                # Apply formatting recursively
+                if child.name == "b" or child.name == "strong":
+                    editor.font("Arial", bold=True)
+                    parse_tag(child)
+                # elif child.name == "i":
+                #     editor.font(child.get_text(), bold=False, italic=True)
+                elif child.name == "u":
+                    editor.append(MTextEditor.UNDERLINE_START)
+                    parse_tag(child)
+                    editor.append(MTextEditor.UNDERLINE_STOP)
+                elif child.name == "br":
+                    editor.append(MTextEditor.NEW_LINE)
+                elif child.name == "p":
+                    editor.append(MTextEditor.NEW_LINE)
+                    parse_tag(child)
+                    editor.append(MTextEditor.NEW_LINE)
+                else:
+                    parse_tag(child)
+
+    parse_tag(soup)
+    return str(editor)
+
+
+if __name__ == "__main__":
+    print(html_to_mtext("<p>PLAN SHEWING PROPERTY</p><p>SAID TO BELONG TO</p><p><strong>MR. BABAWALE OLATUNBO OKUNOLA</strong></p><p><strong>&amp;</strong></p><p><strong>MRS. AZEEZAT OLUSEYI OKUNOLA</strong></p><p>Hello Sir</p>"))

requirements.txt

@@ -1,5 +1,7 @@
 annotated-types==0.7.0
+beautifulsoup4==4.13.5
 blinker==1.9.0
+bs4==0.0.2
 click==8.2.1
 colorama==0.4.6
 comtypes==1.4.12
@@ -22,6 +24,7 @@ pydantic_core==2.33.2
 pyparsing==3.2.4
 python-dateutil==2.9.0.post0
 six==1.17.0
+soupsieve==2.8
 typing-inspection==0.4.1
 typing_extensions==4.15.0
 Werkzeug==3.1.3

utils.py

@@ -1,3 +1,6 @@
+from bs4 import BeautifulSoup
+from ezdxf.tools.text import MTextEditor
+
 def polygon_orientation(coords):
     # coords = [(x1,y1), (x2,y2), ...]
     area = 0
@@ -22,4 +25,53 @@ def line_direction(angle) -> str:
     if -90 <= angle <= 90:
         return "left → right"
     else:
-        return "right → left"
+        return "right → left"
+
+def html_to_mtext(html_text: str):
+    if not html_text:
+        return ""
+
+    html_text = html_text.replace('\n', '')
+    print(html_text)
+    soup = BeautifulSoup(html_text, "html.parser")
+    editor = MTextEditor()
+
+    def parse_tag(tag):
+        for child in tag.children:
+            if isinstance(child, str):  # Plain text
+                editor.append(child.strip())
+            else:
+                # Apply formatting recursively
+                if child.name == "b" or child.name == "strong":
+                    editor.append("\\B")
+                    parse_tag(child)
+                    editor.append("\\b")
+                elif child.name == "i":
+                    editor.append("\\I")
+                    parse_tag(child)
+                    editor.append("\\i")
+                elif child.name == "u":
+                    editor.append(MTextEditor.UNDERLINE_START)
+                    parse_tag(child)
+                    editor.append(MTextEditor.UNDERLINE_STOP)
+                elif child.name == "br":
+                    editor.append(MTextEditor.NEW_LINE)
+                elif child.name == "p":
+                    prev = child.previous_sibling
+                    while prev and str(prev).strip() == "":
+                        prev = prev.previous_sibling
+                    if prev is not None:
+                        editor.append(MTextEditor.NEW_LINE)
+                    parse_tag(child)
+                    # editor.append(MTextEditor.NEW_LINE)
+                else:
+                    parse_tag(child)
+
+    parse_tag(soup)
+    result = str(editor)
+    result = result.replace('\n', '')
+    return result
+
+
+if __name__ == '__main__':
+    print(repr(html_to_mtext()))