refactoring osm2sqlite