More refactoring for taking in account the WKT 2 format.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1561534 13f79535-47bb-0310-9956-ffa450edef68