Update osm-stream, rewrite