[ios] #3979 cleanup

Author: frederoni

platform/darwin/src/NSData+MGLAdditions.mm

@@ -9,17 +9,15 @@ - (NSData *)mgl_compressedData
     std::string string(static_cast<const char*>(self.bytes), self.length);
     std::string compressed_string = mbgl::util::compress(string);
 
-    return [NSData dataWithBytes:(void *) compressed_string.c_str() length:compressed_string.length()];
+    return [NSData dataWithBytes:&compressed_string[0] length:compressed_string.length()];
 }
 
 - (NSData *)mgl_decompressedData
 {
     std::string string(static_cast<const char*>(self.bytes), self.length);
     std::string decompressed_string = mbgl::util::decompress(string);
 
-    NSString *decompressedString = @(decompressed_string.c_str());
-    
-    return [decompressedString dataUsingEncoding:NSUTF8StringEncoding];
+    return [NSData dataWithBytes:&decompressed_string[0] length:decompressed_string.length()];
 }
 
 @end

platform/ios/test/MGLNSDataAdditionsTests.m

@@ -22,19 +22,20 @@ - (void)testCompressDecompress
 
     NSArray *decompressedArray = [NSJSONSerialization JSONObjectWithData:decompressedData options:0 error:nil];
 
-    XCTAssertTrue([originalArray isEqualToArray:decompressedArray], @"originalDict and decompressedDict should be equal");
+    XCTAssertTrue([originalArray isEqualToArray:decompressedArray], @"originalArray and decompressedArray should be equal");
 }
 
 - (NSArray *)mockDataWithCount:(NSUInteger)count
 {
     NSMutableArray *array = [NSMutableArray array];
-    for (NSUInteger i=0;i<count;i++) {
-        
-        NSTimeInterval ts = [[NSDate date] timeIntervalSince1970];
+    
+    for (NSUInteger i=0;i<count;i++)
+    {
         [array addObject:@{@"lat": @([self safeValueBetween:-90 and:90]),
-                           @"lng": @([self safeValueBetween:-190 and:190]),
-                           @"timestamp": @((floor(ts) * 100) / 100)}];
+                           @"lng": @([self safeValueBetween:-180 and:180]),
+                           @"timestamp": @((floor([NSDate date].timeIntervalSince1970) * 100) / 100)}];
     }
+    
     return array;
 }