[SSDK-650] Restore Discover struct for category search

CHANGELOG.md

@@ -20,13 +20,7 @@ Guide: https://keepachangelog.com/en/1.0.0/
 
 - [Privacy] Add Search history collected data for the purpose of product personalization (used for displaying the search history)
 
-- [Discover, Category] Rename Discover to Category and update tests.
-- [Category] Rename Discover.Query.Category to Category.Item
-- [Category] Move Category.Item "Hot" suggested categories to MapboxSearch out of MapboxSearchUI.
-	- This adds legacyName (use with Geocoding API engine) and icon fields to the MapboxSearch suggested categories.
-	- Image assets for these categories remain in MapboxSearchUI.
-	- This Category.Item replaces MapboxSearchUI.SearchCategory.
-	- Add an alias for MapboxSearchUI.SearchCategory = MapboxSearch.Category.Item
+- [Discover, Category] Discover API to query categories remains available and compatible with 1.0.0 series.
 - [Core] Default API engine type remains SBS and search-box is available by opt-in.
 
 - [License] Update license to reflect 2024 usage

Sources/Demo/Base.lproj/Main.storyboard

@@ -229,11 +229,11 @@
             </objects>
             <point key="canvasLocation" x="729" y="1529"/>
         </scene>
-        <!--Category-->
+        <!--Discover-->
         <scene sceneID="Cbv-pg-ufB">
             <objects>
                 <navigationController navigationBarHidden="YES" id="kQh-we-4TL" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Category" image="tag" catalog="system" id="FHv-mk-0xk"/>
+                    <tabBarItem key="tabBarItem" title="Discover" image="tag" catalog="system" id="FHv-mk-0xk"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="XUy-LY-TcY">
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -245,10 +245,10 @@
             </objects>
             <point key="canvasLocation" x="-1023" y="2400"/>
         </scene>
-        <!--Category-->
+        <!--Discover-->
         <scene sceneID="cow-iZ-A5n">
             <objects>
-                <viewController title="Category" id="ggU-4h-Z4i" customClass="CategoryViewController" customModule="MapboxSearch" sceneMemberID="viewController">
+                <viewController title="Discover" id="ggU-4h-Z4i" customClass="DiscoverViewController" customModule="MapboxSearch" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="H51-Up-D8x">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

Sources/Demo/CategoryViewController.swift → Sources/Demo/DiscoverViewController.swift

@@ -1,11 +1,11 @@
 import MapKit
 import UIKit
 
-final class CategoryViewController: UIViewController {
+final class DiscoverViewController: UIViewController {
     @IBOutlet private var mapView: MKMapView!
     @IBOutlet private var segmentedControl: UISegmentedControl!
 
-    private let category = Category()
+    private let category = Discover()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -16,7 +16,7 @@ final class CategoryViewController: UIViewController {
 
 // MARK: - Actions
 
-extension CategoryViewController {
+extension DiscoverViewController {
     @IBAction
     private func handleSearchInRegionAction() {
         let regionResultsLimit: Int
@@ -45,7 +45,7 @@ extension CategoryViewController {
 
 // MARK: - Private
 
-extension CategoryViewController {
+extension DiscoverViewController {
     private var currentBoundingBox: BoundingBox {
         let rect = mapView.visibleMapRect
         let neMapPoint = MKMapPoint(x: rect.maxX, y: rect.origin.y)
@@ -57,11 +57,11 @@ extension CategoryViewController {
         return .init(swCoordinate, neCoordinate)
     }
 
-    private var currentSelectedCategory: Category.Item {
-        let allDemoCategories: [Category.Item] = [
-            .parking,
-            .restaurant,
-            .museum,
+    private var currentSelectedCategory: Discover.Query {
+        let allDemoCategories: [Discover.Query] = [
+            .Category.parking,
+            .Category.restaurant,
+            .Category.museum,
         ]
 
         return allDemoCategories[segmentedControl.selectedSegmentIndex]
@@ -78,7 +78,7 @@ extension CategoryViewController {
         mapView.setRegion(region, animated: false)
     }
 
-    private func showCategoryResults(_ results: [Category.Result]) {
+    private func showCategoryResults(_ results: [Discover.Result]) {
         mapView.removeAnnotations(mapView.annotations)
 
         let annotations: [MKPointAnnotation] = results.map {