main

Author: rajman01

cadastral.py

@@ -96,15 +96,16 @@ def add_leg_labels(self, leg, orientation: str):
 
         # Offset text above/below the line
         normals = line_normals((leg.from_.easting, leg.from_.northing), (leg.to.easting, leg.to.northing), orientation)
-        offset_distance = self._get_drawing_extent() * 0.02
+        offset_distance = self._get_drawing_extent() * 0.04
         offset_inside_x = (normals[0][0] / math.hypot(*normals[0])) * offset_distance
         offset_inside_y = (normals[0][1] / math.hypot(*normals[0])) * offset_distance
         offset_outside_x = (normals[1][0] / math.hypot(*normals[1])) * offset_distance
         offset_outside_y = (normals[1][1] / math.hypot(*normals[1])) * offset_distance
 
         first_x += offset_outside_x; first_y += offset_outside_y
         last_x += offset_outside_x; last_y += offset_outside_y
-        mid_x += offset_inside_x; mid_y += offset_inside_y
+        mid_x +=  offset_inside_x; mid_y += offset_inside_y
+
 
         # Text angle adjustment
         text_angle = angle_deg
@@ -116,7 +117,7 @@ def add_leg_labels(self, leg, orientation: str):
                                angle=text_angle, height=self.label_size)
         ld = line_direction(angle_deg)
         if ld == "left → right":
-            # self._drawer.add_label_mtext(f"{format_number(leg.bearing.degrees, "hundredth")}°         {format_number(leg.bearing.minutes, "tenth")}'", mid_x, mid_y,
+            # self._drawer.add_label_mtext(f"{format_number(leg.bearing.degrees, "hundredth")}°         {format_number(leg.bearing.minutes, "tenth")}'", mid_x + offset_outside_x, mid_y + offset_outside_y,
             #                        angle=text_angle, height=self.label_size)
             self._drawer.add_label(f"{format_number(leg.bearing.degrees, "hundredth")}°", first_x, first_y,
                                    angle=text_angle, height=self.label_size)
@@ -212,7 +213,8 @@ def draw_north_arrow(self):
 
         self._drawer.add_north_arrow_label((coord.easting, northing_label_y),
                                            (coord.easting, northing_label_y + height), f"{coord.northing}mN",
-                                           self.label_size)
+                                           self.label_size, "vertical")
+
         self._drawer.draw_north_arrow_cross(coord.easting, coord.northing, self.beacon_size * 3)
 
     def draw(self):

dxf.py

@@ -323,7 +323,7 @@ def draw_north_arrow(self, x: float, y: float, height: float = 100.0):
             (x, y),
         )
 
-    def add_north_arrow_label(self, start: Tuple[float, float], stop: Tuple[float, float], label: str = "", height: float = 100.0):
+    def add_north_arrow_label(self, start: Tuple[float, float], stop: Tuple[float, float], label: str = "", height: float = 100.0, orientation: str = "horizontal"):
         height = height * self.scale
         x = start[0] * self.scale
         y = start[1] * self.scale
@@ -333,6 +333,12 @@ def add_north_arrow_label(self, start: Tuple[float, float], stop: Tuple[float, f
         # add line
         self.msp.add_line((x, y), (stop_x, stop_y), dxfattribs={'color': 5})
 
+        placement_x = x + 1
+        placement_y = y + 1
+
+        if orientation == "vertical":
+            placement_x = x - 1
+
         if label:
             angle = math.degrees(math.atan2(stop_y - y, stop_x - x))
 
@@ -346,7 +352,7 @@ def add_north_arrow_label(self, start: Tuple[float, float], stop: Tuple[float, f
                     'rotation': angle
                 }
             ).set_placement(
-                (x + 1, y + 1),
+                (placement_x, placement_y),
                 align=TextEntityAlignment.TOP_LEFT,
             )
 

layout.py

@@ -664,7 +664,7 @@ def _add_leg_labels(self, leg, orientation: str):
 
         # Offset text above/below the line
         normals = line_normals((leg.from_.easting, leg.from_.northing), (leg.to.easting, leg.to.northing), orientation)
-        offset_distance = self._get_drawing_extent() * 0.02
+        offset_distance = self._get_drawing_extent() * 0.04
         offset_inside_x = (normals[0][0] / math.hypot(*normals[0])) * offset_distance
         offset_inside_y = (normals[0][1] / math.hypot(*normals[0])) * offset_distance
         offset_outside_x = (normals[1][0] / math.hypot(*normals[1])) * offset_distance
@@ -973,7 +973,7 @@ def draw_north_arrow(self):
 
         self._drawer.add_north_arrow_label((coord.easting, northing_label_y),
                                            (coord.easting, northing_label_y + height), f"{coord.northing}mN",
-                                           self.label_size)
+                                           self.label_size, "vertical")
         self._drawer.draw_north_arrow_cross(coord.easting, coord.northing, self.beacon_size * 3)
 
     def draw_beacons(self):

topographic.py

@@ -137,7 +137,7 @@ def add_leg_labels(self, leg, orientation: str):
 
         # Offset text above/below the line
         normals = line_normals((leg.from_.easting, leg.from_.northing), (leg.to.easting, leg.to.northing), orientation)
-        offset_distance = self._get_drawing_extent() * 0.02
+        offset_distance = self._get_drawing_extent() * 0.04
         offset_inside_x = (normals[0][0] / math.hypot(*normals[0])) * offset_distance
         offset_inside_y = (normals[0][1] / math.hypot(*normals[0])) * offset_distance
         offset_outside_x = (normals[1][0] / math.hypot(*normals[1])) * offset_distance
@@ -537,7 +537,7 @@ def draw_north_arrow(self):
             northing_label_y = northing_label_y + ((self._frame_coords[3] - self._frame_coords[1]) * 0.2)
 
 
-        self._drawer.add_north_arrow_label((coord.easting, northing_label_y), (coord.easting, northing_label_y + height), f"{coord.northing}mN", self.label_size)
+        self._drawer.add_north_arrow_label((coord.easting, northing_label_y), (coord.easting, northing_label_y + height), f"{coord.northing}mN", self.label_size, "vertical")
         self._drawer.draw_north_arrow_cross(coord.easting, coord.northing, self.beacon_size * 3)
 
     def draw(self):