settings now come from the layer gameobject itself because the templa…

…te prefab will not be initialized correctly in webgl
Netherlands3D · Oct 21, 2024 · 95ca251 · 95ca251
1 parent 5dcc7a6
commit 95ca251
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/Assets/_Functionalities/Wms/Prefabs/WMSLayer.prefab b/Assets/_Functionalities/Wms/Prefabs/WMSLayer.prefab
diff --git a/Assets/_Functionalities/Wms/Scripts/WMSImportAdapter.cs b/Assets/_Functionalities/Wms/Scripts/WMSImportAdapter.cs
@@ -69,7 +69,7 @@ public void Execute(LocalFile localFile)
             var sourceUrl = localFile.SourceUrl;
             string url = sourceUrl.Split('?')[0];
             var wmsFolder = new FolderLayer(url);
-
+            
             switch (wms.requestType)
             {
                 case WMS.RequestType.GetCapabilities:

diff --git a/Assets/_Functionalities/Wms/Scripts/WMSLayerGameObject.cs b/Assets/_Functionalities/Wms/Scripts/WMSLayerGameObject.cs
@@ -11,10 +11,10 @@ namespace Netherlands3D.Twin.Layers
     /// </summary>
     public class WMSLayerGameObject : CartesianTileLayerGameObject, ILayerWithPropertyData
     {
-        public WMSTileDataLayer WMSProjectionLayer => wmsProjectionLayer;
-        public bool TransparencyEnabled => WMSProjectionLayer.TransparencyEnabled; 
-        public int DefaultEnabledLayersMax => WMSProjectionLayer.DefaultEnabledLayersMax; 
-        public Vector2Int PreferredImageSize => WMSProjectionLayer.PreferredImageSize;
+        public WMSTileDataLayer WMSProjectionLayer => wmsProjectionLayer;       
+        public bool TransparencyEnabled = true; //this gives the requesting url the extra param to set transparancy enabled by default       
+        public int DefaultEnabledLayersMax = 5;  //in case the dataset is very large with many layers. lets topggle the layers after this count to not visible.
+        public Vector2Int PreferredImageSize = Vector2Int.one * 512;
         public LayerPropertyData PropertyData => urlPropertyData;
 
         private WMSTileDataLayer wmsProjectionLayer;
@@ -28,8 +28,8 @@ protected override void Awake()
 
         protected override void Start()
         {
-            base.Start();            
-            wmsProjectionLayer.WmsUrl = urlPropertyData.Data.ToString();
+            base.Start();
+            WMSProjectionLayer.WmsUrl = urlPropertyData.Data.ToString();
             LayerData.LayerOrderChanged.AddListener(SetRenderOrder);
             SetRenderOrder(LayerData.RootIndex);
         }
@@ -38,7 +38,7 @@ protected override void Start()
         public void SetRenderOrder(int order)
         {
             //we have to flip the value because a lower layer with a higher index needs a lower render index
-            wmsProjectionLayer.RenderIndex = -order;
+            WMSProjectionLayer.RenderIndex = -order;
         }
 
         public virtual void LoadProperties(List<LayerPropertyData> properties)

diff --git a/Assets/_Functionalities/Wms/Scripts/WMSTileDataLayer.cs b/Assets/_Functionalities/Wms/Scripts/WMSTileDataLayer.cs
@@ -10,14 +10,7 @@
 namespace Netherlands3D.Twin
 {
     public class WMSTileDataLayer : ImageProjectionLayer
-    {
-        //this gives the requesting url the extra param to set transparancy enabled by default
-        public bool TransparencyEnabled = true;
-
-        //in case the dataset is very large with many layers. lets topggle the layers after this count to not visible.
-        public int DefaultEnabledLayersMax = 5;
-
-        public Vector2Int PreferredImageSize = Vector2Int.one * 512;
+    {      
 
         public int RenderIndex 
         {