Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae -r9e1b97e9540df6cbd635120135c83de0260aa6d1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 9e1b97e9540df6cbd635120135c83de0260aa6d1)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 18-mei-2016 13:30:01 				*/
+/*  Created On : 23-mei-2016 8:51:48 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -48,6 +48,9 @@
 DROP TABLE IF EXISTS 'SurfaceLinePointEntity'
 ;
 
+DROP TABLE IF EXISTS 'CharacteristicPointEntity'
+;
+
 /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */
 
 CREATE TABLE 'VersionEntity'
@@ -181,18 +184,6 @@
 	'Name' VARCHAR (255) NOT NULL,
 	'ReferenceLineIntersectionX' NUMERIC NOT NULL,
 	'ReferenceLineIntersectionY' NUMERIC NOT NULL,
-	'DitchPolderSidePointEntityId' INTEGER,
-	'BottomDitchPolderSidePointEntityId' INTEGER,
-	'BottomDitchDikeSidePointEntityId' INTEGER,
-	'DitchDikeSidePointEntityId' INTEGER,
-	'DikeToeAtRiverEntityId' INTEGER,
-	'DikeToeAtPolderEntityId' INTEGER,
-	CONSTRAINT 'FK_BottomDitchDikeSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('BottomDitchDikeSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'FK_BottomDitchPolderSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('BottomDitchPolderSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'FK_DikeToeAtPolderPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DikeToeAtPolderEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'FK_DikeToeAtRiverPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DikeToeAtRiverEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'FK_DitchDikeSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DitchDikeSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
-	CONSTRAINT 'FK_DitchPolderSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DitchPolderSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action,
 	CONSTRAINT 'FK_SurfaceLineEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action
 )
 ;
@@ -209,6 +200,15 @@
 )
 ;
 
+CREATE TABLE 'CharacteristicPointEntity'
+(
+	'CharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY,
+	'CharacteristicPointType' SMALLINT NOT NULL, -- Enum: 1 = DikeToeAtRiver 2 = DikeToeAtPolder 3 = DitchDikeSide 4 = BottomDitchDikeSide 5 = BottomDitchPolderSide 6 = DitchPolderSide
+	'SurfaceLinePointEntityId' INTEGER NOT NULL,
+	CONSTRAINT 'FK_CharacteristicPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('SurfaceLinePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
 /* Create Indexes and Triggers */
 
 CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity'
@@ -251,30 +251,10 @@
  ON 'SurfaceLineEntity' ('FailureMechanismEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity'
- ON 'SurfaceLineEntity' ('DitchPolderSidePointEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_02'
- ON 'SurfaceLineEntity' ('BottomDitchPolderSidePointEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_03'
- ON 'SurfaceLineEntity' ('BottomDitchDikeSidePointEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_04'
- ON 'SurfaceLineEntity' ('DitchDikeSidePointEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_05'
- ON 'SurfaceLineEntity' ('DikeToeAtRiverEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_06'
- ON 'SurfaceLineEntity' ('DikeToeAtPolderEntityId' ASC)
-;
-
 CREATE INDEX 'IXFK_SurfaceLinePointEntity_SurfaceLineEntity'
  ON 'SurfaceLinePointEntity' ('SurfaceLineEntityId' ASC)
 ;
+
+CREATE INDEX 'IXFK_CharacteristicPointEntity_SurfaceLinePointEntity'
+ ON 'CharacteristicPointEntity' ('SurfaceLinePointEntityId' ASC)
+;