Merge pull request #949 from isuftin/CCHS-38

CCHS-38
Merge pull request #951 from isuftin/CCHS-38

CCHS-38
Fixes a shoreline issue when there are no published layers