Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs =================================================================== diff -u -r1551 -r1608 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1551) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1608) @@ -280,42 +280,42 @@ var repository = new SensorRepository(location0); repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 }); var sensorData = location0.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor; //location0.Name = "dwp 31,5"; var location1 = locations[1]; repository = new SensorRepository(location1); repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 }); sensorData = location1.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor; //location1.Name = "dwp 34,0"; var location2 = locations[2]; repository = new SensorRepository(location2); repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 }); sensorData = location2.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorData.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl3 = DataSourceTypeSensors.Sensor; + sensorData.SourceTypePl4 = DataSourceTypeSensors.Sensor; //location2.Name = "dwp 37,0"; #endregion