Merge pull request #4 from AlexCornforth/feature/planter_location

Now uploading planter location
Greenstand · Aug 15, 2022 · e7fb97c · e7fb97c
2 parents 449c467 + 1cf1847
commit e7fb97c
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 10 deletions.
diff --git a/Resources/TreeTracker.xcdatamodeld/TreeTracker.xcdatamodel/contents b/Resources/TreeTracker.xcdatamodeld/TreeTracker.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="18154" systemVersion="20D91" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="LocationDataEntity" representedClassName="LocationDataEntity" syncable="YES" codeGenerationType="class">
         <attribute name="accuracy" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="capturedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
@@ -18,6 +18,8 @@
         <attribute name="identifier" optional="YES" attributeType="String"/>
         <attribute name="lastLoggedIn" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="lastName" optional="YES" attributeType="String"/>
+        <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="organization" optional="YES" attributeType="String"/>
         <attribute name="phoneNumber" optional="YES" attributeType="String"/>
         <attribute name="uploaded" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
@@ -26,7 +28,9 @@
     </entity>
     <entity name="PlanterIdentification" representedClassName="PlanterIdentification" syncable="YES" codeGenerationType="class">
         <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="localPhotoPath" optional="YES" attributeType="String"/>
+        <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="photoURL" optional="YES" attributeType="String"/>
         <attribute name="uuid" optional="YES" attributeType="String"/>
         <relationship name="planter" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PlanterDetail" inverseName="identification" inverseEntity="PlanterDetail"/>

diff --git a/Treetracker-Core.podspec b/Treetracker-Core.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |spec|
   spec.name = "Treetracker-Core"
-  spec.version = "0.0.11"
+  spec.version = "0.0.12"
   spec.license = { :type => "GNU", :file => "LICENSE" }
   spec.homepage = "https://github.com/Greenstand/treetracker-ios-core"
   spec.summary = "Greenstand Treetracker core library."
   spec.platform = :ios, "11.0"
   spec.authors = { "Alex Cornforth" => "alexcornforth@me.com" }
   spec.swift_version = '5.0'
-  spec.source = { :git => "https://github.com/Greenstand/treetracker-ios-core.git", :tag => "v0.0.11" }
+  spec.source = { :git => "https://github.com/Greenstand/treetracker-ios-core.git", :tag => "v0.0.12" }
   spec.source_files  = "treetracker-core/**/*.{h,m,swift}"
   spec.resources = "Resources/*"
   spec.dependency "AWSS3", "2.16.0"

diff --git a/treetracker-core/Models/Location.swift b/treetracker-core/Models/Location.swift
@@ -15,3 +15,10 @@ public protocol Location {
     var horizontalAccuracy: Double { get }
     var verticalAccuracy: Double { get }
 }
+
+public extension Location {
+
+    var isValid: Bool {
+        return latitude != 0.0 && longitude != 0.0
+    }
+}
diff --git a/treetracker-core/Models/PlanterCheckIn.swift b/treetracker-core/Models/PlanterCheckIn.swift
@@ -15,6 +15,8 @@ public protocol PlanterCheckIn: AnyObject {
     var photoURL: String? { get }
     var planterDetail: Planter? { get }
     var trees: NSSet? { get }
+    var latitude: Double { get }
+    var longitude: Double { get }
 }
 
 extension PlanterIdentification: PlanterCheckIn {

diff --git a/treetracker-core/Services/Uploads/PlanterUploadService.swift b/treetracker-core/Services/Uploads/PlanterUploadService.swift
@@ -179,8 +179,8 @@ private extension PlanterIdentification {
         }
         return ImageUploadRequest(
             jpegData: data,
-            latitude: 0.0,
-            longitude: 0.0,
+            latitude: latitude,
+            longitude: longitude,
             uuid: uuid
         )
     }
@@ -203,8 +203,8 @@ private extension PlanterDetail {
             organization: organization,
             phone: phoneNumber,
             email: email,
-            latitude: nil,
-            longitude: nil,
+            latitude: latitude,
+            longitude: longitude,
             deviceIdentifier: "",
             recordUUID: recordUUID,
             imageURL: imageURL

diff --git a/treetracker-core/Services/User/SelfieService.swift b/treetracker-core/Services/User/SelfieService.swift
@@ -11,9 +11,17 @@ import Foundation
 public struct SelfieData {
 
     let jpegData: Data
-
-    public init(jpegData: Data) {
+    let latitude: Double
+    let longitude: Double
+
+    public init(
+        jpegData: Data,
+        latitude: Double,
+        longitude:  Double
+    ) {
         self.jpegData = jpegData
+        self.latitude = latitude
+        self.longitude = longitude
     }
 }
 
@@ -58,6 +66,8 @@ class LocalSelfieService: SelfieService {
         identification.createdAt = Date()
         identification.localPhotoPath = photoPath
         identification.uuid = uuid
+        identification.latitude = data.latitude
+        identification.longitude = data.longitude
 
         planter.addToIdentification(identification)
 

diff --git a/treetracker-core/Services/User/SignUpService.swift b/treetracker-core/Services/User/SignUpService.swift
@@ -13,11 +13,21 @@ public struct SignUpDetails {
     let username: Username
     let name: Name
     let organization: Organization
+    let latitude: Double
+    let longitude: Double
 
-    public init(username: Username, name: Name, organization: Organization) {
+    public init(
+        username: Username,
+        name: Name,
+        organization: Organization,
+        latitude: Double,
+        longitude: Double
+    ) {
         self.username = username
         self.name = name
         self.organization = organization
+        self.latitude = latitude
+        self.longitude = longitude
     }
 }
 
@@ -51,6 +61,8 @@ class LocalSignUpService: SignUpService {
         planterDetail.uploaded = false
         planterDetail.identifier = signUpDetails.username.value
         planterDetail.uuid = UUID().uuidString
+        planterDetail.latitude = signUpDetails.latitude
+        planterDetail.longitude = signUpDetails.longitude
 
         do {
             try coreDataManager.viewContext.save()