Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mapbox/mapbox-search-ios into relea…
Browse files Browse the repository at this point in the history
…se/v2.0.0

Conflicts:
	CHANGELOG.md
  • Loading branch information
aokj4ck committed Jan 26, 2024
2 parents 72bd4b1 + ca72601 commit 7460f9b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Guide: https://keepachangelog.com/en/1.0.0/

## 2.0.0

- [Discover] Fix charging station category canonical ID
- [SearchUI] Rename MapboxPanelController.Configuration to .PanelConfiguration. This disambiguates PanelConfiguration from the broader Configuration struct.
- [Core] Update SwiftLint to 0.54.0 and SwiftFormat to 0.52.11
- [Core] Fix project compliance with linter, reformat Swift files
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxSearchUI/SearchCategory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ extension SearchCategory {
/// EV Charging station category.
public static let chargingStation =
SearchCategory(
canonicalId: "ev_charging_station",
canonicalId: "charging_station",
name: Strings.Categories.chargingStation,
legacyName: "charging station",
iconName: Maki.chargingStation.xcassetName
Expand Down

0 comments on commit 7460f9b

Please sign in to comment.