尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Tracy Harton
Commit 7b54080ba2477f25cb46a3c4e49bf3aee3da56a8 1 parent 40088aeb

Add latLongToTilePoint to convert lat/lon to RMTile 

Add [overlay correctPositionOfAllSublayers] to setZoom/setScale to fix issue w/ wandering markers
Inline Side-by-side
Showing 2 changed files with 9 additions and 1 deletions
@@ -181,6 +181,7 @@ enum { @@ -181,6 +181,7 @@ enum {
181 181
182 - (CGPoint)latLongToPixel:(CLLocationCoordinate2D)latlong; 182 - (CGPoint)latLongToPixel:(CLLocationCoordinate2D)latlong;
183 - (CGPoint)latLongToPixel:(CLLocationCoordinate2D)latlong withScale:(float)aScale; 183 - (CGPoint)latLongToPixel:(CLLocationCoordinate2D)latlong withScale:(float)aScale;
  184 +- (RMTilePoint)latLongToTilePoint:(CLLocationCoordinate2D)latlong withScale:(float)aScale;
184 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel; 185 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel;
185 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel withScale:(float)aScale; 186 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel withScale:(float)aScale;
186 187
@@ -296,6 +296,7 @@ @@ -296,6 +296,7 @@
296 [imagesOnScreen moveBy:delta]; 296 [imagesOnScreen moveBy:delta];
297 [tileLoader moveBy:delta]; 297 [tileLoader moveBy:delta];
298 [overlay moveBy:delta]; 298 [overlay moveBy:delta];
  299 + [overlay correctPositionOfAllSublayers];
299 [renderer setNeedsDisplay]; 300 [renderer setNeedsDisplay];
300 } 301 }
301 302
@@ -554,7 +555,7 @@ @@ -554,7 +555,7 @@
554 if (tileSource == newTileSource) 555 if (tileSource == newTileSource)
555 return; 556 return;
556 557
557 - newTileSource = [RMCachedTileSource cachedTileSourceWithSource:newTileSource]; 558 + newTileSource = [RMCachedTileSource cachedTileSourceWithSource:newTileSource];
558 559
559 [tileSource release]; 560 [tileSource release];
560 tileSource = [newTileSource retain]; 561 tileSource = [newTileSource retain];
@@ -749,6 +750,7 @@ @@ -749,6 +750,7 @@
749 calculateScaleFromZoom:zoom]; 750 calculateScaleFromZoom:zoom];
750 //RMLog(@"new scale: %f, scale"); 751 //RMLog(@"new scale: %f, scale");
751 [self setScale:scale]; 752 [self setScale:scale];
  753 + [overlay correctPositionOfAllSublayers];
752 754
753 } 755 }
754 756
@@ -810,6 +812,11 @@ static BOOL _performExpensiveOperations = YES; @@ -810,6 +812,11 @@ static BOOL _performExpensiveOperations = YES;
810 return [mercatorToScreenProjection projectXYPoint:[projection latLongToPoint:latlong] withScale:aScale]; 812 return [mercatorToScreenProjection projectXYPoint:[projection latLongToPoint:latlong] withScale:aScale];
811 } 813 }
812 814
  815 +- (RMTilePoint)latLongToTilePoint:(CLLocationCoordinate2D)latlong withScale:(float)aScale
  816 +{
  817 + return [mercatorToTileProjection project:[projection latLongToPoint:latlong] atZoom:aScale];
  818 +}
  819 +
813 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel 820 - (CLLocationCoordinate2D)pixelToLatLong:(CGPoint)aPixel
814 { 821 {
815 return [projection pointToLatLong:[mercatorToScreenProjection projectScreenPointToXY:aPixel]]; 822 return [projection pointToLatLong:[mercatorToScreenProjection projectScreenPointToXY:aPixel]];