Adding option to show raw PurpleAir values in the widget - iOS client changes

Author: dherberger

client/ios/Widget/LocationSelection.intentdefinition

@@ -9,11 +9,11 @@
 	<key>INIntentDefinitionNamespace</key>
 	<string>88xZPY</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>19H2</string>
+	<string>20G95</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>12A7300</string>
+	<string>12E507</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>12.0.1</string>
+	<string>12.5.1</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
@@ -30,10 +30,10 @@
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
 			<key>INIntentLastParameterTag</key>
-			<integer>4</integer>
+			<integer>6</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
-				<key>location</key>
+				<key>location,display_purpleair</key>
 				<dict>
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
@@ -81,6 +81,48 @@
 					<key>INIntentParameterType</key>
 					<string>Placemark</string>
 				</dict>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Show Raw PurpleAir values</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>gyzQoM</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>2</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataFalseDisplayName</key>
+						<string>false</string>
+						<key>INIntentParameterMetadataFalseDisplayNameID</key>
+						<string>C9JREb</string>
+						<key>INIntentParameterMetadataTrueDisplayName</key>
+						<string>true</string>
+						<key>INIntentParameterMetadataTrueDisplayNameID</key>
+						<string>Pp5b6V</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>display_purpleair</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterTag</key>
+					<integer>6</integer>
+					<key>INIntentParameterType</key>
+					<string>Boolean</string>
+				</dict>
 			</array>
 			<key>INIntentResponse</key>
 			<dict>

client/ios/Widget/Widget.swift

@@ -26,6 +26,7 @@ struct MapProvider : IntentTimelineProvider {
 
     func getSnapshot(for intent: LocationSelectionIntent, in context: Context, completion: @escaping (MapEntry) -> Void) {
         var location = self._location(for: intent)
+        let readingType = self._readingType(for: intent)
         if location == nil {
             let locationManager = CLLocationManager()
             locationManager.desiredAccuracy = kCLLocationAccuracyKilometer
@@ -48,7 +49,7 @@ struct MapProvider : IntentTimelineProvider {
                 }
             }
         }
-        self._mapImage(location: location, size: context.displaySize) { (mapImage) in
+        self._mapImage(location: location, size: context.displaySize, readingType: readingType) { (mapImage) in
             completion(MapEntry(date: Date(), mapImage: mapImage ?? UIImage(named: "MapPlaceholder")!))
         }
     }
@@ -65,7 +66,12 @@ struct MapProvider : IntentTimelineProvider {
         return intent.location?.location
     }
 
-    private func _mapImage(location: CLLocation?, size: CGSize, callback: @escaping (UIImage?) -> Void) {
+    private func _readingType(for intent: LocationSelectionIntent) -> AQI.ReadingType {
+        let displayPurpleAir = intent.display_purpleair?.boolValue ?? false
+        return displayPurpleAir ? .rawPurpleAir : .epaCorrected
+    }
+    
+    private func _mapImage(location: CLLocation?, size: CGSize, readingType: AQI.ReadingType, callback: @escaping (UIImage?) -> Void) {
         let coordinate: CLLocationCoordinate2D
         if let location = location {
             coordinate = location.coordinate
@@ -81,7 +87,7 @@ struct MapProvider : IntentTimelineProvider {
                 callback(nil)
                 return
             }
-            AQI.downloadCompactReadings { (readings, error) in
+            AQI.downloadCompactReadings(type: readingType) { (readings, error) in
                 if let readings = readings {
                     var region = options.region
                     if size.width > size.height {

client/swift/AQI/Download.swift

@@ -6,6 +6,7 @@ import GameKit
 private let aqiDataURL = URL(string: "https://dfddnmlutocpt.cloudfront.net/sensors.pb")!
 private let particulateMatterDataURL = URL(string: "https://dfddnmlutocpt.cloudfront.net/sensors.raw.pb")!
 private let compactDataURL = URL(string: "https://dfddnmlutocpt.cloudfront.net/sensors.compact.pb")!
+private let compactParticulateMatterDataURL = URL(string: "https://dfddnmlutocpt.cloudfront.net/sensors.raw.pb")!
 
 /// The type of air quality measurement
 public enum ReadingType {
@@ -37,11 +38,11 @@ public func downloadReadings(type: ReadingType, onProgess: @escaping (Float) ->
 ///   - onResponse: The callback to which we report the parsed download response
 @available(iOS 13.0, *)
 @available(macOS 10.12, *)
-public func downloadCompactReadings(onResponse: @escaping (GKRTree<Reading>?, Error?) -> Void) {
+public func downloadCompactReadings(type: ReadingType, onResponse: @escaping (GKRTree<Reading>?, Error?) -> Void) {
     let client = DownloadClient(onProgess: { (percentage) in
     }, onResponse: onResponse)
     let session = URLSession(configuration: URLSessionConfiguration.default, delegate: client, delegateQueue: OperationQueue.main)
-    session.downloadTask(with: compactDataURL).resume()
+    session.downloadTask(with: type == .epaCorrected ? compactDataURL : compactParticulateMatterDataURL).resume()
 }
 
 @available(iOS 13.0, *)