add acrylic surface and renew wording and graphics for other pitch su…

…rfaces

app/src/main/java/de/westnordost/streetcomplete/osm/surface/Surface.kt

@@ -27,7 +27,8 @@ enum class Surface(val osmValue: String?) {
     ROCK("rock"),
     CLAY("clay"),
     ARTIFICIAL_TURF("artificial_turf"),
-    TARTAN("tartan"),
+    RUBBER("rubber"),
+    ACRYLIC("acrylic"),
 
     // generic surfaces
     PAVED("paved"),
@@ -46,18 +47,26 @@ enum class Surface(val osmValue: String?) {
     COBBLESTONE_FLATTENED("cobblestone:flattened"), // =sett with good smoothness
     BRICK("brick"),
     BRICKS("bricks"),
+    TARTAN("tartan"), // there are two products by 3M named "Tartan":
+                      // "Tartan track" are bound rubber granules, "Tartan turf" is artificial turf.
+                      // Very likely we mean "bound rubber granules", but still, it is inherently ambiguous
+    HARD("hard"), // badly worded: surface used for tennis hard courts, which is synthetic resin (-> acrylic)
 
     // various possibly valid surfaces not supported as duplicates
     UNKNOWN(null),
 }
 
 val SELECTABLE_PITCH_SURFACES = listOf(
-    GRASS, ASPHALT, SAND, CONCRETE,
-    CLAY, ARTIFICIAL_TURF, TARTAN, DIRT,
+    // grouped a bit: 1. very most popular, 2. artificial, 3. natural
+    GRASS, ASPHALT, CONCRETE,
+    ARTIFICIAL_TURF, ACRYLIC, RUBBER,
+    CLAY, SAND, DIRT,
+    // then, roughly by popularity
     FINE_GRAVEL, PAVING_STONES, COMPACTED,
     SETT, UNHEWN_COBBLESTONE, GRASS_PAVER,
-    WOOD, METAL, GRAVEL, PEBBLES,
-    ROCK, PAVED, UNPAVED, GROUND
+    WOOD, METAL, GRAVEL,
+    PEBBLES, ROCK,
+    PAVED, UNPAVED, GROUND
 )
 
 val SELECTABLE_WAY_SURFACES = listOf(

app/src/main/java/de/westnordost/streetcomplete/osm/surface/SurfaceItem.kt

@@ -48,7 +48,8 @@ val Surface.titleResId: Int get() = when (this) {
     ROCK -> R.string.quest_surface_value_rock
     CLAY -> R.string.quest_surface_value_clay
     ARTIFICIAL_TURF -> R.string.quest_surface_value_artificial_turf
-    TARTAN -> R.string.quest_surface_value_tartan
+    RUBBER, TARTAN -> R.string.quest_surface_value_rubber
+    ACRYLIC, HARD -> R.string.quest_surface_value_acrylic
     PAVED -> R.string.quest_surface_value_paved
     UNPAVED -> R.string.quest_surface_value_unpaved
     GROUND -> R.string.quest_surface_value_ground
@@ -78,7 +79,8 @@ val Surface.iconResId: Int get() = when (this) {
     ROCK -> R.drawable.surface_rock
     CLAY -> R.drawable.surface_tennis_clay
     ARTIFICIAL_TURF -> R.drawable.surface_artificial_turf
-    TARTAN -> R.drawable.surface_tartan
+    RUBBER, TARTAN -> R.drawable.surface_tartan
+    ACRYLIC, HARD -> R.drawable.surface_acrylic
     PAVED -> R.drawable.surface_paved_area
     UNPAVED -> R.drawable.surface_unpaved_area
     GROUND -> R.drawable.surface_ground_area

app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceColorMapping.kt

@@ -61,7 +61,7 @@ val Surface.color get() = when (this) {
     UNKNOWN,
     PAVED, UNPAVED, // overriden in getColor of note is note is not present
     // not encountered in normal situations, get the same as surface with surface:note
-    CLAY, ARTIFICIAL_TURF, TARTAN
+    CLAY, ARTIFICIAL_TURF, TARTAN, RUBBER, ACRYLIC, HARD
                        -> Color.BLACK
 }
 

app/src/main/res/authors.txt

@@ -228,6 +228,7 @@ recycling_container_undergr... CC0               https://commons.wikimedia.org/w
 sliding_envelope.wav           CC0               https://freesound.org/people/MTJohnson/sounds/444431/
 snip.wav                       CC0               https://freesound.org/people/Godowan/sounds/240473/
 
+surface_acrylic.jpg            CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:Tennis_Court_Phoenix.jpg (NWSPhoenix)
 surface_asphalt.jpg            Public Domain     https://commons.wikimedia.org/wiki/File:Ground_frost_damages.JPG (SeppVei)
 surface_cobblestone.jpg        CC-BY-SA 3.0      https://commons.wikimedia.org/wiki/File:Bad_Radkersburg_Murgasse_IMG_0583.jpg (E.mil.mil)
 surface_compacted.jpg          CC-BY 2.0         https://commons.wikimedia.org/wiki/File:Dirt_road_in_countryside.jpg (Ian Munroe)
@@ -245,8 +246,8 @@ surface_paved.jpg              CC0               https://www.goodfreephotos.com/
 surface_paving_stones.jpg      CC-BY-SA 4.0      Tobias Zwick with modifications by Mateusz Konieczny
 surface_rock.jpg               CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:Rock_Trail_Surface_at_Patapsco_Valley_State_Park.jpg
 surface_tennis_clay.jpg        CC-BY-SA 2.0      https://commons.wikimedia.org/wiki/File:Rafael_Nadal%2C_2011_Roland_Garros_(3).jpg (Yann Caradec)
-surface_artificial_turf.jpg    CC-BY-SA 3.0      https://commons.wikimedia.org/wiki/File:Meltingout.jpg
-surface_tartan.jpg             CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:200_metres_track_running_start_line.jpg (Santeri Viinamäki)
+surface_artificial_turf.jpg    CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:Artificial_turf.jpg
+surface_tartan.jpg             CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:4_%C3%97_100_metres_relay_start_line.jpg (Santeri Viinamäki)
 surface_paved_area.jpg         CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:2014-08-27_13_01_48_View_across_Parkway_Avenue_(Mercer_County_Route_634)_near_the_Delaware_and_Bound_Brook_Railroad_underpass,_with_concrete_pavement_likely_dating_to_the_1950s.JPG (Famartin)
 surface_unpaved_area.jpg       CC-BY-SA 4.0      https://commons.wikimedia.org/wiki/File:Art_earthwork_landscape_sculpture_Woodland_Trust_Theydon_Bois_Essex_08.JPG (Acabashi)
 surface_ground_area.jpg        CC-BY 2.0         https://commons.wikimedia.org/wiki/File:Bend_It_Like_Beckham_(3734770583).jpg (Danumurthi Mahendra)

app/src/main/res/values/strings.xml

@@ -1617,7 +1617,8 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards
     <string name="quest_surface_value_unhewn_cobblestone">Unhewn cobblestone</string>
     <string name="quest_surface_value_clay">Clay</string>
     <string name="quest_surface_value_artificial_turf">Artificial turf</string>
-    <string name="quest_surface_value_tartan">Tartan</string>
+    <string name="quest_surface_value_rubber">Rubber granules</string>
+    <string name="quest_surface_value_acrylic">Synthetic resin</string>
     <string name="quest_surface_detailed_answer_impossible">Multiple surfaces…</string>
     <string name="quest_surface_detailed_answer_impossible_confirmation">Are you sure that it is impossible to specify the surface? Note the “Differs along the way” answer option that allows you to cut the way where the surface changes. Please use “Can’t say” if there is a single surface but it is not available as an answer.</string>
     <string name="quest_surface_detailed_answer_impossible_description">Please briefly specify the nature of the surface here, for example “sandy with patches of cobblestone”. The text length is limited to 255 characters.</string>