From b7b312d6961f2b05047bf32ca503be51b0f2b70e Mon Sep 17 00:00:00 2001 From: Patrick Nobbe Date: Thu, 14 Jan 2021 13:38:31 +0100 Subject: [PATCH 1/3] Change BuildingType enum and add entry to db enum mapper --- src/FunderMaps.Core/Types/BuildingType.cs | 4 ++-- src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/FunderMaps.Core/Types/BuildingType.cs b/src/FunderMaps.Core/Types/BuildingType.cs index 72533dfbd..872296aea 100644 --- a/src/FunderMaps.Core/Types/BuildingType.cs +++ b/src/FunderMaps.Core/Types/BuildingType.cs @@ -16,9 +16,9 @@ public enum BuildingType Shed = 1, /// - /// House boat. + /// Houseboat. /// - HouseBoat = 2, + Houseboat = 2, /// /// Mobile home. diff --git a/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs b/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs index 7b550b4a2..f8654017b 100644 --- a/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs +++ b/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs @@ -49,6 +49,7 @@ static NpgsqlDbProvider() NpgsqlConnection.GlobalTypeMapper.MapEnum("application.role"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.audit_status"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.base_measurement_level"); + NpgsqlConnection.GlobalTypeMapper.MapEnum("geocoder.building_type"); NpgsqlConnection.GlobalTypeMapper.MapEnum("maplayer.bundle_status"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.construction_pile"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.crack_type"); @@ -75,6 +76,7 @@ static NpgsqlDbProvider() NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_encroachement"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_quality"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_type"); + } /// From 553f65a36ad2d834514b0abc9827813992f30da2 Mon Sep 17 00:00:00 2001 From: Patrick Nobbe Date: Thu, 14 Jan 2021 13:45:30 +0100 Subject: [PATCH 2/3] Fix tests --- tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs b/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs index a752190aa..5948f75ed 100644 --- a/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs +++ b/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs @@ -20,7 +20,7 @@ public void ValidateBuilding() Geometry = "7b2274797065223a224d756c7469506f6c79676f6e222c22636f6f7264696e61746573223a5b5b5b5b352e3833333038343731312c35332e3039333332373638385d2c5b352e3833333033393531392c35332e3039333331343130385d2c5b352e3833333031393439362c35332e30393333333832325d2c5b352e3833323938353930392c35332e3039333332383132385d2c5b352e3833333036303236382c35332e3039333233383438355d2c5b352e38333331333930362c35332e3039333236323136365d2c5b352e3833333038343731312c35332e3039333332373638385d5d5d5d7d", ExternalId = "external-1", ExternalSource = ExternalDataSource.NlBag, - BuildingType = BuildingType.HouseBoat, + BuildingType = BuildingType.Houseboat, NeighborhoodId = "gfm-neighborhood", }; var entity2 = new Building From 9190413622c2ba3cce6f38bb54ea615e699e01e6 Mon Sep 17 00:00:00 2001 From: Patrick Nobbe Date: Thu, 14 Jan 2021 13:49:04 +0100 Subject: [PATCH 3/3] Fix spacing --- src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs b/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs index f8654017b..215b774ed 100644 --- a/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs +++ b/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs @@ -76,7 +76,6 @@ static NpgsqlDbProvider() NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_encroachement"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_quality"); NpgsqlConnection.GlobalTypeMapper.MapEnum("report.wood_type"); - } ///