diff options
| -rw-r--r-- | platform/darwin/test/MGLShapeSourceTests.mm | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/platform/darwin/test/MGLShapeSourceTests.mm b/platform/darwin/test/MGLShapeSourceTests.mm index ba85d76020..561af7f3d0 100644 --- a/platform/darwin/test/MGLShapeSourceTests.mm +++ b/platform/darwin/test/MGLShapeSourceTests.mm @@ -104,11 +104,11 @@ - (void)testMGLShapeSourceWithPolygonFeatures { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; MGLPolygonFeature *polygonFeature = [MGLPolygonFeature polygonWithCoordinates:coordinates count:5]; polygonFeature.identifier = @"feature-id"; @@ -150,18 +150,18 @@ - (void)testMGLShapeSourceWithPolygonFeaturesInculdingInteriorPolygons { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; CLLocationCoordinate2D interiorCoordinates[] = { - CLLocationCoordinate2DMake(100.2, 0.2), - CLLocationCoordinate2DMake(100.8, 0.2), - CLLocationCoordinate2DMake(100.8, 0.8), - CLLocationCoordinate2DMake(100.2, 0.8), - CLLocationCoordinate2DMake(100.2, 0.2)}; + CLLocationCoordinate2DMake(0.2, 100.2), + CLLocationCoordinate2DMake(0.2, 100.8), + CLLocationCoordinate2DMake(0.8, 100.8), + CLLocationCoordinate2DMake(0.8, 100.2), + CLLocationCoordinate2DMake(0.2, 100.2)}; MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:interiorCoordinates count:5]; @@ -188,18 +188,18 @@ - (void)testMGLShapeSourceWithMultiPolygonFeatures { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; CLLocationCoordinate2D interiorCoordinates[] = { - CLLocationCoordinate2DMake(100.2, 0.2), - CLLocationCoordinate2DMake(100.8, 0.2), - CLLocationCoordinate2DMake(100.8, 0.8), - CLLocationCoordinate2DMake(100.2, 0.8), - CLLocationCoordinate2DMake(100.2, 0.2)}; + CLLocationCoordinate2DMake(0.2, 100.2), + CLLocationCoordinate2DMake(0.2, 100.8), + CLLocationCoordinate2DMake(0.8, 100.8), + CLLocationCoordinate2DMake(0.8, 100.2), + CLLocationCoordinate2DMake(0.2, 100.2)}; MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:interiorCoordinates count:5]; @@ -216,7 +216,7 @@ - (void)testMGLShapeSourceWithPointFeature { MGLPointFeature *pointFeature = [MGLPointFeature new]; - pointFeature.coordinate = CLLocationCoordinate2DMake(100.2, 0.2); + pointFeature.coordinate = CLLocationCoordinate2DMake(0.2, 100.2); MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"souce-id" shape:pointFeature options:nil]; @@ -226,11 +226,11 @@ - (void)testMGLShapeSourceWithPointCollectionFeature { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; MGLPointCollectionFeature *pointCollectionFeature = [MGLPointCollectionFeature pointCollectionWithCoordinates:coordinates count:5]; MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"souce-id" shape:pointCollectionFeature options:nil]; @@ -240,18 +240,18 @@ - (void)testMGLShapeSourceWithShapeCollectionFeatures { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; CLLocationCoordinate2D interiorCoordinates[] = { - CLLocationCoordinate2DMake(100.2, 0.2), - CLLocationCoordinate2DMake(100.8, 0.2), - CLLocationCoordinate2DMake(100.8, 0.8), - CLLocationCoordinate2DMake(100.2, 0.8), - CLLocationCoordinate2DMake(100.2, 0.2)}; + CLLocationCoordinate2DMake(0.2, 100.2), + CLLocationCoordinate2DMake(0.2, 100.8), + CLLocationCoordinate2DMake(0.8, 100.8), + CLLocationCoordinate2DMake(0.8, 100.2), + CLLocationCoordinate2DMake(0.2, 100.2)}; MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:interiorCoordinates count:5]; @@ -267,7 +267,7 @@ MGLPointCollectionFeature *pointCollectionFeature = [MGLPointCollectionFeature pointCollectionWithCoordinates:coordinates count:5]; MGLPointFeature *pointFeature = [MGLPointFeature new]; - pointFeature.coordinate = CLLocationCoordinate2DMake(100.2, 0.2); + pointFeature.coordinate = CLLocationCoordinate2DMake(0.2, 100.2); MGLShapeCollectionFeature *shapeCollectionFeature = [MGLShapeCollectionFeature shapeCollectionWithShapes:@[polygonFeature, polylineFeature, multiPolygonFeature, multiPolylineFeature, pointCollectionFeature, pointFeature]]; @@ -280,11 +280,11 @@ - (void)testMGLShapeSourceWithFeaturesConvenienceInitializer { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; MGLPolygonFeature *polygonFeature = [MGLPolygonFeature polygonWithCoordinates:coordinates count:sizeof(coordinates)/sizeof(coordinates[0]) interiorPolygons:nil]; @@ -302,11 +302,11 @@ - (void)testMGLShapeSourceWithShapesConvenienceInitializer { CLLocationCoordinate2D coordinates[] = { - CLLocationCoordinate2DMake(100.0, 0.0), - CLLocationCoordinate2DMake(101.0, 0.0), - CLLocationCoordinate2DMake(101.0, 1.0), - CLLocationCoordinate2DMake(100.0, 1.0), - CLLocationCoordinate2DMake(100.0, 0.0)}; + CLLocationCoordinate2DMake(0.0, 100.0), + CLLocationCoordinate2DMake(0.0, 101.0), + CLLocationCoordinate2DMake(1.0, 101.0), + CLLocationCoordinate2DMake(1.0, 100.0), + CLLocationCoordinate2DMake(0.0, 100.0)}; MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:coordinates count:sizeof(coordinates)/sizeof(coordinates[0]) interiorPolygons:nil]; |