AUS-2512:Apply restricted bounding box to all WMS layers: refractoring / code clean up