Indoor style and logic cleanup (internal-6361)

GitOrigin-RevId: 7de804b6299441d6805d4bc988a836deeba83241

Author: aleksproger

debug/indoor/indoor_style.js

@@ -1,11 +1,11 @@
 function isSelectedFloor() {
     // True if the current level is selected
-    return ["in", ["get", "floor_id"], ["config", "mbx-indoor-level-selected"]]
+    return ["in", ["get", "floor_id"], ["config", "activeFloors"]]
 }
 
 function isSelectedFloorBase() {
     // True if the current level is selected
-    return ["in", ["get", "id"], ["config", "mbx-indoor-level-selected"]]
+    return ["in", ["get", "id"], ["config", "activeFloors"]]
 }
 
 const indoorLayers = [
@@ -17,7 +17,7 @@ const indoorLayers = [
         "minzoom": 16.0,
         "filter": [
             "all",
-            [ ">", ["length", ["config", "mbx-indoor-level-selected"]], 0],
+            [ ">", ["length", ["config", "activeFloors"]], 0],
             ["==", ["get", "shape_type"], "building"],
         ],
         "layout": {
@@ -33,7 +33,7 @@ const indoorLayers = [
         "slot": "middle",
         "filter": [
             "all",
-            [ ">", ["length", ["config", "mbx-indoor-level-selected"]], 0],
+            [ ">", ["length", ["config", "activeFloors"]], 0],
             ["==", ["geometry-type"], "Polygon"],
             ["in", ["get", "shape_type"], ["literal", ["building"]]],
         ],
@@ -55,7 +55,7 @@ const indoorLayers = [
     // NOTE: In reality we mustn't rely on *_metadata layers, but in current example we need to use them due to internal implementation of indoor with QRF, this will be changed 
     {
         "type": "fill",
-        "id": "building-outline",
+        "id": "building-metadata",
         "source": "indoor-source",
         "source-layer": "indoor_structure_metadata",
         "minzoom": 15.0,
@@ -75,7 +75,7 @@ const indoorLayers = [
     // NOTE: In reality we mustn't rely on *_metadata layers, but in current example we need to use them due to internal implementation of indoor with QRF, this will be changed 
     {
         "type": "fill",
-        "id": "floor-outline",
+        "id": "floor-metadata",
         "source": "indoor-source",
         "source-layer": "indoor_floor_metadata",
         "minzoom": 15.0,
@@ -421,11 +421,17 @@ const style = {
         url: '',
         data: {
             version: 8,
+            schema: {
+                "activeFloors": {
+                    "default": "[]",
+                }
+            },
+            // NOTE: In reality we mustn't rely on *_metadata layers, but in current example we need to use them due to internal implementation of indoor with QRF, this will be changed
             featuresets: {
-                "building-outline": {
+                "building-metadata": {
                     "selectors": [
                         {
-                            "layer": "building-outline",
+                            "layer": "building-metadata",
                             "properties": {
                                 "id": ["get", "id"],
                                 "type": ["get", "type"],
@@ -434,10 +440,10 @@ const style = {
                         }
                     ]
                 },
-                "floor-outline": {
+                "floor-metadata": {
                     "selectors": [
                         {
-                            "layer": "floor-outline",
+                            "layer": "floor-metadata",
                             "properties": {
                                 "id": ["get", "id"],
                                 "is_default": ["get", "is_default"],
@@ -459,9 +465,10 @@ const style = {
                     "url": "mapbox://mapbox-geodata.indoor-v2-next"
                 }
             },
+            // Left it style but empty as indoor_manager depends on it to be present, will change it in future
             indoor: {
-                floorplanFeaturesetId: "floorplan-detection",
-                buildingFeaturesetId: "building-entry"
+                floorplanFeaturesetId: "",
+                buildingFeaturesetId: ""
             },
             layers: indoorLayers,
             glyphs: "mapbox://fonts/mapbox/{fontstack}/{range}.pbf"

src/style/indoor_data_query.ts

@@ -1,67 +1,77 @@
 import Point from '@mapbox/point-geometry';
 
-import type {TargetFeature} from "../util/vectortile_to_geojson";
-import type {QueryRenderedFeaturesetParams} from "./style";
+import type {GeoJSONFeature} from "../util/vectortile_to_geojson";
 import type {Map} from "../ui/map";
 import type {PointLike} from "../types/point-like";
 
 export type IndoorData = {
-    building: TargetFeature;
-    floors: Array<TargetFeature>;
+    building: IndoorDataBuilding;
+    floors: Array<IndoorDataFloor>;
 };
 
-export class IndoorDataQuery {
-    _scope: string;
-    _buildingQueryParams: QueryRenderedFeaturesetParams;
-    _floorQueryParams: QueryRenderedFeaturesetParams;
-
-    // eslint-disable-next-line no-warning-comments
-    // TODO: Don't use hardcoded featureset ids
-    constructor(scope: string) {
-        this._scope = scope;
-        this._buildingQueryParams = {
-            target: {
-                featuresetId: "building-outline",
-                importId: this._scope
-            }
-        };
-        this._floorQueryParams = {
-            target: {
-                featuresetId: "floor-outline",
-                importId: this._scope
-            }
-        };
-    }
+export type IndoorDataBuilding = {
+    id: string;
+    name: string;
+};
+
+export type IndoorDataFloor = {
+    id: string;
+    name: string;
+    isDefault: boolean;
+    zIndex: number;
+    connectedFloorIds: string | null;
+    conflictedFloorIds: string | null;
+    buildingIds: string;
+};
 
+export class IndoorDataQuery {
     execute(map: Map): IndoorData | null {
         const buildingsQueryArea = this._makeBuildingsQueryArea(map);
         const floorsQueryArea = this._makeFloorsQueryArea(map);
 
-        const buildingFeatures = map.queryRenderedFeatures(buildingsQueryArea, this._buildingQueryParams).reduce((unique, feature) => {
+        const buildingFeatures = map.queryRenderedFeatures(buildingsQueryArea).reduce((unique, feature) => {
             const id = feature.properties.id as string;
             const shapeType = feature.properties.type as string;
             if (shapeType === "building" && !unique.some(existing => existing.properties.id === id)) {
                 unique.push(feature);
             }
             return unique;
-        }, [] as Array<TargetFeature>);
+        }, [] as Array<GeoJSONFeature>);
 
-        const floorFeatures = map.queryRenderedFeatures(floorsQueryArea, this._floorQueryParams).reduce((unique, feature) => {
+        const floorFeatures = map.queryRenderedFeatures(floorsQueryArea).reduce((unique, feature) => {
             const id = feature.properties.id as string;
             const shapeType = feature.properties.type as string;
             if (shapeType === "floor" && !unique.some(existing => existing.properties.id === id)) {
                 unique.push(feature);
             }
             return unique;
-        }, [] as Array<TargetFeature>);
+        }, [] as Array<GeoJSONFeature>);
 
         const centerPoint: [number, number] = [map.getCenter().lng, map.getCenter().lat];
         const closestBuilding = this._findBuildingAtCenter(centerPoint, buildingFeatures);
         const anyBuilding = buildingFeatures.length > 0 ? buildingFeatures[0] : null;
 
+        const floorData = floorFeatures.map(floor => ({
+            id: floor.properties.id as string,
+            name: floor.properties.name as string,
+            isDefault: floor.properties.is_default as boolean,
+            zIndex: floor.properties.z_index as number,
+            connectedFloorIds: floor.properties.connected_floor_ids as string,
+            conflictedFloorIds: floor.properties.conflicted_floor_ids as string,
+            buildingIds: floor.properties.building_ids as string
+        }));
+
+        const buildingData = closestBuilding ? {
+            id: closestBuilding.properties.id as string,
+            name: closestBuilding.properties.name as string
+        } : {
+            id: anyBuilding.properties.id as string,
+            name: anyBuilding.properties.name as string
+        };
+
         return {
-            floors: floorFeatures,
-            building: closestBuilding ? closestBuilding : anyBuilding
+            floors: floorData,
+            building: buildingData
         };
     }
 
@@ -87,7 +97,7 @@ export class IndoorDataQuery {
         return [new Point(0, 0), new Point(width, height)];
     }
 
-    _findBuildingAtCenter(centerPoint: [number, number], buildings: Array<TargetFeature>): TargetFeature | null {
+    _findBuildingAtCenter(centerPoint: [number, number], buildings: Array<GeoJSONFeature>): GeoJSONFeature | null {
         for (const building of buildings) {
             if (building.geometry.type === 'Polygon') {
                 const coordinates = building.geometry.coordinates[0];

src/style/indoor_features_storage.ts

@@ -1,9 +1,8 @@
-import type {TargetFeature} from "../util/vectortile_to_geojson";
-import type {IndoorData} from "./indoor_data_query";
+import type {IndoorData, IndoorDataBuilding, IndoorDataFloor} from "./indoor_data_query";
 
 export default class IndoorFeaturesStorage {
-    _floors: Map<string, TargetFeature>;
-    _buildings: Map<string, TargetFeature>;
+    _floors: Map<string, IndoorDataFloor>;
+    _buildings: Map<string, IndoorDataBuilding>;
 
     constructor() {
         this._floors = new Map();
@@ -14,7 +13,7 @@ export default class IndoorFeaturesStorage {
         const building = indoorData.building;
         let hasChanges = false;
         if (building) {
-            const buildingId = building.properties.id as string;
+            const buildingId = building.id;
             if (buildingId) {
                 this._buildings.set(buildingId, building);
                 if (!hasChanges && !this._buildings.has(buildingId)) {
@@ -24,7 +23,7 @@ export default class IndoorFeaturesStorage {
         }
 
         indoorData.floors.forEach(newFloor => {
-            const floorId = newFloor.properties.id as string;
+            const floorId = newFloor.id;
             if (!hasChanges && !this._floors.has(floorId)) {
                 hasChanges = true;
             }
@@ -39,11 +38,11 @@ export default class IndoorFeaturesStorage {
         this._buildings.clear();
     }
 
-    getFloors(buildingId: string | null = null): Array<TargetFeature> {
+    getFloors(buildingId: string | null = null): Array<IndoorDataFloor> {
         const floorFeatures = Array.from(this._floors.values());
         if (buildingId) {
             const floors = floorFeatures.filter(floor => {
-                const buildingIds = floor.properties.building_ids as string;
+                const buildingIds = floor.buildingIds;
                 if (!buildingIds) {
                     return false;
                 }