Skip to content

Commit

Permalink
use produce value instead of trees=xyz (#368)
Browse files Browse the repository at this point in the history
  • Loading branch information
@westnordost
westnordost committed Aug 7, 2017
1 parent 636f249 commit eb8d361
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 49 deletions.
101 changes: 52 additions & 49 deletions ...main/java/de/westnordost/streetcomplete/quests/orchard_produce/AddOrchardProduceForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,56 +14,59 @@ public class AddOrchardProduceForm extends ImageListQuestAnswerFragment
// ordered alphabetically here for overview

This comment has been minimized.

Sign in to view

Copy link
@okainov

okainov Jun 17, 2024

@westnordost Could you please share, what was the reason for it? As per OSM wiki, trees or crop is very fine for orchard, why was it updated to produce? It makes me confused because I think of produce as of something you can buy e.g. at the farm shop or roadside kiosk...

This comment has been minimized.

Sign in to view

Copy link
@FloEdelmann

FloEdelmann Jun 17, 2024

Member

For reference, discussion about this is now in #5692.

// may have been mistaken for an orchard (i.e. agave) from satellite imagery
new OsmItem("landuse=farmland;crop=sisal", R.drawable.surface_grass, R.string.produce_sisal),
// landuse=farmland
new OsmItem("sisal", R.drawable.surface_grass, R.string.produce_sisal),
// landuse=vineyard
new OsmItem("grape", R.drawable.surface_grass, R.string.produce_grapes),

new OsmItem("landuse=vineyard", R.drawable.surface_grass, R.string.produce_grapes),

new OsmItem("trees=agave_plants", R.drawable.surface_grass, R.string.produce_agaves),
new OsmItem("trees=almond_trees", R.drawable.surface_grass, R.string.produce_almonds),
new OsmItem("trees=apple_trees", R.drawable.surface_grass, R.string.produce_apples),
new OsmItem("trees=apricot_trees", R.drawable.surface_grass, R.string.produce_apricots),
new OsmItem("trees=avocado_trees", R.drawable.surface_grass, R.string.produce_avocados),
new OsmItem("trees=banana_plants", R.drawable.surface_grass, R.string.produce_bananas),
new OsmItem("trees=blueberry", R.drawable.surface_grass, R.string.produce_blueberries),
new OsmItem("trees=cacao_trees", R.drawable.surface_grass, R.string.produce_cacao),
new OsmItem("trees=cashew_trees", R.drawable.surface_grass, R.string.produce_cashew_nuts),
new OsmItem("trees=cherry_trees", R.drawable.surface_grass, R.string.produce_cherries),
new OsmItem("trees=chestnut_trees", R.drawable.surface_grass, R.string.produce_chestnuts),
new OsmItem("trees=coconut_palms", R.drawable.surface_grass, R.string.produce_coconuts),
new OsmItem("trees=coffee_plants", R.drawable.surface_grass, R.string.produce_coffee),
new OsmItem("trees=cranberry", R.drawable.surface_grass, R.string.produce_cranberries),
new OsmItem("trees=date_palms", R.drawable.surface_grass, R.string.produce_dates),
new OsmItem("trees=fig_trees", R.drawable.surface_grass, R.string.produce_figs),
new OsmItem("trees=grapefruit_trees", R.drawable.surface_grass, R.string.produce_grapefruits),
new OsmItem("trees=guava_trees", R.drawable.surface_grass, R.string.produce_guavas),
new OsmItem("trees=hazel_plants", R.drawable.surface_grass, R.string.produce_hazelnuts),
new OsmItem("trees=hop_plants", R.drawable.surface_grass, R.string.produce_hops),
new OsmItem("trees=jojoba_plants", R.drawable.surface_grass, R.string.produce_jojoba),
new OsmItem("trees=kiwi_plants", R.drawable.surface_grass, R.string.produce_kiwis),
new OsmItem("trees=kola_trees", R.drawable.surface_grass, R.string.produce_kola_nuts),
new OsmItem("trees=lemon_trees", R.drawable.surface_grass, R.string.produce_lemons),
new OsmItem("trees=lime_trees", R.drawable.surface_grass, R.string.produce_limes),
new OsmItem("trees=mango_trees", R.drawable.surface_grass, R.string.produce_mangos),
new OsmItem("trees=mate_plants", R.drawable.surface_grass, R.string.produce_mate),
new OsmItem("trees=nutmeg_trees", R.drawable.surface_grass, R.string.produce_nutmeg),
new OsmItem("trees=oil_palms", R.drawable.surface_grass, R.string.produce_oil_palms),
new OsmItem("trees=olive_trees", R.drawable.surface_grass, R.string.produce_olives),
new OsmItem("trees=orange_trees", R.drawable.surface_grass, R.string.produce_oranges),
new OsmItem("trees=papaya_trees", R.drawable.surface_grass, R.string.produce_papayas),
new OsmItem("trees=peach_trees", R.drawable.surface_grass, R.string.produce_peaches),
new OsmItem("trees=pear_trees", R.drawable.surface_grass, R.string.produce_pears),
new OsmItem("trees=chili_plants", R.drawable.surface_grass, R.string.produce_chili),
new OsmItem("trees=persimmon_trees", R.drawable.surface_grass, R.string.produce_persimmons),
new OsmItem("trees=pineapple_plants", R.drawable.surface_grass, R.string.produce_pineapples),
new OsmItem("trees=piper_plants", R.drawable.surface_grass, R.string.produce_pepper),
new OsmItem("trees=pistachio_trees", R.drawable.surface_grass, R.string.produce_pistachios),
new OsmItem("trees=plum_trees", R.drawable.surface_grass, R.string.produce_plums),
new OsmItem("trees=raspberry", R.drawable.surface_grass, R.string.produce_raspberries),
new OsmItem("trees=rubber_trees", R.drawable.surface_grass, R.string.produce_rubber),
new OsmItem("trees=strawberry", R.drawable.surface_grass, R.string.produce_strawberries),
new OsmItem("trees=tea_plants", R.drawable.surface_grass, R.string.produce_tea),
new OsmItem("trees=vanilla_plants", R.drawable.surface_grass, R.string.produce_vanilla),
new OsmItem("trees=walnut_trees", R.drawable.surface_grass, R.string.produce_walnuts),
new OsmItem("agave", R.drawable.surface_grass, R.string.produce_agaves),
new OsmItem("almond", R.drawable.surface_grass, R.string.produce_almonds),
new OsmItem("apple", R.drawable.surface_grass, R.string.produce_apples),
new OsmItem("apricot", R.drawable.surface_grass, R.string.produce_apricots),
new OsmItem("avocado", R.drawable.surface_grass, R.string.produce_avocados),
new OsmItem("banana", R.drawable.surface_grass, R.string.produce_bananas),
new OsmItem("blueberry", R.drawable.surface_grass, R.string.produce_blueberries),
new OsmItem("cacao", R.drawable.surface_grass, R.string.produce_cacao),
new OsmItem("cashew", R.drawable.surface_grass, R.string.produce_cashew_nuts),
new OsmItem("cherry", R.drawable.surface_grass, R.string.produce_cherries),
new OsmItem("chestnut", R.drawable.surface_grass, R.string.produce_chestnuts),
new OsmItem("coconut", R.drawable.surface_grass, R.string.produce_coconuts),
new OsmItem("coffee", R.drawable.surface_grass, R.string.produce_coffee),
new OsmItem("cranberry", R.drawable.surface_grass, R.string.produce_cranberries),
new OsmItem("date", R.drawable.surface_grass, R.string.produce_dates),
new OsmItem("fig", R.drawable.surface_grass, R.string.produce_figs),
new OsmItem("grapefruit", R.drawable.surface_grass, R.string.produce_grapefruits),
new OsmItem("guava", R.drawable.surface_grass, R.string.produce_guavas),
new OsmItem("hazelnut", R.drawable.surface_grass, R.string.produce_hazelnuts),
new OsmItem("hop", R.drawable.surface_grass, R.string.produce_hops),
new OsmItem("jojoba", R.drawable.surface_grass, R.string.produce_jojoba),
new OsmItem("kiwi", R.drawable.surface_grass, R.string.produce_kiwis),
new OsmItem("kola_nut", R.drawable.surface_grass, R.string.produce_kola_nuts),
new OsmItem("lemon", R.drawable.surface_grass, R.string.produce_lemons),
new OsmItem("lime", R.drawable.surface_grass, R.string.produce_limes),
new OsmItem("mango", R.drawable.surface_grass, R.string.produce_mangos),
new OsmItem("mangosteen", R.drawable.surface_grass, R.string.produce_mangosteen),
new OsmItem("mate", R.drawable.surface_grass, R.string.produce_mate),
new OsmItem("nutmeg", R.drawable.surface_grass, R.string.produce_nutmeg),
new OsmItem("palm_oil", R.drawable.surface_grass, R.string.produce_oil_palms),
new OsmItem("olive", R.drawable.surface_grass, R.string.produce_olives),
new OsmItem("orange", R.drawable.surface_grass, R.string.produce_oranges),
new OsmItem("papaya", R.drawable.surface_grass, R.string.produce_papayas),
new OsmItem("peach", R.drawable.surface_grass, R.string.produce_peaches),
new OsmItem("pear", R.drawable.surface_grass, R.string.produce_pears),
new OsmItem("chili", R.drawable.surface_grass, R.string.produce_chili),
new OsmItem("persimmon", R.drawable.surface_grass, R.string.produce_persimmons),
new OsmItem("pineapple", R.drawable.surface_grass, R.string.produce_pineapples),
new OsmItem("pepper", R.drawable.surface_grass, R.string.produce_pepper),
new OsmItem("pistachio", R.drawable.surface_grass, R.string.produce_pistachios),
new OsmItem("plum", R.drawable.surface_grass, R.string.produce_plums),
new OsmItem("raspberry", R.drawable.surface_grass, R.string.produce_raspberries),
new OsmItem("rubber", R.drawable.surface_grass, R.string.produce_rubber),
new OsmItem("strawberry", R.drawable.surface_grass, R.string.produce_strawberries),
new OsmItem("tea", R.drawable.surface_grass, R.string.produce_tea),
new OsmItem("tomatoe", R.drawable.surface_grass, R.string.produce_tomatoes),
new OsmItem("vanilla", R.drawable.surface_grass, R.string.produce_vanilla),
new OsmItem("walnut", R.drawable.surface_grass, R.string.produce_walnuts),
};

@Override public View onCreateView(LayoutInflater inflater, ViewGroup container,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,4 +364,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards
<string name="produce_vanilla">Vanilla</string>
<string name="produce_walnuts">Walnuts</string>
<string name="produce_sisal">Sisal</string>
<string name="produce_mangosteen">Mangosteen</string>
<string name="produce_tomatoes">Tomatoes</string>
</resources>

0 comments on commit eb8d361

Please sign in to comment.