maps4fs 2.1.6__tar.gz → 2.1.7__tar.gz

{maps4fs-2.1.6 → maps4fs-2.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.6
+Version: 2.1.7
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.6 → maps4fs-2.1.7}/maps4fs/generator/component/background.py

@@ -601,9 +601,7 @@ class Background(MeshComponent, ImageComponent):
                 fitted_polygon = shapely.Polygon(fitted_polygon_points)
                 fitted_polygons.append(fitted_polygon)
             except Exception as e:
-                self.logger.warning(
-                    "Could not fit polygon into bounds with error: %s, polygon: %s", e, polygon
-                )
+                self.logger.debug("Could not fit polygon into bounds with error: %s.", e)
                 continue
 
         if not fitted_polygons:

{maps4fs-2.1.6 → maps4fs-2.1.7}/maps4fs/generator/component/i3d.py

@@ -658,8 +658,7 @@ class I3d(XMLComponent):
         Returns:
             int: The number of non-empty pixels in the image.
         """
-        result = np.count_nonzero(image > 0)
-        return result
+        return int(np.count_nonzero(image > 0))
 
     def get_step_by_limit(
         self, image: np.ndarray, limit: int, current_step: int | None = None

{maps4fs-2.1.6 → maps4fs-2.1.7}/maps4fs/generator/map.py

@@ -290,8 +290,6 @@ class Map:
             self.size,
             self.rotation,
         )
-        error_text = None
-
         for game_component in self.game.components:
             component = game_component(
                 self.game,
@@ -311,35 +309,18 @@ class Map:
 
             try:
                 component.process()
-            except Exception as e:
-                self.logger.error(
-                    "Error processing component %s: %s",
-                    component.__class__.__name__,
-                    e,
-                )
-                error_text = str(e)
-                raise e
-
-            finally:
-                with open(self.main_settings_path, "r", encoding="utf-8") as file:
-                    main_settings_json = json.load(file)
-
-                main_settings_json["completed"] = True
-                main_settings_json["error"] = error_text
-
-                with open(self.main_settings_path, "w", encoding="utf-8") as file:
-                    json.dump(main_settings_json, file, indent=4)
-
-            try:
                 component.commit_generation_info()
             except Exception as e:
                 self.logger.error(
-                    "Error committing generation info for component %s: %s",
+                    "Error processing or committing generation info for component %s: %s",
                     component.__class__.__name__,
                     e,
                 )
+                self._update_main_settings({"error": str(e)})
                 raise e
 
+        self._update_main_settings({"completed": True})
+
         self.logger.debug(
             "Map generation completed. Game code: %s. Coordinates: %s, size: %s. Rotation: %s.",
             self.game.code,
@@ -348,6 +329,20 @@ class Map:
             self.rotation,
         )
 
+    def _update_main_settings(self, data: dict[str, Any]) -> None:
+        """Update main settings with provided data.
+
+        Arguments:
+            data (dict[str, Any]): Data to update main settings.
+        """
+        with open(self.main_settings_path, "r", encoding="utf-8") as file:
+            main_settings_json = json.load(file)
+
+        main_settings_json.update(data)
+
+        with open(self.main_settings_path, "w", encoding="utf-8") as file:
+            json.dump(main_settings_json, file, indent=4)
+
     def get_component(self, component_name: str) -> Component | None:
         """Get component by name.
 

{maps4fs-2.1.6 → maps4fs-2.1.7}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.1.6
+Version: 2.1.7
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0

{maps4fs-2.1.6 → maps4fs-2.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maps4fs"
-version = "2.1.6"
+version = "2.1.7"
 description = "Generate map templates for Farming Simulator from real places."
 authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
 license = {text = "Apache License 2.0"}