Merge pull request #73 from TaskarCenterAtUW/feature-measure-width

shweta2101 · web-flow · commit 154376e77ed2 · 2024-03-01T11:57:46.000+05:30
Feature measure width
diff --git a/GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj b/GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj
@@ -176,6 +176,8 @@
 		FA87A81B2B6B042E000A6BEA /* SideWalkWidthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA87A81A2B6B042E000A6BEA /* SideWalkWidthTests.swift */; };
 		FABF3CF42B7419BB0080EAC9 /* LocationManagerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CF32B7419BB0080EAC9 /* LocationManagerDelegate.swift */; };
 		FABF3CF82B822F120080EAC9 /* CustomSureAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CF72B822F120080EAC9 /* CustomSureAlert.swift */; };
+		FABF3CFD2B8607860080EAC9 /* MeasureWidthContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CFC2B8607860080EAC9 /* MeasureWidthContainer.swift */; };
+		FABF3D002B8607D80080EAC9 /* MeasureSidewalkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FABF3CFF2B8607D80080EAC9 /* MeasureSidewalkView.swift */; };
 		FAC9E60F2B04F9C800E2C608 /* OverpassRequestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC9E60E2B04F9C800E2C608 /* OverpassRequestManager.swift */; };
 		FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC9E6102B06811300E2C608 /* LocationManager.swift */; };
 		FAD5C4F32AFCBE700040C61A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD5C4F22AFCBE700040C61A /* AppDelegate.swift */; };
@@ -441,6 +443,8 @@
 		FA87A81A2B6B042E000A6BEA /* SideWalkWidthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideWalkWidthTests.swift; sourceTree = "<group>"; };
 		FABF3CF32B7419BB0080EAC9 /* LocationManagerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManagerDelegate.swift; sourceTree = "<group>"; };
 		FABF3CF72B822F120080EAC9 /* CustomSureAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSureAlert.swift; sourceTree = "<group>"; };
+		FABF3CFC2B8607860080EAC9 /* MeasureWidthContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureWidthContainer.swift; sourceTree = "<group>"; };
+		FABF3CFF2B8607D80080EAC9 /* MeasureSidewalkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasureSidewalkView.swift; sourceTree = "<group>"; };
 		FAC9E60E2B04F9C800E2C608 /* OverpassRequestManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverpassRequestManager.swift; sourceTree = "<group>"; };
 		FAC9E6102B06811300E2C608 /* LocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = "<group>"; };
 		FAD5C4EF2AFCBE700040C61A /* GoInfoGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoInfoGame.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -587,6 +591,7 @@
 		05CB71DD2B0FAEC200DED821 /* UI */ = {
 			isa = PBXGroup;
 			children = (
+				FABF3CF92B86062E0080EAC9 /* Camera */,
 				FA87A80E2B681416000A6BEA /* Utils */,
 				970D5BD02B62B61300C20BE7 /* MapViewController.swift */,
 				B0CBEA902B88980A00C430F3 /* Profile */,
@@ -1110,6 +1115,15 @@
 			path = Utils;
 			sourceTree = "<group>";
 		};
+		FABF3CF92B86062E0080EAC9 /* Camera */ = {
+			isa = PBXGroup;
+			children = (
+				FABF3CFC2B8607860080EAC9 /* MeasureWidthContainer.swift */,
+				FABF3CFF2B8607D80080EAC9 /* MeasureSidewalkView.swift */,
+			);
+			path = Camera;
+			sourceTree = "<group>";
+		};
 		FAD5C4E62AFCBE700040C61A = {
 			isa = PBXGroup;
 			children = (
@@ -1678,6 +1692,7 @@
 				FABF3CF42B7419BB0080EAC9 /* LocationManagerDelegate.swift in Sources */,
 				973FC0382B59363C00878269 /* TactilePavingSteps.swift in Sources */,
 				973FC0192B4FB17000878269 /* LocalizedStrings.swift in Sources */,
+				FABF3D002B8607D80080EAC9 /* MeasureSidewalkView.swift in Sources */,
 				FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */,
 				97439F782B87444200DA43E1 /* CrossingKerbHeightForm.swift in Sources */,
 				A4834A3F2B67737500D4F0AA /* StoredChangeset.swift in Sources */,
@@ -1736,6 +1751,7 @@
 				B0CCB98E2B8626C600AA73DE /* ProfileViewVM.swift in Sources */,
 				0536DD942B0BD59900B04C4B /* OAuthError.swift in Sources */,
 				973FC0172B4D567900878269 /* WidthView.swift in Sources */,
+				FABF3CFD2B8607860080EAC9 /* MeasureWidthContainer.swift in Sources */,
 				97AC1C082B6A45C9004F0BF4 /* SideWalkValidationForm.swift in Sources */,
 				FAD5C4F52AFCBE700040C61A /* SceneDelegate.swift in Sources */,
 				97AC1C232B726ADC004F0BF4 /* TactilePavingKerbForm.swift in Sources */,
@@ -2230,11 +2246,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NPCMG529DV;
+				DEVELOPMENT_TEAM = NPCMG529DV;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
@@ -2254,7 +2268,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vindago.goinfogame;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "GoInfoGame AdHoc";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2269,11 +2282,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NPCMG529DV;
+				DEVELOPMENT_TEAM = NPCMG529DV;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
@@ -2293,7 +2304,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vindago.goinfogame;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "GoInfoGame AdHoc";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/GoInfoGame/GoInfoGame/Helpers/Extensions.swift b/GoInfoGame/GoInfoGame/Helpers/Extensions.swift
@@ -8,6 +8,7 @@
 import Foundation
 import MapKit
 import RealmSwift
+import ARKit
 
 
 // Extension to check if a polyline intersects with a coordinate
@@ -73,3 +74,45 @@ extension Array where Element: Equatable {
         
     }
 }
+
+extension SCNVector3: Equatable {
+    static func positionFromTransform(_ transform: matrix_float4x4) -> SCNVector3 {
+        return SCNVector3Make(transform.columns.3.x, transform.columns.3.y, transform.columns.3.z)
+    }
+    
+    func distance(from vector: SCNVector3) -> Float {
+        let distanceX = self.x - vector.x
+        let distanceY = self.y - vector.y
+        let distanceZ = self.z - vector.z
+        
+        return sqrtf( (distanceX * distanceX) + (distanceY * distanceY) + (distanceZ * distanceZ))
+    }
+    
+    public static func ==(lhs: SCNVector3, rhs: SCNVector3) -> Bool {
+        return (lhs.x == rhs.x) && (lhs.y == rhs.y) && (lhs.z == rhs.z)
+    }
+}
+
+extension ARSCNView {
+    func realWorldVector(screenPos: CGPoint) -> SCNVector3? {
+        let planeTestResults = self.hitTest(screenPos, types: [.featurePoint])
+        if let result = planeTestResults.first {
+            return SCNVector3.positionFromTransform(result.worldTransform)
+        }
+        
+        return nil
+    }
+}
+
+extension SCNGeometry {
+    class func line(from points: [SCNVector3]) -> SCNGeometry {
+        let sources = SCNGeometrySource(vertices: points)
+        var indices: [Int32] = []
+        for i in 0..<points.count {
+            indices.append(Int32(i))
+        }
+        let data = Data(bytes: indices, count: MemoryLayout<Int32>.size * indices.count)
+        let element = SCNGeometryElement(data: data, primitiveType: .line, primitiveCount: points.count - 1, bytesPerIndex: MemoryLayout<Int32>.size)
+        return SCNGeometry(sources: [sources], elements: [element])
+    }
+}
diff --git a/GoInfoGame/GoInfoGame/Info.plist b/GoInfoGame/GoInfoGame/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSCameraUsageDescription</key>
+         <string>This app requires to access your camera to measure width of sidewalk</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/GoInfoGame/GoInfoGame/UI/Camera/MeasureSidewalkView.swift b/GoInfoGame/GoInfoGame/UI/Camera/MeasureSidewalkView.swift
@@ -0,0 +1,65 @@
+//
+//  MeasureSidewalkView.swift
+//  GoInfoGame
+//
+//  Created by Achyut Kumar M on 21/02/24.
+//
+
+import SwiftUI
+
+struct MeasureSidewalkView: View {
+    
+    @State private var aimLabelHidden = true
+    @State private var notReadyLabelHidden = false
+    @State private var startMeasuring = false
+    @State private var resultLabelText = ""
+    
+    var body: some View {
+        ZStack {
+           Spacer()
+            MeasureWidthContainer(aimLabelHidden: $aimLabelHidden, notReadyLabelHidden: $notReadyLabelHidden, startMeasuring: $startMeasuring, resultLabelText: $resultLabelText)
+            VStack {
+                Spacer()
+                Text("+")
+                    .font(.system(size: 30))
+                    .foregroundStyle(.white)
+                    .padding()
+                    .font(.largeTitle)
+                
+                Spacer()
+                Button {
+                    toggleMeasuring()
+                } label: {
+                    Text("Measure")
+                        .fontWeight(.bold)
+                        .padding()
+                        .foregroundColor(.white)
+                        .background(Color.blue)
+                        .cornerRadius(8)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8)
+                                .stroke(Color.blue, lineWidth: 2)
+                        )
+                }
+                .padding()
+            }
+        }
+        if !resultLabelText.isEmpty {
+            VStack {
+                Text("Width is: \(resultLabelText)")
+                    .padding()
+                    .foregroundColor(.white)
+                    .font(.headline)
+            }
+        }
+            
+    }
+    
+    func toggleMeasuring() {
+        startMeasuring.toggle()
+    }
+}
+
+#Preview {
+    MeasureSidewalkView()
+}
diff --git a/GoInfoGame/GoInfoGame/UI/Camera/MeasureWidthContainer.swift b/GoInfoGame/GoInfoGame/UI/Camera/MeasureWidthContainer.swift
@@ -0,0 +1,152 @@
+//
+//  CameraView.swift
+//  GoInfoGame
+//
+//  Created by Achyut Kumar M on 21/02/24.
+//
+
+import SwiftUI
+import ARKit
+
+struct MeasureWidthContainer: UIViewRepresentable {
+    
+    @Binding var aimLabelHidden: Bool
+    @Binding var notReadyLabelHidden: Bool
+    @Binding var startMeasuring: Bool
+    @Binding var resultLabelText: String
+    
+    let sceneView = ARSCNView()
+    let session = ARSession()
+    let sessionConfig = ARWorldTrackingConfiguration()
+    
+    let vectorZero = SCNVector3()
+    var startValue = SCNVector3()
+    var endValue = SCNVector3()
+    
+    var startPointNode: SCNNode?
+    var endPointNode: SCNNode?
+    var lineNode: SCNNode?
+    
+    @State private var isMeasuring = false
+
+    
+     func makeUIView(context: Context) -> ARSCNView {
+        sceneView.delegate = context.coordinator
+        sceneView.session = session
+        session.run(sessionConfig, options: [.resetTracking, .removeExistingAnchors])
+       
+        return sceneView
+    }
+        
+    
+    func updateUIView(_ uiView: ARSCNView, context: Context) {
+        if startMeasuring {
+            context.coordinator.startMeasuring()
+        } else {
+            if isMeasuring {
+                context.coordinator.stopMeasuring()
+                isMeasuring = false
+            }
+        }
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+    
+    class Coordinator: NSObject, ARSCNViewDelegate {
+        var parent: MeasureWidthContainer
+        
+        init(_ parent: MeasureWidthContainer) {
+            self.parent = parent
+        }
+        
+        @objc func measuringChanged() {
+            if parent.startMeasuring {
+                startMeasuring()
+            } else {
+                stopMeasuring()
+            }
+        }
+        
+        func startMeasuring() {
+            parent.resetValues()
+            parent.startMeasuring = true
+            
+        }
+        
+        func stopMeasuring() {
+            parent.startMeasuring = false
+            parent.endPointNode = parent.createPointNode(at: parent.endValue, color: .white)
+            parent.sceneView.scene.rootNode.addChildNode(parent.endPointNode!)
+            parent.updateResultLabel(parent.startValue.distance(from: parent.endValue))
+        }
+        
+        
+        func renderer(_ renderer: SCNSceneRenderer, updateAtTime time: TimeInterval) {
+            DispatchQueue.main.async {
+                self.parent.detectObjects()
+            }
+        }
+    }
+    
+    mutating func detectObjects() {
+        if let worldPos = sceneView.realWorldVector(screenPos: sceneView.center) {
+            aimLabelHidden = false
+            notReadyLabelHidden = true
+            if startMeasuring {
+                if startValue == vectorZero {
+                    startValue = worldPos
+                    startPointNode = createPointNode(at: worldPos, color: .white)
+                    sceneView.scene.rootNode.addChildNode(startPointNode!)
+                    isMeasuring = true
+                }
+                
+                endValue = worldPos
+                
+                if let line = lineNode {
+                    line.removeFromParentNode()
+                }
+                lineNode = createLineNode(from: startValue, to: endValue)
+                sceneView.scene.rootNode.addChildNode(lineNode!)
+            }
+        }
+    }
+    
+    mutating func resetValues() {
+        startMeasuring = false
+        startValue = SCNVector3()
+        endValue = SCNVector3()
+        
+        startPointNode?.removeFromParentNode()
+        endPointNode?.removeFromParentNode()
+        lineNode?.removeFromParentNode()
+        
+        updateResultLabel(0.0)
+        
+    }
+    
+    func updateResultLabel(_ value: Float) {
+        let cm = value * 100.0
+        let inch = cm*0.3937007874
+        DispatchQueue.main.async {
+            self.resultLabelText = String(format: "%.2f cm / %.2f\"", cm, inch)
+        }
+    }
+    
+    func createPointNode(at position: SCNVector3, color: UIColor) -> SCNNode {
+        let sphere = SCNSphere(radius: 0.005)
+        sphere.firstMaterial?.diffuse.contents = color
+        let node = SCNNode(geometry: sphere)
+        node.position = position
+        return node
+    }
+    
+    func createLineNode(from startPoint: SCNVector3, to endPoint: SCNVector3) -> SCNNode {
+        let vertices: [SCNVector3] = [startPoint, endPoint]
+        let line = SCNGeometry.line(from: vertices)
+        let lineNode = SCNNode(geometry: line)
+        return lineNode
+    }
+}
diff --git a/GoInfoGame/GoInfoGame/UI/MapViewController.swift b/GoInfoGame/GoInfoGame/UI/MapViewController.swift
