new option scale type
Merge branch 'master' of github.com:gisclient/branch-3.2