[iOS][macOS] Add ImageSource bindings

6 files changed, 105 insertions, 9 deletions

diff --git a/platform/darwin/test/MGLDocumentationExampleTests.swift b/platform/darwin/test/MGLDocumentationExampleTests.swift
index 48e6b17f44..2a441d2774 100644
--- a/platform/darwin/test/MGLDocumentationExampleTests.swift
+++ b/platform/darwin/test/MGLDocumentationExampleTests.swift
@@ -104,6 +104,20 @@ class MGLDocumentationExampleTests: XCTestCase, MGLMapViewDelegate {
         XCTAssertNotNil(mapView.style?.source(withIdentifier: "pois"))
     }
 
+    func testMGLImageSource() {
+        //#-example-code
+        let coordinates: MGLCoordinateQuad = MGLCoordinateQuad(
+          topLeft: CLLocationCoordinate2D(latitude: 46.437, longitude: -80.425),
+          topRight: CLLocationCoordinate2D(latitude: 46.437, longitude: -71.516),
+          bottomRight: CLLocationCoordinate2D(latitude: 37.936, longitude: -71.516),
+          bottomLeft: CLLocationCoordinate2D(latitude: 37.936, longitude: -80.425))
+        let source = MGLImageSource(identifier: "images", coordinates: coordinates, imageURL: URL(string: "https://www.mapbox.com/mapbox-gl-js/assets/radar.gif")!)
+        mapView.style?.addSource(source)
+        //#-end-example-code
+
+        XCTAssertNotNil(mapView.style?.source(withIdentifier: "images"))
+    }
+
     func testMGLCircleStyleLayer() {
         let population = MGLVectorSource(identifier: "population", configurationURL: URL(string: "https://example.com/style.json")!)
         mapView.style?.addSource(population)
diff --git a/platform/darwin/test/MGLGeometryTests.mm b/platform/darwin/test/MGLGeometryTests.mm
index 220a837643..1c85470188 100644
--- a/platform/darwin/test/MGLGeometryTests.mm
+++ b/platform/darwin/test/MGLGeometryTests.mm
@@ -144,4 +144,23 @@
     XCTAssertEqualObjects(serializedGeoJSON, geoJSON, @"MGLPointFeature should serialize as a GeoJSON point feature.");
 }
 
+- (void)testMGLCoordinateBoundsToMGLCoordinateQuad {
+    MGLCoordinateBounds bounds = MGLCoordinateBoundsMake(CLLocationCoordinate2DMake(37.936, -80.425),
+                                                         CLLocationCoordinate2DMake(46.437, -71.516));
+
+    MGLCoordinateQuad quad = MGLCoordinateQuadFromCoordinateBounds(bounds);
+    XCTAssertEqualObjects([NSValue valueWithMGLCoordinate:bounds.sw],
+                          [NSValue valueWithMGLCoordinate:quad.bottomLeft],
+                          @"Bounds southwest should be bottom left of quad.");
+    XCTAssertEqualObjects([NSValue valueWithMGLCoordinate:bounds.ne],
+                          [NSValue valueWithMGLCoordinate:quad.topRight],
+                          @"Bounds northeast should be top right of quad.");
+
+    XCTAssertEqualObjects([NSValue valueWithMGLCoordinate:CLLocationCoordinate2DMake(46.437, -80.425)],
+                          [NSValue valueWithMGLCoordinate:quad.topLeft],
+                          @"Quad top left should be computed correctly.");
+    XCTAssertEqualObjects([NSValue valueWithMGLCoordinate:CLLocationCoordinate2DMake(37.936, -71.516)],
+                          [NSValue valueWithMGLCoordinate:quad.bottomRight],
+                          @"Quad bottom right should be computed correctly.");
+}
 @end
diff --git a/platform/darwin/test/MGLImageSourceTests.m b/platform/darwin/test/MGLImageSourceTests.m
new file mode 100644
index 0000000000..3349a7463b
--- /dev/null
+++ b/platform/darwin/test/MGLImageSourceTests.m
@@ -0,0 +1,42 @@
+#import <XCTest/XCTest.h>
+
+#import <Mapbox/Mapbox.h>
+
+@interface MGLImageSourceTests : XCTestCase
+
+@end
+
+@implementation MGLImageSourceTests
+
+
+- (void)testMGLImageSourceWithImageURL {
+
+    MGLCoordinateQuad quad = { { 80, 37}, { 81, 37}, { 81, 39}, { 80, 39}};
+    MGLImageSource *source = [[MGLImageSource alloc] initWithIdentifier:@"source-id" coordinates:quad imageURL: [NSURL URLWithString:@"http://host/image.png"]];
+    
+    XCTAssertNotNil(source.URL);
+    XCTAssertEqualObjects(source.URL.absoluteString, @"http://host/image.png");
+    XCTAssertNil(source.image);
+}
+
+- (void)testMGLImageSourceWithImage {
+
+    NSString *imageName = @"RadarImage";
+#if TARGET_OS_IPHONE
+    MGLImage *image = [MGLImage imageNamed:imageName
+                                  inBundle:[NSBundle bundleForClass:[self class]]
+             compatibleWithTraitCollection:nil];
+#else
+    MGLImage *image = [[NSBundle bundleForClass:[self class]] imageForResource:imageName];
+#endif
+    XCTAssertNotNil(image);
+
+    MGLCoordinateQuad quad = { { 80, 37}, { 81, 37}, { 81, 39}, { 80, 39}};
+    MGLImageSource *source = [[MGLImageSource alloc] initWithIdentifier:@"source-id" coordinates:quad image:image];
+    
+    XCTAssertNotNil(source.image);
+    XCTAssertEqualObjects(source.image, image);
+    XCTAssertNil(source.URL);
+}
+
+@end
diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm
index d93483ea6e..7f82dddfac 100644
--- a/platform/darwin/test/MGLStyleTests.mm
+++ b/platform/darwin/test/MGLStyleTests.mm
@@ -210,9 +210,9 @@
     MGLRasterSource *rasterSource = [[MGLRasterSource alloc] initWithIdentifier:@"some-identifier" tileURLTemplates:@[] options:nil];
     [self.style addSource:rasterSource];
 
-    // Attempt to remove a shape source with the same identifier as the raster source
-    MGLShapeSource *shapeSource = [[MGLShapeSource alloc] initWithIdentifier:@"some-identifier" shape:nil options:nil];
-    [self.style removeSource:shapeSource];
+    // Attempt to remove an image source with the same identifier as the raster source
+    MGLImageSource *imageSource = [[MGLImageSource alloc] initWithIdentifier:@"some-identifier" coordinates: { }];
+    [self.style removeSource:imageSource];
     // The raster source should still be added
     XCTAssertTrue([[self.style sourceWithIdentifier:rasterSource.identifier] isMemberOfClass:[MGLRasterSource class]]);
 
@@ -220,16 +220,16 @@
     [self.style removeSource:rasterSource];
 
     // Add the shape source
-    [self.style addSource:shapeSource];
+    [self.style addSource:imageSource];
 
     // Attempt to remove a vector source with the same identifer as the shape source
     MGLVectorSource *vectorSource = [[MGLVectorSource alloc] initWithIdentifier:@"some-identifier" tileURLTemplates:@[] options:nil];
     [self.style removeSource:vectorSource];
-    // The shape source should still be added
-    XCTAssertTrue([[self.style sourceWithIdentifier:shapeSource.identifier] isMemberOfClass:[MGLShapeSource class]]);
+    // The image source should still be added
+    XCTAssertTrue([[self.style sourceWithIdentifier:imageSource.identifier] isMemberOfClass:[MGLImageSource class]]);
 
-    // Remove the shape source
-    [self.style removeSource:shapeSource];
+    // Remove the image source
+    [self.style removeSource:imageSource];
 
     // Add the vector source
     [self.style addSource:vectorSource];
@@ -237,7 +237,7 @@
     // Attempt to remove the previously created raster source that has the same identifer as the shape source
     [self.style removeSource:rasterSource];
     // The vector source should still be added
-    XCTAssertTrue([[self.style sourceWithIdentifier:shapeSource.identifier] isMemberOfClass:[MGLVectorSource class]]);
+    XCTAssertTrue([[self.style sourceWithIdentifier:imageSource.identifier] isMemberOfClass:[MGLVectorSource class]]);
 }
 
 - (void)testRemovingSourceInUse {
diff --git a/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json b/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json
new file mode 100644
index 0000000000..79be9ed970
--- /dev/null
+++ b/platform/darwin/test/Media.xcassets/RadarImage.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "radar.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png b/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png
new file mode 100644
index 0000000000..e23697f42a
--- /dev/null
+++ b/platform/darwin/test/Media.xcassets/RadarImage.imageset/radar.png