Yw/Hydro.V1.0.git

			@@ -17,8 +17,9 @@

			namespace Hydro.MapView
			{
			public class MapViewNetWork : NetWork
			public partial class MapViewNetWork : NetWork
			{
			bool use_old = false;
			public string Name;
			public NodeViewModel StartPoint { get; set; }

			@@ -209,6 +210,48 @@
			public List<PumpNodeViewModel> Deserialized_pumpNodes { get; set; }

			public List<AreaViewModel> areas = new List<AreaViewModel>();

			public bool ReadFromJson(string json)
			{
			var net = JsonConvert.DeserializeObject<MapViewNetWork>(json);
			//net.junctions.Clear();
			//net.Nodes.Clear();
			junctions = net.Deserialized_junctions;
			tanks = net.Deserialized_tanks;
			reservoirs = net.Deserialized_reservoirs;
			meters = net.Deserialized_meters;
			nozzles = net.Deserialized_nozzles;
			pipes = net.Deserialized_pipes;
			valves = net.Deserialized_valves;
			valveNodes = net.Deserialized_valveNodes;
			repeaters = net.Deserialized_repeaters;
			pumps = net.Deserialized_pumps;
			pumpNodes = net.Deserialized_pumpNodes;
			StartPoint = net.StartPoint;
			EndPoint = net.EndPoint;

			return true;
			}
			public string WriteToJson()
			{
			var net = new MapViewNetWork();
			net.Deserialized_junctions = junctions;
			net.Deserialized_tanks = tanks;
			net.Deserialized_reservoirs = reservoirs;
			net.Deserialized_meters = meters;
			net.Deserialized_nozzles = nozzles;
			net.Deserialized_pipes = pipes;
			net.Deserialized_valves = valves;
			//net.Deserialized_valveNodes = valveNodes;
			net.Deserialized_repeaters = repeaters;
			net.Deserialized_pumps = pumps;
			net.StartPoint = StartPoint;
			net.EndPoint = EndPoint;
			//net.Deserialized_pumpNodes = pumpNodes;
			string json = JsonConvert.SerializeObject(net);
			return json;
			}


			public JunctionViewModel AddJunction(string ID, PointF position, float z = 0)
			{
			@@ -869,5 +912,10 @@
			k1++;
			}
			}





			}
			}