"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/geometry/qgswkbtypes.h" between
QGIS-final-3_10_5.tar.gz and QGIS-final-3_10_6.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgswkbtypes.h  (QGIS-final-3_10_5):qgswkbtypes.h  (QGIS-final-3_10_6)
skipping to change at line 431 skipping to change at line 431
return MultiPolygon25D; return MultiPolygon25D;
} }
return Unknown; return Unknown;
} }
/** /**
* Returns the curve type for a WKB type. For example, for Polygon WKB types the curve type would be CurvePolygon. * Returns the curve type for a WKB type. For example, for Polygon WKB types the curve type would be CurvePolygon.
* *
* \note Returns `CompoundCurve` for `CircularString` (and its Z/M variants) * \note Returns `CompoundCurve` for `CircularString` (and its Z/M variants)
* *
* \see linearType()
* \see isMultiType() * \see isMultiType()
* \see isCurvedType() * \see isCurvedType()
* \see singleType() * \see singleType()
* \see flatType() * \see flatType()
* \see multiType() * \see multiType()
* *
* \since QGIS 3.10 * \since QGIS 3.10
*/ */
static Type curveType( Type type ) static Type curveType( Type type )
{ {
skipping to change at line 569 skipping to change at line 570
return NoGeometry; return NoGeometry;
case Point25D: case Point25D:
case MultiPoint25D: case MultiPoint25D:
return MultiPoint25D; return MultiPoint25D;
} }
return Unknown; return Unknown;
} }
/** /**
* Returns the linear type for a WKB type. For example, for a CompoundCurve,
the linear type would be LineString.
*
* \see curveType()
* \see isMultiType()
* \see isCurvedType()
* \see singleType()
* \see flatType()
* \see multiType()
*
* \since QGIS 3.14
*/
static Type linearType( Type type )
{
switch ( type )
{
case CircularString:
case CompoundCurve:
return LineString;
case CircularStringM:
case CompoundCurveM:
return LineStringM;
case CircularStringZ:
case CompoundCurveZ:
return LineStringZ;
case CircularStringZM:
case CompoundCurveZM:
return LineStringZM;
case MultiCurve:
return MultiLineString;
case MultiCurveM:
return MultiLineStringM;
case MultiCurveZ:
return MultiLineStringZ;
case MultiCurveZM:
return MultiLineStringZM;
case CurvePolygon:
return Polygon;
case CurvePolygonM:
return PolygonM;
case CurvePolygonZ:
return PolygonZ;
case CurvePolygonZM:
return PolygonZM;
case MultiSurface:
return MultiPolygon;
case MultiSurfaceM:
return MultiPolygonM;
case MultiSurfaceZ:
return MultiPolygonZ;
case MultiSurfaceZM:
return MultiPolygonZM;
case GeometryCollection:
case GeometryCollectionM:
case GeometryCollectionZ:
case GeometryCollectionZM:
case LineString:
case LineString25D:
case LineStringM:
case LineStringZ:
case LineStringZM:
case MultiLineString:
case MultiLineString25D:
case MultiLineStringM:
case MultiLineStringZ:
case MultiLineStringZM:
case MultiPoint:
case MultiPoint25D:
case MultiPointM:
case MultiPointZ:
case MultiPointZM:
case MultiPolygon:
case MultiPolygon25D:
case MultiPolygonM:
case MultiPolygonZ:
case MultiPolygonZM:
case NoGeometry:
case Point:
case Point25D:
case PointM:
case PointZ:
case PointZM:
case Polygon:
case Polygon25D:
case PolygonM:
case PolygonZ:
case PolygonZM:
case Triangle:
case TriangleM:
case TriangleZ:
case TriangleZM:
case Unknown:
return type;
}
return Unknown;
}
/**
* Returns the flat type for a WKB type. This is the WKB type minus any Z or M dimensions. * Returns the flat type for a WKB type. This is the WKB type minus any Z or M dimensions.
* For example, for PolygonZM WKB types the single type would be Polygon. * For example, for PolygonZM WKB types the single type would be Polygon.
* \see singleType() * \see singleType()
* \see multiType() * \see multiType()
* \see curveType() * \see curveType()
*/ */
static Type flatType( Type type ) static Type flatType( Type type )
{ {
switch ( type ) switch ( type )
{ {
 End of changes. 2 change blocks. 
0 lines changed or deleted 117 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)