maps4fs 0.8.9__tar.gz → 0.9.1__tar.gz

{maps4fs-0.8.9 → maps4fs-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.8.9
+Version: 0.9.1
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -266,10 +266,6 @@ Example of the `Texture` component:
     "minimum_y": 5013940.540089059,
     "maximum_x": 441233.5397821935,
     "maximum_y": 5016006.074349126,
-    "height": 2065.5342600671574,
-    "width": 2072.295804702677,
-    "height_coef": 1.0085616504234167,
-    "width_coef": 1.011863185889979
 },
 ```
 
@@ -282,12 +278,7 @@ And here's the list of the fields:
 - `"minimum_x"` - the minimum x coordinate of the map (UTM projection),<br>
 - `"minimum_y"` - the minimum y coordinate of the map (UTM projection),<br>
 - `"maximum_x"` - the maximum x coordinate of the map (UTM projection),<br>
-- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),<br>
-- `"height"` - the height of the map in meters (it won't be equal to the parameters above since the Earth is not flat, sorry flat-earthers),<br>
-- `"width"` - the width of the map in meters (same as above),<br>
-- `"height_coef"` - since we need a texture of exact size, the height of the map is multiplied by this coefficient,<br>
-- `"width_coef"` - same as above but for the width,<br>
-- `"tile_name"` - the name of the SRTM tile which was used to generate the height map, e.g. "N52E013"<br>
+- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),
 
 ### Background
 

{maps4fs-0.8.9 → maps4fs-0.9.1}/README.md

@@ -242,10 +242,6 @@ Example of the `Texture` component:
     "minimum_y": 5013940.540089059,
     "maximum_x": 441233.5397821935,
     "maximum_y": 5016006.074349126,
-    "height": 2065.5342600671574,
-    "width": 2072.295804702677,
-    "height_coef": 1.0085616504234167,
-    "width_coef": 1.011863185889979
 },
 ```
 
@@ -258,12 +254,7 @@ And here's the list of the fields:
 - `"minimum_x"` - the minimum x coordinate of the map (UTM projection),<br>
 - `"minimum_y"` - the minimum y coordinate of the map (UTM projection),<br>
 - `"maximum_x"` - the maximum x coordinate of the map (UTM projection),<br>
-- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),<br>
-- `"height"` - the height of the map in meters (it won't be equal to the parameters above since the Earth is not flat, sorry flat-earthers),<br>
-- `"width"` - the width of the map in meters (same as above),<br>
-- `"height_coef"` - since we need a texture of exact size, the height of the map is multiplied by this coefficient,<br>
-- `"width_coef"` - same as above but for the width,<br>
-- `"tile_name"` - the name of the SRTM tile which was used to generate the height map, e.g. "N52E013"<br>
+- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),
 
 ### Background
 

{maps4fs-0.8.9 → maps4fs-0.9.1}/maps4fs/generator/background.py

@@ -50,7 +50,8 @@ class Background(Component):
                 tile_code=path_step.code,
                 auto_process=False,
                 blur_radius=self.kwargs.get("blur_radius"),
-                multiplier=1,
+                multiplier=self.kwargs.get("multiplier", 1),
+                plateau=self.kwargs.get("plateau", 0),
             )
 
             # Update the origin for the next tile.

{maps4fs-0.8.9 → maps4fs-0.9.1}/maps4fs/generator/texture.py

@@ -167,14 +167,6 @@ class Texture(Component):
         self.logger.debug("Map minimum coordinates (XxY): %s x %s.", self.minimum_x, self.minimum_y)
         self.logger.debug("Map maximum coordinates (XxY): %s x %s.", self.maximum_x, self.maximum_y)
 
-        self.height = abs(north - south)
-        self.width = abs(east - west)
-        self.logger.info("Map dimensions (HxW): %s x %s.", self.height, self.width)
-
-        self.height_coef = self.height / self.map_height
-        self.width_coef = self.width / self.map_width
-        self.logger.debug("Map coefficients (HxW): %s x %s.", self.height_coef, self.width_coef)
-
     def info_sequence(self) -> dict[str, Any]:
         """Returns the JSON representation of the generation info for textures."""
         useful_attributes = [
@@ -186,10 +178,6 @@ class Texture(Component):
             "minimum_y",
             "maximum_x",
             "maximum_y",
-            "height",
-            "width",
-            "height_coef",
-            "width_coef",
         ]
         return {attr: getattr(self, attr, None) for attr in useful_attributes}
 
@@ -321,8 +309,7 @@ class Texture(Component):
         Returns:
             int: Relative X coordinate in map image.
         """
-        raw_x = x - self.minimum_x
-        return int(raw_x * self.height_coef)
+        return int(self.map_width * (x - self.minimum_x) / (self.maximum_x - self.minimum_x))
 
     def get_relative_y(self, y: float) -> int:
         """Converts UTM Y coordinate to relative Y coordinate in map image.
@@ -333,8 +320,7 @@ class Texture(Component):
         Returns:
             int: Relative Y coordinate in map image.
         """
-        raw_y = y - self.minimum_y
-        return self.height - int(raw_y * self.width_coef)
+        return int(self.map_height * (1 - (y - self.minimum_y) / (self.maximum_y - self.minimum_y)))
 
     # pylint: disable=W0613
     def _to_np(self, geometry: shapely.geometry.polygon.Polygon, *args) -> np.ndarray:

{maps4fs-0.8.9 → maps4fs-0.9.1}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maps4fs
-Version: 0.8.9
+Version: 0.9.1
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: MIT License
@@ -266,10 +266,6 @@ Example of the `Texture` component:
     "minimum_y": 5013940.540089059,
     "maximum_x": 441233.5397821935,
     "maximum_y": 5016006.074349126,
-    "height": 2065.5342600671574,
-    "width": 2072.295804702677,
-    "height_coef": 1.0085616504234167,
-    "width_coef": 1.011863185889979
 },
 ```
 
@@ -282,12 +278,7 @@ And here's the list of the fields:
 - `"minimum_x"` - the minimum x coordinate of the map (UTM projection),<br>
 - `"minimum_y"` - the minimum y coordinate of the map (UTM projection),<br>
 - `"maximum_x"` - the maximum x coordinate of the map (UTM projection),<br>
-- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),<br>
-- `"height"` - the height of the map in meters (it won't be equal to the parameters above since the Earth is not flat, sorry flat-earthers),<br>
-- `"width"` - the width of the map in meters (same as above),<br>
-- `"height_coef"` - since we need a texture of exact size, the height of the map is multiplied by this coefficient,<br>
-- `"width_coef"` - same as above but for the width,<br>
-- `"tile_name"` - the name of the SRTM tile which was used to generate the height map, e.g. "N52E013"<br>
+- `"maximum_y"` - the maximum y coordinate of the map (UTM projection),
 
 ### Background
 

{maps4fs-0.8.9 → maps4fs-0.9.1}/pyproject.toml

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