WIP: AddAddressStreet

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,98 @@
+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.osm.elementgeometry.ElementPolylinesGeometry
+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 java.util.regex.Pattern
+
+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
+
+    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 {
+        // This only picks up nodes, so street-name suggestions don't appear
+        // in the middle of a long straight-stretch (longer than 0.5km). This happens rarely
+        // enough that I don't think it is a concern.
+        const val MAX_DIST_FOR_ROAD_NAME_SUGGESTION = 250.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,146 @@
+package de.westnordost.streetcomplete.quests.address
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.PopupMenu
+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.LastPickedValuesStore
+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 de.westnordost.streetcomplete.util.TextChangedWatcher
+import java.util.*
+import javax.inject.Inject
+
+class AddAddressStreetForm : AAddLocalizedNameForm<AddressStreetAnswer>() {
+    private var isPlaceName = false
+    private var defaultName = ""
+
+    @Inject
+    internal lateinit var abbreviationsByLocale: AbbreviationsByLocale
+    @Inject
+    internal lateinit var roadNameSuggestionsDao: RoadNameSuggestionsDao
+
+    @Inject internal lateinit var favs: LastPickedValuesStore<String>
+
+    init {
+        Injector.instance.applicationComponent.inject(this)
+        val lastPickedNames = favs.get(javaClass.simpleName)
+        defaultName = if (lastPickedNames.isEmpty()) {""} else {lastPickedNames.first}
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+
+        isPlaceName = savedInstanceState?.getBoolean(IS_PLACENAME) ?: false
+        if (isPlaceName) {
+            switchToPlaceNameLayout()
+        }
+
+        return view
+    }
+
+    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)
+            }
+        }
+
+        if (!isPlaceName) {
+            favs.add(javaClass.simpleName,
+                    names.first().name, max = 1)
+        }
+
+        confirmPossibleAbbreviationsIfAny(possibleAbbreviations) {
+            if(isPlaceName) {
+                applyAnswer(PlaceName(names))
+            } else {
+                applyAnswer(StreetName(names))
+            }
+        }
+    }
+
+    override val otherAnswers = listOf(
+            OtherAnswer(R.string.quest_address_street_no_named_streets) { switchToPlaceNameLayout() }
+    )
+
+    override fun setupNameAdapter(data: List<LocalizedName>, addLanguageButton: View): AddLocalizedNameAdapter {
+
+        return AddLocalizedNameAdapter(
+                data, activity!!, getPossibleStreetsignLanguages(),
+                abbreviationsByLocale, getNameSuggestions(), addLanguageButton,
+                defaultName
+        )
+    }
+
+    private fun getNameSuggestions(): List<MutableMap<String, String>> {
+        return if (isPlaceName) {
+            emptyList<MutableMap<String, String>>()
+        } else {
+            roadNameSuggestionsDao.getNames(
+                    geometryToMajorPoints(elementGeometry),
+                    AddAddressStreet.MAX_DIST_FOR_ROAD_NAME_SUGGESTION
+            )
+        }
+    }
+
+    private fun geometryToMajorPoints(geometry: ElementGeometry): List<LatLon> {
+        return when(geometry) {
+            is ElementPolylinesGeometry -> {
+                val polyline = geometry.polylines.first()
+                listOf(polyline.first(), polyline.last())
+            }
+            is ElementPolygonsGeometry -> {
+                // return center and one of nodes from the way constructing area
+                listOf(geometry.center, geometry.polygons.first().last())
+            }
+            is ElementPointGeometry -> {
+                listOf(geometry.center)
+            }
+        }
+
+
+    }
+
+    override fun isRejectingClose() : Boolean {
+        // if the form is complete, we will reject close, unless it is still has only the default name
+        return isFormComplete() && !(adapter.localizedNames.size == 1 && adapter.localizedNames.first().name == defaultName)
+    }
+
+    private fun switchToPlaceNameLayout() {
+        isPlaceName = true
+        changeLayout(resources.getString(R.string.quest_address_street_place_name_label),
+            R.drawable.background_placename)
+        defaultName = ""
+        initLocalizedNameAdapter(null)
+    }
+
+    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

@@ -41,7 +41,7 @@ abstract class AAddLocalizedNameForm<T> : AbstractQuestFormAnswerFragment<T>() {
         initLocalizedNameAdapter(savedInstanceState)
     }
 
-    private fun initLocalizedNameAdapter(savedInstanceState: Bundle?) {
+    protected fun initLocalizedNameAdapter(savedInstanceState: Bundle?) {
         val data: ArrayList<LocalizedName> = if (savedInstanceState != null) {
             serializer.toObject(savedInstanceState.getByteArray(LOCALIZED_NAMES_DATA)!!)
         } else {
@@ -57,6 +57,11 @@ abstract class AAddLocalizedNameForm<T> : AbstractQuestFormAnswerFragment<T>() {
         checkIsFormComplete()
     }
 
+    protected fun changeLayout(label : String, background_resource : Int) {
+        descriptionLabel.setText(label)
+        namesList.setBackgroundResource(background_resource)
+    }
+
     protected open fun setupNameAdapter(data: List<LocalizedName>, addLanguageButton: View) =
         AddLocalizedNameAdapter(data, activity!!, getPossibleStreetsignLanguages(), null, null, addLanguageButton)