尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit 47c7a8835a7642f1d879e98298956a5baecc653f 1 parent 9ac509c2

o Added a takeSnapshot prototype implementation

Inline Side-by-side
Showing 5 changed files with 259 additions and 42 deletions
... ... @@ -195,6 +195,9 @@ typedef enum {
- (RMProjectedSize)viewSizeToProjectedSize:(CGSize)screenSize;
- (CGSize)projectedSizeToViewSize:(RMProjectedSize)projectedSize;
- (CLLocationCoordinate2D)normalizeCoordinate:(CLLocationCoordinate2D)coordinate;
- (RMTile)tileWithCoordinate:(CLLocationCoordinate2D)coordinate andZoom:(int)zoom;
/// returns the smallest bounding box containing the entire view
- (RMSphericalTrapezium)latitudeLongitudeBoundingBox;
/// returns the smallest bounding box containing a rectangular region of the view
... ... @@ -226,4 +229,10 @@ typedef enum {
/// Clear all images from the #tileSource's caching system.
-(void)removeAllCachedImages;
#pragma mark -
#pragma mark Snapshots
- (UIImage *)takeSnapshot;
- (UIImage *)takeSnapshotInRect:(CGRect)snapshotRect includeOverlay:(BOOL)includeOverlay;
@end
... ...
... ... @@ -1221,6 +1221,84 @@
}
#pragma mark -
#pragma mark Snapshots
// snapshotRect is not yet used
- (UIImage *)takeSnapshotInRect:(CGRect)snapshotRect includeOverlay:(BOOL)includeOverlay
{
RMProjectedRect bounds = [self projectedBounds];
CLLocationCoordinate2D bottomLeft = [projection projectedPointToCoordinate:bounds.origin];
CLLocationCoordinate2D topRight = [projection projectedPointToCoordinate:RMProjectedPointMake(bounds.origin.x + bounds.size.width, bounds.origin.y + bounds.size.height)];
RMTile baseTile = [self tileWithCoordinate:bottomLeft andZoom:ceilf(zoom)];
RMTile borderTile = [self tileWithCoordinate:topRight andZoom:ceilf(zoom)];
// RMLog(@"x:%d, y:%d, zoom:%d (real zoom:%f)", baseTile.x, baseTile.y, baseTile.zoom, zoom);
// RMLog(@"-> x:%d, y:%d, zoom:%d (real zoom:%f)", borderTile.x, borderTile.y, borderTile.zoom, zoom);
CATiledLayer *tiledLayer = (CATiledLayer *)tiledLayerView.layer;
CGSize tileSize = tiledLayer.tileSize;
int tilesX = borderTile.x - baseTile.x + 1;
int tilesY = baseTile.y - borderTile.y + 1;
// RMLog(@"tiles x=%d, y=%d", tilesX, tilesY);
int scale = (1<<(int)ceilf(zoom));
CLLocationCoordinate2D normalizedCoordinate = [self normalizeCoordinate:bottomLeft];
CGFloat leftBorder = round(((normalizedCoordinate.longitude * scale) * tileSize.width) - (baseTile.x * tileSize.width));
CGFloat topBorder = (tilesY * tileSize.height) - (256.0 - round(((normalizedCoordinate.latitude * scale) * tileSize.height) - (baseTile.y * tileSize.height))) - self.bounds.size.height;
// RMLog(@"left: %f, top:%f", leftBorder, topBorder);
UIGraphicsBeginImageContextWithOptions(self.bounds.size, NO, [[UIScreen mainScreen] scale]);
for (int column=0; column<tilesX; column++)
{
for (int row=0; row<tilesY; row++)
{
// RMLog(@"x:%d, y:%d, zoom:%d", baseTile.x + column, borderTile.y + row, baseTile.zoom);
UIImage *tileImage = [tileSource imageForTile:RMTileMake(baseTile.x + column, borderTile.y + row, baseTile.zoom) inCache:tileCache];
if (tileImage)
{
[tileImage drawInRect:CGRectMake(column * tileSize.width - leftBorder,
row * tileSize.height - topBorder,
tileSize.width,
tileSize.height)];
}
}
}
if (includeOverlay)
{
UIGraphicsBeginImageContextWithOptions(overlayView.bounds.size, NO, [[UIScreen mainScreen] scale]);
[overlayView.layer renderInContext:UIGraphicsGetCurrentContext()];
UIImage *overlayImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
[overlayImage drawInRect:CGRectMake(0.0, 0.0, overlayView.bounds.size.width, overlayView.bounds.size.height)];
}
// final image
UIImage *finalImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
return finalImage;
}
- (UIImage *)takeSnapshot
{
return [self takeSnapshotInRect:self.bounds includeOverlay:YES];
}
#pragma mark -
#pragma mark Properties
- (id <RMTileSource>)tileSource
... ... @@ -1466,6 +1544,31 @@
return RMProjectedSizeMake(self.bounds.size.width * self.metersPerPixel, self.bounds.size.height * self.metersPerPixel);
}
- (CLLocationCoordinate2D)normalizeCoordinate:(CLLocationCoordinate2D)coordinate
{
if (coordinate.longitude > 180)
coordinate.longitude -= 360;
coordinate.longitude /= 360.0;
coordinate.longitude += 0.5;
coordinate.latitude = 0.5 - ((log(tan((M_PI_4) + ((0.5 * M_PI * coordinate.latitude) / 180.0))) / M_PI) / 2.0);
return coordinate;
}
- (RMTile)tileWithCoordinate:(CLLocationCoordinate2D)coordinate andZoom:(int)tileZoom
{
int scale = (1<<tileZoom);
CLLocationCoordinate2D normalizedCoordinate = [self normalizeCoordinate:coordinate];
RMTile returnTile;
returnTile.x = (int)(normalizedCoordinate.longitude * scale);
returnTile.y = (int)(normalizedCoordinate.latitude * scale);
returnTile.zoom = tileZoom;
return returnTile;
}
#pragma mark -
#pragma mark Markers and overlays
... ...
... ... @@ -18,6 +18,7 @@
@property(nonatomic,retain)RMMapView *mapView;
- (IBAction)doTheTest:(id)sender;
- (IBAction)takeSnapshot:(id)sender;
@end
... ...
... ... @@ -43,4 +43,10 @@
[self.mapView setCenterCoordinate:secondLocation];
}
- (IBAction)takeSnapshot:(id)sender
{
UIImage *snapshot = [self.mapView snapshotImage];
[UIImagePNGRepresentation(snapshot) writeToFile:[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"snap.png"] atomically:YES];
}
@end
... ...
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">528</int>
<string key="IBDocument.SystemVersion">9G55</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.43</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="6"/>
<string>IBProxyObject</string>
<string>IBUIView</string>
<string>IBUIButton</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="843779117">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="774585933">
<reference key="NSNextResponder"/>
... ... @@ -39,17 +42,15 @@
<object class="IBUIButton" id="504618324">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{124, 403}, {72, 37}}</string>
<string key="NSFrame">{{40, 403}, {100, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">1.500000e+01</double>
<int key="NSfFlags">16</int>
</object>
<int key="IBUIButtonType">1</int>
<string key="IBUIHighlightedTitle">Move</string>
<string key="IBUIDisabledTitle">Move</string>
... ... @@ -63,10 +64,57 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="269339381">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIButton" id="988769131">
<reference key="NSNextResponder" ref="774585933"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{180, 403}, {100, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Snapshot</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<reference key="IBUIFont" ref="269339381"/>
</object>
</object>
<string key="NSFrameSize">{320, 460}</string>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="504618324"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC43NQA</bytes>
... ... @@ -76,6 +124,7 @@
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
... ... @@ -98,6 +147,15 @@
</object>
<int key="connectionID">9</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">takeSnapshot:</string>
<reference key="source" ref="988769131"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">11</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
... ... @@ -114,7 +172,7 @@
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="360949347"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
... ... @@ -127,6 +185,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="504618324"/>
<reference ref="988769131"/>
</object>
<reference key="parent" ref="360949347"/>
</object>
... ... @@ -135,48 +194,49 @@
<reference key="object" ref="504618324"/>
<reference key="parent" ref="774585933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="988769131"/>
<reference key="parent" ref="774585933"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-1.IBPluginDependency</string>
<string>-2.CustomClassName</string>
<string>6.IBEditorWindowLastContentRect</string>
<string>-2.IBPluginDependency</string>
<string>10.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ProgrammaticMapViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIResponder</string>
<string>{{118, 28}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="360949347"/>
<reference key="dict.values" ref="360949347"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="360949347"/>
<reference key="dict.values" ref="360949347"/>
</object>
<nil key="sourceID"/>
<int key="maxID">9</int>
<int key="maxID">11</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
... ... @@ -185,18 +245,56 @@
<string key="className">ProgrammaticMapViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">doTheTest:</string>
<string key="NS.object.0">id</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doTheTest:</string>
<string>takeSnapshot:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doTheTest:</string>
<string>takeSnapshot:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doTheTest:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">takeSnapshot:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/ProgrammaticMapViewController.h</string>
<string key="minorKey">./Classes/ProgrammaticMapViewController.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.LastKnownRelativeProjectPath">ProgrammaticMap.xcodeproj</string>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="528" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">933</string>
</data>
</archive>
... ...