Remove smoking field from generic building preset

Fixes #2209
Add shop=wine preset
Fix typo
Fix more fill opacities
Add some fields for crossings
Add landuse=churchyard preset