More refactoring of gis.js