Api ui integration vector texturing (#1031)

* add a proof of concept for partial layer updates

* Replaced bare EditorHelper.CheckForModifiedProperty calls with EditorGUILayout.Popup-centric Begin/EndChangeCheck-encapsulated EditorHelper.CheckForModifiedProperty calls.

* - Added property.serializedObject.Update() calls to beginning of OnGUI calls in vector-centric property drawers.
- Wrapped CheckForModifiedProperty calls in EndChangeCheck conditional checks. Added color-coded debug message for Vector layer in AbstractMap.
- Added System.EventHandler LayerVisualizerHasChanged and OnUpdateLayerVisualizer method to LayerVisualizerBase.
- Added System.EventHandler TileFactoryHasChanged and UpdateTileFactory method to AbstractTileFactory.
- Chain of EventHandlers = VectorLayerVisualizer -> VectorTileFactory -> VectorLayer -> AbstractMap

* Temporarily disabled Vector Update business in abstract map.

* Adding/removing mesh and/or gameplay modifiers now triggers change events.

* Removed unused EndChangeCheck call in BehaviorModifiersSectionDrawer; moved tile factory update/change event vars/methods into events section.

* Added support for change events in vector filter section.

* Fix ui errors vector section (#1011)

* Fix PropertyDrawer errors when adding new layer.

* Fix errors on adding filters.

* Removed commented/dead property.serializedObject.Update() calls.

* Added UI update checks for Behavior Modifier section.

* Removed unused delegate and method.

* Removed property.serializedObject.Update call at beginning of OnGUI.

* Adding/removing map features now triggers update event.

* Enabling/disabling map feature checkboxes now fires UI update events.

* Changing DataSource in map features section now triggers update. For some reason, this is not working with EditorHelper.CheckForModifiedProperty; setting HasChanged manually does work.

* VectorUpdate is now working; map redraws vector section on vector-centric UI changes.
- Sequential Vector UI changes will cause over/re-registration for event handlers. We need to fix this.
- Added debug message and comment re: register/unregistering for EventHandlers...

* hook terrain layer property to property changed event.

* Use the variable to set collider.

* Add helper methods

* Add update methods to MapboxDataProperty

* Use new methods in MapboxDataProperty.

* Remove SerializedObject.update

* Add ChangeCheck for Vector DataSource.

* Add NeedsForceUpdate override

* Switch to UpdateProperty

* Change Active from field to Property.

* Update signature for NotifyUpdateLayer

* Add ChangeImagery method to test.

* Add VectorLayerUpdateArgs + overload for NotifyUpdateLayer

* Hook to UpdateTileFactory event

* Add hooks to UpdateModifier Event

* Add abstract SublayerProperty

* Add UnregisterTilesFromLayer method

* Add method to change texturing type.

* Remove static MapboxDefaultStyle class.

* Add event hookup to modifiers

* Add layer args for vector layers

* Add events for Add/Remove layer

* Add events for modifiers.

* Change HasChanged to virtual, add overrides

* Add event hookup to modifiers

* Code cleanup

* Trigger Collider option change from UI

* Add a method to re-intialize stack.

* Clean out stacks before recreating the layer.

* Add events to trigger SubLayerAdded from UI

* Remove Layer API and hooks

* Add missing property

* Add function to unbind properties from modifier.

* UpdateVector method now unbinds all modifiers.

* remove SnapTerrain and CombineMeshes from points.

* Add UpdateMap call to trigger when UI is changed.

* extract lineGeometryOptions to its own class (with drawer)
change line mesh modifier to use new lineGeometryOptions data container object
add line feature event bindings to VectorLayerVisualizer

* add update event support to poi layer

* extract lineGeometryOptions to its own class (with drawer)
change line mesh modifier to use new lineGeometryOptions data container object
add line feature event bindings to VectorLayerVisualizer

* add update event support to poi layer

* fix a bug where prefab modifier rupdate event registration wasn't firing after an update

* fix filtering poi category by none with a hacky solution

* Remove hack with a fix for POILayer being set to None.

* Add map update logic to General section UI events.

* Add property to trigger separate events for extentType & Extent property change.

* Property drawer changes for extentOptions

* Add API methods for General Section functionality.

* Add APi method for snapMapToZero.

* add api methods to terrain and imagery layers

* Fix typo.

* Fix typo

* add update system functionality to add/remove poi layers on data property change (#1022)

* fix an issue where poi layer didn't create prefab modifier for name and latlng settings (#1028)

* Vector Filter options API calls.

* Added additional API methods.

* Add multiple property methods (#1026)

* add two SetProperties methods to terrain and image layer to set multiple properties at once

* add comments to SetProperties methods

* Move poi methods (#1023)

* move poi api methods to vector layer
add basic comments for terrain/image factory api methods

* fix a broken method reference

* change poi api methods to fire update events and work with runtime calls

* Added API methods for interacting with texture style options.

* Added API Get/Set methods and CustomStyleBundle class.

* Removed duplicate methods in EditorHelper. Added comments and regions to API calls in VectorSubLayerProperties.

* Marked all API methods as virtual.

* Added VectorTextureApiTest.

* Replaced new Material(material) calls with = material; renamed GetCustom___ methods to Get___ methods.

* Wrapper for public interfaces

* interface templates

Author: greglemonmapbox

sdkproject/Assets/ApiTest.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using Mapbox.Unity.Map;
 using Mapbox.Unity.MeshGeneration.Interfaces;
+using Mapbox.Unity.MeshGeneration.Filters;
 using UnityEngine;
 
 public class ApiTest : MonoBehaviour
@@ -11,8 +12,17 @@ public class ApiTest : MonoBehaviour
 	public ImagerySourceType imagerySource = ImagerySourceType.MapboxStreets;
 
 	public LocationPrefabCategories LocationPrefabCategories;
+	public LayerFilterOperationType layerFilterOperationType;
 	public GameObject PoiPrefab;
 
+
+	public LayerFilterCombinerOperationType layerFilterCombinerOperationType;
+	public string filterKey;
+
+	public float min;
+	public float max;
+	public string contains;
+
 	readonly StyleTypes[] testStyles = new StyleTypes[3] { StyleTypes.Fantasy, StyleTypes.Realistic, StyleTypes.Simple };
 	int styleId = -1;
 	void Start()
@@ -113,7 +123,7 @@ public void ChangeBuildingMaterial()
 		var layer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("ExtrudedBuildings");
 		if (layer != null)
 		{
-			layer.SetTexturingType(testStyles[styleId]);
+			layer.SetStyleType(testStyles[styleId]);
 		}
 		else
 		{
@@ -175,7 +185,6 @@ public void ChangePoiCategory()
 	{
 		var pois = _abstractMap.VectorData.LayerProperty.FindPoiLayerWithName("loc");
 		pois.categories = LocationPrefabCategories;
-		Debug.Log("ChangePoiCategory ---> " + pois.GetType().ToString()); //PrefabItemOptions
 		pois.HasChanged = true;
 	}
 
@@ -184,7 +193,6 @@ public void ChangePoiPrefab()
 	{
 		var pois = _abstractMap.VectorData.LayerProperty.FindPoiLayerWithName("loc");
 		pois.spawnPrefabOptions.prefab = PoiPrefab;
-        Debug.Log("ChangePoiPrefab ---> " + pois.spawnPrefabOptions.GetType().ToString());//SpawnPrefabOptions
 		pois.spawnPrefabOptions.HasChanged = true;
 	}
 
@@ -194,7 +202,6 @@ public void ChangeToPoiByName()
 		var pois = _abstractMap.VectorData.LayerProperty.FindPoiLayerWithName("loc");
 		pois.findByType = LocationPrefabFindBy.POIName;
 		pois.nameString = "yerba";
-		Debug.Log("ChangeToPoiByName ---> " + pois.GetType().ToString());//PrefabItemOptions
 		pois.HasChanged = true;
 	}
 
@@ -203,10 +210,101 @@ public void ChangeToCategory()
 	{
 		var pois = _abstractMap.VectorData.LayerProperty.FindPoiLayerWithName("loc");
 		pois.findByType = LocationPrefabFindBy.MapboxCategory;
-		Debug.Log("ChangeToCategory ---> " + pois.GetType().ToString());//PrefabItemOptions
 		pois.HasChanged = true;
 	}
 
+	[ContextMenu("Vector - Add New Filter")]
+	public void AddNewFilter()
+	{
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		LayerFilter layerFilter = new LayerFilter(LayerFilterOperationType.Contains);
+		vectorLayer.filterOptions.filters.Add(layerFilter);
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Remove Filter")]
+	public void RemoveFilter()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if(index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters.RemoveAt(index);
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Combiner Type")]
+	public void SetFilterCombinerType()
+	{
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+
+		vectorLayer.filterOptions.combinerType = layerFilterCombinerOperationType;
+
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Key")]
+	public void SetFilterKey()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if (index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters[index].Key = filterKey;
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Operator")]
+	public void SetFilterOperator()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if (index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters[index].filterOperator = layerFilterOperationType;
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Min Value")]
+	public void SetFilterCompareValue()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if (index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters[index].Min = min;
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Compare MinMaxValue")]
+	public void SetFilterCompareMinMaxValue()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if (index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters[index].Min = min;
+			vectorLayer.filterOptions.filters[index].Max = max;
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
+	[ContextMenu("Vector - Set Filter Contains Value")]
+	public void SetFilterContainsValue()
+	{
+		int index = 0;
+		var vectorLayer = _abstractMap.VectorData.LayerProperty.FindFeatureLayerWithName("loc");
+		if (index < vectorLayer.filterOptions.filters.Count)
+		{
+			vectorLayer.filterOptions.filters[index].PropertyValue = contains;
+		}
+		vectorLayer.filterOptions.HasChanged = true;
+	}
+
 	[ContextMenu("TestPoiCategoryApi")]
 	public void TestPoiCategoryApi()
 	{

sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs

@@ -7,8 +7,17 @@
 	using Mapbox.Unity.MeshGeneration.Modifiers;
 	using Mapbox.Unity.MeshGeneration.Data;
 
+	public class CustomStyleBundle
+	{
+		public Material topMaterial;
+		public Material sideMaterial;
+		public AtlasInfo atlasInfo;
+		public ScriptablePalette colorPalette;
+	}
+
 	[Serializable]
-	public class GeometryMaterialOptions : ModifierProperties
+	public class GeometryMaterialOptions : ModifierProperties, ISubLayerTexturing
+
 	{
 		public override Type ModifierType
 		{
@@ -128,6 +137,11 @@ public void SetDefaultAssets()
 			texturingType = UvMapType.Atlas;
 			AssignAssets(styleAssetPathBundle);
 		}
+
+		public void SetDefaultStyleType(StyleTypes style)
+		{
+			throw new NotImplementedException();
+		}
 	}
 
 	[Serializable]