Catami

Changes to handle geoserver namespaces (which are needed for the Catami project).  Catami also uses surface geometry types for its tracks, so there's a change to handle this.