Welcome to OSM (again)! I completely reverted your changeset. 

If you need support for a better way to map the objects, I recommend the wiki.osm.org or the local mapper community. But of course you can also ask directly.