Most of the way to making it work on normal OSM extract files

Not drawing correctly yet where one node in a way was relocated
but the adjacent one wasn't.