Default areas generation

GameRealisticMap.Arma3/Arma3LayerGeneratorCatalog.cs

@@ -1,6 +1,7 @@
 using GameRealisticMap.Arma3.Assets;
 using GameRealisticMap.Arma3.ManMade;
 using GameRealisticMap.Arma3.ManMade.Farmlands;
+using GameRealisticMap.Arma3.Nature.DefaultAreas;
 using GameRealisticMap.Arma3.Nature.Forests;
 using GameRealisticMap.Arma3.Nature.Lakes;
 using GameRealisticMap.Arma3.Nature.RockAreas;
@@ -38,6 +39,7 @@ public Arma3LayerGeneratorCatalog(IProgressSystem progress, IArma3RegionAssets a
             Generators.Add(new TreeRowsGenerator(progress, assets));
             Generators.Add(new WatercourseGenerator(progress, assets));
             Generators.Add(new WatercourseRadialGenerator(progress, assets));
+            Generators.Add(new DefaultAreasGenerator(progress, assets));
         }
 
         public List<ITerrainBuilderLayerGenerator> Generators { get; } = new List<ITerrainBuilderLayerGenerator>();

GameRealisticMap.Arma3/Nature/BasicGeneratorBase.cs

@@ -8,7 +8,7 @@
 
 namespace GameRealisticMap.Arma3.Nature
 {
-    internal abstract class BasicGeneratorBase<TData> : GeneratorBase<TData> where TData : class, IBasicTerrainData
+    internal abstract class BasicGeneratorBase<TData> : GeneratorBase<TData> where TData : class, IPolygonTerrainData
     {
         public BasicGeneratorBase(IProgressSystem progress, IArma3RegionAssets assets)
             : base(progress, assets)

GameRealisticMap.Arma3/Nature/ClusteredGeneratorBase.cs

@@ -1,9 +1,7 @@
-using System.Numerics;
-using GameRealisticMap.Algorithms;
+using GameRealisticMap.Algorithms;
 using GameRealisticMap.Algorithms.Filling;
 using GameRealisticMap.Arma3.Assets;
 using GameRealisticMap.Arma3.Assets.Filling;
-using GameRealisticMap.Arma3.TerrainBuilder;
 using GameRealisticMap.Geometries;
 using GameRealisticMap.Nature;
 using GameRealisticMap.Reporting;

GameRealisticMap.Arma3/Nature/DefaultAreas/DefaultAreasGenerator.cs

@@ -0,0 +1,19 @@
+using GameRealisticMap.Arma3.Assets;
+using GameRealisticMap.Arma3.Assets.Filling;
+using GameRealisticMap.Nature.DefaultAreas;
+using GameRealisticMap.Reporting;
+
+namespace GameRealisticMap.Arma3.Nature.DefaultAreas
+{
+    internal class DefaultAreasGenerator : BasicGeneratorBase<DefaultAreasData>
+    {
+        public DefaultAreasGenerator(IProgressSystem progress, IArma3RegionAssets assets)
+            : base(progress, assets)
+        {
+        }
+
+        protected override bool ShouldGenerate => assets.GetBasicCollections(Id).Count > 0;
+
+        protected override BasicCollectionId Id => BasicCollectionId.DefaultAreas;
+    }
+}

GameRealisticMap.Arma3/Nature/GeneratorBase.cs

@@ -1,6 +1,5 @@
 using System.Numerics;
 using GameRealisticMap.Algorithms;
-using GameRealisticMap.Algorithms.Filling;
 using GameRealisticMap.Arma3.Assets;
 using GameRealisticMap.Arma3.TerrainBuilder;
 using GameRealisticMap.Geometries;
@@ -10,7 +9,7 @@
 namespace GameRealisticMap.Arma3.Nature
 {
     public abstract class GeneratorBase<TData> : ITerrainBuilderLayerGenerator 
-        where TData : class, IBasicTerrainData
+        where TData : class, IPolygonTerrainData
     {
         protected readonly IProgressSystem progress;
         protected readonly IArma3RegionAssets assets;
@@ -21,8 +20,15 @@ public GeneratorBase(IProgressSystem progress, IArma3RegionAssets assets)
             this.assets = assets;
         }
 
+        protected virtual bool ShouldGenerate => true;
+
         public IEnumerable<TerrainBuilderObject> Generate(IArma3MapConfig config, IContext context)
         {
+            if (!ShouldGenerate)
+            {
+                return new List<TerrainBuilderObject>(0);
+            }
+
             using var scope = progress.CreateScope(GetType().Name.Replace("Generator",""));
 
             var polygons = context.GetData<TData>().Polygons;

GameRealisticMap/BuildContext.cs

@@ -1,4 +1,5 @@
-using GameRealisticMap.Osm;
+using System.Diagnostics;
+using GameRealisticMap.Osm;
 using GameRealisticMap.Reporting;
 using HugeImages.Storage;
 
@@ -52,6 +53,11 @@ public T GetData<T>()
             }
         }
 
+        public IEnumerable<T> GetOfType<T>() where T : class
+        {
+            return catalog.GetOfType<T>(this);
+        }
+
         public void SetData<T>(T value)
             where T : class
         {

GameRealisticMap/BuildersCatalog.cs

@@ -8,6 +8,8 @@
 using GameRealisticMap.ManMade.Railways;
 using GameRealisticMap.ManMade.Roads;
 using GameRealisticMap.ManMade.Roads.Libraries;
+using GameRealisticMap.Nature;
+using GameRealisticMap.Nature.DefaultAreas;
 using GameRealisticMap.Nature.Forests;
 using GameRealisticMap.Nature.Lakes;
 using GameRealisticMap.Nature.Ocean;
@@ -57,6 +59,7 @@ public BuildersCatalog(IProgressSystem progress, IRoadTypeLibrary<IRoadTypeInfos
             Register(new VineyardBuilder(progress));
             Register(new OrchardBuilder(progress));
             Register(new TreeRowsBuilder(progress));
+            Register(new DefaultAreasBuilder(progress));
         }
 
         public void Register<TData>(IDataBuilder<TData> builder)

GameRealisticMap/IContext.cs

@@ -6,6 +6,8 @@ public interface IContext
     {
         T GetData<T>() where T : class;
 
+        IEnumerable<T> GetOfType<T>() where T : class;
+
         IHugeImageStorage HugeImageStorage { get; }
     }
 }

GameRealisticMap/IO/ContextReader.cs

@@ -1,4 +1,5 @@
-using HugeImages.Storage;
+using System.Diagnostics;
+using HugeImages.Storage;
 
 namespace GameRealisticMap.IO
 {
@@ -31,6 +32,11 @@ public T GetData<T>() where T : class
             return result;
         }
 
+        public IEnumerable<T> GetOfType<T>() where T : class
+        {
+            return catalog.GetOfType<T>(this);
+        }
+
         public async Task Visit<TData>(IDataBuilder<TData> builder) where TData : class
         {
             if (!cache.ContainsKey(typeof(TData)))

GameRealisticMap/ManMade/Buildings/BuildingsData.cs

@@ -1,11 +1,12 @@
 using System.Text.Json.Serialization;
 using GameRealisticMap.Geometries;
+using GameRealisticMap.Nature;
 using GeoJSON.Text.Feature;
 using GeoJSON.Text.Geometry;
 
 namespace GameRealisticMap.ManMade.Buildings
 {
-    public class BuildingsData : IGeoJsonData
+    public class BuildingsData : IGeoJsonData, INonDefaultArea
     {
         [JsonConstructor]
         public BuildingsData(List<Building> buildings)
@@ -15,6 +16,8 @@ public BuildingsData(List<Building> buildings)
 
         public List<Building> Buildings { get; }
 
+        IEnumerable<TerrainPolygon> INonDefaultArea.Polygons => Buildings.Select(b => b.Box.Polygon);
+
         public IEnumerable<Feature> ToGeoJson(Func<TerrainPoint, IPosition> project)
         {
             var entrance = new Dictionary<string, object>() {

GameRealisticMap/ManMade/CategoryAreaData.cs

@@ -1,14 +1,18 @@
-using GeoJSON.Text.Feature;
+using GameRealisticMap.Geometries;
+using GameRealisticMap.Nature;
+using GeoJSON.Text.Feature;
 
 namespace GameRealisticMap.ManMade
 {
-    public class CategoryAreaData
+    public class CategoryAreaData : INonDefaultArea
     {
         public CategoryAreaData(List<CategoryArea> areas)
         {
             Areas = areas;
         }
 
         public List<CategoryArea> Areas { get; }
+
+        IEnumerable<TerrainPolygon> INonDefaultArea.Polygons => Areas.SelectMany(a => a.PolyList);
     }
 }

GameRealisticMap/ManMade/Railways/RailwaysData.cs

@@ -1,11 +1,12 @@
 using System.Text.Json.Serialization;
 using GameRealisticMap.Geometries;
+using GameRealisticMap.Nature;
 using GeoJSON.Text.Feature;
 using GeoJSON.Text.Geometry;
 
 namespace GameRealisticMap.ManMade.Railways
 {
-    public class RailwaysData : IGeoJsonData
+    public class RailwaysData : IGeoJsonData, INonDefaultArea
     {
         [JsonConstructor]
         public RailwaysData(List<Railway> railways)
@@ -15,6 +16,8 @@ public RailwaysData(List<Railway> railways)
 
         public List<Railway> Railways { get; }
 
+        IEnumerable<TerrainPolygon> INonDefaultArea.Polygons => Railways.SelectMany(x => x.ClearPolygons);
+
         public IEnumerable<Feature> ToGeoJson(Func<TerrainPoint, IPosition> project)
         {
             var properties = new Dictionary<string, object>() {

GameRealisticMap/ManMade/Roads/RoadsData.cs

@@ -1,11 +1,12 @@
 using System.Text.Json.Serialization;
 using GameRealisticMap.Geometries;
+using GameRealisticMap.Nature;
 using GeoJSON.Text.Feature;
 using GeoJSON.Text.Geometry;
 
 namespace GameRealisticMap.ManMade.Roads
 {
-    public class RoadsData : IGeoJsonData
+    public class RoadsData : IGeoJsonData, INonDefaultArea
     {
         [JsonConstructor]
         public RoadsData(List<Road> roads)
@@ -15,6 +16,8 @@ public RoadsData(List<Road> roads)
 
         public List<Road> Roads { get; }
 
+        IEnumerable<TerrainPolygon> INonDefaultArea.Polygons => Roads.SelectMany(x => x.ClearPolygons);
+
         public IEnumerable<Feature> ToGeoJson(Func<TerrainPoint, IPosition> project)
         {
             return Roads.Select(r => new Feature(new MultiPolygon(r.Polygons.Select(p => p.ToGeoJson(project))), new Dictionary<string, object>() {

GameRealisticMap/Nature/DefaultAreas/DefaultAreasBuilder.cs

@@ -0,0 +1,26 @@
+using GameRealisticMap.Geometries;
+using GameRealisticMap.Reporting;
+
+namespace GameRealisticMap.Nature.DefaultAreas
+{
+    internal class DefaultAreasBuilder : IDataBuilder<DefaultAreasData>
+    {
+        private readonly IProgressSystem progress;
+
+        public DefaultAreasBuilder(IProgressSystem progress)
+        {
+            this.progress = progress;
+        }
+
+        public DefaultAreasData Build(IBuildContext context)
+        {
+            var allData = context.GetOfType<INonDefaultArea>().ToList();
+            var allPolygons = allData.ProgressStep(progress, "Polygons")
+                .SelectMany(l => l.Polygons)
+                .ToList();
+            using var report = progress.CreateStep("SubstractAll", 1);
+            var polygons = context.Area.TerrainBounds.SubstractAllSplitted(allPolygons).ToList();
+            return new DefaultAreasData(polygons);
+        }
+    }
+}

GameRealisticMap/Nature/DefaultAreas/DefaultAreasData.cs

@@ -0,0 +1,24 @@
+using GameRealisticMap.Geometries;
+using GeoJSON.Text.Feature;
+using GeoJSON.Text.Geometry;
+
+namespace GameRealisticMap.Nature.DefaultAreas
+{
+    public class DefaultAreasData : IGeoJsonData, IPolygonTerrainData
+    {
+        public DefaultAreasData(List<TerrainPolygon> polygons)
+        {
+            Polygons = polygons;
+        }
+
+        public List<TerrainPolygon> Polygons { get; }
+
+        public IEnumerable<Feature> ToGeoJson(Func<TerrainPoint, IPosition> project)
+        {
+            var properties = new Dictionary<string, object>() {
+                {"type", "default" }
+            };
+            return Polygons.Select(b => new Feature(b.ToGeoJson(project), properties));
+        }
+    }
+}

GameRealisticMap/Nature/IBasicTerrainData.cs

@@ -2,8 +2,10 @@
 
 namespace GameRealisticMap.Nature
 {
-    public interface IBasicTerrainData : IGeoJsonData
+    public interface IBasicTerrainData : IGeoJsonData, INonDefaultArea, IPolygonTerrainData
     {
-        List<TerrainPolygon> Polygons { get; }
+        new List<TerrainPolygon> Polygons { get; }
+
+        IEnumerable<TerrainPolygon> INonDefaultArea.Polygons => Polygons;
     }
 }

GameRealisticMap/Nature/INonDefaultArea.cs

@@ -0,0 +1,9 @@
+using GameRealisticMap.Geometries;
+
+namespace GameRealisticMap.Nature
+{
+    public interface INonDefaultArea
+    {
+        IEnumerable<TerrainPolygon> Polygons { get; }
+    }
+}

GameRealisticMap/Nature/IPolygonTerrainData.cs

@@ -0,0 +1,9 @@
+using GameRealisticMap.Geometries;
+
+namespace GameRealisticMap.Nature
+{
+    public interface IPolygonTerrainData
+    {
+        List<TerrainPolygon> Polygons { get; }
+    }
+}

GameRealisticMap/Preview/PreviewRender.cs

@@ -130,7 +130,7 @@ public async Task RenderHtml<TData>(IProgressTask progress, string targetFile)
 
         public static async Task RenderHtml(BuildContext context, string targetFile)
         {
-            await RenderHtml(new FeatureCollection(context.Catalog.GetOfType<IGeoJsonData>(context).SelectMany(b => b.ToGeoJson(p => p)).ToList()), targetFile);
+            await RenderHtml(new FeatureCollection(context.GetOfType<IGeoJsonData>().SelectMany(b => b.ToGeoJson(p => p)).ToList()), targetFile);
         }
 
         public static async Task RenderHtml(FeatureCollection collection, string targetFile)

GameRealisticMap/Preview/grm-preview.html

@@ -23,10 +23,12 @@
     </div>
     <script src="https://unpkg.com/[email protected]/dist/leaflet.js">
     </script>
+    <script src="https://unpkg.com/[email protected]/dist/leaflet.pattern.js">
+    </script>
     <script src="grm-preview.js">
     </script>
     <script>
-InitPreview({"type":"FeatureCollection"});
+        InitPreview({"type":"FeatureCollection"});
     </script>
 </body>
 </html>

GameRealisticMap/Preview/grm-preview.js

@@ -449,6 +449,8 @@ function InitPreview(geoJson)
 	L.control.scale({ maxWidth: 200, imperial: false }).addTo(map);
 	L.control.gridMousePosition().addTo(map);
 
+    var stripes = new L.StripePattern();
+    stripes.addTo(map);
 
 	L.geoJSON(geoJson, {
 		style: function(feature) {
@@ -483,6 +485,10 @@ function InitPreview(geoJson)
 
                 case 'ocean': return { fillColor: 'RoyalBlue', fillOpacity: 0.5, stroke: true, weight: 3, color: 'RoyalBlue' };
                 case 'coastline': return { stroke: true, weight: 1, dashArray: [5, 5], color: 'yellow', fillOpacity: 0 };
+                case 'orchard': return { fillColor: 'greenyellow', stroke: false, fillOpacity: 0.35 };
+                case 'vineyard': return { fillColor: 'greenyellow', stroke: false, fillOpacity: 0.35 };
+                case 'default':
+                    return { fillPattern: stripes, stroke: false, fillOpacity: 0.2 };
 			}
 			return { fillColor:'black', stroke: false, fillOpacity: 0.2 };
         },