Merge pull request #160 from TaskarCenterAtUW/feature-query-longform

Replace static filter with quest query from longform

Author: iAKM

GoInfoGame/GoInfoGame/quests/LongQuests/Classes/LongCrossingQuest.swift

@@ -35,7 +35,15 @@ class LongCrossingQuest: QuestBase, Quest {
             return _internalExpression
         }
         else {
-            _internalExpression = try? filter.toElementFilterExpression()
+            let crossingLongQuestQuery = QuestsRepository.shared.crossingsLongQuestModel?.questQuery
+            var crossingFilter = ""
+            
+            if let crossingLongQuestQuery = crossingLongQuestQuery {
+                crossingFilter = crossingLongQuestQuery + " and !ext:gig_complete"
+            } else {
+                crossingFilter = "ways with (highway=footway and footway=crossing) and !ext:gig_complete"
+            }
+            _internalExpression = try? crossingFilter.toElementFilterExpression()
             return _internalExpression
         }
     }

GoInfoGame/GoInfoGame/quests/LongQuests/Classes/LongKerbQuest.swift

@@ -37,7 +37,15 @@ class LongKerbQuest: QuestBase, Quest {
             return _internalExpression
         }
         else {
-            _internalExpression = try? filter.toElementFilterExpression()
+            let kerbLongQuestQuery = QuestsRepository.shared.kerbLongQuestModel?.questQuery
+            var kerbFilter = ""
+            
+            if let kerbLongQuestQuery = kerbLongQuestQuery {
+                kerbFilter = kerbLongQuestQuery + " and !ext:gig_complete"
+            } else {
+                kerbFilter = "nodes with barrier=kerb and !ext:gig_complete"
+            }
+            _internalExpression = try? kerbFilter.toElementFilterExpression()
             return _internalExpression
         }
     }

GoInfoGame/GoInfoGame/quests/LongQuests/Classes/LongSidewalkQuest.swift

@@ -41,7 +41,15 @@ class LongSidewalkQuest: QuestBase, Quest {
             return _internalExpression
         }
         else {
-            _internalExpression = try? filter.toElementFilterExpression()
+            let sideWalkLongQuestQuery = QuestsRepository.shared.sideWalkLongQuestModel?.questQuery
+            var sideWalkFilter = ""
+            
+            if let sideWalkLongQuestQuery = sideWalkLongQuestQuery {
+                sideWalkFilter = sideWalkLongQuestQuery + " and !ext:gig_complete"
+            } else {
+                sideWalkFilter = "ways with (highway=footway and footway=sidewalk) and !ext:gig_complete"
+            }
+            _internalExpression = try? sideWalkFilter.toElementFilterExpression()
             return _internalExpression
         }
     }