maps4fs 0.8.9__py3-none-any.whl → 0.9.1__py3-none-any.whl

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/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.dist-info → maps4fs-0.9.1.dist-info}/METADATA

@@ -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.dist-info → maps4fs-0.9.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 maps4fs/__init__.py,sha256=da4jmND2Ths9AffnkAKgzLHNkvKFOc_l21gJisPXqWY,155
 maps4fs/logger.py,sha256=CneeHxQywjNUJXqQrUUSeiDxu95FfrfyK_Si1v0gMZ8,1477
 maps4fs/generator/__init__.py,sha256=zZMLEkGzb4z0xql650gOtGSvcgX58DnJ2yN3vC2daRk,43
-maps4fs/generator/background.py,sha256=YZbTSijKgNQOvpWJHqCJNHeoV5GxUjp79b8PoQwRQH0,10778
+maps4fs/generator/background.py,sha256=ThYwjk7XJuqMDf9ITh22clvE5wVq_b1lSRH4Ha8REC8,10864
 maps4fs/generator/component.py,sha256=g3IBC8ul9zmcG9tHvyPJIg8hxBHFR8kB8Smw9yMW3qA,7864
 maps4fs/generator/config.py,sha256=JkRexT_ZclRa_x0w6ojgG-Tsu4NoshFTUGycRFdfrVk,3463
 maps4fs/generator/dem.py,sha256=p7THncPUdYWtNR2HrTXe0bCuJ8psUV8rRpYPJkzL2gA,15220
@@ -9,10 +9,10 @@ maps4fs/generator/game.py,sha256=94HjPNOyy6XSSOnBp-uxrkBglKyC-X3ULIrrucfdlKw,682
 maps4fs/generator/i3d.py,sha256=UuQiQRusPQ2f6PvGKxJ_UZeXsx3uG15efmy8Ysnm3F8,3597
 maps4fs/generator/map.py,sha256=BS8ylTCRlHRmbImg73wnHMpBB2ODckVyVZq5KJhCMfM,4236
 maps4fs/generator/path_steps.py,sha256=rKslIiG9mriCVL9_0i8Oet2p0DITrpBWi0pECpvuyUM,2707
-maps4fs/generator/texture.py,sha256=0gkohGmamZbmqc9VpPqt8pli_x9w9SnUh2JjYGaiI3I,18170
+maps4fs/generator/texture.py,sha256=CwaXZfAG4e3D3YR7yVR2MC677EHpbUWTboCS3G6jkhk,17723
 maps4fs/generator/tile.py,sha256=3vmfjQiPiiUZKPuIo5tg2rOKkgcP1NRVkMGK-Vo10-A,2138
-maps4fs-0.8.9.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
-maps4fs-0.8.9.dist-info/METADATA,sha256=99ENTzW6vG2TNZDrnN4fBNQtUTYmMzfaFyn93BAZJjY,24031
-maps4fs-0.8.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-maps4fs-0.8.9.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
-maps4fs-0.8.9.dist-info/RECORD,,
+maps4fs-0.9.1.dist-info/LICENSE.md,sha256=-JY0v7p3dwXze61EbYiK7YEJ2aKrjaFZ8y2xYEOrmRY,1068
+maps4fs-0.9.1.dist-info/METADATA,sha256=XTu4AwG_x6F8n_7ooxJMRCBXv7RwuR2Jf5Po8i1zRGs,23393
+maps4fs-0.9.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+maps4fs-0.9.1.dist-info/top_level.txt,sha256=Ue9DSRlejRQRCaJueB0uLcKrWwsEq9zezfv5dI5mV1M,8
+maps4fs-0.9.1.dist-info/RECORD,,