wip

Author: rajman01

cadastral.py

@@ -191,6 +191,26 @@ def draw_north_arrow(self):
         height = (self._frame_coords[3] - self._frame_coords[1]) * 0.07
         self._drawer.draw_north_arrow(coord.easting, self._frame_coords[3] - height, height)
 
+        # for easting label
+        width = (self._frame_coords[2] - self._frame_coords[0]) * 0.1
+
+        self._drawer.add_north_arrow_label((self._frame_coords[0], coord.northing),
+                                           (self._frame_coords[0] + width, coord.northing), f"{coord.easting}mE",
+                                           self.label_size)
+        self._drawer.add_north_arrow_label((self._frame_coords[2], coord.northing),
+                                           (self._frame_coords[2] - width, coord.northing), "",
+                                           self.label_size)
+
+        # for northing label
+        northing_label_y = self._frame_coords[1]
+        if len(self.footers) > 0:
+            northing_label_y = northing_label_y + ((self._frame_coords[3] - self._frame_coords[1]) * 0.25)
+
+        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.draw_north_arrow_cross(coord.easting, coord.northing, self.beacon_size * 3)
+
     def draw(self):
         # Draw elements
         self.draw_beacons()

dxf.py

@@ -228,6 +228,44 @@ 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):
+        height = height * self.scale
+        x = start[0] * self.scale
+        y = start[1] * self.scale
+        stop_x = stop[0] * self.scale
+        stop_y = stop[1] * self.scale
+
+        # add line
+        self.msp.add_line((x, y), (stop_x, stop_y), dxfattribs={'color': 5})
+
+        if label:
+            angle = math.degrees(math.atan2(stop_y - y, stop_x - x))
+
+            # add text at midpoint
+            self.msp.add_text(
+                label,
+                dxfattribs={
+                    'height': height,
+                    'color': 5,
+                    'style': 'SURVEY_TEXT',
+                    'rotation': angle
+                }
+            ).set_placement(
+                (x, y),
+                align=TextEntityAlignment.TOP_LEFT,
+            )
+
+    def draw_north_arrow_cross(self, x: float, y: float, length: float = 100.0):
+        x = x * self.scale
+        y = y * self.scale
+        length = length * self.scale
+
+        half = length / 2
+
+        # add cross lines
+        self.msp.add_line((x - half, y), (x + half, y), dxfattribs={'color': 5})
+        self.msp.add_line((x, y - half), (x, y + half), dxfattribs={'color': 5})
+
     def draw_graphical_scale(self, x: float, y: float, length: float = 1000.0):
         X = x * self.scale
         Y = y * self.scale
@@ -614,7 +652,7 @@ def save(self, paper_size: str = "A4", orientation: str = "portrait"):
             url = upload_file(zip_path, folder="survey_plans", file_name=filename)
             if url is None:
                 raise Exception("Upload failed")
-            return url
+            return "url"
 
 
 

topographic.py

@@ -520,6 +520,23 @@ def draw_north_arrow(self):
         height = (self._frame_coords[3] - self._frame_coords[1]) * 0.07
         self._drawer.draw_north_arrow(coord.easting, self._frame_coords[3] - height, height)
 
+        # for easting label
+        width = (self._frame_coords[2] - self._frame_coords[0]) * 0.1
+
+        self._drawer.add_north_arrow_label((self._frame_coords[0], coord.northing), (self._frame_coords[0] + width, coord.northing), f"{coord.easting}mE", self.label_size)
+        self._drawer.add_north_arrow_label((self._frame_coords[2], coord.northing),
+                                           (self._frame_coords[2] - width, coord.northing), "",
+                                           self.label_size)
+
+        # for northing label
+        northing_label_y = self._frame_coords[1]
+        if len(self.footers) > 0:
+            northing_label_y = northing_label_y + ((self._frame_coords[3] - self._frame_coords[1]) * 0.25)
+
+
+        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.draw_north_arrow_cross(coord.easting, coord.northing, self.beacon_size * 3)
+
     def draw(self):
         # Draw elements
         self.draw_beacons()