Rework Configuration to load Feature configuration from an attached S…

…criptableObject

By moving the configuration for indicators to an indicator feature; we can keep config and feature closer together and serialize them from and to a JSON file.

Assets/Scripts/Configuration/Configuration.cs

@@ -4,26 +4,19 @@
 using System.Linq;
 using System.Text;
 using Netherlands3D.Coordinates;
+using Netherlands3D.Twin.Configuration.Indicators;
 using Netherlands3D.Twin.Features;
 using UnityEngine;
 using UnityEngine.Events;
 
 namespace Netherlands3D.Twin.Configuration
 {
-    public struct IndicatorConfiguration
-    {
-        public string dossierId;
-    }
-
     [CreateAssetMenu(menuName = "Netherlands3D/Twin/Configuration", fileName = "Configuration", order = 0)]
     public class Configuration : ScriptableObject
     {
-        [SerializeField]
-        public string title = "Amersfoort";
-        [SerializeField]
-        private Coordinate origin = new(CoordinateSystem.RD, 161088, 503050, 300);
+        [SerializeField] public string title = "Amersfoort";
+        [SerializeField] private Coordinate origin = new(CoordinateSystem.RD, 161088, 503050, 300);
         public List<Feature> Features = new();
-        private IndicatorConfiguration indicatorConfiguration;
 
         public string Title
         {
@@ -62,15 +55,31 @@ public bool LoadFromUrl(string url)
 
             LoadOriginFromString(queryParameters.Get("origin"));
             LoadFeaturesFromString(queryParameters.Get("features"));
-            indicatorConfiguration.dossierId = queryParameters.Get("indicators.dossier");
-            if (indicatorConfiguration.dossierId != null)
-            {
-                OnDossierLoadingStart.Invoke(indicatorConfiguration.dossierId);
-            }
+            LoadIndicatorConfiguration(queryParameters);
 
             return true;
         }
 
+        private void LoadIndicatorConfiguration(NameValueCollection queryParameters)
+        {
+            var featureId = "indicators";
+            var indicatorFeature = GetFeatureById(featureId);
+            if (!indicatorFeature) return;
+
+            var indicatorConfiguration = indicatorFeature.configuration as Indicators.Configuration;
+            if (!indicatorConfiguration) return;
+
+            indicatorConfiguration.dossierId = queryParameters.Get("indicators.dossier");
+            if (indicatorConfiguration.dossierId == null) return;
+
+            OnDossierLoadingStart.Invoke(indicatorConfiguration.dossierId);
+        }
+
+        private Feature GetFeatureById(string featureId)
+        {
+            return Features.FirstOrDefault(feature => string.Equals(feature.Id, featureId));
+        }
+
         private bool UrlContainsConfiguration(NameValueCollection queryParameters) 
         {
             string origin = queryParameters.Get("origin");

Assets/Scripts/Configuration/Indicators/Configuration.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace Netherlands3D.Twin.Configuration.Indicators
+{
+    [CreateAssetMenu(menuName = "Netherlands3D/Twin/Configuration/Indicators", fileName = "IndicatorConfiguration", order = 0)]
+    public class Configuration : ScriptableObject
+    {
+        public string dossierId;
+    }
+}

Assets/Scripts/Configuration/Indicators/DossierLoader.cs

@@ -5,7 +5,7 @@ namespace Netherlands3D.Twin.Configuration.Indicators
 {
     public class DossierLoader : MonoBehaviour
     {
-        [SerializeField] private Configuration configuration;
+        [SerializeField] private Twin.Configuration.Configuration configuration;
         [SerializeField] private DossierSO dossier;
 
         private void OnEnable()

Packages/eu.netherlands3d.twin-features/Scripts/Feature.cs

@@ -1,5 +1,7 @@
-using UnityEngine;
+using Newtonsoft.Json;
+using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.Serialization;
 
 namespace Netherlands3D.Twin.Features
 {
@@ -8,6 +10,9 @@ public class Feature : ScriptableObject
     {
         public string Id;
         public string Caption;
+
+        [JsonProperty(TypeNameHandling = TypeNameHandling.Auto)]
+        public ScriptableObject configuration;
 
         [SerializeField] private bool isEnabled;