Skip to content

Clean unbinding ui events #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
abhishektrip merged 12 commits into from
Oct 6, 2018
Merged

Clean unbinding ui events #1062

abhishektrip merged 12 commits into from
Oct 6, 2018

Conversation

@abhishektrip
Copy link
Contributor

@abhishektrip abhishektrip commented Oct 5, 2018 •
edited
Loading

Description of changes
Fixes issues related to unbinding of events when extent was changed
Fixes issues with POI layer add/remove & enable/disable.
Changes treeview for POI's to be consistent with Feature tree view.

QA checklists

  • Add relevant code comments. Every API class and method should have <summary> description as well as description of parameters.
  • Add tests for new/changed/updated classes and methods!!!
  • Check out conventions in CONTRIBUTING.md.
  • Check out conventions in CODING-STYLE.md
  • Update the changelog
  • Update documentation.

Reviewers

Tag your reviewer(s). Choose wisely.

greglemonmapbox and others added 12 commits October 4, 2018 10:23
@greglemonmapbox
Removing feature layers through UI calls vectorLayerProperties.OnSubL…
ec5a5d2 
…ayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer
@greglemonmapbox
Merge remote-tracking branch 'origin/develop' into remove-selected-la…
b18e2e7 
…yer-fix
@brnkhy
fix an issue where zombie gameobject were left in the scene after sub…
4b6b768 
…layers get removed

fix an issue where ReplaceFeatureModifier and ReplaceFeatureCollectionModifier were leaving zombies on toggling and/or removing their layer
@abhishektrip
Clean unbinding of vector factory & visualizer UI events.
0ecca46
@abhishektrip
Merge branch 'bug-fixes-runtime' into clean-unbinding-ui-events
159ccda 
* bug-fixes-runtime:
  Clean unbinding of vector factory & visualizer UI events.
  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
  Removing feature layers through UI calls vectorLayerProperties.OnSubLayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs
@abhishektrip
Remove duplicate method.
5441c99
@abhishektrip
Set opacity to 1 for dark/light styles
6428954
@abhishektrip
Fix for PoiRemovelayer issue
09ac3a7
@abhishektrip
Change POI treeview to use the same treeview as features.
5966723
@abhishektrip
Fix enable disable for POI layers.
c7e187d
@brnkhy
fix zombie object issue with poi layers
88125a6
@abhishektrip
Fix for empty gameobjects being created when none was selected as c…
cd17d60 
…ategory.
@abhishektrip abhishektrip requested a review from brnkhy October 5, 2018 22:52
brnkhy
brnkhy approved these changes Oct 5, 2018
View reviewed changes
Copy link
Contributor

@brnkhy brnkhy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

@abhishektrip abhishektrip merged commit eb12cca into develop Oct 6, 2018
abhishektrip added a commit that referenced this pull request Oct 8, 2018
@abhishektrip
Merge branch 'develop' into restructureAbstractMapFile
9e7c2d0 
* develop:
  Custom material fix (#1064)
  Edit IImageryLayer comments (#1055)
  SnapToZero fix (#1063)
  Clean unbinding ui events (#1062)
  Salesforce Tower fix in Unity 2017.4.2f2 (#1060)
  Add default terrain-rgb if custom source is empty. (#1061)
  Zombie object fix (#1057)
  Removing feature layers through UI calls vectorLayerProperties.OnSubLayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer (#1056)
  fix an issue where ReplaceFeatureModifier was creating duplicates on layer toggling (#1051)
  Api methods review (#1052)

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
abhishektrip added a commit that referenced this pull request Oct 9, 2018
@abhishektrip
Merge branch 'develop' into v146-master-develop
9f31aeb 
* develop: (617 commits)
  Fixed material assignment in prefabs. (#1072)
  fix resetmap function in AbstractMap (#1068)
  Vector tile factory file restructure (#1070)
  Unity 2017 custom material fix (#1067)
  Add test for map + fix errors. (#1066)
  move all interfaces and classes inside AbstractMap file to individual files and their respective folders (#1054)
  Removed update debug messages (#1065)
  Fix tabletop ar snap to plane (#999)
  Custom material fix (#1064)
  Edit IImageryLayer comments (#1055)
  SnapToZero fix (#1063)
  Clean unbinding ui events (#1062)
  Salesforce Tower fix in Unity 2017.4.2f2 (#1060)
  Add default terrain-rgb if custom source is empty. (#1061)
  Zombie object fix (#1057)
  Removing feature layers through UI calls vectorLayerProperties.OnSubLayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer (#1056)
  fix an issue where ReplaceFeatureModifier was creating duplicates on layer toggling (#1051)
  Api methods review (#1052)
  Enable disable vector layer fix (#1050)
  Added /// comments to VectorFilterOptions. (#1049)
  ...

# Conflicts:
#	documentation/docs/05-changelog.md
#	sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity
#	sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity.meta
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/TrafficLayer/SevereTraffic/ExplorerSevereTrafficMaterial.asset
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/HeavyTrafficMaterial.asset
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/LowTrafficMaterial.asset
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/ModerateTrafficMaterial.asset
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/SevereTrafficMaterial.asset
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/SevereTrafficMaterial.mat.meta
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/TrafficAndDirections.unity
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/TrafficAndDirections.unity.meta
#	sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame.unity
#	sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame.unity.meta
#	sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame/Park/cone.FBX.meta
#	sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame/Road/LocationRoadMaterialModifier.asset
#	sdkproject/Assets/Mapbox/Examples/4_ReplaceFeatures/IconicBuildings.unity
#	sdkproject/Assets/Mapbox/Examples/4_ReplaceFeatures/ReplaceFeatures.unity
#	sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat
#	sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta
#	sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/RemoveZ-Fighting.unity
#	sdkproject/Assets/Mapbox/Examples/Prefabs/ReloadMapIconicBuildingCanvas.prefab
#	sdkproject/Assets/Mapbox/Examples/Resources/DirectionMaterial.mat.meta
#	sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab
#	sdkproject/Assets/Mapbox/Prefabs/IconicBuildingMap.prefab
#	sdkproject/Assets/Mapbox/Resources/HeroStructures/Materials/StatueOfLibertyBase.mat
#	sdkproject/Assets/Mapbox/Resources/HeroStructures/Materials/StatueOfLibertyBody.mat
#	sdkproject/Assets/Mapbox/Unity/DataContainers/ElevationRequiredOptions.cs
#	sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs
#	sdkproject/Assets/Mapbox/Unity/DataContainers/TileProviderOptions.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/FeatureSubLayerTreeView.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/MapManagerEditor.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PointsOfInterestSubLayerTreeView.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/BehaviorModifiersSectionDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/CoreVectorLayerPropertiesDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ElevationLayerPropertiesDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ElevationRequiredOptionsDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ModelingSectionDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/PointsOfInterestSubLayerPropertiesDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/VectorFilterOptionsDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/LayerProperties/CoreVectorLayerProperties.cs
#	sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs
#	sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
#	sdkproject/Assets/Mapbox/Unity/Map/AbstractMapVisualizer.cs
#	sdkproject/Assets/Mapbox/Unity/Map/AbstractTileProvider.cs
#	sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs
#	sdkproject/Assets/Mapbox/Unity/Map/Interfaces/IMap.cs
#	sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs
#	sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs
#	sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/AbstractTileFactory.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainFactoryBase.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/ElevatedTerrainStrategy.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/ElevatedTerrainWithSidesStrategy.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/FlatSphereTerrainStrategy.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/FlatTerrainStrategy.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/LowPolyTerrainStrategy.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorTileFactory.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureCollectionModifier.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs
#	sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs
#	sdkproject/Assets/Mapbox/Unity/SourceLayers/TerrainLayer.cs
#	sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity
#	sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR-ManualAlignment.unity
#	sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR.unity
#	sdkproject/Assets/Resources.meta
#	sdkproject/ProjectSettings/ProjectSettings.asset
#	sdkproject/ProjectSettings/ProjectVersion.txt
@abhishektrip abhishektrip deleted the clean-unbinding-ui-events branch October 12, 2018 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brnkhy brnkhy brnkhy approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@abhishektrip @brnkhy @greglemonmapbox