@@ -4006,10 +4006,10 @@ QString QgsGeometry::exportToWkt() const
4006
4006
{
4007
4007
mWkt += " POINT(" ;
4008
4008
x = ( double * )( mGeometry + 5 );
4009
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4009
+ mWkt += qgsDoubleToString ( *x );
4010
4010
mWkt += " " ;
4011
4011
y = ( double * )( mGeometry + 5 + sizeof ( double ) );
4012
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4012
+ mWkt += qgsDoubleToString ( *y );
4013
4013
mWkt += " )" ;
4014
4014
return mWkt ;
4015
4015
}
@@ -4035,11 +4035,11 @@ QString QgsGeometry::exportToWkt() const
4035
4035
mWkt += " , " ;
4036
4036
}
4037
4037
x = ( double * ) ptr;
4038
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4038
+ mWkt += qgsDoubleToString ( *x );
4039
4039
mWkt += " " ;
4040
4040
ptr += sizeof ( double );
4041
4041
y = ( double * ) ptr;
4042
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4042
+ mWkt += qgsDoubleToString ( *y );
4043
4043
ptr += sizeof ( double );
4044
4044
if ( hasZValue )
4045
4045
{
@@ -4090,11 +4090,11 @@ QString QgsGeometry::exportToWkt() const
4090
4090
mWkt += " ," ;
4091
4091
}
4092
4092
x = ( double * ) ptr;
4093
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4093
+ mWkt += qgsDoubleToString ( *x );
4094
4094
mWkt += " " ;
4095
4095
ptr += sizeof ( double );
4096
4096
y = ( double * ) ptr;
4097
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4097
+ mWkt += qgsDoubleToString ( *y );
4098
4098
ptr += sizeof ( double );
4099
4099
if ( hasZValue )
4100
4100
{
@@ -4128,11 +4128,11 @@ QString QgsGeometry::exportToWkt() const
4128
4128
mWkt += " , " ;
4129
4129
}
4130
4130
x = ( double * )( ptr );
4131
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4131
+ mWkt += qgsDoubleToString ( *x );
4132
4132
mWkt += " " ;
4133
4133
ptr += sizeof ( double );
4134
4134
y = ( double * )( ptr );
4135
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4135
+ mWkt += qgsDoubleToString ( *y );
4136
4136
ptr += sizeof ( double );
4137
4137
if ( hasZValue )
4138
4138
{
@@ -4172,11 +4172,11 @@ QString QgsGeometry::exportToWkt() const
4172
4172
mWkt += " , " ;
4173
4173
}
4174
4174
x = ( double * ) ptr;
4175
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4175
+ mWkt += qgsDoubleToString ( *x );
4176
4176
ptr += sizeof ( double );
4177
4177
mWkt += " " ;
4178
4178
y = ( double * ) ptr;
4179
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4179
+ mWkt += qgsDoubleToString ( *y );
4180
4180
ptr += sizeof ( double );
4181
4181
if ( hasZValue )
4182
4182
{
@@ -4228,11 +4228,11 @@ QString QgsGeometry::exportToWkt() const
4228
4228
mWkt += " ," ;
4229
4229
}
4230
4230
x = ( double * ) ptr;
4231
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4231
+ mWkt += qgsDoubleToString ( *x );
4232
4232
ptr += sizeof ( double );
4233
4233
mWkt += " " ;
4234
4234
y = ( double * ) ptr;
4235
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4235
+ mWkt += qgsDoubleToString ( *y );
4236
4236
ptr += sizeof ( double );
4237
4237
if ( hasZValue )
4238
4238
{
@@ -4286,10 +4286,10 @@ QString QgsGeometry::exportToGeoJSON() const
4286
4286
{
4287
4287
mWkt += " { \" type\" : \" Point\" , \" coordinates\" : [" ;
4288
4288
x = ( double * )( mGeometry + 5 );
4289
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4289
+ mWkt += qgsDoubleToString ( *x );
4290
4290
mWkt += " , " ;
4291
4291
y = ( double * )( mGeometry + 5 + sizeof ( double ) );
4292
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4292
+ mWkt += qgsDoubleToString ( *y );
4293
4293
mWkt += " ] }" ;
4294
4294
return mWkt ;
4295
4295
}
@@ -4316,11 +4316,11 @@ QString QgsGeometry::exportToGeoJSON() const
4316
4316
}
4317
4317
mWkt += " [" ;
4318
4318
x = ( double * ) ptr;
4319
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4319
+ mWkt += qgsDoubleToString ( *x );
4320
4320
mWkt += " , " ;
4321
4321
ptr += sizeof ( double );
4322
4322
y = ( double * ) ptr;
4323
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4323
+ mWkt += qgsDoubleToString ( *y );
4324
4324
ptr += sizeof ( double );
4325
4325
if ( hasZValue )
4326
4326
{
@@ -4373,11 +4373,11 @@ QString QgsGeometry::exportToGeoJSON() const
4373
4373
}
4374
4374
mWkt += " [" ;
4375
4375
x = ( double * ) ptr;
4376
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4376
+ mWkt += qgsDoubleToString ( *x );
4377
4377
mWkt += " , " ;
4378
4378
ptr += sizeof ( double );
4379
4379
y = ( double * ) ptr;
4380
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4380
+ mWkt += qgsDoubleToString ( *y );
4381
4381
ptr += sizeof ( double );
4382
4382
if ( hasZValue )
4383
4383
{
@@ -4413,11 +4413,11 @@ QString QgsGeometry::exportToGeoJSON() const
4413
4413
}
4414
4414
mWkt += " [" ;
4415
4415
x = ( double * )( ptr );
4416
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4416
+ mWkt += qgsDoubleToString ( *x );
4417
4417
mWkt += " , " ;
4418
4418
ptr += sizeof ( double );
4419
4419
y = ( double * )( ptr );
4420
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4420
+ mWkt += qgsDoubleToString ( *y );
4421
4421
ptr += sizeof ( double );
4422
4422
if ( hasZValue )
4423
4423
{
@@ -4459,11 +4459,11 @@ QString QgsGeometry::exportToGeoJSON() const
4459
4459
}
4460
4460
mWkt += " [" ;
4461
4461
x = ( double * ) ptr;
4462
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4462
+ mWkt += qgsDoubleToString ( *x );
4463
4463
ptr += sizeof ( double );
4464
4464
mWkt += " , " ;
4465
4465
y = ( double * ) ptr;
4466
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4466
+ mWkt += qgsDoubleToString ( *y );
4467
4467
ptr += sizeof ( double );
4468
4468
if ( hasZValue )
4469
4469
{
@@ -4517,11 +4517,11 @@ QString QgsGeometry::exportToGeoJSON() const
4517
4517
}
4518
4518
mWkt += " [" ;
4519
4519
x = ( double * ) ptr;
4520
- mWkt += QString::number ( *x, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4520
+ mWkt += qgsDoubleToString ( *x );
4521
4521
ptr += sizeof ( double );
4522
4522
mWkt += " , " ;
4523
4523
y = ( double * ) ptr;
4524
- mWkt += QString::number ( *y, ' f ' , 8 ). remove ( QRegExp ( " [0]{1,7}$ " ) );
4524
+ mWkt += qgsDoubleToString ( *y );
4525
4525
ptr += sizeof ( double );
4526
4526
if ( hasZValue )
4527
4527
{
0 commit comments