modify
merge
cgis, details layer js
Merge branch 'test'