Gwt 681 split shapefile and improve