maps4fs 1.3.6__tar.gz → 1.3.7__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. {maps4fs-1.3.6 → maps4fs-1.3.7}/PKG-INFO +3 -1
  2. {maps4fs-1.3.6 → maps4fs-1.3.7}/README.md +3 -1
  3. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/map.py +5 -1
  4. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/texture.py +4 -1
  5. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs.egg-info/PKG-INFO +3 -1
  6. {maps4fs-1.3.6 → maps4fs-1.3.7}/pyproject.toml +1 -1
  7. {maps4fs-1.3.6 → maps4fs-1.3.7}/LICENSE.md +0 -0
  8. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/__init__.py +0 -0
  9. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/__init__.py +0 -0
  10. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/background.py +0 -0
  11. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/component.py +0 -0
  12. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/config.py +0 -0
  13. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/dem.py +0 -0
  14. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/game.py +0 -0
  15. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/grle.py +0 -0
  16. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/i3d.py +0 -0
  17. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/generator/qgis.py +0 -0
  18. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/logger.py +0 -0
  19. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/toolbox/__init__.py +0 -0
  20. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/toolbox/background.py +0 -0
  21. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs/toolbox/dem.py +0 -0
  22. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs.egg-info/SOURCES.txt +0 -0
  23. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs.egg-info/dependency_links.txt +0 -0
  24. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs.egg-info/requires.txt +0 -0
  25. {maps4fs-1.3.6 → maps4fs-1.3.7}/maps4fs.egg-info/top_level.txt +0 -0
  26. {maps4fs-1.3.6 → maps4fs-1.3.7}/setup.cfg +0 -0
  27. {maps4fs-1.3.6 → maps4fs-1.3.7}/tests/test_generator.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: maps4fs
3
- Version: 1.3.6
3
+ Version: 1.3.7
4
4
  Summary: Generate map templates for Farming Simulator from real places.
5
5
  Author-email: iwatkot <iwatkot@gmail.com>
6
6
  License: MIT License
@@ -72,6 +72,7 @@ Requires-Dist: pympler
72
72
  🌲 Automatically generates forests 🆕<br>
73
73
  🌊 Automatically generates water planes 🆕<br>
74
74
  🌍 Based on real-world data from OpenStreetMap<br>
75
+ 🗺️ Supports [custom OSM maps](/docs/custom_osm.md)<br>
75
76
  🏞️ Generates height map using SRTM dataset<br>
76
77
  📦 Provides a ready-to-use map template for the Giants Editor<br>
77
78
  🚜 Supports Farming Simulator 22 and 25<br>
@@ -528,3 +529,4 @@ But also, I want to thank the people who helped me with the project in some way,
528
529
  - [BFernaesds](https://github.com/BFernaesds) - for the manual tests of the app.
529
530
  - [gamerdesigns](https://github.com/gamerdesigns) - for the manual tests of the app.
530
531
  - [Tox3](https://github.com/Tox3) - for the manual tests of the app.
532
+ - [Lucandia](https://github.com/Lucandia) - for the awesome StreamLit [widget to preview STL files](https://github.com/Lucandia/streamlit_stl).
@@ -47,6 +47,7 @@
47
47
  🌲 Automatically generates forests 🆕<br>
48
48
  🌊 Automatically generates water planes 🆕<br>
49
49
  🌍 Based on real-world data from OpenStreetMap<br>
50
+ 🗺️ Supports [custom OSM maps](/docs/custom_osm.md)<br>
50
51
  🏞️ Generates height map using SRTM dataset<br>
51
52
  📦 Provides a ready-to-use map template for the Giants Editor<br>
52
53
  🚜 Supports Farming Simulator 22 and 25<br>
@@ -502,4 +503,5 @@ But also, I want to thank the people who helped me with the project in some way,
502
503
  - [OneSunnySunday](https://www.artstation.com/onesunnysunday) - for expert advice on Blender, help in processing background terrain, and compiling detailed tutorials on how to prepare the OBJ files for use in Giants Editor.
503
504
  - [BFernaesds](https://github.com/BFernaesds) - for the manual tests of the app.
504
505
  - [gamerdesigns](https://github.com/gamerdesigns) - for the manual tests of the app.
505
- - [Tox3](https://github.com/Tox3) - for the manual tests of the app.
506
+ - [Tox3](https://github.com/Tox3) - for the manual tests of the app.
507
+ - [Lucandia](https://github.com/Lucandia) - for the awesome StreamLit [widget to preview STL files](https://github.com/Lucandia/streamlit_stl).
@@ -79,7 +79,7 @@ class TextureSettings(NamedTuple):
79
79
  skip_drains: bool = False
80
80
 
81
81
 
82
- # pylint: disable=R0913, R0902
82
+ # pylint: disable=R0913, R0902, R0914
83
83
  class Map:
84
84
  """Class used to generate map using all components.
85
85
 
@@ -99,6 +99,7 @@ class Map:
99
99
  rotation: int,
100
100
  map_directory: str,
101
101
  logger: Any = None,
102
+ custom_osm: str | None = None,
102
103
  dem_settings: DEMSettings = DEMSettings(),
103
104
  background_settings: BackgroundSettings = BackgroundSettings(),
104
105
  grle_settings: GRLESettings = GRLESettings(),
@@ -126,6 +127,9 @@ class Map:
126
127
 
127
128
  self.logger.info("Game was set to %s", game.code)
128
129
 
130
+ self.custom_osm = custom_osm
131
+ self.logger.info("Custom OSM file: %s", custom_osm)
132
+
129
133
  self.dem_settings = dem_settings
130
134
  self.logger.info("DEM settings: %s", dem_settings)
131
135
  self.background_settings = background_settings
@@ -635,7 +635,10 @@ class Texture(Component):
635
635
  """
636
636
  is_fieds = info_layer == "fields"
637
637
  try:
638
- objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
638
+ if self.map.custom_osm is not None:
639
+ objects = ox.features_from_xml(self.map.custom_osm, tags=tags)
640
+ else:
641
+ objects = ox.features_from_bbox(bbox=self.new_bbox, tags=tags)
639
642
  except Exception: # pylint: disable=W0718
640
643
  self.logger.debug("Error fetching objects for tags: %s.", tags)
641
644
  return
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: maps4fs
3
- Version: 1.3.6
3
+ Version: 1.3.7
4
4
  Summary: Generate map templates for Farming Simulator from real places.
5
5
  Author-email: iwatkot <iwatkot@gmail.com>
6
6
  License: MIT License
@@ -72,6 +72,7 @@ Requires-Dist: pympler
72
72
  🌲 Automatically generates forests 🆕<br>
73
73
  🌊 Automatically generates water planes 🆕<br>
74
74
  🌍 Based on real-world data from OpenStreetMap<br>
75
+ 🗺️ Supports [custom OSM maps](/docs/custom_osm.md)<br>
75
76
  🏞️ Generates height map using SRTM dataset<br>
76
77
  📦 Provides a ready-to-use map template for the Giants Editor<br>
77
78
  🚜 Supports Farming Simulator 22 and 25<br>
@@ -528,3 +529,4 @@ But also, I want to thank the people who helped me with the project in some way,
528
529
  - [BFernaesds](https://github.com/BFernaesds) - for the manual tests of the app.
529
530
  - [gamerdesigns](https://github.com/gamerdesigns) - for the manual tests of the app.
530
531
  - [Tox3](https://github.com/Tox3) - for the manual tests of the app.
532
+ - [Lucandia](https://github.com/Lucandia) - for the awesome StreamLit [widget to preview STL files](https://github.com/Lucandia/streamlit_stl).
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "maps4fs"
7
- version = "1.3.6"
7
+ version = "1.3.7"
8
8
  description = "Generate map templates for Farming Simulator from real places."
9
9
  authors = [{name = "iwatkot", email = "iwatkot@gmail.com"}]
10
10
  license = {text = "MIT License"}
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes