Clean unbinding ui events (#1062)

* Removing feature layers through UI calls vectorLayerProperties.OnSubLayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer

* fix an issue where zombie gameobject were left in the scene after sublayers get removed
fix an issue where ReplaceFeatureModifier and ReplaceFeatureCollectionModifier were leaving zombies on toggling and/or removing their layer

* Clean unbinding of vector factory & visualizer UI events.

* Remove duplicate method.

* Set opacity to 1 for dark/light styles

* Fix for PoiRemovelayer issue

* Change POI treeview to use the same treeview as features.

* Fix enable disable for POI layers.

* fix zombie object issue with poi layers

* Fix for empty gameobjects being created when `none` was selected as category.

Author: abhishektrip

sdkproject/Assets/Mapbox/Unity/Editor/FeatureSubLayerTreeView.cs

@@ -10,7 +10,9 @@ internal class FeatureSubLayerTreeView : TreeViewWithTreeModel<FeatureTreeElemen
 	{
 		public SerializedProperty Layers;
 		private float kToggleWidth = 18f;
-		public static int uniqueId = 3000;
+		public int uniqueId;
+		public static int uniqueIdPoI = 1000;
+		public static int uniqueIdFeature = 3000;
 		public int maxElementsAdded = 0;
 
 		public bool hasChanged = false;
@@ -25,14 +27,15 @@ internal class FeatureSubLayerTreeView : TreeViewWithTreeModel<FeatureTreeElemen
 			normal = new GUIStyleState() { textColor = Color.white }
 		};
 
-		public FeatureSubLayerTreeView(TreeViewState state, MultiColumnHeader multicolumnHeader, TreeModel<FeatureTreeElement> model) : base(state, multicolumnHeader, model)
+		public FeatureSubLayerTreeView(TreeViewState state, MultiColumnHeader multicolumnHeader, TreeModel<FeatureTreeElement> model, int uniqueIdentifier = 3000) : base(state, multicolumnHeader, model)
 		{
 			// Custom setup
 			//rowHeight = kRowHeights;
 			showAlternatingRowBackgrounds = true;
 			showBorder = true;
 			customFoldoutYOffset = (kRowHeights - EditorGUIUtility.singleLineHeight) * 0.5f; // center foldout in the row since we also center content. See RowGUI
 			extraSpaceBeforeIconAndLabel = kToggleWidth;
+			uniqueId = uniqueIdentifier;
 			Reload();
 		}
 

sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs

@@ -218,16 +218,16 @@ public void DrawUI(SerializedProperty property)
 				if (selectedLayers.Count > 0)
 				{
 					//ensure that selectedLayers[0] isn't out of bounds
-					if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueId > subLayerArray.arraySize - 1)
+					if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdFeature > subLayerArray.arraySize - 1)
 					{
-						selectedLayers[0] = subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueId;
+						selectedLayers[0] = subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueIdFeature;
 					}
 
 					SelectionIndex = selectedLayers[0];
 				}
 				else
 				{
-					if (SelectionIndex > 0 && (SelectionIndex - FeatureSubLayerTreeView.uniqueId <= subLayerArray.arraySize - 1))
+					if (SelectionIndex > 0 && (SelectionIndex - FeatureSubLayerTreeView.uniqueIdFeature <= subLayerArray.arraySize - 1))
 					{
 						selectedLayers = new int[1] { SelectionIndex };
 						layerTreeView.SetSelection(selectedLayers);
@@ -264,7 +264,7 @@ public void DrawUI(SerializedProperty property)
 					layerTreeView.AddElementToTree(subLayer);
 					layerTreeView.Reload();
 
-					selectedLayers = new int[1] { subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueId };
+					selectedLayers = new int[1] { subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueIdFeature };
 					layerTreeView.SetSelection(selectedLayers);
 					subLayerProperties = null; // setting this to null so that the if block is not called again
 
@@ -280,15 +280,15 @@ public void DrawUI(SerializedProperty property)
 					{
 						if (layerTreeView != null)
 						{
-							var subLayer = subLayerArray.GetArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueId);
+							var subLayer = subLayerArray.GetArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueIdFeature);
 
 							VectorLayerProperties vectorLayerProperties = (VectorLayerProperties)EditorHelper.GetTargetObjectOfProperty(property);
 							VectorSubLayerProperties vectorSubLayerProperties = (VectorSubLayerProperties)EditorHelper.GetTargetObjectOfProperty(subLayer);
 
 							vectorLayerProperties.OnSubLayerPropertyRemoved(new VectorLayerUpdateArgs { property = vectorSubLayerProperties });
 
 							layerTreeView.RemoveItemFromTree(index);
-							subLayerArray.DeleteArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueId);
+							subLayerArray.DeleteArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueIdFeature);
 							layerTreeView.treeModel.SetData(GetData(subLayerArray));
 						}
 					}
@@ -301,17 +301,17 @@ public void DrawUI(SerializedProperty property)
 
 				GUILayout.Space(EditorGUIUtility.singleLineHeight);
 
-				if (selectedLayers.Count == 1 && subLayerArray.arraySize != 0 && selectedLayers[0] - FeatureSubLayerTreeView.uniqueId >= 0)
+				if (selectedLayers.Count == 1 && subLayerArray.arraySize != 0 && selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdFeature >= 0)
 				{
 					//ensure that selectedLayers[0] isn't out of bounds
-					if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueId > subLayerArray.arraySize - 1)
+					if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdFeature > subLayerArray.arraySize - 1)
 					{
-						selectedLayers[0] = subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueId;
+						selectedLayers[0] = subLayerArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueIdFeature;
 					}
 
 					SelectionIndex = selectedLayers[0];
 
-					var layerProperty = subLayerArray.GetArrayElementAtIndex(SelectionIndex - FeatureSubLayerTreeView.uniqueId);
+					var layerProperty = subLayerArray.GetArrayElementAtIndex(SelectionIndex - FeatureSubLayerTreeView.uniqueIdFeature);
 
 					layerProperty.isExpanded = true;
 					var subLayerCoreOptions = layerProperty.FindPropertyRelative("coreOptions");
@@ -347,7 +347,7 @@ IList<FeatureTreeElement> GetData(SerializedProperty subLayerArray)
 			{
 				var subLayer = subLayerArray.GetArrayElementAtIndex(i);
 				name = subLayer.FindPropertyRelative("coreOptions.sublayerName").stringValue;
-				id = i + FeatureSubLayerTreeView.uniqueId;
+				id = i + FeatureSubLayerTreeView.uniqueIdFeature;
 				type = ((PresetFeatureType)subLayer.FindPropertyRelative("presetFeatureType").enumValueIndex).ToString();
 				FeatureTreeElement element = new FeatureTreeElement(name, 0, id);
 				element.Name = name;
@@ -429,11 +429,16 @@ void SetSubLayerProps(SerializedProperty subLayer)
 
 			var atlas = subLayerGeometryMaterialOptions.FindPropertyRelative("atlasInfo");
 			var palette = subLayerGeometryMaterialOptions.FindPropertyRelative("colorPalette");
+			var lightStyleOpacity = subLayerGeometryMaterialOptions.FindPropertyRelative("lightStyleOpacity");
+			var darkStyleOpacity = subLayerGeometryMaterialOptions.FindPropertyRelative("darkStyleOpacity");
 
 			topMat.objectReferenceValue = materialOptions.materials[0].Materials[0];
 			sideMat.objectReferenceValue = materialOptions.materials[1].Materials[0];
 			atlas.objectReferenceValue = materialOptions.atlasInfo;
 			palette.objectReferenceValue = materialOptions.colorPalette;
+			lightStyleOpacity.floatValue = materialOptions.lightStyleOpacity;
+			darkStyleOpacity.floatValue = materialOptions.darkStyleOpacity;
+
 
 			subLayer.FindPropertyRelative("buildingsWithUniqueIds").boolValue = subLayerProperties.buildingsWithUniqueIds;
 			subLayer.FindPropertyRelative("moveFeaturePositionTo").enumValueIndex = (int)subLayerProperties.moveFeaturePositionTo;

sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/PointsOfInterestSubLayerPropertiesDrawer.cs

@@ -12,9 +12,19 @@ public class PointsOfInterestSubLayerPropertiesDrawer
 		string objectId = "";
 		static float _lineHeight = EditorGUIUtility.singleLineHeight;
 
-		PointsOfInterestSubLayerTreeView layerTreeView = new PointsOfInterestSubLayerTreeView(new TreeViewState());
+		//PointsOfInterestSubLayerTreeView layerTreeView = new PointsOfInterestSubLayerTreeView(new TreeViewState());
+		FeatureSubLayerTreeView layerTreeView;// = new FeatureSubLayerTreeView
 		IList<int> selectedLayers = new List<int>();
 
+		private TreeModel<FeatureTreeElement> treeModel;
+		[SerializeField]
+		TreeViewState m_TreeViewState;
+
+		[SerializeField]
+		MultiColumnHeaderState m_MultiColumnHeaderState;
+
+		bool m_Initialized = false;
+
 		int SelectionIndex
 		{
 			get
@@ -31,8 +41,40 @@ public void DrawUI(SerializedProperty property)
 		{
 			objectId = property.serializedObject.targetObject.GetInstanceID().ToString();
 			var prefabItemArray = property.FindPropertyRelative("locationPrefabList");
-			var layersRect = EditorGUILayout.GetControlRect(GUILayout.MinHeight(Mathf.Max(prefabItemArray.arraySize + 1, 1) * _lineHeight),
-															GUILayout.MaxHeight((prefabItemArray.arraySize + 1) * _lineHeight));
+			var layersRect = EditorGUILayout.GetControlRect(GUILayout.MinHeight(Mathf.Max(prefabItemArray.arraySize + 1, 1) * _lineHeight + MultiColumnHeader.DefaultGUI.defaultHeight),
+															GUILayout.MaxHeight((prefabItemArray.arraySize + 1) * _lineHeight + MultiColumnHeader.DefaultGUI.defaultHeight));
+
+			if (!m_Initialized)
+			{
+				bool firstInit = m_MultiColumnHeaderState == null;
+				var headerState = FeatureSubLayerTreeView.CreateDefaultMultiColumnHeaderState();
+				if (MultiColumnHeaderState.CanOverwriteSerializedFields(m_MultiColumnHeaderState, headerState))
+				{
+					MultiColumnHeaderState.OverwriteSerializedFields(m_MultiColumnHeaderState, headerState);
+				}
+				m_MultiColumnHeaderState = headerState;
+
+				var multiColumnHeader = new FeatureSectionMultiColumnHeader(headerState);
+
+				if (firstInit)
+				{
+					multiColumnHeader.ResizeToFit();
+				}
+
+				treeModel = new TreeModel<FeatureTreeElement>(GetData(prefabItemArray));
+				if (m_TreeViewState == null)
+				{
+					m_TreeViewState = new TreeViewState();
+				}
+
+				if (layerTreeView == null)
+				{
+					layerTreeView = new FeatureSubLayerTreeView(m_TreeViewState, multiColumnHeader, treeModel, FeatureSubLayerTreeView.uniqueIdPoI);
+				}
+				layerTreeView.multiColumnHeader = multiColumnHeader;
+				m_Initialized = true;
+			}
+
 
 			layerTreeView.Layers = prefabItemArray;
 			layerTreeView.Reload();
@@ -50,9 +92,9 @@ public void DrawUI(SerializedProperty property)
 			if (selectedLayers.Count > 0)
 			{
 				//ensure that selectedLayers[0] isn't out of bounds
-				if (selectedLayers[0] > prefabItemArray.arraySize - 1)
+				if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdPoI > prefabItemArray.arraySize - 1)
 				{
-					selectedLayers[0] = prefabItemArray.arraySize - 1;
+					selectedLayers[0] = prefabItemArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueIdPoI;
 				}
 
 				SelectionIndex = selectedLayers[0];
@@ -61,7 +103,7 @@ public void DrawUI(SerializedProperty property)
 			else
 			{
 				selectedLayers = new int[1] { SelectionIndex };
-				if (SelectionIndex > 0 && (SelectionIndex <= prefabItemArray.arraySize - 1))
+				if (SelectionIndex > 0 && (SelectionIndex - FeatureSubLayerTreeView.uniqueIdPoI <= prefabItemArray.arraySize - 1))
 				{
 					layerTreeView.SetSelection(selectedLayers);
 				}
@@ -74,10 +116,7 @@ public void DrawUI(SerializedProperty property)
 			if (GUILayout.Button(new GUIContent("Add Layer"), (GUIStyle)"minibuttonleft"))
 			{
 
-				GUILayout.Space(EditorGUIUtility.singleLineHeight);
-
-				selectedLayers = layerTreeView.GetSelection();
-
+				//GUILayout.Space(EditorGUIUtility.singleLineHeight);
 				prefabItemArray.arraySize++;
 
 				var prefabItem = prefabItemArray.GetArrayElementAtIndex(prefabItemArray.arraySize - 1);
@@ -88,62 +127,62 @@ public void DrawUI(SerializedProperty property)
 				// Set defaults here because SerializedProperty copies the previous element.
 				prefabItem.FindPropertyRelative("coreOptions.isActive").boolValue = true;
 				prefabItem.FindPropertyRelative("coreOptions.snapToTerrain").boolValue = true;
+				prefabItem.FindPropertyRelative("presetFeatureType").enumValueIndex = (int)PresetFeatureType.Points;
 				var categories = prefabItem.FindPropertyRelative("categories");
 				categories.intValue = (int)(LocationPrefabCategories.AnyCategory);//To select any category option
 
 				var density = prefabItem.FindPropertyRelative("density");
 				density.intValue = 15;//To select all locations option
 
+				//Refreshing the tree
+				layerTreeView.Layers = prefabItemArray;
+				layerTreeView.AddElementToTree(prefabItem);
+				layerTreeView.Reload();
+
 				selectedLayers = new int[1] { prefabItemArray.arraySize - 1 };
 				layerTreeView.SetSelection(selectedLayers);
 
 				if (EditorHelper.DidModifyProperty(property))
 				{
-					PrefabItemOptions prefabItemOptionToAdd= (PrefabItemOptions)EditorHelper.GetTargetObjectOfProperty(prefabItem) as PrefabItemOptions;
+					PrefabItemOptions prefabItemOptionToAdd = (PrefabItemOptions)EditorHelper.GetTargetObjectOfProperty(prefabItem) as PrefabItemOptions;
 					((VectorLayerProperties)EditorHelper.GetTargetObjectOfProperty(property)).OnSubLayerPropertyAdded(new VectorLayerUpdateArgs { property = prefabItemOptionToAdd });
 				}
 			}
 
 			if (GUILayout.Button(new GUIContent("Remove Selected"), (GUIStyle)"minibuttonright"))
 			{
-				if (prefabItemArray.arraySize == 0)
-				{
-					return;
-				}
-
-				List<PrefabItemOptions> LayersToRemove = new List<PrefabItemOptions>();
 				foreach (var index in selectedLayers.OrderByDescending(i => i))
 				{
-					PrefabItemOptions prefabItemOptionsToRemove = (PrefabItemOptions)EditorHelper.GetTargetObjectOfProperty(prefabItemArray.GetArrayElementAtIndex(index)) as PrefabItemOptions;
-					if(prefabItemOptionsToRemove != null)
+					if (layerTreeView != null)
 					{
-						LayersToRemove.Add(prefabItemOptionsToRemove);
+						var poiSubLayer = prefabItemArray.GetArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueIdPoI);
+
+						VectorLayerProperties vectorLayerProperties = (VectorLayerProperties)EditorHelper.GetTargetObjectOfProperty(property);
+						PrefabItemOptions poiSubLayerProperties = (PrefabItemOptions)EditorHelper.GetTargetObjectOfProperty(poiSubLayer);
+
+						vectorLayerProperties.OnSubLayerPropertyRemoved(new VectorLayerUpdateArgs { property = poiSubLayerProperties });
+
+						layerTreeView.RemoveItemFromTree(index);
+						prefabItemArray.DeleteArrayElementAtIndex(index - FeatureSubLayerTreeView.uniqueIdPoI);
+						layerTreeView.treeModel.SetData(GetData(prefabItemArray));
 					}
-					prefabItemArray.DeleteArrayElementAtIndex(index);
 				}
 				selectedLayers = new int[0];
 				layerTreeView.SetSelection(selectedLayers);
-				if (EditorHelper.DidModifyProperty(property))
-				{
-					for (int i = 0; i < LayersToRemove.Count; i++)
-					{
-						((VectorLayerProperties)EditorHelper.GetTargetObjectOfProperty(property)).OnSubLayerPropertyRemoved(new VectorLayerUpdateArgs { property = LayersToRemove[i]});
-					}
-				}
 			}
 
 			EditorGUILayout.EndHorizontal();
 
-			if (selectedLayers.Count == 1 && prefabItemArray.arraySize != 0)
+			if (selectedLayers.Count == 1 && prefabItemArray.arraySize != 0 && selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdPoI >= 0)
 			{
 				//ensure that selectedLayers[0] isn't out of bounds
-				if (selectedLayers[0] > prefabItemArray.arraySize - 1)
+				if (selectedLayers[0] - FeatureSubLayerTreeView.uniqueIdPoI > prefabItemArray.arraySize - 1)
 				{
-					selectedLayers[0] = prefabItemArray.arraySize - 1;
+					selectedLayers[0] = prefabItemArray.arraySize - 1 + FeatureSubLayerTreeView.uniqueIdPoI;
 				}
 				SelectionIndex = selectedLayers[0];
 
-				var layerProperty = prefabItemArray.GetArrayElementAtIndex(SelectionIndex);
+				var layerProperty = prefabItemArray.GetArrayElementAtIndex(SelectionIndex - FeatureSubLayerTreeView.uniqueIdPoI);
 
 				layerProperty.isExpanded = true;
 				var subLayerCoreOptions = layerProperty.FindPropertyRelative("coreOptions");
@@ -169,5 +208,28 @@ void DrawLayerLocationPrefabProperties(SerializedProperty layerProperty, Seriali
 		{
 			EditorGUILayout.PropertyField(layerProperty);
 		}
+
+		IList<FeatureTreeElement> GetData(SerializedProperty subLayerArray)
+		{
+			List<FeatureTreeElement> elements = new List<FeatureTreeElement>();
+			string name = string.Empty;
+			string type = string.Empty;
+			int id = 0;
+			var root = new FeatureTreeElement("Root", -1, 0);
+			elements.Add(root);
+			for (int i = 0; i < subLayerArray.arraySize; i++)
+			{
+				var subLayer = subLayerArray.GetArrayElementAtIndex(i);
+				name = subLayer.FindPropertyRelative("coreOptions.sublayerName").stringValue;
+				id = i + FeatureSubLayerTreeView.uniqueIdPoI;
+				type = PresetFeatureType.Points.ToString();//((PresetFeatureType)subLayer.FindPropertyRelative("presetFeatureType").enumValueIndex).ToString();
+				FeatureTreeElement element = new FeatureTreeElement(name, 0, id);
+				element.Name = name;
+				element.name = name;
+				element.Type = type;
+				elements.Add(element);
+			}
+			return elements;
+		}
 	}
 }

sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs

@@ -629,6 +629,7 @@ private void OnImageOrTerrainUpdateLayer(object sender, System.EventArgs eventAr
 		private void RedrawVectorDataLayer()
 		{
 			_mapVisualizer.UnregisterTilesFrom(_vectorData.Factory);
+			_vectorData.UnbindAllEvents();
 			_vectorData.UpdateFactorySettings();
 			_mapVisualizer.ReregisterTilesTo(_vectorData.Factory);
 		}

sdkproject/Assets/Mapbox/Unity/Map/AbstractMapVisualizer.cs

@@ -286,6 +286,7 @@ public void UnregisterAndRedrawTilesFromLayer(VectorTileFactory factory, LayerVi
 			{
 				factory.UnregisterLayer(tileBundle.Value, layerVisualizer);
 			}
+			layerVisualizer.UnbindSubLayerEvents();
 			layerVisualizer.SetProperties(layerVisualizer.SubLayerProperties);
 			layerVisualizer.InitializeStack();
 			foreach (KeyValuePair<UnwrappedTileId, UnityTile> tileBundle in _activeTiles)

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/AbstractTileFactory.cs

@@ -87,6 +87,11 @@ public virtual void Unregister(UnityTile tile)
 			OnUnregistered(tile);
 		}
 
+		public virtual void UnbindEvents()
+		{
+			OnUnbindEvents();
+		}
+
 		public virtual void UpdateTileProperty(UnityTile tile, LayerUpdateArgs updateArgs)
 		{
 			Debug.Log("Update Tile Property -> " + tile.UnwrappedTileId.ToString());
@@ -103,6 +108,7 @@ public virtual void UpdateTileProperty(UnityTile tile, LayerUpdateArgs updateArg
 		protected abstract void OnRegistered(UnityTile tile);
 		protected abstract void OnPostProcess(UnityTile tile);
 		protected abstract void OnUnregistered(UnityTile tile);
+		protected abstract void OnUnbindEvents();
 
 		#region Events
 		public event EventHandler<TileErrorEventArgs> OnTileError;

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs

@@ -151,6 +151,15 @@ protected override void OnUnregistered(UnityTile tile)
 		protected override void OnPostProcess(UnityTile tile)
 		{
 
+		}
+
+		public override void UnbindEvents()
+		{
+			base.UnbindEvents();
+		}
+
+		protected override void OnUnbindEvents()
+		{
 		}
 		#endregion
 	}