Added basemap-mapping.json, compatible with basemaps
Merge remote-tracking branch 'origin/master'