From ec3a10e110cf1cdef5cf29384670600753aea261 Mon Sep 17 00:00:00 2001 From: Thomas Rasch Date: Sat, 16 Sep 2023 18:37:51 +0200 Subject: [PATCH] Fix for some tests (rounding problems) --- Tests/GISToolsTests/GeoJson/MultiPolygonTests.swift | 12 ++++++------ Tests/GISToolsTests/GeoJson/PolygonTests.swift | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tests/GISToolsTests/GeoJson/MultiPolygonTests.swift b/Tests/GISToolsTests/GeoJson/MultiPolygonTests.swift index 002ce87..59b7693 100644 --- a/Tests/GISToolsTests/GeoJson/MultiPolygonTests.swift +++ b/Tests/GISToolsTests/GeoJson/MultiPolygonTests.swift @@ -25,11 +25,11 @@ final class MultiPolygonTests: XCTestCase { [100.0, 0.0] ], [ - [100.2, 0.2], - [100.2, 0.8], - [100.8, 0.8], - [100.8, 0.2], - [100.2, 0.2] + [100.2, 2.0], + [100.2, 1.0], + [100.8, 1.0], + [100.8, 2.0], + [100.2, 2.0] ] ] ], @@ -42,7 +42,7 @@ final class MultiPolygonTests: XCTestCase { XCTAssertEqual(multiPolygon.type, GeoJsonType.multiPolygon) XCTAssertEqual(multiPolygon.projection, .epsg4326) - XCTAssertEqual(multiPolygon.coordinates, [[[Coordinate3D(latitude: 2.0, longitude: 102.0), Coordinate3D(latitude: 2.0, longitude: 103.0), Coordinate3D(latitude: 3.0, longitude: 103.0), Coordinate3D(latitude: 3.0, longitude: 102.0), Coordinate3D(latitude: 2.0, longitude: 102.0)]], [[Coordinate3D(latitude: 0.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 100.0)], [Coordinate3D(latitude: 0.2, longitude: 100.2), Coordinate3D(latitude: 0.8, longitude: 100.2), Coordinate3D(latitude: 0.8, longitude: 100.8), Coordinate3D(latitude: 0.2, longitude: 100.8), Coordinate3D(latitude: 0.2, longitude: 100.2)]]]) + XCTAssertEqual(multiPolygon.coordinates, [[[Coordinate3D(latitude: 2.0, longitude: 102.0), Coordinate3D(latitude: 2.0, longitude: 103.0), Coordinate3D(latitude: 3.0, longitude: 103.0), Coordinate3D(latitude: 3.0, longitude: 102.0), Coordinate3D(latitude: 2.0, longitude: 102.0)]], [[Coordinate3D(latitude: 0.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 100.0)], [Coordinate3D(latitude: 2.0, longitude: 100.2), Coordinate3D(latitude: 1.0, longitude: 100.2), Coordinate3D(latitude: 1.0, longitude: 100.8), Coordinate3D(latitude: 2.0, longitude: 100.8), Coordinate3D(latitude: 2.0, longitude: 100.2)]]]) XCTAssertEqual(multiPolygon.foreignMember(for: "other"), "something else") XCTAssertEqual(multiPolygon[foreignMember: "other"], "something else") } diff --git a/Tests/GISToolsTests/GeoJson/PolygonTests.swift b/Tests/GISToolsTests/GeoJson/PolygonTests.swift index 3079809..b0c1384 100644 --- a/Tests/GISToolsTests/GeoJson/PolygonTests.swift +++ b/Tests/GISToolsTests/GeoJson/PolygonTests.swift @@ -31,11 +31,11 @@ final class PolygonTests: XCTestCase { [100.0, 0.0] ], [ - [100.8, 0.8], - [100.8, 0.2], - [100.2, 0.2], - [100.2, 0.8], - [100.8, 0.8] + [100.8, 1.0], + [100.8, 2.0], + [100.2, 2.0], + [100.2, 1.0], + [100.8, 1.0] ] ], "other": "something else" @@ -55,7 +55,7 @@ final class PolygonTests: XCTestCase { XCTAssertEqual(polygonWithHoles.type, GeoJsonType.polygon) XCTAssertEqual(polygonWithHoles.projection, .epsg4326) - XCTAssertEqual(polygonWithHoles.coordinates, [[Coordinate3D(latitude: 0.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 100.0)], [Coordinate3D(latitude: 0.8, longitude: 100.8), Coordinate3D(latitude: 0.2, longitude: 100.8), Coordinate3D(latitude: 0.2, longitude: 100.2), Coordinate3D(latitude: 0.8, longitude: 100.2), Coordinate3D(latitude: 0.8, longitude: 100.8)]]) + XCTAssertEqual(polygonWithHoles.coordinates, [[Coordinate3D(latitude: 0.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 101.0), Coordinate3D(latitude: 1.0, longitude: 100.0), Coordinate3D(latitude: 0.0, longitude: 100.0)], [Coordinate3D(latitude: 1.0, longitude: 100.8), Coordinate3D(latitude: 2.0, longitude: 100.8), Coordinate3D(latitude: 2.0, longitude: 100.2), Coordinate3D(latitude: 1.0, longitude: 100.2), Coordinate3D(latitude: 1.0, longitude: 100.8)]]) XCTAssertEqual(polygonWithHoles.foreignMember(for: "other"), "something else") XCTAssertEqual(polygonWithHoles[foreignMember: "other"], "something else") }