combine water ocean and water area layers into one water layer
previously had a rendering issue with these being one, but can't repro anymore
maybe fixed in either code or data somewhere along the way...
update mapbox tile source