Adapt another centroid to match the improved segmentation

Author: mhugent

tests/testdata/geom_data.csv

@@ -11,12 +11,12 @@ wkt,valid_wkt,num_points,length,area,perimeter,num_geometries,num_rings,is_close
 "COMPOUNDCURVEZM((5 3 1 11, 5 13 2 12), CIRCULARSTRINGZM(5 13 2 12, 7 15 3 13, 9 13 4 14), (9 13 4 14, 9 3 5 15), CIRCULARSTRINGZM(9 3 5 15, 7 1 6 16, 5 3 1 11))","COMPOUNDCURVEZM((5 3 1 11, 5 13 2 12), CIRCULARSTRINGZM(5 13 2 12, 7 15 3 13, 9 13 4 14), (9 13 4 14, 9 3 5 15), CIRCULARSTRINGZM(9 3 5 15, 7 1 6 16, 5 3 1 11))",7,32.5663706144,0,0,1,0,1,POINT(7 8),5,1,9,15,Unsure about accuracy of numpoints – PostGIS reports 10 for same geometry
 "COMPOUNDCURVE((5 3 1, 5 13 2), CIRCULARSTRING(5 13 2, 7 15 3, 9 13 4), (9 13 4, 9 3 5), CIRCULARSTRING(9 3 5, 7 1 6, 5 3 1))","COMPOUNDCURVEZ((5 3 1, 5 13 2), CIRCULARSTRINGZ(5 13 2, 7 15 3, 9 13 4), (9 13 4, 9 3 5), CIRCULARSTRINGZ(9 3 5, 7 1 6, 5 3 1))",7,32.5663706144,0,0,1,0,1,POINT(7 8),5,1,9,15,"z coordinate, but geometry not explicitly marked as such. Should be upgraded to have Z dimension"
 "COMPOUNDCURVE((5 3 1 11, 5 13 2 12), CIRCULARSTRING(5 13 2 12, 7 15 3 13, 9 13 4 14), (9 13 4 14, 9 3 5 15), CIRCULARSTRING(9 3 5 15, 7 1 6 16, 5 3 1 11))","COMPOUNDCURVEZM((5 3 1 11, 5 13 2 12), CIRCULARSTRINGZM(5 13 2 12, 7 15 3 13, 9 13 4 14), (9 13 4 14, 9 3 5 15), CIRCULARSTRINGZM(9 3 5 15, 7 1 6 16, 5 3 1 11))",7,32.5663706144,0,0,1,0,1,POINT(7 8),5,1,9,15,"4d coordinates, but geometry not explicitly marked as such. Should be upgraded to have ZM dimension"
-"CURVEPOLYGON(CIRCULARSTRING(1 3, 3 5, 4 7, 7 3, 1 3))","CURVEPOLYGON(CIRCULARSTRING(1 3, 3 5, 4 7, 7 3, 1 3))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,
-"CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,
-"CURVEPOLYGONM(CIRCULARSTRINGM(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONM(CIRCULARSTRINGM(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,
-"CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))","CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,
-"CURVEPOLYGON(CIRCULARSTRING(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,"z coordinate, but geometry not explicitly marked as such. Should be upgraded to have Z dimension"
-"CURVEPOLYGON(CIRCULARSTRING(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))","CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851485241232677 3.56861296120545823),1,0.75,7.125,7,"4d coordinates, but geometry not explicitly marked as such. Should be upgraded to have ZM dimension"
+"CURVEPOLYGON(CIRCULARSTRING(1 3, 3 5, 4 7, 7 3, 1 3))","CURVEPOLYGON(CIRCULARSTRING(1 3, 3 5, 4 7, 7 3, 1 3))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,
+"CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,
+"CURVEPOLYGONM(CIRCULARSTRINGM(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONM(CIRCULARSTRINGM(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,
+"CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))","CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,
+"CURVEPOLYGON(CIRCULARSTRING(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))","CURVEPOLYGONZ(CIRCULARSTRINGZ(1 3 1, 3 5 2, 4 7 3, 7 3 4, 1 3 1))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,"z coordinate, but geometry not explicitly marked as such. Should be upgraded to have Z dimension"
+"CURVEPOLYGON(CIRCULARSTRING(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))","CURVEPOLYGONZM(CIRCULARSTRINGZM(1 3 1 11, 3 5 2 12, 4 7 3 13, 7 3 4 14, 1 3 1 11))",5,0,24.9520887446,18.926681924,1,0,0,Point (4.40851648449795963 3.56861199335415558),1,0.75,7.125,7,"4d coordinates, but geometry not explicitly marked as such. Should be upgraded to have ZM dimension"
 GeometryCollection (GeometryCollection (Point (1 1))),GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1))),1,0,0,0,1,0,0,POINT(1 1),1,1,1,1,
 "GeometryCollection (LineString (0 0, 1 1, 2 2, 3 3 , 4 4))","GEOMETRYCOLLECTION(LINESTRING(0 0,1 1,2 2,3 3,4 4))",5,5.6568542495,0,0,1,0,0,POINT(2 2),0,0,4,4,
 "GeometryCollection (LineStringZ (0 0 0, 1 1 0, 2 2 0, 3 3 0, 4 4 0),PointZ (1 2 3))","GEOMETRYCOLLECTION Z (LINESTRING Z (0 0 0,1 1 0,2 2 0,3 3 0,4 4 0),POINT Z (1 2 3))",6,5.6568542495,0,0,2,0,0,POINT(2 2),0,0,4,4,