Refactored schematic helper to available to ironpython scripts

Author: joelrahman

FlowMatters.Source.Veneer/ExchangeObjects/GeoJSONFeature.cs

@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Runtime.Serialization;
+using FlowMatters.Source.Veneer.RemoteScripting;
 using FlowMatters.Source.WebServer;
 using Microsoft.CSharp.RuntimeBinder;
 using RiverSystem;
@@ -48,7 +49,7 @@ public GeoJSONFeature(Node n,RiverSystemScenario scenario,bool useSchematicLocat
             properties.Add("name",n.Name);
             properties.Add(FeatureTypeProperty, "node");
             Coordinate loc = n.location;
-            var schematic = GetSchematic(scenario);
+            var schematic = ScriptHelpers.GetSchematic(scenario);
             if (schematic != null)
             {
                 PointF schematicLocation = SchematicLocationForNode(n, schematic);
@@ -67,14 +68,6 @@ private static PointF SchematicLocationForNode(TIME.DataTypes.NodeLinkNetwork.No
             return schematic.ExistingFeatureShapeProperties.Where(shape=>shape.Feature==n).Select(shape=>shape.Location).FirstOrDefault();
         }
 
-        private static SchematicNetworkConfigurationPersistent GetSchematic(RiverSystemScenario scenario)
-        {
-            object tmp;
-            scenario.AuxiliaryInformation.TryGetValue(SchematicNetworkControl.AUX_CONFIG, out tmp);
-            SchematicNetworkConfigurationPersistent schematic = tmp as SchematicNetworkConfigurationPersistent;
-            return schematic;
-        }
-
         private static string ResourceName(Node n)
         {
             object o = RetrieveNodeModel(n) ?? (object) n.FlowPartitioning;
@@ -114,7 +107,7 @@ public GeoJSONFeature(Link l, RiverSystemScenario scenario, bool useSchematicLoc
 
             if (useSchematicLocation)
             {
-                var schematic = GetSchematic(scenario);
+                var schematic = ScriptHelpers.GetSchematic(scenario);
                 if (scenario != null)
                 {
 

FlowMatters.Source.Veneer/RemoteScripting/ScriptHelpers.cs

@@ -20,6 +20,7 @@
 using RiverSystem.DataManagement.DataManager.DataSources;
 using RiverSystem.ManagedExtensions;
 using RiverSystem.Quality.SourceSinkModels;
+using RiverSystemGUI_II.SchematicBuilder;
 using TIME.Core;
 using TimeSeries = TIME.DataTypes.TimeSeries;
 using TIME.Management;
@@ -142,7 +143,7 @@ public static string FindDataSource(RiverSystemScenario scenario, object target,
 
             DataManager dm = theNetwork.DataManager;
 
-            foreach (var name in dm.DataGroups.Select(g => g.GetFullPath(ri,theInputSet)).Where(name => !string.IsNullOrEmpty(name)))
+            foreach (var name in dm.DataGroups.Select(g => g.GetFullPath(ri,theInputSet)).Where(name => !String.IsNullOrEmpty(name)))
             {
                 return name;
             }
@@ -177,7 +178,7 @@ public static void InitialiseModelsForConstituent(RiverSystemScenario s, Constit
 
         public static void EnsureElementsHaveConstituentProviders(RiverSystemScenario scenario)
         {
-            RiverSystem.Network network = scenario.Network;
+            Network network = scenario.Network;
             ConstituentsManagement cm = network.ConstituentsManagement;
 
             Action<INetworkElement> ensure = element =>
@@ -225,5 +226,13 @@ private static Type DefaultSourceSinkType(NetworkElementConstituentData data)
 
             return null;
         }
+
+        public static SchematicNetworkConfigurationPersistent GetSchematic(RiverSystemScenario scenario)
+        {
+            object tmp;
+            scenario.AuxiliaryInformation.TryGetValue(SchematicNetworkControl.AUX_CONFIG, out tmp);
+            SchematicNetworkConfigurationPersistent schematic = tmp as SchematicNetworkConfigurationPersistent;
+            return schematic;
+        }
     }
 }