Fix QgsPoint code samples

qgis · Jul 21, 2021 · 5bbae76 · 5bbae76
1 parent d382ef3
commit 5bbae76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/python/core/auto_generated/geometry/qgspoint.sip.in b/python/core/auto_generated/geometry/qgspoint.sip.in
@@ -54,15 +54,15 @@ based on the following rules:
        pt.asWkt() # Point(43.4 5.3)
 
        pt_z = QgsPoint(120, 343, 77)
-       pt.asWkt() # PointZ(120 343 77)
+       pt_z.asWkt() # PointZ(120 343 77)
 
        pt_m = QgsPoint(33, 88, m=5)
        pt_m.m() # 5
-       pt_m.wkbType() # QgsWkbTypes.PointM
+       pt_m.wkbType() # 2001 (QgsWkbTypes.PointM)
 
        pt = QgsPoint(30, 40, wkbType=QgsWkbTypes.PointZ)
        pt.z() # nan
-       pt.wkbType() # QgsWkbTypes.PointZ
+       pt.wkbType() # 1001 (QgsWkbTypes.PointZ)
 %End
 %MethodCode
     if ( sipCanConvertToType( a0, sipType_QgsPointXY, SIP_NOT_NONE ) && a1 == Py_None && a2 == Py_None && a3 == Py_None && a4 == Py_None )
@@ -342,8 +342,8 @@ Example
        pr = p.project ( 1, 0, 90 )
        # pr is a 2D point: 'Point (1 3)'
        pr = p.project (1, 0, 0 )
-       # pr is a 3D point: 'PointZ (1 2 1)'
-       p = QgsPoint( QgsWkbTypes.PointZ, 1, 2, 2 ) # 3D point
+       # pr is a 3D point: 'PointZ (1 2 nan)'
+       p = QgsPoint( 1, 2, 2, wkbType=QgsWkbTypes.PointZ ) # 3D point
        pr = p.project ( 1, 0 )
        # pr is a 3D point: 'PointZ (1 3 2)'
        pr = p.project ( 1, 0, 90 )

diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h
@@ -71,15 +71,15 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
      *   pt.asWkt() # Point(43.4 5.3)
      *
      *   pt_z = QgsPoint(120, 343, 77)
-     *   pt.asWkt() # PointZ(120 343 77)
+     *   pt_z.asWkt() # PointZ(120 343 77)
      *
      *   pt_m = QgsPoint(33, 88, m=5)
      *   pt_m.m() # 5
-     *   pt_m.wkbType() # QgsWkbTypes.PointM
+     *   pt_m.wkbType() # 2001 (QgsWkbTypes.PointM)
      *
      *   pt = QgsPoint(30, 40, wkbType=QgsWkbTypes.PointZ)
      *   pt.z() # nan
-     *   pt.wkbType() # QgsWkbTypes.PointZ
+     *   pt.wkbType() # 1001 (QgsWkbTypes.PointZ)
      * \endcode
      */
 #ifndef SIP_RUN
@@ -449,8 +449,8 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
      *   pr = p.project ( 1, 0, 90 )
      *   # pr is a 2D point: 'Point (1 3)'
      *   pr = p.project (1, 0, 0 )
-     *   # pr is a 3D point: 'PointZ (1 2 1)'
-     *   p = QgsPoint( QgsWkbTypes.PointZ, 1, 2, 2 ) # 3D point
+     *   # pr is a 3D point: 'PointZ (1 2 nan)'
+     *   p = QgsPoint( 1, 2, 2, wkbType=QgsWkbTypes.PointZ ) # 3D point
      *   pr = p.project ( 1, 0 )
      *   # pr is a 3D point: 'PointZ (1 3 2)'
      *   pr = p.project ( 1, 0, 90 )