Fix workplane cylinder center when generated using a custom direction

cadquery/cq.py

@@ -4120,6 +4120,18 @@ def cylinder(
         If combine is false, the result will be a list of the cylinders produced.
         """
 
+        if isinstance(centered, bool):
+            centered = (centered, centered, centered)
+
+        xyz = [
+            (1, 0, 0),
+            (0, 1, 0),
+            (0, 0, 1),
+            (-1, 0, 0),
+            (0, -1, 0),
+            (0, 0, -1),
+        ]
+
         if isinstance(centered, bool):
             centered = (centered, centered, centered)
 
@@ -4131,7 +4143,10 @@ def cylinder(
         if centered[2]:
             offset += Vector(0, 0, -height / 2)
 
-        s = Solid.makeCylinder(radius, height, offset, direct, angle)
+        # first center and then apply the direction
+        s = Solid.makeCylinder(radius, height, offset, Vector(0, 0, 1), angle).moved(
+            Plane(Vector(), normal=direct).location
+        )
 
         # We want a cylinder for each point on the workplane
         return self.eachpoint(lambda loc: s.moved(loc), True, combine, clean)

tests/test_cadquery.py

@@ -2603,6 +2603,43 @@ def testCylinderCentering(self):
                 s0.val().Center().toTuple(), s1.val().Center().toTuple(), 3
             )
 
+    def testCylinderCenteringAndDirection(self):
+        radius = 10
+        height = 40
+
+        for direction in [
+            (1, 0, 0),
+            (0, 1, 0),
+            (0, 0, 1),
+            (-1, 0, 0),
+            (0, -1, 0),
+            (0, 0, -1),
+        ]:
+            for centered in product([True, False], repeat=3):
+                s = Workplane("XY").cylinder(
+                    height, radius, direct=Vector(direction), centered=centered,
+                )
+                expected_xyz = tuple(
+                    radius * (1 - abs(direction[i])) + 0.5 * height * direction[i]
+                    if not centered[i]
+                    else 0
+                    for i in range(3)
+                )
+                self.assertTupleAlmostEquals(
+                    s.val().Center().toTuple(), expected_xyz, 3
+                )
+
+        s = Workplane("XY").cylinder(
+            height, radius, direct=Vector(-1, 1, 0.5), centered=True
+        )
+        expected_xyz = (0, 0, 0)
+        self.assertTupleAlmostEquals(s.val().Center().toTuple(), expected_xyz, 3)
+
+        with raises(ValueError):
+            Workplane("XY").cylinder(
+                height, radius, direct=Vector(1, 1, 1), centered=False
+            )
+
     def testWedgeDefaults(self):
         s = Workplane("XY").wedge(10, 10, 10, 5, 5, 5, 5)
         self.saveModel(s)
@@ -2906,7 +2943,11 @@ def testClean(self):
             .faces("<Z")
             .workplane()
             .cylinder(
-                2, 0.2, centered=(True, True, False), direct=(0, 0, -1), clean=True
+                2,
+                0.2,
+                centered=(True, True, False),
+                direct=Vector(0, 0, -1),
+                clean=True,
             )
         )
         assert len(s.edges().vals()) == 15
@@ -2973,7 +3014,11 @@ def testNoClean(self):
             .faces("<Z")
             .workplane()
             .cylinder(
-                2, 0.2, centered=(True, True, False), direct=(0, 0, -1), clean=False
+                2,
+                0.2,
+                centered=(True, True, False),
+                direct=Vector(0, 0, -1),
+                clean=False,
             )
         )
         assert len(s.edges().vals()) == 16