Proper fix is just to revert #160964134

This changeset removed the linkbridge between the main office building of Marine One. way/463857944 that is the linkbridge is removed incorrectly.
way/463857944/history

There is also breakage in terms of 3D rendering with this change.
https://demo.f4map.com/#lat=1.2775500&lon=103.8415099&zoom=18&camera.phi=-21.486

This changeset incorrectly forces buildings with unique address points into a multi-polygon relation, and therefore these addesses loses the ability to be searched correctly (as building).

Buildings with unique address point should remain as is - otherwise these address points will be pointing to the wrong objects.

This changeset incorrect marks the town as a city.

Downtown Core is a suburb in Singapore, but never a city by itself. There is only Singapore as both city and country.

There is Changi City Point (a mall), but never have I ever heard of Changi city. Singapore itself is city, but never individual suburbs/towns being another city in Singapore.

There is Woodlands town, but never have I ever heard of Woodlands city. Singapore itself is city, but never individual suburbs/towns.

Hi,
The OMaps client does not show the additional fields after updating shop name and POI type. The POI has been cleaned manually in rev 112571792.