Merge branch 'dev' into feature-profileScreen

Author: sudulaMuralikrishna

.DS_Store

@@ -61,6 +61,10 @@
 		973FC0482B5A477E00878269 /* CrossMarking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC0472B5A477E00878269 /* CrossMarking.swift */; };
 		973FC04A2B5A478C00878269 /* CrossMarkingForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC0492B5A478C00878269 /* CrossMarkingForm.swift */; };
 		973FC04C2B5A5F5F00878269 /* RadioItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973FC04B2B5A5F5F00878269 /* RadioItem.swift */; };
+		97439F782B87444200DA43E1 /* CrossingKerbHeightForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97439F772B87444200DA43E1 /* CrossingKerbHeightForm.swift */; };
+		97439F7A2B87447400DA43E1 /* CrossingKerbHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97439F792B87447400DA43E1 /* CrossingKerbHeight.swift */; };
+		97A014BF2B7B580700F7C277 /* OSMMapData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A014BE2B7B580700F7C277 /* OSMMapData.swift */; };
+		97A014C12B7C95A500F7C277 /* OSMElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A014C02B7C95A500F7C277 /* OSMElement.swift */; };
 		97AC1C062B6A45B0004F0BF4 /* SideWalkValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AC1C052B6A45B0004F0BF4 /* SideWalkValidation.swift */; };
 		97AC1C082B6A45C9004F0BF4 /* SideWalkValidationForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AC1C072B6A45C9004F0BF4 /* SideWalkValidationForm.swift */; };
 		97AC1C0A2B6B7F10004F0BF4 /* CustomVerticalButtonsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AC1C092B6B7F10004F0BF4 /* CustomVerticalButtonsList.swift */; };
@@ -320,6 +324,10 @@
 		973FC0472B5A477E00878269 /* CrossMarking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrossMarking.swift; path = GoInfoGame/quests/CrossingMarking/CrossMarking.swift; sourceTree = SOURCE_ROOT; };
 		973FC0492B5A478C00878269 /* CrossMarkingForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrossMarkingForm.swift; path = GoInfoGame/quests/CrossingMarking/CrossMarkingForm.swift; sourceTree = SOURCE_ROOT; };
 		973FC04B2B5A5F5F00878269 /* RadioItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioItem.swift; sourceTree = "<group>"; };
+		97439F772B87444200DA43E1 /* CrossingKerbHeightForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingKerbHeightForm.swift; sourceTree = "<group>"; };
+		97439F792B87447400DA43E1 /* CrossingKerbHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrossingKerbHeight.swift; sourceTree = "<group>"; };
+		97A014BE2B7B580700F7C277 /* OSMMapData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSMMapData.swift; sourceTree = "<group>"; };
+		97A014C02B7C95A500F7C277 /* OSMElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSMElement.swift; sourceTree = "<group>"; };
 		97AC1C052B6A45B0004F0BF4 /* SideWalkValidation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideWalkValidation.swift; sourceTree = "<group>"; };
 		97AC1C072B6A45C9004F0BF4 /* SideWalkValidationForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideWalkValidationForm.swift; sourceTree = "<group>"; };
 		97AC1C092B6B7F10004F0BF4 /* CustomVerticalButtonsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomVerticalButtonsList.swift; sourceTree = "<group>"; };
@@ -771,6 +779,15 @@
 			path = CrossingMarking;
 			sourceTree = "<group>";
 		};
+		97439F762B8729EA00DA43E1 /* CrossingKerbHeight */ = {
+			isa = PBXGroup;
+			children = (
+				97439F772B87444200DA43E1 /* CrossingKerbHeightForm.swift */,
+				97439F792B87447400DA43E1 /* CrossingKerbHeight.swift */,
+			);
+			path = CrossingKerbHeight;
+			sourceTree = "<group>";
+		};
 		97AC1C042B6A44C1004F0BF4 /* SideWalkValidation */ = {
 			isa = PBXGroup;
 			children = (
@@ -840,6 +857,8 @@
 				A475C7D82B5E264700BABEDA /* OSMWay.swift */,
 				A475C7DC2B5E3E7C00BABEDA /* OSMPayload.swift */,
 				970D5BD42B677CC500C20BE7 /* OSMUserData.swift */,
+				97A014BE2B7B580700F7C277 /* OSMMapData.swift */,
+				97A014C02B7C95A500F7C277 /* OSMElement.swift */,
 			);
 			path = models;
 			sourceTree = "<group>";
@@ -1014,6 +1033,7 @@
 		A4E7119C2B57A22300C9DE08 /* quests */ = {
 			isa = PBXGroup;
 			children = (
+				97439F762B8729EA00DA43E1 /* CrossingKerbHeight */,
 				971F9FE22B84ABA6005397CC /* CrossingType */,
 				971F9FDD2B847318005397CC /* CrossingIsland */,
 				18EC425A2B8497F200DE05D7 /* TactilePavingCrosswalk */,
@@ -1546,6 +1566,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A40E726E2B5D462A00328848 /* osmapi.docc in Sources */,
+				97A014C12B7C95A500F7C277 /* OSMElement.swift in Sources */,
 				A40E728D2B5D494100328848 /* OSMLogin.swift in Sources */,
 				A40E72892B5D487C00328848 /* OSMConfig.swift in Sources */,
 				A475C7E02B5E4B6E00BABEDA /* OSMXMLBuilder.swift in Sources */,
@@ -1555,6 +1576,7 @@
 				A475C7D32B5E22C800BABEDA /* OSMNode.swift in Sources */,
 				A475C7D92B5E264700BABEDA /* OSMWay.swift in Sources */,
 				A475C7DD2B5E3E7C00BABEDA /* OSMPayload.swift in Sources */,
+				97A014BF2B7B580700F7C277 /* OSMMapData.swift in Sources */,
 				970D5BD52B677CC500C20BE7 /* OSMUserData.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1649,6 +1671,7 @@
 				973FC0382B59363C00878269 /* TactilePavingSteps.swift in Sources */,
 				973FC0192B4FB17000878269 /* LocalizedStrings.swift in Sources */,
 				FAC9E6112B06811300E2C608 /* LocationManager.swift in Sources */,
+				97439F782B87444200DA43E1 /* CrossingKerbHeightForm.swift in Sources */,
 				A4834A3F2B67737500D4F0AA /* StoredChangeset.swift in Sources */,
 				973FC02F2B58F81F00878269 /* StepsRamp.swift in Sources */,
 				971F9FE62B84CDCE005397CC /* CrossingTypeForm.swift in Sources */,
@@ -1695,6 +1718,7 @@
 				971F9FDF2B847349005397CC /* CrossingIslandForm.swift in Sources */,
 				05DBBB5F2B1263FF00B6F110 /* DatabaseConnector.swift in Sources */,
 				FAF44FC12B30850A004FE664 /* OnboardingView3.swift in Sources */,
+				97439F7A2B87447400DA43E1 /* CrossingKerbHeight.swift in Sources */,
 				971F9FE12B847358005397CC /* CrossingIsland.swift in Sources */,
 				970D5BD12B62B61300C20BE7 /* MapViewController.swift in Sources */,
 				0536DD972B0BD95100B04C4B /* URLSession+Extension.swift in Sources */,

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -6,18 +6,19 @@
 //
 
 import Foundation
-import SwiftOverpassAPI
+//import SwiftOverpassAPI
 import osmparser
 import MapKit
+import osmapi
 
 
 // Class that handles data handling and display of annotations
 class AppQuestManager {
 
-    let opManager = OverpassRequestManager()
+//    let opManager = OverpassRequestManager()
 
     let dbInstance = DatabaseConnector.shared
-    
+    let osmConnection = OSMConnection()
 
     static let shared = AppQuestManager()
     private init() {}
@@ -31,14 +32,35 @@ class AppQuestManager {
     // Fetch the quests for a bounding box
     func fetchData(fromBBOx bbox: BBox,completion: @escaping () -> Void){
         // Get the data from bbox
-        opManager.fetchElements(fromBBox: bbox) { fetchedElements in
-            // Get the count of nodes and ways
-            let allValues = fetchedElements.values
-            let allElements = allValues.filter({!$0.tags.isEmpty})
-            print("Saving tags")
-            self.dbInstance.saveElements(allElements) // Save all where there are tags
-            completion()
+        let centralLocation = CLLocation(latitude: 37.7749, longitude: -122.4194) // San Francisco coords
+        let distance = 100
+        //37.41465820658871,-122.0912196996173,37.42366839341129,-122.0799229003827
+        let boundingCoordinates = centralLocation.boundingCoordinates(distance: CLLocationDistance(distance))
+        
+        osmConnection.fetchMapData(left:bbox.minLon , bottom:bbox.minLat , right:bbox.maxLon , top:bbox.maxLat ) { result in
+            switch result {
+            case .success(let mapData):
+                let response = Array(mapData.values)
+                let allValues = response
+                let allElements = allValues.filter({!$0.tags.isEmpty})
+                print("Saving tags")
+                DispatchQueue.main.async {
+                    self.dbInstance.saveOSMElements(allElements) // Save all where there are tags
+                    completion()
+                }
+            case .failure(let error):
+                print("error")
+            }
+           
         }
+//        opManager.fetchElements(fromBBox: bbox) { fetchedElements in
+//            // Get the count of nodes and ways
+//            let allValues = fetchedElements.values
+//            let allElements = allValues.filter({!$0.tags.isEmpty})
+//            print("Saving tags")
+//            self.dbInstance.saveElements(allElements) // Save all where there are tags
+//            completion()
+//        }
     }
 
 

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "kerb_height_flush.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Quests/kerb_height_flush.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "kerb_height_lowered.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Quests/kerb_height_flush.imageset/kerb_height_flush.pdf

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "kerb_height_lowered_ramp.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Quests/kerb_height_lowered.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "kerb_height_no.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}