Fix two wrong behavior in TWKB with optional id and type in different situations

git-svn-id: http://svn.osgeo.org/postgis/trunk@12188 b70326c6-7e19-0410-871a-916f4a2858ee