Finish major4 roads

Also fix an issue with the water layer

the bbox will && large water polygons but not intersect them. using
st_intersect avoids transferring 20MB of data for every water layer
request