Merge pull request #79 from TaskarCenterAtUW/feature-sidewalk-width-changes

Author: iAKM

GoInfoGame/GoInfoGame/UI/CustomComponents/WidthView.swift

@@ -23,7 +23,7 @@ struct WidthView: View {
         if unit == .feetInch {
             VStack {
                 HStack {
-                    TextField("Feet", text: Binding(
+                    TextField("Feet",text: Binding(
                         get: { "\(self.feet)" },
                         set: {
                             if let value = NumberFormatter().number(from: $0) {
@@ -34,6 +34,8 @@ struct WidthView: View {
                             validateInput()
                         }
                     ))
+                    .accessibilityLabel(Text("Enter in Feet"))
+                    .accessibilityHint(Text("Tap to input measurements in feet in the text field."))
                     .frame(width: 20)
                     .padding(.horizontal)
                     .overlay(Rectangle().frame(height: 1).padding(.top, 25).foregroundColor(.orange), alignment: .bottom)
@@ -53,6 +55,8 @@ struct WidthView: View {
                             validateInput()
                         }
                     ))
+                    .accessibilityLabel(Text("Enter in Inches"))
+                    .accessibilityHint(Text("Tap to input measurements in inches in the text field."))
                     .frame(width: 20)
                     .padding(.horizontal)
                     .overlay(Rectangle().frame(height: 1).padding(.top, 25).foregroundColor(.orange), alignment: .bottom)

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -81,14 +81,18 @@ struct CustomMap: UIViewRepresentable {
             if let selectedQuest = annotation as? DisplayUnitAnnotation {
                 parent.selectedQuest = selectedQuest.displayUnit
                 parent.isPresented = true
-                
-                let distance = parent.calculateDistance(selectedAnnotation: selectedQuest.coordinate)
+                var contextualString = ""
+                let distance = Int(parent.calculateDistance(selectedAnnotation: selectedQuest.coordinate))
                 let direction = parent.inferDirection(selectedAnnotation: selectedQuest.coordinate)
 
                 let annotationLocation = CLLocation(latitude: selectedQuest.coordinate.latitude, longitude: selectedQuest.coordinate.longitude)
                 parent.inferStreetName(location: annotationLocation) { streetName in
                     if let streetName = streetName {
-                        let contextualString = "The \(selectedQuest.title!) is on \(streetName) at \(distance) meters \(direction) of you"
+                        if let sidewalk =  self.parent.selectedQuest?.parent as? SideWalkWidth {
+                            contextualString = "The Sidewalk is along \(streetName == "" ? "the street" : streetName) at \(distance) meters \(direction) of you"
+                        } else {
+                            contextualString = "The \(selectedQuest.title!) is on \(streetName == "" ? "the street" : streetName) at \(distance) meters \(direction) of you"
+                        }
                         self.contextualInfo?(contextualString)
                     } 
                 }

GoInfoGame/GoInfoGame/en.lproj/Localizable.strings

@@ -6,12 +6,12 @@
 
 */
 "quest_width_most_narrow_path" = "What is the width of the most narrow usable path along this footpath? (measure with your phone please)";
-"quest_determine_sidewalk_widths" = "Determine sidewalk widths";
-"quest_road_width_explanation" = "The roadway width from curb to curb: This includes anything on the street surface, including on-street parking or bicycle lanes but excluding anything beyond the curb like sidewalks, off-street parking or adjacent bicycle paths.";
+"quest_determine_sidewalk_widths" = "Determine Sidewalk Width";
+"quest_road_width_explanation" = "Roadway width from curb to curb includes on-street parking and bicycle lanes but excludes sidewalks, off-street parking, or adjacent bicycle paths.";
 "other_answers" = "OTHER ANSWERS...";
 "questions_list" = "Questions List";
 "quest_generic_confirmation_title" = "Are you sure?";
-"quest_road_width_unusualInput_confirmation_description" = "This width looks implausible. Remember, this should be the width from curb to curb, including on-street parking, bicycle lanes etc.";
+"quest_road_width_unusualInput_confirmation_description" = "This width seems unlikely. Just remember, it should account for everything from one side of the road to the other, like parking spaces and bike lanes.";
 "quest_generic_confirmation_no" = "I WILL CHECK";
 "quest_specify_handrails" = "Specify whether steps have handrails";
 "quest_handrail_title" = "Do these steps have a handrail?";

GoInfoGame/GoInfoGame/quests/SidewalkWidth/SideWalkWidth.swift

@@ -14,7 +14,7 @@ class SideWalkWidth : QuestBase, Quest {
     typealias AnswerClass = WidthAnswer
     var _internalExpression: ElementFilterExpression?
     var relationData: Element? = nil
-    var title: String = "Side Walk Width"
+    var title: String = " Quest is Side Walk Width"
     var filter: String = """
                         ways with
                         ( highway = footway

GoInfoGame/GoInfoGame/quests/SidewalkWidth/SideWalkWidthForm.swift

@@ -54,14 +54,26 @@ struct SideWalkWidthForm: View, QuestForm {
         }.padding()
             .frame(maxWidth: .infinity, maxHeight: .infinity)
             .alert(isPresented: $isConfirmAlert) {
-                Alert(
-                    title: Text(LocalizedStrings.questGenericConfirmationTitle.localized),
-                    message: Text(LocalizedStrings.questRoadWidthUnusualInputConfirmation.localized),
-                    primaryButton: .default(Text(LocalizedStrings.questGenericConfirmationYes.localized)) {
-                        processAnswer()
-                    },
-                    secondaryButton: .default(Text(LocalizedStrings.questGenericConfirmationNo.localized))
-                )
+                if !(feet >= 1 && feet <= 12) {
+                    return Alert(
+                        title: Text(LocalizedStrings.questGenericConfirmationTitle.localized),
+                        message: Text(LocalizedStrings.questRoadWidthUnusualInputConfirmation.localized),
+                        primaryButton: .default(Text(LocalizedStrings.questGenericConfirmationYes.localized)) {
+                            processAnswer()
+                        },
+                        secondaryButton: .default(Text(LocalizedStrings.questGenericConfirmationNo.localized))
+                    )
+                } else {
+                    return Alert(
+                        title: Text(LocalizedStrings.questSourceDialogTitle.localized),
+                        message: Text(LocalizedStrings.questSourceDialogNote.localized),
+                        primaryButton: .default(Text(LocalizedStrings.questGenericConfirmationYes.localized)) {
+                            processAnswer()
+                        },
+                        secondaryButton: .default(Text(LocalizedStrings.undoConfirmNegative.localized))
+                    )
+                }
+                
             }
     }
 

GoInfoGame/GoInfoGame/quests/WayLit/WayLit.swift

@@ -17,7 +17,7 @@ class WayLit: QuestBase, Quest {
     var icon: UIImage = #imageLiteral(resourceName: "add_way_lit")
     var wikiLink: String = ""
     var changesetComment: String = ""
-    var title: String = "Way Lit"
+    var title: String = "Quest is Way Lit"
     private static let litResidentialRoads =  ["residential", "living_street", "pedestrian"]
     private static let litWays = ["footway", "cycleway", "steps"]
     private  static let litNonResidentialRoads = [