Merge pull request #57 from TaskarCenterAtUW/Feature-apply-tag

Added tag with answer for Quests

Author: shweta2101

GoInfoGame/GoInfoGame/UI/CustomComponents/YesNoView.swift

@@ -6,21 +6,22 @@
 //
 
 import SwiftUI
-enum YesNoAnswer {
+
+enum YesNoAnswer: String {
     case yes
     case no
     case other
     case unknown
 }
 
-
 struct YesNoView: View {
 
     var action: ((_ answer:YesNoAnswer) -> Void)?
 
     init(action: ((_ answer: YesNoAnswer) -> Void)? = nil) {
         self.action = action
     }
+    
     var body: some View {
         HStack(spacing: 0) {
             Spacer()
@@ -41,14 +42,12 @@ struct YesNoView: View {
             .frame(minWidth: 20, maxWidth: 80, minHeight: 50)
             Divider().background(Color.gray).frame(height: 30)
             Button {
-                
                 action?(.no)
             } label: {
                 Text(LocalizedStrings.questGenericHasFeatureNo.localized)
                     .foregroundColor(.orange).font(.body)
                     .frame(maxWidth: .infinity)
             }
-             
         }
     }
 }

GoInfoGame/GoInfoGame/quests/BusStopLit/BusStopLit.swift

@@ -11,6 +11,12 @@ import SwiftUI
 import osmparser
 
 class BusStopLit: QuestBase, Quest {
+    typealias AnswerClass = YesNoAnswer
+    var relationData: Element? = nil
+    var _internalExpression: ElementFilterExpression?
+    var icon: UIImage = #imageLiteral(resourceName: "stop_lit")
+    var wikiLink: String = ""
+    var changesetComment: String = ""
     var title: String = "Bus Stop Lit"
     var filter: String = """
     nodes, ways, relations with
@@ -28,24 +34,14 @@ class BusStopLit: QuestBase, Quest {
               or lit older today -16 years
             )
     """
-    var icon: UIImage = #imageLiteral(resourceName: "stop_lit")
-    var wikiLink: String = ""
-    var changesetComment: String = ""
-    
-    var relationData: Element? = nil
     var displayUnit: DisplayUnit {
         DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.SMALL )
     }
-    typealias AnswerClass = YesNoAnswer
-    
-    var _internalExpression: ElementFilterExpression?
-    
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){
             return _internalExpression
         }
         else {
-            print("<>")
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }
@@ -64,7 +60,9 @@ class BusStopLit: QuestBase, Quest {
     }
 
     func onAnswer(answer: YesNoAnswer) {
-        
+        if let rData = self.relationData {
+            self.updateTags(id: rData.id, tags: ["lit":answer.rawValue], type: rData.type)
+        }
     }
 
     func copyWithElement(element: Element) -> any Quest {

GoInfoGame/GoInfoGame/quests/BusStopLit/BusStopLitForm.swift

@@ -14,7 +14,9 @@ struct BusStopLitForm: View, QuestForm {
     typealias AnswerClass = YesNoAnswer
     var body: some View {
         VStack{
-            QuestionHeader(icon: Image("stop_lit"), title: LocalizedStrings.questBusStopLitTitle.localized, subtitle: "SideWalk")
+            QuestionHeader(icon: Image("stop_lit"),
+                           title: LocalizedStrings.questBusStopLitTitle.localized,
+                           subtitle: "SideWalk")
             YesNoView(action: action).padding(10)
                 .background(
                     RoundedRectangle(cornerRadius: 10)

GoInfoGame/GoInfoGame/quests/CrossingMarking/CrossMarking.swift

@@ -11,6 +11,8 @@ import SwiftUI
 import osmparser
 
 class CrossMarking: QuestBase, Quest {
+    typealias AnswerClass = CrossingAnswer
+    var _internalExpression: ElementFilterExpression?
     var title: String = "Cross Marking"
     var filter: String = ""
     var icon: UIImage = #imageLiteral(resourceName: "pedestrian")
@@ -20,16 +22,11 @@ class CrossMarking: QuestBase, Quest {
     var displayUnit: DisplayUnit {
         DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.MEDIUM )
     }
-    typealias AnswerClass = CrossingAnswer
-    
-    var _internalExpression: ElementFilterExpression?
-    
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){
             return _internalExpression
         }
         else {
-            print("<>")
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }
@@ -48,7 +45,9 @@ class CrossMarking: QuestBase, Quest {
     }
 
     func onAnswer(answer: CrossingAnswer) {
-        
+        if let rData = self.relationData {
+            self.updateTags(id: rData.id, tags: ["crossing":answer.rawValue], type: rData.type)
+        }
     }
 
     func copyWithElement(element: Element) -> any Quest {
@@ -58,18 +57,10 @@ class CrossMarking: QuestBase, Quest {
     }
 }
 
-enum CrossingAnswer: String, CaseIterable {
-    case yes
-    case no
-    case prohibited
-
-    var description: String {
-        switch self {
-        case .yes: return "Yes"
-        case .no: return "No"
-        case .prohibited: return "Prohibited"
-        }
-    }
+enum CrossingAnswer: String {
+    case yes = "Yes"
+    case no = "No"
+    case prohibited = "Prohibited"
 }
 
 struct TextItem<T> {

GoInfoGame/GoInfoGame/quests/CrossingMarking/CrossMarkingForm.swift

@@ -10,11 +10,9 @@ import SwiftUI
 
 struct CrossMarkingForm : View,QuestForm{
     var action: ((CrossingAnswer) -> Void)?
-    
+    typealias AnswerClass = CrossingAnswer
     @State private var selectedAnswer: CrossingAnswer?
     @State private var showAlert = false
-    
-    typealias AnswerClass = CrossingAnswer
     let items = [
         TextItem(value: CrossingAnswer.yes, titleId: LocalizedStrings.questCrossingYes.localized),
         TextItem(value: CrossingAnswer.no, titleId: LocalizedStrings.questCrossingNo.localized),
@@ -23,7 +21,9 @@ struct CrossMarkingForm : View,QuestForm{
 
     var body: some View {
         VStack{
-            QuestionHeader(icon: Image("pedestrian"), title: LocalizedStrings.questCrossingTitle.localized, subtitle: "")
+            QuestionHeader(icon: Image("pedestrian"),
+                           title: LocalizedStrings.questCrossingTitle.localized,
+                           subtitle: "")
             VStack{
                 VStack (alignment: .leading){
                     ForEach(items, id: \.titleId) { item in

GoInfoGame/GoInfoGame/quests/Handrail/HandRail.swift

@@ -11,9 +11,12 @@ import osmparser
 
 class HandRail: QuestBase,Quest {
     typealias AnswerClass = YesNoAnswer
-    
+    var _internalExpression: ElementFilterExpression?
+    var relationData: Element? = nil
+    var icon: UIImage = #imageLiteral(resourceName: "steps_handrail.pdf")
+    var wikiLink: String = "Key:handrail"
+    var changesetComment: String = "Specify whether steps have handrails"
     var title: String = "HandRail"
-    
     var filter: String = """
         ways with highway = steps
         and (!indoor or indoor = no)
@@ -26,36 +29,23 @@ class HandRail: QuestBase,Quest {
             or older today -8 years
         )
 """
-    
-    var icon: UIImage = #imageLiteral(resourceName: "steps_handrail.pdf")
-    
-    var wikiLink: String = "Key:handrail"
-    
-    var changesetComment: String = "Specify whether steps have handrails"
-    
     var form: AnyView {
         get{
             return AnyView(self.internalForm as! HandRailForm)
         }
     }
-    
-    var relationData: Element? = nil
-    
     var displayUnit: DisplayUnit {
         DisplayUnit(title: self.title, description: "",parent: self,sheetSize: .SMALL)
     }
-    
-    var _internalExpression: ElementFilterExpression?
-    
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){
             return _internalExpression
-        }
-        else {
+        } else {
             _internalExpression = try? filter.toElementFilterExpression()
             return _internalExpression
         }
     }
+    
     override init() {
         super.init()
         self.internalForm = HandRailForm(action: { [self] yesNo in
@@ -64,7 +54,9 @@ class HandRail: QuestBase,Quest {
     }
 
     func onAnswer(answer: YesNoAnswer) {
-        
+        if let rData = self.relationData {
+            self.updateTags(id: rData.id, tags: ["handrail":answer.rawValue], type: rData.type)
+        }
     }
 
     func copyWithElement(element: Element) -> any Quest {

GoInfoGame/GoInfoGame/quests/Handrail/HandRailForm.swift

@@ -13,12 +13,13 @@ struct HandRailForm: View, QuestForm {
 
     var body: some View {
         VStack{
-            QuestionHeader(icon: Image("steps_handrail"), title: "Do these steps have handrail?", subtitle: "")
+            QuestionHeader(icon: Image("steps_handrail"),
+                           title: "Do these steps have handrail?",
+                           subtitle: "")
             YesNoView(action: action)
-                .background(
-                    RoundedRectangle(cornerRadius: 10)
-                        .fill(Color.white)
-                        .shadow(color: .gray, radius: 2, x: 0, y: 2))
+                .background(RoundedRectangle(cornerRadius: 10)
+                    .fill(Color.white)
+                    .shadow(color: .gray, radius: 2, x: 0, y: 2))
         }.padding()
     }
 }

GoInfoGame/GoInfoGame/quests/QuestsRepository.swift

@@ -48,9 +48,6 @@ class QuestsRepository {
 
             return CLLocationCoordinate2D(latitude: randomLat, longitude: randomLon)
         }
-    
-    
-    
 }
 // Probably move somewhere else
 struct DisplayUnitWithCoordinate: Identifiable {

GoInfoGame/GoInfoGame/quests/SideWalkValidation/SideWalkValidation.swift

@@ -34,7 +34,9 @@ class SideWalkValidation: QuestBase, Quest {
     }
 
     func onAnswer(answer: SideWalkValidationAnswer) {
-        
+        if let rData = self.relationData {
+            self.updateTags(id: rData.id, tags: ["sidewalk":answer.description], type: rData.type)
+        }
     }
 
     func copyWithElement(element: Element) -> any Quest {

GoInfoGame/GoInfoGame/quests/SideWalkValidation/SideWalkValidationForm.swift

@@ -29,7 +29,10 @@ struct SideWalkValidationForm: QuestForm ,View {
     var body: some View {
         ZStack{
             VStack (alignment: .leading){
-                QuestionHeader(icon: Image("sidewalk"), title: LocalizedStrings.questSidewalkTitle.localized, subtitle: "Street").padding(.bottom,10)
+                QuestionHeader(icon: Image("sidewalk"),
+                               title: LocalizedStrings.questSidewalkTitle.localized,
+                               subtitle: "Street")
+                .padding(.bottom,10)
                 VStack(alignment: .leading){
                     Text(LocalizedStrings.select.localized).font(.caption).foregroundColor(.gray)
                     ImageGridItemView(gridCount: 2, isLabelBelow: true, imageData: SideWalksImageData, isImageRotated: false, isDisplayImageOnly: false, onTap: { (type, tag) in
@@ -84,8 +87,6 @@ struct SideWalkValidationForm: QuestForm ,View {
     }
 }
 
-
-
 #Preview {
     SideWalkValidationForm()
 }