Skip to content

perf(search): Cache building list at startup to speed up search #82

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

Open
SiddhantBhirud wants to merge 4 commits into
base: maizebus-2.1
Choose a base branch
from
+43 −105
Open

perf(search): Cache building list at startup to speed up search #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
198f4c2
Download building list at startup instead of every search
SiddhantBhirud Mar 30, 2026
ae070a3
perf(widget): Cache building list at startup instead of fetching on e…
SiddhantBhirud Mar 30, 2026
1dab18f
fix(ios): revert bundle identifier and team to original
SiddhantBhirud Apr 11, 2026
1c0bc2f
fix(ios): revert bundle identifier and team to original
SiddhantBhirud Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 4LLPM7NY5C;
DEVELOPMENT_TEAM = TY8BMZ5C7D;

@TheStaticBits TheStaticBits Jun 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This change is unnecessary.

ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = MaizeBus;
Expand Down Expand Up @@ -724,7 +724,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = 4LLPM7NY5C;
DEVELOPMENT_TEAM = TY8BMZ5C7D;

@TheStaticBits TheStaticBits Jun 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This change is also unnecessary.

ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = MaizeBus;
Expand Down
5 changes: 1 addition & 4 deletions ios/Runner/Runner.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
<dict/>

@TheStaticBits TheStaticBits Jun 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This again is unnecessary

</plist>
1 change: 1 addition & 0 deletions lib/globals.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'constants.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';

List<Location> globalStopLocs = [];
List<Location> globalBuildingLocs = [];

// the global app padding
// don't modify these here, instead use the helper function in map_screen.dart that sets these based on phone type and safe area insets
Expand Down
24 changes: 24 additions & 0 deletions lib/screens/map_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,13 @@ class _MaizeBusCoreState extends State<MaizeBusCore> {
// LOADS BOTH STOP TYPES
final uriStops = Uri.parse(BACKEND_URL + '/getAllStops');
final uriRideStops = Uri.parse(BACKEND_URL + '/getAllRideStops');
final uriBuildings = Uri.parse(BACKEND_URL + '/getBuildingLocations');

// Calling in parallel
final responses = await Future.wait([
http.get(uriStops),
http.get(uriRideStops),
http.get(uriBuildings),
]);

// Helper function to parse a response into a List<Location>
Expand Down Expand Up @@ -356,6 +358,28 @@ class _MaizeBusCoreState extends State<MaizeBusCore> {
...parseLocations(responses[1]),
];

final buildingResponse = responses[2];
if (buildingResponse.statusCode == 200 &&
buildingResponse.body.trim().isNotEmpty &&
buildingResponse.body.trim() != '{}') {
final buildingLocations =
jsonDecode(buildingResponse.body) as List<dynamic>;
globalBuildingLocs = buildingLocations.map((building) {
final name = building['buildingName'] as String;
final abbrev = building['abbrev'] as String?;
final altName = building['altName'] as String?;
final lat = building['lat'] as double;
final long = building['long'] as double;
return Location(
name,
(abbrev != null) ? abbrev : "",
[if (abbrev != null) abbrev, if (altName != null) altName],
false,
latlng: LatLng(lat, long),
);
}).toList();
}

globalStopLocs = stopLocs;
}

Expand Down
114 changes: 15 additions & 99 deletions lib/widgets/search_sheet_main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,97 +35,11 @@ class LocationSearchBar extends HookWidget {
}, [focusNode]);
final searchQuery = useState('');

final refreshKey = useState(0);

// Parse Buildings
final locations = useMemoized(() async {
try {
final buildingResponse = await http.get(
Uri.parse(BACKEND_URL + '/getBuildingLocations'),
);
List<Location> buildingLocs = [];
if (buildingResponse.statusCode == 200 &&
buildingResponse.body.trim().isNotEmpty &&
buildingResponse.body.trim() != '{}') {
final buildingLocations =
jsonDecode(buildingResponse.body) as List<dynamic>;
buildingLocs = buildingLocations.map((building) {
final name = building['buildingName'] as String;
final abbrev = building['abbrev'] as String?;
final altName = building['altName'] as String?;
final lat = building['lat'] as double;
final long = building['long'] as double;
return Location(
name,
(abbrev != null) ? abbrev : "",
[if (abbrev != null) abbrev, if (altName != null) altName],
false,
latlng: LatLng(lat, long),
);
}).toList();
}

// TODO: this code is DUPLICATED. We need to refactor to avoid duplication.
// LOADS BOTH STOP TYPES
final uriStops = Uri.parse(BACKEND_URL + '/getAllStops');
final uriRideStops = Uri.parse(BACKEND_URL + '/getAllRideStops');

// Calling in parallel
final responses = await Future.wait([
http.get(uriStops),
http.get(uriRideStops),
]);

// Helper function to parse a response into a List<Location>
// This prevents copying/pasting the parsing logic.
List<Location> parseLocations(http.Response response) {
if (response.statusCode == 200 &&
response.body.trim().isNotEmpty &&
response.body.trim() != '{}') {

final stopList = jsonDecode(response.body) as List<dynamic>;

return stopList.map((stop) {
final name = stop['name'] as String;
final aliases = [
name.split(' ').map((w) => w.isNotEmpty ? w[0] : '').join(),
];
final stopId = stop['stpid'] as String?;
final lat = stop['lat'] as double?;
final lon = stop['lon'] as double?;

return Location(
name,
(stopId != null) ? stopId : "",
aliases,
true,
stopId: stopId,
latlng: (lat != null && lon != null) ? LatLng(lat, lon) : null,
);
}).toList();
}
return []; // Return empty list if call failed or body is empty
}

// parse both and merge
List<Location> stopLocs = [
...parseLocations(responses[0]),
...parseLocations(responses[1]),
];

globalStopLocs = stopLocs;

final allLocs = [...buildingLocs, ...stopLocs];
if (allLocs.isEmpty) {
refreshKey.value++;
}

return allLocs;
} catch (e) {
print('Failed to fetch locations: $e');
refreshKey.value++;
return <Location>[];
}
}, [refreshKey.value]);
final allLocs = [...globalBuildingLocs, ...globalStopLocs];
return allLocs;
}, []);

Map<String, Set<Location>> buildNgramIndex(
List<Location> locations, {
Expand Down Expand Up @@ -207,15 +121,13 @@ class LocationSearchBar extends HookWidget {
SizedBox(
height: 50,
child: DecoratedBox(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(56),
),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(56)),

@TheStaticBits TheStaticBits Jun 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

In the future, stylistic changes such as this and the others in this file can be in a separate pull request if you feel that they are necessary, otherwise, try not to include them in an unrelated pull request. This is fine for now tho

child: TextField(
textAlignVertical: TextAlignVertical.center,
textInputAction: TextInputAction.go,
style: TextStyle(
style: TextStyle(
color: getColor(context, ColorType.opposite).withAlpha(204),
fontSize: 22
fontSize: 22,
),
autofocus: true,
controller: controller,
Expand Down Expand Up @@ -312,12 +224,16 @@ class LocationSearchBar extends HookWidget {
? Icon(
Icons.hail,
size: 40,
color: isDarkMode(context) ? Color.fromARGB(150, 255, 255, 255) : Color.fromARGB(150, 0, 0, 0),
color: isDarkMode(context)
? Color.fromARGB(150, 255, 255, 255)
: Color.fromARGB(150, 0, 0, 0),
)
: Icon(
Icons.business_rounded,
size: 40,
color: isDarkMode(context) ? Color.fromARGB(150, 255, 255, 255) : Color.fromARGB(150, 0, 0, 0),
color: isDarkMode(context)
? Color.fromARGB(150, 255, 255, 255)
: Color.fromARGB(150, 0, 0, 0),
),
onTap: () {
controller.text = loc.name;
Expand Down Expand Up @@ -372,7 +288,7 @@ class _SearchSheetState extends State<SearchSheet> {
topLeft: Radius.circular(30),
topRight: Radius.circular(30),
),
boxShadow: [SheetBoxShadow]
boxShadow: [SheetBoxShadow],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -421,7 +337,7 @@ class _SearchSheetState extends State<SearchSheet> {
color: getColor(context, ColorType.inputText),
),
),

enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(56.0)),
borderSide: BorderSide(color: Colors.transparent, width: 0),
Expand Down