Fix missing roads or buildings in file name suffix. For AIFDR/inasafe#773
Partial fix for AIFDR/inasafe#773 - refactored shp extract method to prevent code duplication.