Skip to content

Commit 730d10a

Browse files
committed
Fix failing test
1 parent 0afc88e commit 730d10a

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

tests/src/python/test_qgsvectorlayer.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,11 +1495,9 @@ def test_ExpressionFieldEllipsoidLengthCalculation(self):
14951495

14961496
# set project CRS and ellipsoid
14971497
srs = QgsCoordinateReferenceSystem(3111, QgsCoordinateReferenceSystem.EpsgCrsId)
1498-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSProj4String", srs.toProj4())
1499-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSID", srs.srsid())
1500-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCrs", srs.authid())
1501-
QgsProject.instance().writeEntry("Measure", "/Ellipsoid", "WGS84")
1502-
QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.DistanceMeters))
1498+
QgsProject.instance().setCrs(srs)
1499+
QgsProject.instance().setEllipsoid("WGS84")
1500+
QgsProject.instance().setDistanceUnits(QgsUnitTypes.DistanceMeters)
15031501

15041502
idx = temp_layer.addExpressionField('$length', QgsField('length', QVariant.Double)) # NOQA
15051503

@@ -1509,7 +1507,7 @@ def test_ExpressionFieldEllipsoidLengthCalculation(self):
15091507
self.assertAlmostEqual(f['length'], expected, 3)
15101508

15111509
# change project length unit, check calculation respects unit
1512-
QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.DistanceFeet))
1510+
QgsProject.instance().setDistanceUnits(QgsUnitTypes.DistanceFeet)
15131511
f = next(temp_layer.getFeatures())
15141512
expected = 88360.0918635
15151513
self.assertAlmostEqual(f['length'], expected, 3)
@@ -1525,11 +1523,9 @@ def test_ExpressionFieldEllipsoidAreaCalculation(self):
15251523

15261524
# set project CRS and ellipsoid
15271525
srs = QgsCoordinateReferenceSystem(3111, QgsCoordinateReferenceSystem.EpsgCrsId)
1528-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSProj4String", srs.toProj4())
1529-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSID", srs.srsid())
1530-
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCrs", srs.authid())
1531-
QgsProject.instance().writeEntry("Measure", "/Ellipsoid", "WGS84")
1532-
QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.AreaSquareMeters))
1526+
QgsProject.instance().setCrs(srs)
1527+
QgsProject.instance().setEllipsoid("WGS84")
1528+
QgsProject.instance().setAreaUnits(QgsUnitTypes.AreaSquareMeters)
15331529

15341530
idx = temp_layer.addExpressionField('$area', QgsField('area', QVariant.Double)) # NOQA
15351531

@@ -1539,7 +1535,7 @@ def test_ExpressionFieldEllipsoidAreaCalculation(self):
15391535
self.assertAlmostEqual(f['area'], expected, delta=1.0)
15401536

15411537
# change project area unit, check calculation respects unit
1542-
QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.AreaSquareMiles))
1538+
QgsProject.instance().setAreaUnits(QgsUnitTypes.AreaSquareMiles)
15431539
f = next(temp_layer.getFeatures())
15441540
expected = 389.6117565069
15451541
self.assertAlmostEqual(f['area'], expected, 3)

0 commit comments

Comments
 (0)