WIP: AddAddressStreet

app/src/androidTest/java/de/westnordost/streetcomplete/quests/localized_name/data/RoadNameSuggestionsDaoTest.kt

@@ -23,26 +23,27 @@ class RoadNameSuggestionsDaoTest : ApplicationDbTestCase() {
             "de" to "Große Straße",
             "en" to "Big Street"
         )
-        dao.putRoad(1, names, createRoadPositions())
+        dao.putRoad(1, names, listOf(OsmLatLon(0.0, 0.0), OsmLatLon(0.0, 0.0001)))
 
-        val result = dao.getNames(createPosOnRoad(), 1000.0)
+        val result = dao.getNames(listOf(OsmLatLon(0.0, 0.00005)), 1000.0)
 
         assertEquals(listOf(names), result)
     }
 
-    @Test fun getMultipleNames() {
-        val names1 = mapOf("en" to "Big Street")
-        dao.putRoad(1, names1, createRoadPositions())
+    @Test fun getMultipleNamesSortedByDistance() {
+        val middle = mapOf("en" to "Middle Street")
+        dao.putRoad(1, middle, listOf(OsmLatLon(0.0, 0.0001), OsmLatLon(0.0, 0.0002)))
 
-        val names2 = mapOf("es" to "Calle Pequena")
-        dao.putRoad(2, names2, createRoadPositions())
+        val far = mapOf("en" to "Far Street")
+        dao.putRoad(2, far, listOf(OsmLatLon(0.0, 0.0002), OsmLatLon(0.0, 0.0003)))
 
-        val result = dao.getNames(createPosOnRoad(), 1000.0)
-        assertEquals(2, result.size)
-        assertTrue(result.containsAll(listOf(names1, names2)))
-    }
+        val near = mapOf("en" to "Near Street")
+        dao.putRoad(3, near, listOf(OsmLatLon(0.0, 0.0000), OsmLatLon(0.0, 0.0001)))
 
-    private fun createRoadPositions() = listOf(OsmLatLon(0.0, 0.0), OsmLatLon(0.0, 0.0001))
+        val tooFar = mapOf("en" to "Too Far Street")
+        dao.putRoad(4, tooFar, listOf(OsmLatLon(10.0, 0.0002), OsmLatLon(10.0, 0.0003)))
 
-    private fun createPosOnRoad() = listOf(OsmLatLon(0.0, 0.00005))
+        val result = dao.getNames(listOf(OsmLatLon(0.0, 0.0)), 1000.0)
+        assertEquals(listOf(near, middle, far), result)
+    }
 }

app/src/main/assets/map_theme/layers/labels.yaml

@@ -32,7 +32,7 @@ layers:
     buildings:
         data: { source: mapzen}
         address-labels:
-            filter: { $zoom: { min: 19 }, kind: address }
+            filter: { $zoom: { min: 18 }, kind: address }
             draw:
                 text:
                     text_source: addr_housenumber

app/src/main/java/de/westnordost/streetcomplete/ApplicationComponent.kt

@@ -20,6 +20,7 @@ import de.westnordost.streetcomplete.notifications.OsmUnreadMessagesFragment
 import de.westnordost.streetcomplete.quests.AbstractQuestAnswerFragment
 import de.westnordost.streetcomplete.quests.QuestModule
 import de.westnordost.streetcomplete.quests.SplitWayFragment
+import de.westnordost.streetcomplete.quests.address.AddAddressStreetForm;
 import de.westnordost.streetcomplete.quests.building_levels.AddBuildingLevelsForm
 import de.westnordost.streetcomplete.quests.localized_name.AAddLocalizedNameForm
 import de.westnordost.streetcomplete.quests.localized_name.AddRoadNameForm
@@ -64,6 +65,7 @@ interface ApplicationComponent {
     fun inject(settingsActivity: SettingsActivity)
     fun inject(addOpeningHoursForm: AddOpeningHoursForm)
     fun inject(addRoadNameForm: AddRoadNameForm)
+    fun inject(addAddressStreetForm: AddAddressStreetForm)
     fun inject(parkingFeeForm: AddParkingFeeForm)
     fun inject(addOnewayForm: AddOnewayForm)
     fun inject(addCollectionTimesForm: AddCollectionTimesForm)

app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt

@@ -10,6 +10,7 @@ import de.westnordost.osmfeatures.FeatureDictionary
 import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
 import de.westnordost.streetcomplete.data.osm.mapdata.OverpassMapDataAndGeometryApi
 import de.westnordost.streetcomplete.data.osmnotes.notequests.OsmNoteQuestType
+import de.westnordost.streetcomplete.quests.address.AddAddressStreet;
 import de.westnordost.streetcomplete.quests.accepts_cash.AddAcceptsCash
 import de.westnordost.streetcomplete.quests.baby_changing_table.AddBabyChangingTable
 import de.westnordost.streetcomplete.quests.bike_parking_capacity.AddBikeParkingCapacity
@@ -69,7 +70,7 @@ import de.westnordost.streetcomplete.quests.toilet_availability.AddToiletAvailab
 import de.westnordost.streetcomplete.quests.toilets_fee.AddToiletsFee
 import de.westnordost.streetcomplete.quests.tourism_information.AddInformationToTourism
 import de.westnordost.streetcomplete.quests.tracktype.AddTracktype
-import de.westnordost.streetcomplete.quests.housenumber.AddHousenumber
+import de.westnordost.streetcomplete.quests.address.AddHousenumber
 import de.westnordost.streetcomplete.quests.max_speed.AddMaxSpeed
 import de.westnordost.streetcomplete.quests.opening_hours.AddOpeningHours
 import de.westnordost.streetcomplete.quests.localized_name.AddRoadName
@@ -108,6 +109,7 @@ object QuestModule
         AddBusStopName(o),
         AddIsBuildingUnderground(o), //to avoid asking AddHousenumber and other for underground buildings
         AddHousenumber(o),
+        AddAddressStreet(o, roadNameSuggestionsDao),
         MarkCompletedHighwayConstruction(o),
         AddReligionToPlaceOfWorship(o), // icons on maps are different - OSM Carto, mapy.cz, OsmAnd, Sputnik etc
         AddParkingAccess(o), //OSM Carto, mapy.cz, OSMand, Sputnik etc

app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreet.kt

@@ -0,0 +1,95 @@
+package de.westnordost.streetcomplete.quests.address
+
+import de.westnordost.osmapi.map.data.BoundingBox
+import de.westnordost.osmapi.map.data.Element
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.meta.ALL_ROADS
+import de.westnordost.streetcomplete.data.osm.osmquest.OsmElementQuestType
+import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder
+import de.westnordost.streetcomplete.data.osm.mapdata.OverpassMapDataAndGeometryApi
+import de.westnordost.streetcomplete.data.osm.elementgeometry.ElementGeometry
+import de.westnordost.streetcomplete.data.quest.AllCountriesExcept
+import de.westnordost.streetcomplete.data.tagfilters.FiltersParser
+import de.westnordost.streetcomplete.data.tagfilters.getQuestPrintStatement
+import de.westnordost.streetcomplete.data.tagfilters.toGlobalOverpassBBox
+import de.westnordost.streetcomplete.quests.localized_name.data.RoadNameSuggestionsDao
+import de.westnordost.streetcomplete.quests.localized_name.data.putRoadNameSuggestion
+
+class AddAddressStreet(
+        private val overpassApi: OverpassMapDataAndGeometryApi,
+        private val roadNameSuggestionsDao: RoadNameSuggestionsDao
+) : OsmElementQuestType<AddressStreetAnswer> {
+
+    override val commitMessage = "Add street/place names to address"
+    override val icon = R.drawable.ic_quest_housenumber_street
+    // In Japan, housenumbers usually have block numbers, not streets
+    override val enabledInCountries = AllCountriesExcept("JP")
+
+    override fun getTitle(tags: Map<String, String>) = R.string.quest_address_street_title
+
+    override fun getTitleArgs(tags: Map<String, String>, featureName: Lazy<String?>): Array<String> {
+        val housenumber = tags["addr:streetnumber"] ?: tags["addr:housenumber"]
+        return if (housenumber != null) arrayOf(housenumber) else arrayOf()
+    }
+
+    override fun createForm() = AddAddressStreetForm()
+
+    override fun isApplicableTo(element: Element): Boolean? =
+            ADDRESSES_WITHOUT_STREETS_TFE.matches(element)
+
+    override fun download(bbox: BoundingBox, handler: (element: Element, geometry: ElementGeometry?) -> Unit): Boolean {
+        if (!overpassApi.query(getOverpassQuery(bbox), handler)) return false
+        if (!overpassApi.query(getStreetNameSuggestionsOverpassQuery(bbox), roadNameSuggestionsDao::putRoadNameSuggestion)) return false
+        return true
+    }
+
+    private fun getOverpassQuery(bbox: BoundingBox) =
+            bbox.toGlobalOverpassBBox() + """
+            relation["type"="associatedStreet"]; > -> .inStreetRelation;
+            $ADDRESSES_WITHOUT_STREETS -> .missing_data;
+            (.missing_data; - .inStreetRelation;);
+            """.trimIndent() + getQuestPrintStatement()
+
+    /** return overpass query string to get roads with names around addresses without streets
+     * */
+    private fun getStreetNameSuggestionsOverpassQuery(bbox: BoundingBox) =
+            bbox.toGlobalOverpassBBox() + "\n" + """
+        $ADDRESSES_WITHOUT_STREETS -> .address_missing_street;
+        $ROADS_WITH_NAMES -> .named_roads;
+        way.named_roads(
+            around.address_missing_street: $MAX_DIST_FOR_ROAD_NAME_SUGGESTION);
+        out body geom;""".trimIndent()
+
+    override fun applyAnswerTo(answer: AddressStreetAnswer, changes: StringMapChangesBuilder) {
+        val key = when(answer) {
+            is StreetName -> "addr:street"
+            is PlaceName -> "addr:place"
+        }
+        for ((languageCode, name) in answer.localizedNames) {
+            if (languageCode.isEmpty()) {
+                changes.addOrModify(key, name)
+            } else {
+                changes.addOrModify("$key:$languageCode", name)
+            }
+        }
+    }
+
+    companion object {
+        const val MAX_DIST_FOR_ROAD_NAME_SUGGESTION = 100.0
+
+        private val ADDRESSES_WITHOUT_STREETS = """
+                (
+                    nwr["addr:housenumber"][!"addr:street"][!"addr:place"][!"addr:block_number"];
+                    nwr["addr:streetnumber"][!"addr:street"];
+                )""".trimIndent()
+        // this must be the same as above but in tag filter expression syntax
+        private val ADDRESSES_WITHOUT_STREETS_TFE by lazy { FiltersParser().parse("""
+                nodes, ways, relations with 
+                  addr:housenumber and !addr:street and !addr:place and !addr:block_number
+                  or addr:streetnumber and !addr:street
+        """)}
+
+        private val ROADS_WITH_NAMES =
+                "way[highway ~ \"^(${ALL_ROADS.joinToString("|")})$\"][name]"
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreetForm.kt

@@ -0,0 +1,100 @@
+package de.westnordost.streetcomplete.quests.address
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import de.westnordost.osmapi.map.data.LatLon
+import de.westnordost.streetcomplete.Injector
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.meta.AbbreviationsByLocale
+import de.westnordost.streetcomplete.data.osm.elementgeometry.ElementGeometry
+import de.westnordost.streetcomplete.data.osm.elementgeometry.ElementPointGeometry
+import de.westnordost.streetcomplete.data.osm.elementgeometry.ElementPolygonsGeometry
+import de.westnordost.streetcomplete.data.osm.elementgeometry.ElementPolylinesGeometry
+import de.westnordost.streetcomplete.quests.localized_name.AAddLocalizedNameForm
+import de.westnordost.streetcomplete.quests.OtherAnswer
+import de.westnordost.streetcomplete.quests.localized_name.AddLocalizedNameAdapter
+import de.westnordost.streetcomplete.quests.localized_name.LocalizedName
+import de.westnordost.streetcomplete.quests.localized_name.data.RoadNameSuggestionsDao
+import java.util.*
+import javax.inject.Inject
+
+class AddAddressStreetForm : AAddLocalizedNameForm<AddressStreetAnswer>() {
+    private var isPlaceName = false
+
+    @Inject internal lateinit var abbreviationsByLocale: AbbreviationsByLocale
+    @Inject internal lateinit var roadNameSuggestionsDao: RoadNameSuggestionsDao
+
+    init {
+        Injector.instance.applicationComponent.inject(this)
+    }
+
+    override val otherAnswers = listOf(
+        OtherAnswer(R.string.quest_address_street_no_named_streets) { switchToPlaceNameLayout() }
+    )
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        isPlaceName = savedInstanceState?.getBoolean(IS_PLACENAME) ?: false
+        contentLayoutResId = if (isPlaceName) R.layout.quest_localized_name_place else R.layout.quest_localizedname
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(IS_PLACENAME, isPlaceName)
+    }
+
+    override fun onClickOk(names: List<LocalizedName>) {
+        val possibleAbbreviations = LinkedList<String>()
+        for ((languageCode, name) in adapter.localizedNames) {
+            val locale = if(languageCode.isEmpty()) countryInfo.locale else Locale(languageCode)
+            val abbr = abbreviationsByLocale.get(locale)
+            val containsAbbreviations = abbr?.containsAbbreviations(name) == true
+
+            if (name.contains(".") || containsAbbreviations) {
+                possibleAbbreviations.add(name)
+            }
+        }
+
+        confirmPossibleAbbreviationsIfAny(possibleAbbreviations) {
+            if(isPlaceName) {
+                applyAnswer(PlaceName(names))
+            } else {
+                applyAnswer(StreetName(names))
+            }
+        }
+    }
+
+    override fun createLocalizedNameAdapter(data: List<LocalizedName>, addLanguageButton: View) =
+        AddLocalizedNameAdapter(
+            data, activity!!, getPossibleStreetsignLanguages(),
+            abbreviationsByLocale, getNameSuggestions(), addLanguageButton,
+            getRowLayoutResId()
+        )
+
+    private fun getNameSuggestions(): List<MutableMap<String, String>> {
+        return if (isPlaceName) {
+            emptyList()
+        } else {
+            roadNameSuggestionsDao.getNames(
+                listOf(elementGeometry.center),
+                AddAddressStreet.MAX_DIST_FOR_ROAD_NAME_SUGGESTION
+            ).take(4)
+            /* taking the four closest streets because in the worst case, the building is located
+               on an island surrounded on every side by a street */
+        }
+    }
+
+    private fun getRowLayoutResId(): Int =
+        if (isPlaceName) R.layout.quest_localized_name_place_row else R.layout.quest_localizedname_row
+
+    private fun switchToPlaceNameLayout() {
+        isPlaceName = true
+        setLayout(R.layout.quest_localized_name_place)
+    }
+
+    companion object {
+        private const val IS_PLACENAME = "is_placename"
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/quests/housenumber/AddHousenumber.kt → app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumber.kt

@@ -1,4 +1,4 @@
-package de.westnordost.streetcomplete.quests.housenumber
+package de.westnordost.streetcomplete.quests.address
 
 import android.util.Log
 

app/src/main/java/de/westnordost/streetcomplete/quests/housenumber/AddHousenumberForm.kt → app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumberForm.kt

@@ -1,4 +1,4 @@
-package de.westnordost.streetcomplete.quests.housenumber
+package de.westnordost.streetcomplete.quests.address
 
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog

app/src/main/java/de/westnordost/streetcomplete/quests/address/AddressStreetAnswer.kt

@@ -0,0 +1,8 @@
+package de.westnordost.streetcomplete.quests.address
+
+import de.westnordost.streetcomplete.quests.localized_name.LocalizedName
+
+sealed class AddressStreetAnswer(open val localizedNames: List<LocalizedName>)
+
+data class StreetName(override val localizedNames: List<LocalizedName>) : AddressStreetAnswer(localizedNames)
+data class PlaceName(override val localizedNames: List<LocalizedName>) : AddressStreetAnswer(localizedNames)

app/src/main/java/de/westnordost/streetcomplete/quests/housenumber/HousenumberAnswer.kt → app/src/main/java/de/westnordost/streetcomplete/quests/address/HousenumberAnswer.kt

@@ -1,4 +1,4 @@
-package de.westnordost.streetcomplete.quests.housenumber
+package de.westnordost.streetcomplete.quests.address
 
 sealed class HousenumberAnswer
 

app/src/main/java/de/westnordost/streetcomplete/quests/localized_name/AAddLocalizedNameForm.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
 import android.text.Html
 import android.view.View
+import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 
 import java.util.ArrayList
@@ -20,15 +21,16 @@ import de.westnordost.streetcomplete.quests.AbstractQuestFormAnswerFragment
 import de.westnordost.streetcomplete.util.AdapterDataChangedWatcher
 import de.westnordost.streetcomplete.util.Serializer
 import de.westnordost.streetcomplete.ktx.toObject
-import kotlinx.android.synthetic.main.quest_localizedname.*
 
 abstract class AAddLocalizedNameForm<T> : AbstractQuestFormAnswerFragment<T>() {
 
-    override val contentLayoutResId = R.layout.quest_localizedname
+    override var contentLayoutResId: Int = R.layout.quest_localizedname
 
     private val serializer: Serializer
 
     protected lateinit var adapter: AddLocalizedNameAdapter
+    private lateinit var namesList: RecyclerView
+    private lateinit var addLanguageButton: View
 
     init {
         val fields = InjectedFields()
@@ -38,26 +40,34 @@ abstract class AAddLocalizedNameForm<T> : AbstractQuestFormAnswerFragment<T>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initLocalizedNameAdapter(savedInstanceState)
-    }
 
-    private fun initLocalizedNameAdapter(savedInstanceState: Bundle?) {
-        val data: ArrayList<LocalizedName> = if (savedInstanceState != null) {
+        val data: ArrayList<LocalizedName>? = if (savedInstanceState != null) {
             serializer.toObject(savedInstanceState.getByteArray(LOCALIZED_NAMES_DATA)!!)
         } else {
-            ArrayList()
+            null
         }
 
-        adapter = setupNameAdapter(data, addLanguageButton)
+        initLocalizedNameAdapter(view as ViewGroup, data)
+    }
+
+    protected fun setLayout(resId: Int) {
+        val view = setContentView(resId)
+        initLocalizedNameAdapter(view as ViewGroup)
+    }
+
+    private fun initLocalizedNameAdapter(view: ViewGroup, data: MutableList<LocalizedName>? = null) {
+        addLanguageButton = view.findViewById(R.id.addLanguageButton)
+        adapter = createLocalizedNameAdapter(data.orEmpty(), addLanguageButton)
         adapter.addOnNameChangedListener { checkIsFormComplete() }
         adapter.registerAdapterDataObserver(AdapterDataChangedWatcher { checkIsFormComplete() })
+        namesList = view.findViewById(R.id.namesList)
         namesList.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
         namesList.adapter = adapter
         namesList.isNestedScrollingEnabled = false
         checkIsFormComplete()
     }
 
-    protected open fun setupNameAdapter(data: List<LocalizedName>, addLanguageButton: View) =
+    protected open fun createLocalizedNameAdapter(data: List<LocalizedName>, addLanguageButton: View) =
         AddLocalizedNameAdapter(data, activity!!, getPossibleStreetsignLanguages(), null, null, addLanguageButton)
 
     protected fun getPossibleStreetsignLanguages(): List<String> {