Merged raster data source sample, refactoring
API changes, mapView state saving and restoration