Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql =================================================================== diff -u -r97c9190ed248b48cdec74d092f53ef28e8ad4530 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 97c9190ed248b48cdec74d092f53ef28e8ad4530) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 17-Mar-2017 10:26:22 */ +/* Created On : 20-Mar-2017 07:58:30 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1348,8 +1348,8 @@ 'IsVisible' TINYINT (1) NOT NULL, -- true or false 'Transparency' REAL NOT NULL, 'IsConfigured' TINYINT (1) NOT NULL, -- true or false - 'BackgroundDataType' TINYINT (1) NOT NULL, -- Enum: 0 = Wmts, 1 = WellKnown - CONSTRAINT 'FK_WmtsMapDataEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade + 'BackgroundDataType' TINYINT (1) NOT NULL, -- Enum: 1 = Wmts, 2 = WellKnown + CONSTRAINT 'FK_BackgroundDataEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -1718,7 +1718,7 @@ ON 'DuneLocationOutputEntity' ('DuneLocationEntityId' ASC) ; -CREATE INDEX 'IXFK_WmtsMapDataEntity_AssessmentSectionEntity' +CREATE INDEX 'IXFK_BackgroundDataEntity_AssessmentSectionEntity' ON 'BackgroundDataEntity' ('AssessmentSectionEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql =================================================================== diff -u -r97c9190ed248b48cdec74d092f53ef28e8ad4530 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 97c9190ed248b48cdec74d092f53ef28e8ad4530) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -214,7 +214,7 @@ 0, 0.0, 0, - 0 + 1 FROM AssessmentSectionEntity; DETACH SOURCEPROJECT; Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/BackgroundMapDataType.cs =================================================================== diff -u -r40793165416093e9d2fefb6b12acf82fbd8a84c2 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/BackgroundMapDataType.cs (.../BackgroundMapDataType.cs) (revision 40793165416093e9d2fefb6b12acf82fbd8a84c2) +++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/BackgroundMapDataType.cs (.../BackgroundMapDataType.cs) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -29,11 +29,11 @@ /// /// Web Map Tile Service background map data type. /// - Wmts = 0, + Wmts = 1, /// /// Well known tile source background map data type. /// - WellKnown = 1 + WellKnown = 2 } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/BackgroundDataTest.cs =================================================================== diff -u -rd2d96421974b56eb204dd8f756748aa582da0874 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/BackgroundDataTest.cs (.../BackgroundDataTest.cs) (revision d2d96421974b56eb204dd8f756748aa582da0874) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/BackgroundDataTest.cs (.../BackgroundDataTest.cs) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -41,7 +41,7 @@ Assert.IsTrue(backgroundData.IsVisible); Assert.AreEqual(2, backgroundData.Transparency.NumberOfDecimalPlaces); Assert.AreEqual(0, backgroundData.Transparency.Value); - Assert.AreEqual(BackgroundMapDataType.Wmts, backgroundData.BackgroundMapDataType); + Assert.AreEqual(0, (int) backgroundData.BackgroundMapDataType); Assert.IsFalse(backgroundData.IsConfigured); CollectionAssert.IsEmpty(backgroundData.Parameters); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs =================================================================== diff -u -rd2d96421974b56eb204dd8f756748aa582da0874 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs (.../ObservableTestAssessmentSectionStub.cs) (revision d2d96421974b56eb204dd8f756748aa582da0874) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ObservableTestAssessmentSectionStub.cs (.../ObservableTestAssessmentSectionStub.cs) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -41,7 +41,8 @@ FailureMechanismContribution = new FailureMechanismContribution(Enumerable.Empty(), 0, 1.0 / 300000); BackgroundData = new BackgroundData { - Name = "Background data" + Name = "Background data", + BackgroundMapDataType = BackgroundMapDataType.Wmts }; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs =================================================================== diff -u -r9c23520df7a2adf82996d79bf59b83fc1adc1f26 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 9c23520df7a2adf82996d79bf59b83fc1adc1f26) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -320,7 +320,8 @@ var backgroundMapData = new BackgroundData { - Name = "background map data" + Name = "background map data", + BackgroundMapDataType = BackgroundMapDataType.Wmts }; using (var treeViewControl = new TreeViewControl()) Index: build/DatabaseStructure.sql =================================================================== diff -u -r97c9190ed248b48cdec74d092f53ef28e8ad4530 -rc0387d79bcdc500558362264d5bc08834ebe6db5 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 97c9190ed248b48cdec74d092f53ef28e8ad4530) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision c0387d79bcdc500558362264d5bc08834ebe6db5) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 17-Mar-2017 10:26:22 */ +/* Created On : 20-Mar-2017 07:58:30 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1348,8 +1348,8 @@ 'IsVisible' TINYINT (1) NOT NULL, -- true or false 'Transparency' REAL NOT NULL, 'IsConfigured' TINYINT (1) NOT NULL, -- true or false - 'BackgroundDataType' TINYINT (1) NOT NULL, -- Enum: 0 = Wmts, 1 = WellKnown - CONSTRAINT 'FK_WmtsMapDataEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade + 'BackgroundDataType' TINYINT (1) NOT NULL, -- Enum: 1 = Wmts, 2 = WellKnown + CONSTRAINT 'FK_BackgroundDataEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -1718,7 +1718,7 @@ ON 'DuneLocationOutputEntity' ('DuneLocationEntityId' ASC) ; -CREATE INDEX 'IXFK_WmtsMapDataEntity_AssessmentSectionEntity' +CREATE INDEX 'IXFK_BackgroundDataEntity_AssessmentSectionEntity' ON 'BackgroundDataEntity' ('AssessmentSectionEntityId' ASC) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -r97c9190ed248b48cdec74d092f53ef28e8ad4530 -rc0387d79bcdc500558362264d5bc08834ebe6db5 Binary files differ