Feature/indoor map #34
Conversation
fzampella-huawei
left a comment
fzampella-huawei
left a comment
There was a problem hiding this comment.
Very good implementation, only add the indoor map to the GoogleMap instance and put the images under a folder named Nucleus, or with a nucleus prefix to be able to extend to other buildings
| public class NuclearBuildingManager { | ||
| private IndoorMapManager indoorMapManager; | ||
|
|
||
| public NuclearBuildingManager(GoogleMap map) { |
There was a problem hiding this comment.
change the name to NucleusBuildingManager
Add an instance of the manager into the StartLocationFragment or RecordingFragment to show the map if the user is inside
There was a problem hiding this comment.
Move this files (all floors) under a Nucleus folder or with a <building_name>_ prefix
| // This is just a demonstration of the automatic expansion of the indoor map. | ||
| // Assume that we have obtained the user's position "newPosition" from the callback function. | ||
| if (newPosition != null) { | ||
| if (Nuclear.contains(newPosition)) { |
There was a problem hiding this comment.
The current version of Google Maps, it appears that the LatLngBounds "contains" method internally does not check to see if an element is actually inside the bounds- it creates a square the size of the bounding box and checks if the point is inside it.
This would not account for differently shaped buildings.
Would it not be better to use a point-in-polygon implemented in my previous PR? @fzampella-huawei
There was a problem hiding this comment.
Use Ray-Casting Algorithm to determine whether the user is within a polygon to suit irregular buildings.
fzampella-huawei
left a comment
fzampella-huawei
left a comment
There was a problem hiding this comment.
The inPolygon detection needs to be fixed before merging. As @Codermaga suggested, and you corrected the ray tracing algorithm is better for non rectangular cases.
|
|
||
| } | ||
|
|
||
| /** | ||
| * Determines if a given point is inside a polygon. | ||
| * | ||
| * @param point the point to check | ||
| * @param polygon the list of LatLng points representing the vertices of the polygon | ||
| * @return true if the point is inside the polygon, false otherwise | ||
| */ | ||
| private boolean isPointInPolygon(LatLng point, ArrayList<LatLng> polygon) { | ||
| int intersectCount = 0; | ||
| // Loop through each edge of the polygon | ||
| for (int j = 0; j < polygon.size() - 1; j++) { | ||
| // Check if the ray from the point intersects with the edge | ||
| if (rayCastIntersect(point, polygon.get(j), polygon.get(j + 1))) { | ||
| intersectCount++; | ||
| } | ||
| } | ||
| // If the number of intersections is odd, the point is inside the polygon | ||
| return ((intersectCount % 2) == 1); // odd = inside, even = outside; | ||
| } | ||
|
|
||
| /** | ||
| * Determines if a ray from a point intersects with a given edge of the polygon. | ||
| * | ||
| * @param point the point from which the ray is cast | ||
| * @param vertA the first vertex of the edge | ||
| * @param vertB the second vertex of the edge | ||
| * @return true if the ray intersects with the edge, false otherwise | ||
| */ | ||
| private boolean rayCastIntersect(LatLng point, LatLng vertA, LatLng vertB) { | ||
| double aY = vertA.latitude; | ||
| double bY = vertB.latitude; | ||
| double aX = vertA.longitude; | ||
| double bX = vertB.longitude; | ||
| double pY = point.latitude; | ||
| double pX = point.longitude; | ||
|
|
||
| // Check if the point is horizontally aligned with the edge | ||
| if ((aY > pY && bY > pY) || (aY < pY && bY < pY) || (aX < pX && bX < pX)) { | ||
| return false; | ||
| } | ||
|
|
||
| // Calculate the slope of the edge | ||
| double m = (aY - bY) / (aX - bX); | ||
| // Calculate the y-intercept of the edge | ||
| double bee = -aX * m + aY; | ||
| // Calculate the x-coordinate of the intersection point of the ray and the edge | ||
| double x = (pY - bee) / m; | ||
|
|
||
| // Return true if the intersection point is to the right of the point | ||
| return x > pX; | ||
| } |
There was a problem hiding this comment.
This functions are available from BuildingPolygon. Make that pointInPolygon function public and add a contain(LatLng point) function to the IndoorMap that uses it. You will need to add the polygon to the IndoorMap as it is created (from the bounds (4 points for a non closed polygon, not 2)
| ArrayList<LatLng> buildingPolygon = new ArrayList<>(); | ||
| buildingPolygon.add(new LatLng(55.922679, -3.174672)); | ||
| buildingPolygon.add(new LatLng(55.923316, -3.173781)); |
There was a problem hiding this comment.
The building polygon in this case needs 4 points (assuming it is non closed), not 2. I prefer if the polygon assignment is part of the IndoorMap creation
|
@fzampella-huawei Isn't there a lot of repetitive code now, the point in polygon is written in BuildingPolygon class(written by me) previously. The images as well as are duplicated as they are present in the previous PR. |
|
@Codermaga , I know that there some redundant code and I understand your concern, but wanted to integrate the pull request and I will clean the code myself later given the initial deadline for the contributions. I understand that the previous IndoorMapManager had a similar target, but I liked that this implementation instantiated the buildings, the final version will be a mix between both approaches and will rely on your BuildingPolygon implementation |
Implement floor changes
3 participants
The new IndoorMapManager class has been added to easily create indoor maps and add them to existing maps. Contains another class "NuclearBuildingManager" which instantiates an IndoorMapManager for loading the indoor map of the nuclear building.