Skip to content

fix resetmap function in AbstractMap #1068

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
merged 3 commits into from
Oct 9, 2018
Merged

fix resetmap function in AbstractMap #1068

merged 3 commits into from
Oct 9, 2018

Conversation

brnkhy
Copy link
Contributor

@brnkhy brnkhy commented Oct 8, 2018

fix resetmap function in AbstractMap to unregister all tiles from factories, clear caches for all module and reregister all tiles again

@atripathi-mb

@brnkhy
fix resetmap function in AbstractMap to unregister all tiles from fac…
dcd21d9 
…tories, clear caches for all module and reregister all tiles again
@brnkhy brnkhy requested a review from abhishektrip October 8, 2018 23:29
abhishektrip
abhishektrip reviewed Oct 9, 2018
View reviewed changes
sdkproject/Assets/Mapbox/Unity/Map/AbstractMapVisualizer.cs
}
}

public void ReregisterAllTiles()
Copy link
Contributor

Choose a reason for hiding this comment

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

Rename method to RegisterAllTiles? Why does it need to be re-register?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I felt like the name RegisterAllTiles implies a given list. While in this method we're reregisterin tiles (that already has been registered to map visualizer before) to factories.

Copy link
Contributor

Choose a reason for hiding this comment

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

@brnkhy The method is doing nothing but registering all tiles, calling it re-register might be misleading. Re-register to me means this function will take care of all logic that is required for registering tiles that are already registered.

@abhishektrip
Merge commit '1668c91b2c5e3976c52a59ab5ab24ea950b70e3b' into resetMap
0d8bb65 
* commit '1668c91b2c5e3976c52a59ab5ab24ea950b70e3b':
  Vector tile factory file restructure (#1070)
  Unity 2017 custom material fix (#1067)
  Add test for map + fix errors. (#1066)

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorTileFactory.cs
@abhishektrip
Change imagery type to light
2e1f14c
@abhishektrip abhishektrip merged commit 4b2f3f9 into develop Oct 9, 2018
abhishektrip added a commit that referenced this pull request Oct 9, 2018
@abhishektrip
Merge commit '4b2f3f9291dbbbbe0dce87c39b43b2983870a990' into prefab-m…
77f13e2 
…aterial-fix

* commit '4b2f3f9291dbbbbe0dce87c39b43b2983870a990':
  fix resetmap function in AbstractMap (#1068)
  Vector tile factory file restructure (#1070)
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 resetMap branch October 12, 2018 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@abhishektrip abhishektrip abhishektrip approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@brnkhy @abhishektrip