Lint

matkoniecz · Feb 16, 2024 · d98a265 · d98a265
1 parent b36171e
commit d98a265
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt
@@ -240,7 +240,6 @@ fun StringMapChangesBuilder.replacePlace(tags: Map<String, String>) {
     }
 }
 
-
 // generated by "make update" from https://github.com/mnalis/StreetComplete-taginfo-categorize/
 private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
     "shop_?[1-9]?(:.*)?", "craft_?[1-9]?", "amenity_?[1-9]?", "old_amenity", "old_shop",

diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Things.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Things.kt
@@ -269,11 +269,11 @@ val POPULAR_THING_FEATURE_IDS = listOf(
     // More:
 
     // mostly found in parks/plazas, i.e. specific places instead of ~everywhere
-    //"historic/memorial",           // 0.4 M (if this is displayed in quick select, artwork should probably too)
-    //"amenity/drinking_water",      // 0.3 M
-    //"leisure/picnic_table",        // 0.3 M
+    // "historic/memorial",           // 0.4 M (if this is displayed in quick select, artwork should probably too)
+    // "amenity/drinking_water",      // 0.3 M
+    // "leisure/picnic_table",        // 0.3 M
 
     // found most often on hiking routes where there are not that many "things" features anyway
-    //"information/guidepost",       // 0.5M
-    //"tourism/information/board",   // 0.3M
+    // "information/guidepost",       // 0.5M
+    // "tourism/information/board",   // 0.3M
 )
diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt
@@ -14,9 +14,9 @@ import de.westnordost.streetcomplete.overlays.buildings.BuildingsOverlay
 import de.westnordost.streetcomplete.overlays.cycleway.CyclewayOverlay
 import de.westnordost.streetcomplete.overlays.shops.ShopsOverlay
 import de.westnordost.streetcomplete.overlays.sidewalk.SidewalkOverlay
-import de.westnordost.streetcomplete.overlays.things.ThingsOverlay
 import de.westnordost.streetcomplete.overlays.street_parking.StreetParkingOverlay
 import de.westnordost.streetcomplete.overlays.surface.SurfaceOverlay
+import de.westnordost.streetcomplete.overlays.things.ThingsOverlay
 import de.westnordost.streetcomplete.overlays.way_lit.WayLitOverlay
 import de.westnordost.streetcomplete.util.ktx.getFeature
 import de.westnordost.streetcomplete.util.ktx.getIds

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt
@@ -19,15 +19,15 @@ import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
 import de.westnordost.streetcomplete.data.osm.mapdata.Node
 import de.westnordost.streetcomplete.databinding.FragmentOverlayShopsBinding
 import de.westnordost.streetcomplete.osm.LocalizedName
+import de.westnordost.streetcomplete.osm.POPULAR_PLACE_FEATURE_IDS
 import de.westnordost.streetcomplete.osm.applyTo
+import de.westnordost.streetcomplete.osm.isDisusedPlace
+import de.westnordost.streetcomplete.osm.isPlace
 import de.westnordost.streetcomplete.osm.parseLocalizedNames
 import de.westnordost.streetcomplete.osm.replacePlace
 import de.westnordost.streetcomplete.overlays.AbstractOverlayForm
 import de.westnordost.streetcomplete.overlays.AnswerItem
 import de.westnordost.streetcomplete.quests.LocalizedNameAdapter
-import de.westnordost.streetcomplete.osm.POPULAR_PLACE_FEATURE_IDS
-import de.westnordost.streetcomplete.osm.isDisusedPlace
-import de.westnordost.streetcomplete.osm.isPlace
 import de.westnordost.streetcomplete.util.DummyFeature
 import de.westnordost.streetcomplete.util.getLocalesForFeatureDictionary
 import de.westnordost.streetcomplete.util.getLocationLabel

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceOverlayForm.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.core.view.isGone
-import de.westnordost.osmfeatures.GeometryType
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/things/ThingsOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/things/ThingsOverlayForm.kt
@@ -22,7 +22,6 @@ import de.westnordost.streetcomplete.overlays.AnswerItem
 import de.westnordost.streetcomplete.overlays.IAnswerItem
 import de.westnordost.streetcomplete.util.DummyFeature
 import de.westnordost.streetcomplete.util.getLocalesForFeatureDictionary
-import de.westnordost.streetcomplete.util.getLocationLabel
 import de.westnordost.streetcomplete.util.getNameAndLocationLabel
 import de.westnordost.streetcomplete.util.ktx.geometryType
 import de.westnordost.streetcomplete.view.controller.FeatureViewController

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt
@@ -39,7 +39,6 @@ class CheckShopType : OsmElementQuestType<ShopTypeAnswer> {
           )
     """.toElementFilterExpression() }
 
-
     override val changesetComment = "Survey if vacant shops are still vacant"
     override val wikiLink = "Key:disused:"
     override val icon = R.drawable.ic_quest_check_shop

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/about/LogsFiltersDialog.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/about/LogsFiltersDialog.kt
@@ -38,7 +38,6 @@ class LogsFiltersDialog(
     private var timestampNewerThan: LocalDateTime? = initialFilters.timestampNewerThan
     private var timestampOlderThan: LocalDateTime? = initialFilters.timestampOlderThan
 
-
     private val binding = DialogLogsFiltersBinding.inflate(LayoutInflater.from(context))
     private val locale = Locale.getDefault()