Lint

streetcomplete · Jan 25, 2024 · f8976a9 · f8976a9
1 parent fac2d1c
commit f8976a9
Show file tree

Hide file tree

Showing 38 changed files with 34 additions and 78 deletions.
diff --git a/app/src/androidTest/java/de/westnordost/streetcomplete/data/logs/LogsDaoTest.kt b/app/src/androidTest/java/de/westnordost/streetcomplete/data/logs/LogsDaoTest.kt
@@ -78,4 +78,3 @@ private fun createMessage(
     null,
     timestamp
 )
-
diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/AndroidDatabase.kt b/app/src/main/java/de/westnordost/streetcomplete/data/AndroidDatabase.kt
@@ -10,7 +10,6 @@ import android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE
 import android.database.sqlite.SQLiteDatabase.CONFLICT_NONE
 import android.database.sqlite.SQLiteDatabase.CONFLICT_REPLACE
 import android.database.sqlite.SQLiteDatabase.CONFLICT_ROLLBACK
-import android.database.sqlite.SQLiteOpenHelper
 import android.database.sqlite.SQLiteStatement
 import androidx.core.database.getBlobOrNull
 import androidx.core.database.getDoubleOrNull

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/StreetCompleteSQLiteOpenHelper.kt b/app/src/main/java/de/westnordost/streetcomplete/data/StreetCompleteSQLiteOpenHelper.kt
@@ -3,33 +3,6 @@ package de.westnordost.streetcomplete.data
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import androidx.core.content.contentValuesOf
-import de.westnordost.streetcomplete.data.download.tiles.DownloadedTilesTable
-import de.westnordost.streetcomplete.data.logs.LogsTable
-import de.westnordost.streetcomplete.data.osm.created_elements.CreatedElementsTable
-import de.westnordost.streetcomplete.data.osm.edits.EditElementsTable
-import de.westnordost.streetcomplete.data.osm.edits.ElementEditsTable
-import de.westnordost.streetcomplete.data.osm.edits.ElementIdProviderTable
-import de.westnordost.streetcomplete.data.osm.edits.upload.changesets.OpenChangesetsTable
-import de.westnordost.streetcomplete.data.osm.geometry.RelationGeometryTable
-import de.westnordost.streetcomplete.data.osm.geometry.WayGeometryTable
-import de.westnordost.streetcomplete.data.osm.mapdata.NodeTable
-import de.westnordost.streetcomplete.data.osm.mapdata.RelationTables
-import de.westnordost.streetcomplete.data.osm.mapdata.WayTables
-import de.westnordost.streetcomplete.data.osm.osmquests.OsmQuestTable
-import de.westnordost.streetcomplete.data.osm.osmquests.OsmQuestsHiddenTable
-import de.westnordost.streetcomplete.data.osmnotes.NoteTable
-import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditsTable
-import de.westnordost.streetcomplete.data.osmnotes.notequests.NoteQuestsHiddenTable
-import de.westnordost.streetcomplete.data.user.achievements.UserAchievementsTable
-import de.westnordost.streetcomplete.data.user.achievements.UserLinksTable
-import de.westnordost.streetcomplete.data.user.statistics.ActiveDaysTable
-import de.westnordost.streetcomplete.data.user.statistics.CountryStatisticsTables
-import de.westnordost.streetcomplete.data.user.statistics.EditTypeStatisticsTables
-import de.westnordost.streetcomplete.data.visiblequests.QuestPresetsTable
-import de.westnordost.streetcomplete.data.visiblequests.QuestTypeOrderTable
-import de.westnordost.streetcomplete.data.visiblequests.VisibleQuestTypeTable
-import de.westnordost.streetcomplete.quests.oneway_suspects.data.WayTrafficFlowTable
 
 class StreetCompleteSQLiteOpenHelper(context: Context, dbName: String) :
     SQLiteOpenHelper(context, dbName, null, DatabaseInitializer.DB_VERSION) {

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/elementfilter/StringWithCursor.kt b/app/src/main/java/de/westnordost/streetcomplete/data/elementfilter/StringWithCursor.kt
@@ -51,7 +51,7 @@ class StringWithCursor(private val string: String) {
     /** @return the position relative to the cursor position at which the given [block] returns true
      *  If not found, the position past the end of the string is returned */
     fun findNext(offs: Int = 0, block: (Char) -> Boolean): Int {
-        for (i in cursorPos + offs ..< string.length) {
+        for (i in cursorPos + offs..<string.length) {
             if (block(string[i])) {
                 return toDelta(i)
             }

diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt
@@ -1,11 +1,11 @@
 package de.westnordost.streetcomplete.osm
 
-import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.estimatedWidth
+import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.shoulders.parseShoulders
-import de.westnordost.streetcomplete.osm.street_parking.parseStreetParkingSides
 import de.westnordost.streetcomplete.osm.street_parking.estimatedWidthOffRoad
 import de.westnordost.streetcomplete.osm.street_parking.estimatedWidthOnRoad
+import de.westnordost.streetcomplete.osm.street_parking.parseStreetParkingSides
 
 /** Functions to estimate road width(s). */
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/CyclewayOverlay.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/CyclewayOverlay.kt
@@ -14,8 +14,8 @@ import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard
 import de.westnordost.streetcomplete.osm.bicycle_boulevard.parseBicycleBoulevard
 import de.westnordost.streetcomplete.osm.cycleway.Cycleway
 import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*
-import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.isAmbiguous
+import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway
 import de.westnordost.streetcomplete.osm.cycleway_separate.parseSeparateCycleway
 import de.westnordost.streetcomplete.osm.isPrivateOnFoot

diff --git a/...rc/main/java/de/westnordost/streetcomplete/overlays/cycleway/StreetCyclewayOverlayForm.kt b/...rc/main/java/de/westnordost/streetcomplete/overlays/cycleway/StreetCyclewayOverlayForm.kt
@@ -17,9 +17,9 @@ import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway
 import de.westnordost.streetcomplete.osm.cycleway.applyTo
 import de.westnordost.streetcomplete.osm.cycleway.asDialogItem
 import de.westnordost.streetcomplete.osm.cycleway.asStreetSideItem
-import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.getDefault
 import de.westnordost.streetcomplete.osm.cycleway.getSelectableCycleways
+import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.selectableOrNullValues
 import de.westnordost.streetcomplete.osm.cycleway.wasNoOnewayForCyclistsButNowItIs
 import de.westnordost.streetcomplete.osm.isInContraflowOfOneway

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
@@ -15,9 +15,9 @@ import de.westnordost.streetcomplete.osm.changeToSteps
 import de.westnordost.streetcomplete.osm.surface.SELECTABLE_WAY_SURFACES
 import de.westnordost.streetcomplete.osm.surface.SurfaceAndNote
 import de.westnordost.streetcomplete.osm.surface.applyTo
+import de.westnordost.streetcomplete.osm.surface.isComplete
 import de.westnordost.streetcomplete.osm.surface.parseSurface
 import de.westnordost.streetcomplete.osm.surface.parseSurfaceAndNote
-import de.westnordost.streetcomplete.osm.surface.isComplete
 import de.westnordost.streetcomplete.osm.surface.updateCommonSurfaceFromFootAndCyclewaySurface
 import de.westnordost.streetcomplete.overlays.AbstractOverlayForm
 import de.westnordost.streetcomplete.overlays.AnswerItem

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt
@@ -19,8 +19,8 @@ import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_SHARED_LA
 import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway
 import de.westnordost.streetcomplete.osm.cycleway.any
 import de.westnordost.streetcomplete.osm.cycleway.applyTo
-import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.isAmbiguous
+import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.isImplicitMaxSpeedButNotSlowZone
 import de.westnordost.streetcomplete.osm.surface.ANYTHING_UNPAVED
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt
@@ -11,9 +11,9 @@ import de.westnordost.streetcomplete.osm.cycleway.Direction
 import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway
 import de.westnordost.streetcomplete.osm.cycleway.asDialogItem
 import de.westnordost.streetcomplete.osm.cycleway.asStreetSideItem
-import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.getDefault
 import de.westnordost.streetcomplete.osm.cycleway.getSelectableCycleways
+import de.westnordost.streetcomplete.osm.cycleway.parseCyclewaySides
 import de.westnordost.streetcomplete.osm.cycleway.selectableOrNullValues
 import de.westnordost.streetcomplete.osm.cycleway.wasNoOnewayForCyclistsButNowItIs
 import de.westnordost.streetcomplete.osm.isInContraflowOfOneway

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevelForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevelForm.kt
@@ -10,9 +10,9 @@ import de.westnordost.streetcomplete.data.osm.mapdata.Element
 import de.westnordost.streetcomplete.databinding.QuestLevelBinding
 import de.westnordost.streetcomplete.osm.IS_SHOP_OR_DISUSED_SHOP_EXPRESSION
 import de.westnordost.streetcomplete.osm.level.SingleLevel
+import de.westnordost.streetcomplete.osm.level.levelsIntersect
 import de.westnordost.streetcomplete.osm.level.parseLevelsOrNull
 import de.westnordost.streetcomplete.osm.level.parseSelectableLevels
-import de.westnordost.streetcomplete.osm.level.levelsIntersect
 import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
 import de.westnordost.streetcomplete.screens.main.map.ShowsGeometryMarkers
 import de.westnordost.streetcomplete.screens.main.map.getPinIcon

diff --git a/...de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt b/...de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt
@@ -14,10 +14,6 @@ import de.westnordost.streetcomplete.osm.Tags
 import de.westnordost.streetcomplete.osm.hasCheckDateForKey
 import de.westnordost.streetcomplete.osm.removeCheckDatesForKey
 import de.westnordost.streetcomplete.osm.updateCheckDateForKey
-import de.westnordost.streetcomplete.quests.recycling_material.RecyclingMaterial.BEVERAGE_CARTONS
-import de.westnordost.streetcomplete.quests.recycling_material.RecyclingMaterial.PET
-import de.westnordost.streetcomplete.quests.recycling_material.RecyclingMaterial.PLASTIC_BOTTLES
-import de.westnordost.streetcomplete.quests.recycling_material.RecyclingMaterial.PLASTIC_PACKAGING
 
 class AddRecyclingContainerMaterials : OsmElementQuestType<RecyclingContainerMaterialsAnswer> {
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt
@@ -6,9 +6,7 @@ import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
 import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST
 import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS
 import de.westnordost.streetcomplete.osm.Tags
-import de.westnordost.streetcomplete.osm.removeCheckDatesForKey
 import de.westnordost.streetcomplete.osm.surface.ANYTHING_PAVED
-import de.westnordost.streetcomplete.osm.updateWithCheckDate
 import de.westnordost.streetcomplete.quests.segregated.CyclewaySegregation.*
 
 class AddCyclewaySegregation : OsmFilterQuestType<CyclewaySegregation>() {

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt
@@ -9,7 +9,6 @@ import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.
 import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR
 import de.westnordost.streetcomplete.osm.Tags
 import de.westnordost.streetcomplete.osm.changeToSteps
-import de.westnordost.streetcomplete.osm.surface.ANYTHING_UNPAVED
 import de.westnordost.streetcomplete.osm.surface.INVALID_SURFACES
 import de.westnordost.streetcomplete.osm.surface.applyTo
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt
@@ -65,8 +65,8 @@ import de.westnordost.streetcomplete.data.quest.QuestType
 import de.westnordost.streetcomplete.data.quest.VisibleQuestsSource
 import de.westnordost.streetcomplete.databinding.EffectQuestPlopBinding
 import de.westnordost.streetcomplete.databinding.FragmentMainBinding
-import de.westnordost.streetcomplete.osm.level.parseLevelsOrNull
 import de.westnordost.streetcomplete.osm.level.levelsIntersect
+import de.westnordost.streetcomplete.osm.level.parseLevelsOrNull
 import de.westnordost.streetcomplete.overlays.AbstractOverlayForm
 import de.westnordost.streetcomplete.overlays.IsShowingElement
 import de.westnordost.streetcomplete.overlays.Overlay

diff --git a/app/src/test/java/de/westnordost/streetcomplete/data/elementfilter/StringWithCursorTest.kt b/app/src/test/java/de/westnordost/streetcomplete/data/elementfilter/StringWithCursorTest.kt
@@ -163,11 +163,11 @@ class StringWithCursorTest {
 
     @Test fun advanceWhile() {
         val x = StringWithCursor("hello you   !")
-        assertEquals(0, x.advanceWhile { it == ' '})
+        assertEquals(0, x.advanceWhile { it == ' ' })
         x.advanceBy(5)
-        assertEquals(1, x.advanceWhile { it == ' '})
+        assertEquals(1, x.advanceWhile { it == ' ' })
         x.advanceBy(3)
-        assertEquals(3, x.advanceWhile { it == ' '})
+        assertEquals(3, x.advanceWhile { it == ' ' })
     }
 
     @Test fun retreatWhile() {

diff --git a/...c/test/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevardKtTest.kt b/...c/test/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevardKtTest.kt
@@ -6,8 +6,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryCh
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard.*
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class BicycleBoulevardKtTest {
 

diff --git a/...java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreatorKtTest.kt b/...java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreatorKtTest.kt
@@ -7,8 +7,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDe
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class SeparateCyclewayCreatorKtTest {
     @Test fun `apply none`() {

diff --git a/...etcomplete/osm/lane_narrowing_traffic_calming/LaneNarrowingTrafficCalmingCreatorKtTest.kt b/...etcomplete/osm/lane_narrowing_traffic_calming/LaneNarrowingTrafficCalmingCreatorKtTest.kt
@@ -7,8 +7,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDe
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.lane_narrowing_traffic_calming.LaneNarrowingTrafficCalming.*
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class LaneNarrowingTrafficCalmingCreatorKtTest {
     @Test fun `set traffic_calming`() {

diff --git a/.../test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreatorKtTest.kt b/.../test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreatorKtTest.kt
@@ -9,8 +9,8 @@ import de.westnordost.streetcomplete.osm.nowAsCheckDateString
 import de.westnordost.streetcomplete.osm.street_parking.ParkingOrientation.*
 import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.*
 import kotlin.test.Test
-import kotlin.test.assertFailsWith
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class StreetParkingCreatorKtTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtilsKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtilsKtTest.kt
@@ -5,7 +5,6 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAd
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
-import de.westnordost.streetcomplete.util.ktx.containsExactlyInAnyOrder
 import kotlin.test.*
 import kotlin.test.Test
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileTypeTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileTypeTest.kt
@@ -5,8 +5,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDe
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
 import de.westnordost.streetcomplete.quests.answerAppliedTo
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddStileTypeTest {
     private val questType = AddStileType()

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameTest.kt
@@ -10,7 +10,6 @@ class AddBusStopNameTest {
 
     private val questType = AddBusStopName()
 
-
     @Test fun `apply no name answer`() {
         assertEquals(
             setOf(StringMapEntryAdd("name:signed", "no")),

diff --git a/.../test/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelterTest.kt b/.../test/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelterTest.kt
@@ -6,8 +6,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryMo
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
 import de.westnordost.streetcomplete.quests.answerApplied
 import de.westnordost.streetcomplete.quests.answerAppliedTo
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddBusStopShelterTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashTypeTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashTypeTest.kt
@@ -1,10 +1,10 @@
 package de.westnordost.streetcomplete.quests.car_wash_type
 
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
+import de.westnordost.streetcomplete.quests.answerApplied
 import de.westnordost.streetcomplete.quests.car_wash_type.CarWashType.AUTOMATED
 import de.westnordost.streetcomplete.quests.car_wash_type.CarWashType.SELF_SERVICE
 import de.westnordost.streetcomplete.quests.car_wash_type.CarWashType.SERVICE
-import de.westnordost.streetcomplete.quests.answerApplied
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingTypeTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingTypeTest.kt
@@ -3,12 +3,12 @@ package de.westnordost.streetcomplete.quests.crossing_type
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
-import de.westnordost.streetcomplete.quests.crossing_type.CrossingType.MARKED
-import de.westnordost.streetcomplete.quests.crossing_type.CrossingType.TRAFFIC_SIGNALS
 import de.westnordost.streetcomplete.quests.answerApplied
 import de.westnordost.streetcomplete.quests.answerAppliedTo
-import kotlin.test.assertEquals
+import de.westnordost.streetcomplete.quests.crossing_type.CrossingType.MARKED
+import de.westnordost.streetcomplete.quests.crossing_type.CrossingType.TRAFFIC_SIGNALS
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddCrossingTypeTest {
 

diff --git a/...st/java/de/westnordost/streetcomplete/quests/drinking_water_type/DrinkingWaterTypeTest.kt b/...st/java/de/westnordost/streetcomplete/quests/drinking_water_type/DrinkingWaterTypeTest.kt
@@ -6,8 +6,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryCh
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete
 import de.westnordost.streetcomplete.osm.SURVEY_MARK_KEY
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class DrinkingWaterTypeTest {
     @Test fun `set drinking water as spring`() {

diff --git a/...rc/test/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansTest.kt b/...rc/test/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestriansTest.kt
@@ -6,8 +6,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryMo
 import de.westnordost.streetcomplete.quests.answerApplied
 import de.westnordost.streetcomplete.quests.answerAppliedTo
 import de.westnordost.streetcomplete.quests.foot.ProhibitedForPedestriansAnswer.*
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddProhibitedForPedestriansTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeightTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeightTest.kt
@@ -2,8 +2,8 @@ package de.westnordost.streetcomplete.quests.max_weight
 
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
 import de.westnordost.streetcomplete.quests.answerApplied
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddMaxWeightTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/parking_fee/FeeTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/parking_fee/FeeTest.kt
@@ -8,14 +8,13 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDe
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
 import de.westnordost.streetcomplete.osm.opening_hours.parser.OpeningHoursRuleList
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class FeeTest {
     private val oh = OpeningHoursRuleList(listOf(Rule().apply { isTwentyfourseven = true }))
     private val ohStr = "24/7"
 
-
     @Test fun `apply HasNoFee`() {
         assertEquals(
             setOf(

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/parking_fee/MaxStayTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/parking_fee/MaxStayTest.kt
@@ -8,8 +8,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDe
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
 import de.westnordost.streetcomplete.osm.nowAsCheckDateString
 import de.westnordost.streetcomplete.osm.opening_hours.parser.OpeningHoursRuleList
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class MaxStayTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameTest.kt
@@ -4,8 +4,8 @@ import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAd
 import de.westnordost.streetcomplete.osm.LocalizedName
 import de.westnordost.streetcomplete.quests.answerApplied
 import de.westnordost.streetcomplete.testutils.mock
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddPlaceNameTest {
 

diff --git a/...stnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesTest.kt b/...stnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesTest.kt
@@ -4,8 +4,8 @@ import ch.poole.openinghoursparser.Rule
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
 import de.westnordost.streetcomplete.osm.opening_hours.parser.OpeningHoursRuleList
 import de.westnordost.streetcomplete.quests.answerApplied
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddPostboxCollectionTimesTest {
 

diff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefTest.kt
@@ -2,8 +2,8 @@ package de.westnordost.streetcomplete.quests.postbox_ref
 
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
 import de.westnordost.streetcomplete.quests.answerApplied
-import kotlin.test.assertEquals
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class AddPostboxRefTest {