From 6c6f43de5e33a82598a2949583652ef501243f87 Mon Sep 17 00:00:00 2001 From: Ian M Date: Tue, 4 Nov 2025 19:06:31 +0900 Subject: [PATCH 1/3] Clarifies nature of missing modifier stack object references; rename AddModifierStack to AddModifierStacks as it adds a range of ModifierStack objects, and identify its parameter as IEnumerable because it only enumerates the given collection --- Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs | 2 +- .../Mapbox/VectorModule/Unity/VectorLayerVisualizerObject.cs | 3 ++- Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs b/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs index 968c8a02c..77efe35ef 100644 --- a/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs +++ b/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs @@ -12,7 +12,7 @@ namespace Mapbox.VectorModule public interface IVectorLayerVisualizer { string VectorLayerName { get; } - void AddModifierStack(List stack); + void AddModifierStacks(IEnumerable stack); Dictionary> CreateMesh(CanonicalTileId tileId, VectorTileLayer layer); List CreateGo(CanonicalTileId tileId, Dictionary> meshData); void UnregisterTile(CanonicalTileId tileId); diff --git a/Runtime/Mapbox/VectorModule/Unity/VectorLayerVisualizerObject.cs b/Runtime/Mapbox/VectorModule/Unity/VectorLayerVisualizerObject.cs index 159ee6b97..2615fdbf3 100644 --- a/Runtime/Mapbox/VectorModule/Unity/VectorLayerVisualizerObject.cs +++ b/Runtime/Mapbox/VectorModule/Unity/VectorLayerVisualizerObject.cs @@ -32,7 +32,8 @@ public IVectorLayerVisualizer ConstructLayerVisualizer(IMapInformation mapInform { modifierStackObject.Initialize(unityContext); } - _layerVisualizer.AddModifierStack(_modifierStackObjects.Select(x => x.GetModifierStack).ToList()); + _layerVisualizer.AddModifierStacks(_modifierStackObjects.Select((x, i) => x?.GetModifierStack + ?? throw new NullReferenceException($"{name} ({nameof(VectorLayerVisualizerObject)}) is missing {nameof(ModifierStackObject)} reference @ element {i}"))); _layerVisualizer.OnVectorMeshCreated += OnVectorMeshCreated; _layerVisualizer.OnVectorMeshDestroyed += OnVectorMeshDestroyed; diff --git a/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs b/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs index 6b551cf20..b742ea2fb 100644 --- a/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs +++ b/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs @@ -108,7 +108,7 @@ public IEnumerator Initialize() yield return null; } - public void AddModifierStack(List stack) + public void AddModifierStacks(IEnumerable stack) { foreach (var modifierStack in stack) { From c156bcd09df68b5b5ae36f6f13039dc2fde7e4b6 Mon Sep 17 00:00:00 2001 From: Ian M Date: Tue, 4 Nov 2025 19:22:04 +0900 Subject: [PATCH 2/3] Made 'stacks' parameter also plural --- Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs b/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs index b742ea2fb..2c3258320 100644 --- a/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs +++ b/Runtime/Mapbox/VectorModule/VectorLayerVisualizer.cs @@ -108,9 +108,9 @@ public IEnumerator Initialize() yield return null; } - public void AddModifierStacks(IEnumerable stack) + public void AddModifierStacks(IEnumerable stacks) { - foreach (var modifierStack in stack) + foreach (var modifierStack in stacks) { _stackList.Add(modifierStack.GetHashCode(), modifierStack); } From f57e2725a8a07a0cf3c7b60c0eb5c801e5f503da Mon Sep 17 00:00:00 2001 From: Ian M Date: Tue, 4 Nov 2025 19:24:26 +0900 Subject: [PATCH 3/3] Made AddModifierStack parameter plural also in IVectorLayerVisualizer interface for consistency --- Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs b/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs index 77efe35ef..e677b755f 100644 --- a/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs +++ b/Runtime/Mapbox/VectorModule/IVectorLayerVisualizer.cs @@ -12,7 +12,7 @@ namespace Mapbox.VectorModule public interface IVectorLayerVisualizer { string VectorLayerName { get; } - void AddModifierStacks(IEnumerable stack); + void AddModifierStacks(IEnumerable stacks); Dictionary> CreateMesh(CanonicalTileId tileId, VectorTileLayer layer); List CreateGo(CanonicalTileId tileId, Dictionary> meshData); void UnregisterTile(CanonicalTileId tileId);