From 74cb62e5946ac1768f7094ad6fb8121c5b4222a8 Mon Sep 17 00:00:00 2001 From: Jacob Fielding Date: Wed, 17 Apr 2024 20:23:29 -0700 Subject: [PATCH] feat: voice and banner instructions --- apple/Sources/OSRM/Models/BannerContent.swift | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/apple/Sources/OSRM/Models/BannerContent.swift b/apple/Sources/OSRM/Models/BannerContent.swift index 63d824d..9ad4a25 100644 --- a/apple/Sources/OSRM/Models/BannerContent.swift +++ b/apple/Sources/OSRM/Models/BannerContent.swift @@ -11,20 +11,12 @@ import Foundation #endif public struct BannerContent: Codable, Hashable { -<<<<<<< HEAD public var text: String -======= - public var text: String? ->>>>>>> 1e308f0f8fdd74de7727c77ec1ca9967b4af17e1 public var type: String? public var modifier: String? public var components: [BannerContentComponentsInner]? -<<<<<<< HEAD public init(text: String, type: String? = nil, modifier: String? = nil, components: [BannerContentComponentsInner]? = nil) { -======= - public init(text: String? = nil, type: String? = nil, modifier: String? = nil, components: [BannerContentComponentsInner]? = nil) { ->>>>>>> 1e308f0f8fdd74de7727c77ec1ca9967b4af17e1 self.text = text self.type = type self.modifier = modifier @@ -42,11 +34,7 @@ public struct BannerContent: Codable, Hashable { public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) -<<<<<<< HEAD try container.encode(text, forKey: .text) -======= - try container.encodeIfPresent(text, forKey: .text) ->>>>>>> 1e308f0f8fdd74de7727c77ec1ca9967b4af17e1 try container.encodeIfPresent(type, forKey: .type) try container.encodeIfPresent(modifier, forKey: .modifier) try container.encodeIfPresent(components, forKey: .components)