show also disused shops when showing shoplike

disused shops that re correctly tagged are useful for orientation

disused shops that incorrectly tagged may be also present but
- it may cause user to report issue in OSM data
- SC is not supporting invalid data (like disused:shop=* used when there is no trace of shop anymore)

discussed in streetcomplete#3719

app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddHalal.kt

@@ -34,7 +34,9 @@ class AddHalal : OsmFilterQuestType<DietAvailabilityAnswer>() {
     override fun getTitle(tags: Map<String, String>) = R.string.quest_dietType_halal_name_title
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_halal)
 

app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt

@@ -35,7 +35,9 @@ class AddKosher : OsmFilterQuestType<DietAvailabilityAnswer>() {
     override fun getTitle(tags: Map<String, String>) = R.string.quest_dietType_kosher_name_title
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_kosher)
 

app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegan.kt

@@ -39,7 +39,9 @@ class AddVegan : OsmFilterQuestType<DietAvailabilityAnswer>() {
     override fun getTitle(tags: Map<String, String>) = R.string.quest_dietType_vegan_name_title
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_vegan)
 

app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt

@@ -36,7 +36,9 @@ class AddVegetarian : OsmFilterQuestType<DietAvailabilityAnswer>() {
     override fun getTitle(tags: Map<String, String>) = R.string.quest_dietType_vegetarian_name_title
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_vegetarian)
 

app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHours.kt

@@ -159,7 +159,9 @@ class AddOpeningHours(
     }
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddOpeningHoursForm()
 

app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours_signed/CheckOpeningHoursSigned.kt

@@ -77,7 +77,9 @@ class CheckOpeningHoursSigned (
         filter.matches(element) && hasName(element.tags)
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = YesNoQuestAnswerFragment()
 

app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceName.kt

@@ -124,7 +124,9 @@ class AddPlaceName(
         filter.matches(element) && hasFeatureName(element.tags)
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddPlaceNameForm()
 

app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt

@@ -48,7 +48,9 @@ class CheckShopType : OsmElementQuestType<ShopTypeAnswer> {
         disusedShopsFilter.matches(element) && !shopsFilter.matches(element)
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = ShopTypeForm()
 

app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/SpecifyShopType.kt

@@ -41,7 +41,9 @@ class SpecifyShopType : OsmFilterQuestType<ShopTypeAnswer>() {
     }
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = ShopTypeForm()
 

app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessBusiness.kt

@@ -115,7 +115,9 @@ class AddWheelchairAccessBusiness(
     }
 
     override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
-        getMapData().filter("nodes, ways, relations with " + isKindOfShopExpression())
+        getMapData().filter("nodes, ways, relations with " +
+            isKindOfShopExpression() + " or " + isKindOfShopExpression("disused")
+        )
 
     override fun createForm() = AddWheelchairAccessBusinessForm()