Persist w3w (even though we don't use it yet)

Author: sunshinejr

Tree Tracker/Models/AirtableTree.swift

@@ -6,6 +6,7 @@ struct AirtableTree: Decodable {
     let species: String
     let notes: String?
     let coordinates: String?
+    let what3words: String?
     let imageMd5: String?
     let createDate: Date?
     let uploadDate: Date?
@@ -18,19 +19,21 @@ struct AirtableTree: Decodable {
         case species = "Species"
         case notes = "Notes"
         case coordinates = "Coordinates"
+        case what3words = "What3Words"
         case image = "Image"
         case imageMd5 = "ImageSignature"
         case createDate = "CreatedDate"
         case uploadDate = "UploadedDate"
         case fields
     }
 
-    init(id: Int, supervisor: String, species: String, notes: String?, coordinates: String?, imageUrl: String?, thumbnailUrl: String?, imageMd5: String?, uploadDate: Date?, createDate: Date?) {
+    init(id: Int, supervisor: String, species: String, notes: String?, coordinates: String?, what3words: String?, imageUrl: String?, thumbnailUrl: String?, imageMd5: String?, uploadDate: Date?, createDate: Date?) {
         self.id = id
         self.supervisor = supervisor
         self.species = species
         self.notes = notes
         self.coordinates = coordinates
+        self.what3words = what3words
         self.imageUrl = imageUrl
         self.thumbnailUrl = thumbnailUrl
         self.imageMd5 = imageMd5
@@ -47,6 +50,7 @@ struct AirtableTree: Decodable {
         species = try container.decode(String.self, forKey: .species)
         notes = try container.decodeIfPresent(String.self, forKey: .notes)
         coordinates = try container.decodeIfPresent(String.self, forKey: .coordinates)
+        what3words = try container.decodeIfPresent(String.self, forKey: .what3words)
         imageMd5 = try container.decodeIfPresent(String.self, forKey: .imageMd5)
         uploadDate = try container.decodeIfPresent(Date.self, forKey: .uploadDate)
         createDate = try container.decodeIfPresent(Date.self, forKey: .createDate)
@@ -63,7 +67,7 @@ struct AirtableTree: Decodable {
     }
 
     func toRemoteTree() -> RemoteTree {
-        return RemoteTree(id: id, supervisor: supervisor, species: species, notes: notes, coordinates: coordinates, imageUrl: imageUrl, thumbnailUrl: thumbnailUrl, imageMd5: imageMd5, createDate: createDate, uploadDate: uploadDate)
+        return RemoteTree(id: id, supervisor: supervisor, species: species, notes: notes, coordinates: coordinates, what3words: what3words, imageUrl: imageUrl, thumbnailUrl: thumbnailUrl, imageMd5: imageMd5, createDate: createDate, uploadDate: uploadDate)
     }
 }
 
@@ -131,6 +135,7 @@ struct AirtableTreeEncodable: Encodable {
     let species: String
     let notes: String?
     let coordinates: String?
+    let what3words: String?
     let imageMd5: String?
     let createDate: Date?
     let uploadDate: Date?
@@ -141,18 +146,20 @@ struct AirtableTreeEncodable: Encodable {
         case species = "Species"
         case notes = "Notes"
         case coordinates = "Coordinates"
+        case what3words = "What3Words"
         case image = "Image"
         case imageMd5 = "ImageSignature"
         case createDate = "CreatedDate"
         case uploadDate = "UploadedDate"
         case fields
     }
 
-    init(supervisor: String, species: String, notes: String?, coordinates: String?, imageUrl: String?, imageMd5: String?, uploadDate: Date?, createDate: Date?) {
+    init(supervisor: String, species: String, notes: String?, coordinates: String?, what3words: String?, imageUrl: String?, imageMd5: String?, uploadDate: Date?, createDate: Date?) {
         self.supervisor = supervisor
         self.species = species
         self.notes = notes
         self.coordinates = coordinates
+        self.what3words = what3words
         self.imageUrl = imageUrl
         self.imageMd5 = imageMd5
         self.uploadDate = uploadDate
@@ -167,6 +174,7 @@ struct AirtableTreeEncodable: Encodable {
         try container.encode(species, forKey: .species)
         try container.encode(notes, forKey: .notes)
         try container.encode(coordinates, forKey: .coordinates)
+        try container.encode(what3words, forKey: .what3words)
         try container.encode(imageMd5, forKey: .imageMd5)
         try container.encode(imageUrl.map { AirtableImage(url: $0, thumbnailUrl: nil) }, forKey: .image)
         try container.encode(uploadDate, forKey: .uploadDate)

Tree Tracker/Models/LocalTree.swift

@@ -5,6 +5,7 @@ struct LocalTree: Codable, FetchableRecord, PersistableRecord, TableRecord {
     let phImageId: String
     var createDate: Date?
     var supervisor: String
+    var what3words: String?
     var species: String
     var notes: String?
     var coordinates: String?
@@ -14,13 +15,14 @@ struct LocalTree: Codable, FetchableRecord, PersistableRecord, TableRecord {
         case phImageId
         case createDate
         case supervisor
+        case what3words
         case species
         case notes
         case coordinates
         case imageMd5
     }
 
     func toAirtableTree(imageUrl: String) -> AirtableTreeEncodable {
-        return AirtableTreeEncodable(supervisor: supervisor, species: species, notes: notes, coordinates: coordinates, imageUrl: imageUrl, imageMd5: imageMd5, uploadDate: Date(), createDate: createDate)
+        return AirtableTreeEncodable(supervisor: supervisor, species: species, notes: notes, coordinates: coordinates, what3words: what3words, imageUrl: imageUrl, imageMd5: imageMd5, uploadDate: Date(), createDate: createDate)
     }
 }

Tree Tracker/Models/RemoteTree.swift

@@ -7,6 +7,7 @@ struct RemoteTree: Codable, FetchableRecord, PersistableRecord, TableRecord {
     let species: String
     let notes: String?
     var coordinates: String?
+    let what3words: String?
     var imageUrl: String?
     var thumbnailUrl: String?
     let imageMd5: String?
@@ -19,6 +20,7 @@ struct RemoteTree: Codable, FetchableRecord, PersistableRecord, TableRecord {
         case species
         case notes
         case coordinates
+        case what3words
         case imageUrl
         case thumbnailUrl
         case imageMd5

Tree Tracker/Screens/Details/AddLocalTreeViewModel.swift

@@ -108,7 +108,7 @@ final class AddLocalTreeViewModel: TreeDetailsViewModel {
     }
 
     private func save(asset: PHAsset, coordinates: String, species: String, supervisor: String, notes: String) {
-        let tree = LocalTree(phImageId: asset.localIdentifier, createDate: asset.creationDate, supervisor: supervisor, species: species, notes: notes, coordinates: coordinates, imageMd5: nil)
+        let tree = LocalTree(phImageId: asset.localIdentifier, createDate: asset.creationDate, supervisor: supervisor, what3words: nil, species: species, notes: notes, coordinates: coordinates, imageMd5: nil)
         defaults[.species] = species
         defaults[.supervisor] = supervisor
         database.save([tree])

Tree Tracker/Services/Database.swift

@@ -23,6 +23,7 @@ final class Database {
                     table.column(RemoteTree.CodingKeys.species.stringValue, .text)
                     table.column(RemoteTree.CodingKeys.notes.stringValue, .text)
                     table.column(RemoteTree.CodingKeys.coordinates.stringValue, .text)
+                    table.column(RemoteTree.CodingKeys.what3words.stringValue, .text)
                     table.column(RemoteTree.CodingKeys.imageUrl.stringValue, .text)
                     table.column(RemoteTree.CodingKeys.thumbnailUrl.stringValue, .text)
                     table.column(RemoteTree.CodingKeys.imageMd5.stringValue, .text)
@@ -41,6 +42,7 @@ final class Database {
                     table.column(LocalTree.CodingKeys.species.stringValue, .text)
                     table.column(LocalTree.CodingKeys.notes.stringValue, .text)
                     table.column(LocalTree.CodingKeys.coordinates.stringValue, .text)
+                    table.column(LocalTree.CodingKeys.what3words.stringValue, .text)
                     table.column(LocalTree.CodingKeys.imageMd5.stringValue, .text)
 
                     table.primaryKey([LocalTree.CodingKeys.phImageId.stringValue])