maps4fs 1.8.216__py3-none-any.whl → 1.8.217__py3-none-any.whl

maps4fs/generator/component/base/component.py

@@ -176,7 +176,10 @@ class Component:
         self.logger.debug("Updated generation info, now contains %s fields", len(data))
 
         with open(self.generation_info_path, "w", encoding="utf-8") as file:
-            json.dump(updated_generation_info, file, indent=4)
+            try:
+                json.dump(updated_generation_info, file, indent=4)
+            except Exception as e:
+                self.logger.warning("Could not save updated generation info: %s", e)
 
         self.logger.debug("Saved updated generation info to %s", self.generation_info_path)
 

maps4fs/generator/dem.py

@@ -63,6 +63,8 @@ class DEM(Component):
             map=self.map,
         )
 
+        self.info: dict[str, Any] = {}
+
     @property
     def dem_path(self) -> str:
         """Returns path to the DEM file.
@@ -112,6 +114,27 @@ class DEM(Component):
         )
         return dem_size, dem_size
 
+    def update_info(self, state: str, data: np.ndarray) -> None:
+        """Update info dictionary with additional information about DEM data.
+
+        Arguments:
+            data (np.ndarray): DEM data.
+        """
+
+        try:
+            entry = {
+                "min": float(data.min()),
+                "max": float(data.max()),
+                "std": data.std(),
+                "deviation": float(data.max() - data.min()),
+                "mean": data.mean(),
+                "dtype": str(data.dtype),
+                "shape": str(data.shape),
+            }
+            self.info[state] = entry
+        except Exception as e:
+            self.logger.warning("Failed to update DEM info: %s.", e)
+
     def process(self) -> None:
         """Reads DTM file, crops it to map size, normalizes and blurs it,
         saves to map directory."""
@@ -141,6 +164,8 @@ class DEM(Component):
             data.max(),
         )
 
+        self.update_info("original", data)
+
         # Check if the data contains any non zero values, otherwise raise an error.
         if not np.any(data):
             self.logger.error("DTM provider returned empty data.")
@@ -151,10 +176,12 @@ class DEM(Component):
 
         # 2. Apply multiplier (-10 to 120.4 becomes -20 to 240.8)
         resampled_data = self.apply_multiplier(resampled_data)
+        self.update_info("multiplied", resampled_data)
 
         # 3. Raise terrain, and optionally lower to plateau level+water depth
         # e.g. -20 to 240.8m becomes 20 to 280.8m
         resampled_data = self.raise_or_lower(resampled_data)
+        self.update_info("raised_lowered", resampled_data)
 
         # 4. Determine actual height scale value using ceiling
         # e.g. 255 becomes 280.8+10 = 291
@@ -163,6 +190,7 @@ class DEM(Component):
         # 5. Normalize DEM data to 16-bit unsigned integer range (0 to 65535)
         # e.g. multiply by 65535/291, clip and return as uint16
         resampled_data = self.normalize_data(resampled_data, height_scale_value)
+        self.update_info("normalized", resampled_data)
 
         # 6. Blur DEM data.
         resampled_data = self.apply_blur(resampled_data)
@@ -205,10 +233,13 @@ class DEM(Component):
         adjusted_height_scale = math.ceil(
             max(height_scale, data.max() + self.map.dem_settings.ceiling)
         )
+        self.info["adjusted_height_scale"] = adjusted_height_scale
 
         self.map.shared_settings.height_scale_value = adjusted_height_scale  # type: ignore
         self.map.shared_settings.mesh_z_scaling_factor = 65535 / adjusted_height_scale
+        self.info["mesh_z_scaling_factor"] = 65535 / adjusted_height_scale
         self.map.shared_settings.height_scale_multiplier = adjusted_height_scale / 255
+        self.info["height_scale_multiplier"] = adjusted_height_scale / 255
         self.map.shared_settings.change_height_scale = True  # type: ignore
 
         self.logger.debug("Height scale value is %s.", adjusted_height_scale)
@@ -316,14 +347,9 @@ class DEM(Component):
         )
 
     def info_sequence(self) -> dict[Any, Any] | None:  # type: ignore
-        """Returns the information sequence for the component. Must be implemented in the child
-        class. If the component does not have an information sequence, an empty dictionary must be
-        returned.
+        """Returns the information sequence for the component.
 
         Returns:
             dict[Any, Any]: The information sequence for the component.
         """
-        provider_info_sequence = self.dtm_provider.info_sequence()
-        if provider_info_sequence is None:
-            return {}
-        return provider_info_sequence
+        return self.info

maps4fs/generator/dtm/dtm.py

@@ -74,8 +74,6 @@ class DTMProvider(ABC):
         self.logger = logger
         self.map = map
 
-        self._data_info: dict[str, int | str | float] | None = None
-
     @classmethod
     def name(cls) -> str | None:
         """Name of the provider.
@@ -94,24 +92,6 @@ class DTMProvider(ABC):
         """
         return cls._code
 
-    @property
-    def data_info(self) -> dict[str, int | str | float] | None:
-        """Information about the DTM data.
-
-        Returns:
-            dict[str, int | str | float] | None: Information about the DTM data.
-        """
-        return self._data_info
-
-    @data_info.setter
-    def data_info(self, value: dict[str, int | str | float] | None) -> None:
-        """Set information about the DTM data.
-
-        Arguments:
-            value (dict[str, int | str | float] | None): Information about the DTM data.
-        """
-        self._data_info = value
-
     @property
     def coordinates(self) -> tuple[float, float]:
         """Coordinates of the center point of the DTM data.
@@ -330,16 +310,6 @@ class DTMProvider(ABC):
 
         return data
 
-    def info_sequence(self) -> dict[str, int | str | float] | None:
-        """Returns the information sequence for the component. Must be implemented in the child
-        class. If the component does not have an information sequence, an empty dictionary must be
-        returned.
-
-        Returns:
-            dict[str, int | str | float] | None: Information sequence for the component.
-        """
-        return self.data_info
-
     # region helpers
     def get_bbox(self) -> tuple[float, float, float, float]:
         """Get bounding box of the tile based on the center point and size.

maps4fs/generator/dtm/srtm.py

@@ -33,7 +33,6 @@ class SRTM30Provider(DTMProvider):
         self.gz_directory = os.path.join(self._tile_directory, "gz")
         os.makedirs(self.hgt_directory, exist_ok=True)
         os.makedirs(self.gz_directory, exist_ok=True)
-        self.data_info: dict[str, int | str | float] | None = None  # type: ignore
 
     def download_tiles(self):
         """Download SRTM tiles."""

{maps4fs-1.8.216.dist-info → maps4fs-1.8.217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: maps4fs
-Version: 1.8.216
+Version: 1.8.217
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License

{maps4fs-1.8.216.dist-info → maps4fs-1.8.217.dist-info}/RECORD

@@ -1,7 +1,7 @@
 maps4fs/__init__.py,sha256=EGvLVoRpSt4jITswsGbe1ISVmGAZAMQJcBmTwtyuVxI,335
 maps4fs/logger.py,sha256=HQrDyj72mUjVYo25aR_-_SxVn2rfFjDCNbj-JKJdSnE,1488
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/dem.py,sha256=Nyz64BWM---Vpy1mi8bbhHEfd2Wc2rWw9UqHraqXDJ8,11771
+maps4fs/generator/dem.py,sha256=bPtMLkY0sa3Euue2oGh-Z4npr4dS8q7N_J9BfaomOoM,12651
 maps4fs/generator/game.py,sha256=NZaxj5z7WzMiHzAvQyr-TvVjGoHgqGldM6ZsItuYyzA,11292
 maps4fs/generator/map.py,sha256=1mbnOWXVEDeFHWDBBDX9ugzRtrGBQYrJ5ruKmPUsMe8,11136
 maps4fs/generator/qgis.py,sha256=Es8hLuqN_KH8lDfnJE6He2rWYbAKJ3RGPn-o87S6CPI,6116
@@ -15,7 +15,7 @@ maps4fs/generator/component/layer.py,sha256=QPcEzTv_8N9wYvHAZy8OezfATaVLG-YetSfC
 maps4fs/generator/component/satellite.py,sha256=oZBHjP_QY0ik1-Vk7JqMS__zIG8ffw2voeozB7-HUQc,4946
 maps4fs/generator/component/texture.py,sha256=GWOE7w2maydB2LDku-YEC1w1oc8kcnnZ1SPTL6b82H8,30966
 maps4fs/generator/component/base/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/component/base/component.py,sha256=apGuQ7TcwqL0neJZiciNLGO22wZwYyqoDZM7aI1RHw8,21273
+maps4fs/generator/component/base/component.py,sha256=sUinM8Q6cb26ctJTNF35Gb4rU9gbPCMkV6PKju3sfRo,21414
 maps4fs/generator/component/base/component_image.py,sha256=2QnJ9xm0D54v4whg7bc1s-kwRVjZHhOo1OR5jHr1Qp0,4786
 maps4fs/generator/component/base/component_mesh.py,sha256=pc7UVakZCnJPV-0Ukdsm6aUD3NFZbOUazuEbb44k170,8747
 maps4fs/generator/component/base/component_xml.py,sha256=6OO1dKoceO1ACk7-k1oGtnkfNud8ZN3u3ZNjdNMpTqw,3967
@@ -26,7 +26,7 @@ maps4fs/generator/dtm/bavaria.py,sha256=nH2wTxiIdQgKotauTqD-zztwFgfZzIdym2sjmSqf
 maps4fs/generator/dtm/canada.py,sha256=XJ_za2LDV9PEV7hmjPnzdwPbpr6ezAR73-HDVaTuKPk,1290
 maps4fs/generator/dtm/czech.py,sha256=sT0gwbtEnizVNcZeL7kyDdwmKvB3w8m6UgJR7ZTk1to,1058
 maps4fs/generator/dtm/denmark.py,sha256=JFuBRrCJTMXe_vdO3gRCwsnZ3nZOp_Y6671Kq8aXRGM,1591
-maps4fs/generator/dtm/dtm.py,sha256=dXPQH6eT0InoPtt5ZD8TUS5uhrOSqB_t4UiDjhueZMs,17812
+maps4fs/generator/dtm/dtm.py,sha256=iuZ5lV5OFefpmJh8NKu37APZydcjFzcrhLe1ChxVRjc,16748
 maps4fs/generator/dtm/england.py,sha256=3URUm7uLH_RYXcQdDW3Vt09GWKAE8RAy1ZFJB94kXOA,1124
 maps4fs/generator/dtm/finland.py,sha256=VpXpvCgzbyKA6VGSa7ikSzE4B-cLfR1_2zOHvS8delc,1870
 maps4fs/generator/dtm/flanders.py,sha256=LltmowbS84_DaBHAS9XYoJPMunX6sWGy6zaVACHj5Ro,1039
@@ -42,7 +42,7 @@ maps4fs/generator/dtm/rema.py,sha256=arLE12yE92EWmWysNUTtdEzwcNiCBtEBmnfnryOriRY
 maps4fs/generator/dtm/sachsenanhalt.py,sha256=UvLrQVxJX30BqtNbKZyR6EJc-vS5fLyanh6fntjYj2k,1144
 maps4fs/generator/dtm/scotland.py,sha256=kUGPNjn3mQPOU9sgK3k-uwumPG2wrRFLaDMyPMh06Jw,4819
 maps4fs/generator/dtm/spain.py,sha256=A5QScsrd_bkVlf2n9ZfXBL9z_YoXpLsm_5FWs-5nd_o,1021
-maps4fs/generator/dtm/srtm.py,sha256=zeQovZCC6AKzdKAxypKQFuIn1mi2c9EUpRjaA4jSVVs,4346
+maps4fs/generator/dtm/srtm.py,sha256=RcAB0PRaTLAJNvasLLdGVvjww05Lby2O2Aw5TG0M0sY,4263
 maps4fs/generator/dtm/switzerland.py,sha256=Jn3qYVEps_K6cH-9rMfB_zoXMxhzWQKPnlKkSE-TehE,3549
 maps4fs/generator/dtm/usgs_wcs.py,sha256=X8VxdhyH0-EciGE_X-KgrAM6sVLTGssYIhtebOj8MPI,1021
 maps4fs/generator/dtm/utils.py,sha256=I-wUSA_J85Xbt8sZCZAVKHSIcrMj5Ng-0adtPVhVmk0,2315
@@ -52,8 +52,8 @@ maps4fs/toolbox/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,4
 maps4fs/toolbox/background.py,sha256=RclEqxEWLbMxuEkkegQP8jybzugwQ1_R3rdfDe0s21U,2104
 maps4fs/toolbox/custom_osm.py,sha256=X6ZlPqiOhNjkmdD_qVroIfdOl9Rb90cDwVSLDVYgx80,1892
 maps4fs/toolbox/dem.py,sha256=z9IPFNmYbjiigb3t02ZenI3Mo8odd19c5MZbjDEovTo,3525
-maps4fs-1.8.216.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
-maps4fs-1.8.216.dist-info/METADATA,sha256=UgfYmvQjsMnGZ7K-9NehPbnIvn3bik6VxbzzEW7D3yo,45770
-maps4fs-1.8.216.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-maps4fs-1.8.216.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-1.8.216.dist-info/RECORD,,
+maps4fs-1.8.217.dist-info/LICENSE.md,sha256=pTKD_oUexcn-yccFCTrMeLkZy0ifLRa-VNcDLqLZaIw,10749
+maps4fs-1.8.217.dist-info/METADATA,sha256=dYYPzjVFgA-mTbkFQWK8tUNJ5YOnRqEAbnd4BeDi6oo,45770
+maps4fs-1.8.217.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+maps4fs-1.8.217.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-1.8.217.dist-info/RECORD,,