Skip to content

Commit da25a17

Browse files
[REFACTORING] Indoor Poi Marker Factory (#218)
* Organized indoor map components into a new folder * [Refactoring] Moved marker component to separate file * [Refactoring] Replaced hard coded creation with simple factory method * Fixed linting errors * Fix sonarqube readonly issues * Addressed copilot comments * Fixed linting errors * Fixed merge conflicts properly
1 parent 78b202c commit da25a17

15 files changed

Lines changed: 498 additions & 553 deletions

__tests__/building-floor.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import BuildingFloor from "@/components/map/building-floor";
1+
import BuildingFloor from "@/components/map/indoor-map/building-floor";
22
import { render } from "@testing-library/react-native";
33

44
describe("building floor", () => {

__tests__/components/map/map-settings.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { render, fireEvent } from "@testing-library/react-native";
3-
import MapSettings from "@/components/map/indoor-map-settings";
3+
import MapSettings from "@/components/map/indoor-map/indoor-map-settings";
44

55
jest.mock("@expo/vector-icons", () => {
66
const { Text } = require("react-native");

__tests__/indoor-map-step-navigation.test.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,24 @@ jest.mock("expo-secure-store", () => {
3737
};
3838
});
3939

40-
jest.mock("@/components/map/building-floor", () => (props: unknown) => {
40+
jest.mock("@/components/map/indoor-map/building-floor", () => (props: unknown) => {
4141
mockBuildingFloor(props);
4242
return null;
4343
});
4444

45-
jest.mock("@/components/map/indoor-room-fields", () => (props: unknown) => {
45+
jest.mock("@/components/map/indoor-map/indoor-room-fields", () => (props: unknown) => {
4646
mockIndoorRoomFields(props);
4747
return null;
4848
});
4949

50-
jest.mock("@/components/map/indoor-map-settings", () => () => null);
51-
jest.mock("@/components/map/indoor-navigation-controls", () => (props: unknown) => {
52-
mockIndoorNavigationControls(props);
53-
return null;
54-
});
50+
jest.mock("@/components/map/indoor-map/indoor-map-settings", () => () => null);
51+
jest.mock(
52+
"@/components/map/indoor-map/indoor-navigation-controls",
53+
() => (props: unknown) => {
54+
mockIndoorNavigationControls(props);
55+
return null;
56+
},
57+
);
5558

5659
const getLatestFloorProps = () => mockBuildingFloor.mock.calls.at(-1)?.[0] as any;
5760
const getLatestRoomFieldsProps = () => mockIndoorRoomFields.mock.calls.at(-1)?.[0] as any;

__tests__/indoor-map-wheelchair-routing.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ jest.mock("expo-secure-store", () => {
3535
};
3636
});
3737

38-
jest.mock("@/components/map/building-floor", () => (props: unknown) => {
38+
jest.mock("@/components/map/indoor-map/building-floor", () => (props: unknown) => {
3939
mockBuildingFloor(props);
4040
return null;
4141
});
4242

43-
jest.mock("@/components/map/indoor-room-fields", () => (props: unknown) => {
43+
jest.mock("@/components/map/indoor-map/indoor-room-fields", () => (props: unknown) => {
4444
mockIndoorRoomFields(props);
4545
return null;
4646
});
4747

48-
jest.mock("@/components/map/indoor-map-settings", () => (props: unknown) => {
48+
jest.mock("@/components/map/indoor-map/indoor-map-settings", () => (props: unknown) => {
4949
mockMapSettings(props);
5050
return null;
5151
});
5252

53-
jest.mock("@/components/map/indoor-navigation-controls", () => () => null);
53+
jest.mock("@/components/map/indoor-map/indoor-navigation-controls", () => () => null);
5454

5555
const getLatestFloorProps = () => mockBuildingFloor.mock.calls.at(-1)?.[0] as any;
5656
const getLatestRoomFieldsProps = () => mockIndoorRoomFields.mock.calls.at(-1)?.[0] as any;

__tests__/indoor-room-fields.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import IndoorRoomFields from "@/components/map/indoor-room-fields";
1+
import IndoorRoomFields from "@/components/map/indoor-map/indoor-room-fields";
22
import { fireEvent, render } from "@testing-library/react-native";
33
import React, { useState } from "react";
44

app/(tabs)/(map)/[buildingCode].tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import BuildingFloor from "@/components/map/building-floor";
2-
import MapSettings from "@/components/map/indoor-map-settings";
3-
import IndoorNavigationControls from "@/components/map/indoor-navigation-controls";
4-
import IndoorRoomFields from "@/components/map/indoor-room-fields";
1+
import BuildingFloor from "@/components/map/indoor-map/building-floor";
2+
import MapSettings from "@/components/map/indoor-map/indoor-map-settings";
3+
import IndoorNavigationControls from "@/components/map/indoor-map/indoor-navigation-controls";
4+
import IndoorRoomFields from "@/components/map/indoor-map/indoor-room-fields";
55
import { NavigationLoader } from "@/globals/IndoorNavigationLoader";
66
import { IndoorMapSettings } from "@/globals/IndoorMapSettingsStore";
77
import { OutdoorStepResume } from "@/globals/OutdoorStepResumeStore";

0 commit comments

Comments
 (0)