pnorman's version of UVM's Rewrite of ogr2osm