Merge pull request #598 from Laixer/develop

v3.3.11
Laixer · Oct 2, 2021 · 2de0a5e · 2de0a5e
2 parents 017d735 + 631c4ec
commit 2de0a5e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 40 deletions.
diff --git a/database/fundermaps_base.sql b/database/fundermaps_base.sql
@@ -680,7 +680,10 @@ CREATE TYPE report.foundation_type AS ENUM (
     'no_pile_slit',
     'wood_amsterdam',
     'wood_rotterdam',
-    'no_pile_bearing_floor'
+    'no_pile_bearing_floor',
+    'wood_rotterdam_amsterdam',
+    'wood_rotterdam_arch',
+    'wood_amsterdam_arch'
 );
 
 

diff --git a/src/FunderMaps.BatchNode/Program.cs b/src/FunderMaps.BatchNode/Program.cs
@@ -53,8 +53,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddHostedService<TimedMapBundleService>();
 
                     // Add the task scheduler.
-                    services.Configure<ModelOptions>(Configuration.GetSection(ModelOptions.Section));
-                    services.AddHostedService<TimedModelService>();
+                    // services.Configure<ModelOptions>(Configuration.GetSection(ModelOptions.Section));
+                    // services.AddHostedService<TimedModelService>();
                 });
     }
 }
diff --git a/src/FunderMaps.Core/IncidentReport/IncidentService.cs b/src/FunderMaps.Core/IncidentReport/IncidentService.cs
@@ -58,6 +58,9 @@ public static string ToFoundationType(Core.Types.FoundationType? value)
                     Core.Types.FoundationType.WoodAmsterdam => "Hout",
                     Core.Types.FoundationType.WoodRotterdam => "Hout",
                     Core.Types.FoundationType.WoodCharger => "Hout",
+                    Core.Types.FoundationType.WoodRotterdamAmsterdam => "Hout",
+                    Core.Types.FoundationType.WoodRotterdamArch => "Hout",
+                    Core.Types.FoundationType.WoodAmsterdamArch => "Hout",
                     Core.Types.FoundationType.Concrete => "Beton",
                     Core.Types.FoundationType.NoPile => "Niet onderheid",
                     Core.Types.FoundationType.NoPileMasonry => "Niet onderheid",

diff --git a/src/FunderMaps.Core/Types/FoundationType.cs b/src/FunderMaps.Core/Types/FoundationType.cs
@@ -79,5 +79,20 @@ public enum FoundationType
         ///     Other.
         /// </summary>
         Other = 14,
+
+        /// <summary>
+        ///     Wood foundation accoring to Amsterdam or Rotterdam.
+        /// </summary>
+        WoodRotterdamAmsterdam = 15,
+
+        /// <summary>
+        ///     Wood foundation accoring to Rotterdam with an arch.
+        /// </summary>
+        WoodRotterdamArch = 16,
+
+        /// <summary>
+        ///     Wood foundation accoring to Amsterdam with an arch.
+        /// </summary>
+        WoodAmsterdamArch = 17,
     }
 }
diff --git a/src/FunderMaps.Data/DataNpgsqlLogger.cs b/src/FunderMaps.Data/DataNpgsqlLogger.cs