maps4fs 2.2.0__tar.gz → 2.2.2__tar.gz

{maps4fs-2.2.0 → maps4fs-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.2.0
+Version: 2.2.2
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -45,7 +45,7 @@ Dynamic: license-file
 
 <div align="center" markdown>
 <a href="https://discord.gg/Sj5QKKyE42">
-<img src="https://github.com/user-attachments/assets/37043333-d6ef-4ca3-9f3c-81323d9d0b71">
+<img src="https://github.com/iwatkot/maps4fs/releases/download/2.2.0/maps4fs-poster-discord-mymaps.png">
 </a>
 
 <p align="center">
@@ -54,6 +54,7 @@ Dynamic: license-file
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
   <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
+  <a href="docs/my_maps.md">My Maps</a> •
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
   <a href="#Schemas-Editor">Schemas Editor</a> •
@@ -85,8 +86,10 @@ Dynamic: license-file
 
 </div>
 
+🔥🔥🔥🗂️ Track, store and organize all your maps using the [My Maps](docs/my_maps.md) feature. 🔥🔥🔥<br>
+<br>
 🗺️ Supports 2x2, 4x4, 8x8, 16x16 and any custom size maps<br>
-🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
+🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi)<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
 🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
@@ -158,6 +161,14 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container: 
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
+Learn more in the [My Maps](docs/my_maps.md) documentation.
+
 And open [http://localhost:8501](http://localhost:8501) in your browser.<br>
 If you don't know how to use Docker, navigate to the [Docker version](#option-2-docker-version), it's really simple.<br>
 Check out the [Docker FAQ](docs/FAQ_docker.md) if you have any questions.<br>
@@ -212,8 +223,8 @@ Don't know where to start? Don't worry, just follow this [step-by-step guide](do
 🛠️ Don't need to install anything.  
 🗺️ Supported map sizes: 2x2, 4x4.  
 ✂️ Map scaling: not supported.  
-⚙️ Advanced settings: enabled.  
-🖼️ Texture dissolving: enabled.  
+⚙️ Advanced settings: partial.  
+🖼️ Texture dissolving: disabled.  
 Using the public version on [maps4fs.xyz](https://maps4fs.xyz) is the easiest way to generate a map template. Just open the link and follow the instructions.
 Note: due to CPU and RAM limitations of the hosting, the generation may take some time. If you need faster processing, use the [Docker version](#option-2-docker-version).<br>
 
@@ -240,6 +251,12 @@ You can launch the project with minimalistic UI in your browser using Docker. Fo
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container:
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
 3. Open your browser and go to [http://localhost:8501](http://localhost:8501).
 4. Fill in the required fields and click on the `Generate` button.
 5. When the map is generated click on the `Download` button to get the map.

{maps4fs-2.2.0 → maps4fs-2.2.2}/README.md

@@ -14,7 +14,7 @@
 
 <div align="center" markdown>
 <a href="https://discord.gg/Sj5QKKyE42">
-<img src="https://github.com/user-attachments/assets/37043333-d6ef-4ca3-9f3c-81323d9d0b71">
+<img src="https://github.com/iwatkot/maps4fs/releases/download/2.2.0/maps4fs-poster-discord-mymaps.png">
 </a>
 
 <p align="center">
@@ -23,6 +23,7 @@
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
   <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
+  <a href="docs/my_maps.md">My Maps</a> •
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
   <a href="#Schemas-Editor">Schemas Editor</a> •
@@ -54,8 +55,10 @@
 
 </div>
 
+🔥🔥🔥🗂️ Track, store and organize all your maps using the [My Maps](docs/my_maps.md) feature. 🔥🔥🔥<br>
+<br>
 🗺️ Supports 2x2, 4x4, 8x8, 16x16 and any custom size maps<br>
-🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
+🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi)<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
 🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
@@ -127,6 +130,14 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container: 
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
+Learn more in the [My Maps](docs/my_maps.md) documentation.
+
 And open [http://localhost:8501](http://localhost:8501) in your browser.<br>
 If you don't know how to use Docker, navigate to the [Docker version](#option-2-docker-version), it's really simple.<br>
 Check out the [Docker FAQ](docs/FAQ_docker.md) if you have any questions.<br>
@@ -181,8 +192,8 @@ Don't know where to start? Don't worry, just follow this [step-by-step guide](do
 🛠️ Don't need to install anything.  
 🗺️ Supported map sizes: 2x2, 4x4.  
 ✂️ Map scaling: not supported.  
-⚙️ Advanced settings: enabled.  
-🖼️ Texture dissolving: enabled.  
+⚙️ Advanced settings: partial.  
+🖼️ Texture dissolving: disabled.  
 Using the public version on [maps4fs.xyz](https://maps4fs.xyz) is the easiest way to generate a map template. Just open the link and follow the instructions.
 Note: due to CPU and RAM limitations of the hosting, the generation may take some time. If you need faster processing, use the [Docker version](#option-2-docker-version).<br>
 
@@ -209,6 +220,12 @@ You can launch the project with minimalistic UI in your browser using Docker. Fo
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container:
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
 3. Open your browser and go to [http://localhost:8501](http://localhost:8501).
 4. Fill in the required fields and click on the `Generate` button.
 5. When the map is generated click on the `Download` button to get the map.

{maps4fs-2.2.0 → maps4fs-2.2.2}/maps4fs/generator/component/background.py

@@ -597,6 +597,7 @@ class Background(MeshComponent, ImageComponent):
                     polygon_points=polygon.exterior.coords,
                     angle=self.rotation,
                     canvas_size=self.background_size,
+                    xshift=-Parameters.BACKGROUND_DISTANCE,
                 )
                 fitted_polygon = shapely.Polygon(fitted_polygon_points)
                 fitted_polygons.append(fitted_polygon)

{maps4fs-2.2.0 → maps4fs-2.2.2}/maps4fs/generator/component/base/component.py

@@ -365,6 +365,8 @@ class Component:
         angle: int = 0,
         border: int = 0,
         canvas_size: int | None = None,
+        xshift: int = 0,
+        yshift: int = 0,
     ) -> list[tuple[int, int]]:
         """Fits a polygon into the bounds of the map.
 
@@ -374,6 +376,9 @@ class Component:
             margin (int, optional): The margin to add to the polygon. Defaults to 0.
             angle (int, optional): The angle to rotate the polygon by. Defaults to 0.
             border (int, optional): The border to add to the bounds. Defaults to 0.
+            canvas_size (int, optional): The size of the canvas. Defaults to None.
+            xshift (int, optional): The x-axis shift to apply. Will be added to calculated offset.
+            yshift (int, optional): The y-axis shift to apply. Will be added to calculated offset.
 
         Returns:
             list[tuple[int, int]]: The points of the polygon fitted into the map bounds.
@@ -400,8 +405,11 @@ class Component:
             )
             osm_object = rotate(osm_object, -angle, origin=(center_x, center_y))
             offset = int((self.map_size / 2) - (self.map_rotated_size / 2)) * self.map.size_scale
-            self.logger.debug("Translating the osm_object by %s", offset)
-            osm_object = translate(osm_object, xoff=offset, yoff=offset)
+            xoff = yoff = offset
+            xoff += xshift
+            yoff += yshift
+            self.logger.debug("Translating the osm_object by X: %s, Y: %s", xoff, yoff)
+            osm_object = translate(osm_object, xoff=xoff, yoff=yoff)
             self.logger.debug("Rotated and translated the osm_object.")
 
         if margin and object_type is Polygon:

{maps4fs-2.2.0 → maps4fs-2.2.2}/maps4fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maps4fs
-Version: 2.2.0
+Version: 2.2.2
 Summary: Generate map templates for Farming Simulator from real places.
 Author-email: iwatkot <iwatkot@gmail.com>
 License: Apache License 2.0
@@ -45,7 +45,7 @@ Dynamic: license-file
 
 <div align="center" markdown>
 <a href="https://discord.gg/Sj5QKKyE42">
-<img src="https://github.com/user-attachments/assets/37043333-d6ef-4ca3-9f3c-81323d9d0b71">
+<img src="https://github.com/iwatkot/maps4fs/releases/download/2.2.0/maps4fs-poster-discord-mymaps.png">
 </a>
 
 <p align="center">
@@ -54,6 +54,7 @@ Dynamic: license-file
   <a href="docs/step_by_step.md">Create a map in 10 steps</a> •
   <a href="docs/recommendations.md">Practical recommendations</a> •
   <a href="#How-To-Run">How-To-Run</a><br>
+  <a href="docs/my_maps.md">My Maps</a> •
   <a href="docs/FAQ.md">FAQ</a> •
   <a href="docs/map_structure.md">Map Structure</a> •
   <a href="#Schemas-Editor">Schemas Editor</a> •
@@ -85,8 +86,10 @@ Dynamic: license-file
 
 </div>
 
+🔥🔥🔥🗂️ Track, store and organize all your maps using the [My Maps](docs/my_maps.md) feature. 🔥🔥🔥<br>
+<br>
 🗺️ Supports 2x2, 4x4, 8x8, 16x16 and any custom size maps<br>
-🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi) 🆕<br>
+🔗 Generate maps using an [API](https://github.com/iwatkot/maps4fsapi)<br>
 ✂️ Supports map scaling<br>
 🔄 Support map rotation<br>
 🌐 Supports custom [DTM Providers](https://github.com/iwatkot/pydtmdl)<br>
@@ -158,6 +161,14 @@ There are several ways to use the tool. You obviously need the **first one**, bu
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container: 
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
+Learn more in the [My Maps](docs/my_maps.md) documentation.
+
 And open [http://localhost:8501](http://localhost:8501) in your browser.<br>
 If you don't know how to use Docker, navigate to the [Docker version](#option-2-docker-version), it's really simple.<br>
 Check out the [Docker FAQ](docs/FAQ_docker.md) if you have any questions.<br>
@@ -212,8 +223,8 @@ Don't know where to start? Don't worry, just follow this [step-by-step guide](do
 🛠️ Don't need to install anything.  
 🗺️ Supported map sizes: 2x2, 4x4.  
 ✂️ Map scaling: not supported.  
-⚙️ Advanced settings: enabled.  
-🖼️ Texture dissolving: enabled.  
+⚙️ Advanced settings: partial.  
+🖼️ Texture dissolving: disabled.  
 Using the public version on [maps4fs.xyz](https://maps4fs.xyz) is the easiest way to generate a map template. Just open the link and follow the instructions.
 Note: due to CPU and RAM limitations of the hosting, the generation may take some time. If you need faster processing, use the [Docker version](#option-2-docker-version).<br>
 
@@ -240,6 +251,12 @@ You can launch the project with minimalistic UI in your browser using Docker. Fo
 docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs iwatkot/maps4fs
 ```
 
+If you want to persist your data, you can mount a directory to the container:
+
+```bash
+docker run -d -p 8501:8501 -p 8000:8000 --name maps4fs -v /c/maps4fs:/usr/src/app/mfsrootdir iwatkot/maps4fs
+```
+
 3. Open your browser and go to [http://localhost:8501](http://localhost:8501).
 4. Fill in the required fields and click on the `Generate` button.
 5. When the map is generated click on the `Download` button to get the map.

{maps4fs-2.2.0 → maps4fs-2.2.2}/pyproject.toml

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