Store wkbtype instead of hasZ/hasM