Allow passing len-1 array for x and y coordinates in Point(..) (compa…

…t with 1.8) (#1590)

shapely/geometry/point.py

@@ -65,14 +65,12 @@ def __new__(self, *args):
             if not hasattr(coords, "__getitem__"):  # generators
                 coords = list(coords)
 
-            if isinstance(coords[0], tuple):
-                coords = coords[0]
-
-            geom = shapely.points(coords)
+            coords = np.asarray(coords).squeeze()
         else:
             # 2 or 3 args
-            geom = shapely.points(np.array(args))
+            coords = np.array(args).squeeze()
 
+        geom = shapely.points(coords)
         if not isinstance(geom, Point):
             raise ValueError("Invalid values passed to Point constructor")
         return geom

shapely/tests/geometry/test_point.py

@@ -34,6 +34,8 @@ def test_from_sequence():
     # From coordinate sequence
     p = Point([(3.0, 4.0)])
     assert p.coords[:] == [(3.0, 4.0)]
+    p = Point([[3.0, 4.0]])
+    assert p.coords[:] == [(3.0, 4.0)]
 
     # 3D
     p = Point((3.0, 4.0, 5.0))
@@ -53,6 +55,17 @@ def test_from_numpy():
     assert p.coords[:] == [(1.0, 2.0, 3.0)]
 
 
+def test_from_numpy_xy():
+    # Construct from separate x, y numpy arrays - if those are length 1,
+    # this is allowed for compat with shapely 1.8
+    # (https://github.com/shapely/shapely/issues/1587)
+    p = Point(np.array([1.0]), np.array([2.0]))
+    assert p.coords[:] == [(1.0, 2.0)]
+
+    p = Point(np.array([1.0]), np.array([2.0]), np.array([3.0]))
+    assert p.coords[:] == [(1.0, 2.0, 3.0)]
+
+
 def test_from_point():
     # From another point
     p = Point(3.0, 4.0)