Commit Graph

4631 Commits

Author SHA1 Message Date
Minh Nguyễn
273b930c76 Merge branch 'master' into 1ec5-strong-self 2015-04-22 15:36:20 -07:00
Jason Wray
44e2bf419f Correct indentation — #1315 2015-04-22 15:35:59 -07:00
Justin R. Miller
b43ba4089c fixes #1308: normalize tile memory cache keys & allow dupe inserts 2015-04-22 15:35:34 -07:00
Minh Nguyễn
73f982f4a4 Merge branch 'master' into 1ec5-constraints-1327 2015-04-22 15:35:10 -07:00
Minh Nguyễn
9b8b072d28 Cleaned up subview layout
No need to set the frames manually since we set up constraints as soon as the `MGLMapView` is added to the view hierarchy. Set proper edge insets on the logo bug rather than fudging constraint constants.
2015-04-22 15:33:56 -07:00
Peter Liu
f760026448 Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native 2015-04-22 15:23:59 -07:00
Peter Liu
c512cb12c8 update Emerald and Streets styles 2015-04-22 15:23:05 -07:00
Brad Leege
578d48b303 #1225 - Initial setup of MapboxGL as a singleton object with access token 2015-04-22 17:19:59 -05:00
John Firebaugh
55118e5bd7 Revert "build on trusty"
This reverts commit decc493ec8.

Conflicts:
	.mason
2015-04-22 14:07:05 -07:00
Minh Nguyễn
61d4fcc2ba Merge branch 'master' into 1ec5-strong-self 2015-04-22 13:11:26 -07:00
Minh Nguyễn
8ab22c11a2 Clip MGLMapView to its bounds
Fixes #1300.
2015-04-22 12:48:15 -07:00
Minh Nguyễn
e1cf6d1515 Refactored constraints
The existing Visual Format Language usage necessitated various ternaries and over-wide lines that made the code harder to grok. Now it’s just plain ol’ Objective-C, mostly column-80-compliant. This change also adds additional constraint relations so that the various subviews respect the `MGLView`’s frame when it’s smaller than the view controller’s root view.

Fixes #1327.
2015-04-22 12:45:09 -07:00
Minh Nguyễn
1008787745 Merge pull request #1322 from mapbox/1ec5-orientation-1313
Constrain user dot to superview margins
2015-04-22 09:10:34 -07:00
Brad Leege
2f67f60dbb Merge pull request #1321 from mapbox/1166-nsurlsession
NSURLSession
2015-04-21 20:46:27 -05:00
Minh Nguyễn
87409b1234 Constrain user dot to superview margins
When the screen changes orientation, the user dot should always appear at the correct location.

Fixed #1313.
2015-04-21 15:58:55 -07:00
Brad Leege
d4264edea3 #1166 - Cleaning up logs and old NSURLConnection code 2015-04-21 17:19:37 -05:00
Brad Leege
1a43b773af #1166 - Initial conversion from NSURLConnection to NSURLSession 2015-04-21 17:13:23 -05:00
Brad Leege
3ddd65cb0e Merge pull request #1310 from mapbox/1306-geotrust-sslpin
SSL Pinning of Geotrust Cert
2015-04-21 13:13:13 -05:00
Brad Leege
d4add0bfdb #1306 - Removing kSecTrustResultConfirm as it's deprecated 2015-04-21 11:15:31 -05:00
Brad Leege
a951229591 #1306 - Moving local geoTrustCert to one time setup and cache in immutable NSData object 2015-04-21 11:09:22 -05:00
Konstantin Käfer
7e7f7b8273 copy the styles to the correct location for iOS builds 2015-04-21 15:11:45 +02:00
Brad Leege
736bdca81e #1306 - Renaming certificate to include geotrust name for easier tracking 2015-04-20 19:59:28 -05:00
Brad Leege
6f9bcd86af #1306 - Moving api_mapbox_com.der to iOS Resources directory so that it can be accessed via GL Framework 2015-04-20 19:47:24 -05:00
John Firebaugh
75af3db17d Use a promise rather than async dance 2015-04-20 17:01:27 -07:00
Brad Leege
96a6371fa0 #1306 - Explicitly scheduling NSURLConnections in mainRunLoop so that delegates and connections stay connected. 2015-04-20 18:56:42 -05:00
Brad Leege
fbd610695a #1306 - Trying strongSelf / weakSelf pattern for delegate 2015-04-20 14:55:39 -05:00
Brad Leege
a2883dddc0 #1306 - Adding api_mapbox_com.der (public key) and nsurlconnection checking infrastructure 2015-04-20 14:28:32 -05:00
Minh Nguyễn
0aadbedecb Lower threshold for rotation drift
It’s pretty darn hard to get up to 5 rad/s with the same two fingers.
2015-04-20 11:15:29 -07:00
Minh Nguyễn
2ec09a663f Use strongSelf inside blocks
It’d be pointless to create a `strongSelf` but not use it; `weakSelf` isn’t guaranteed to exist past that point.
2015-04-20 09:58:05 -07:00
Brad Leege
1efb3869af Merge pull request #1304 from mapbox/1303-battery-levels
Battery Level Monitoring
2015-04-20 11:24:08 -05:00
Brad Leege
21dc01e375 Merge remote-tracking branch 'origin/master' into 1303-battery-levels 2015-04-20 10:59:50 -05:00
Brad Leege
e7518d56c5 #1303 - Enabling Battery Monitoring for app. Formatting battery level to int instead of float. 2015-04-20 10:59:09 -05:00
Konstantin Käfer
8d34d21685 Merge pull request #1245 from mapbox/1245-adjust-exposed-method-array-size
Android TestApp crashes on startup
2015-04-20 16:03:56 +02:00
Konstantin Käfer
ba8434c917 bump mason 2015-04-20 15:14:54 +02:00
Konstantin Käfer
ddf4dd882d [android] never pass garbage info to RegisterNatives() 2015-04-20 14:56:35 +02:00
Konstantin Käfer
ac61d03c40 Merge pull request #1301 from mapbox/travis-trusty
Move Travis builds to newer build infrastructure to speed up builds
2015-04-20 14:24:21 +02:00
Konstantin Käfer
decc493ec8 build on trusty 2015-04-20 13:26:02 +02:00
Konstantin Käfer
2831073f85 Merge pull request #1295 from mapbox/1199-whee
Ensure correct spin direction
2015-04-20 12:01:46 +02:00
Konstantin Käfer
219737ffa6 Merge pull request #1290 from mapbox/1290-static-to-still
Rename Static => Still
2015-04-20 11:58:27 +02:00
Konstantin Käfer
86d8029e20 Merge pull request #1207 from mapbox/fix-linux-app-on-osx-host
Fix linux app on osx host
2015-04-20 11:56:19 +02:00
Konstantin Käfer
02735b0e6d default to CGL on OS X 2015-04-20 11:34:23 +02:00
Dane Springmeyer
7b080e8fc3 fix style copying for linux app on osx - refs #511 / e69beba4d1 2015-04-20 11:34:22 +02:00
Minh Nguyễn
0bb2e05063 weakSelf needs strongSelf
The `weakSelf` dance requires the use of a `strongSelf` in non-trivial blocks. In these cases, `weakSelf` could disappear right out from under the block. A crash could potentially occur due to setting a `nil` value in an `NSMutableDictionary`.
2015-04-18 23:28:51 -07:00
Minh Nguyễn
261b6161f2 Cancel animations on touch down
Cancel any map animations as soon as a finger is set upon the screen.

Fixes #1258.
2015-04-18 23:01:42 -07:00
Minh Nguyễn
8b44cfeb76 Ensure correct spin direction
Ported mapbox/mapbox-gl-js#821 as well as `util.wrap()` from mapbox-gl-js.

Fixes #1199.
2015-04-18 22:14:39 -07:00
Minh Nguyễn
fae0c4c8b3 Simplified math for drift-rotation
fmodf() would conflict with the fix for #1199.
2015-04-18 22:02:15 -07:00
Minh Nguyễn
33aeecef22 Added drift-rotation effect after rotation gesture 2015-04-18 20:50:35 -07:00
Minh Nguyễn
41d28e7203 Added drift-zooming effect after pinch gesture
Apply a subtle animated zoom after a pinch gesture completes. Lots of magic numbers involved. Avoid drifting when the pinch is near-static, and when the scale factor would go below the minimum. There is more resistance to pinching outward than pinching inward, because it’s far easier to lose your place when you accidentally zoom out. Disabled two-finger pan, which is typically reserved for changing pitch; otherwise, it’s easy to accidentally pan while intending to pinch.
2015-04-18 19:47:52 -07:00
Minh Nguyễn
4c6987b20e Apply some friction to pan drift
When the panning velocity is low enough, ignore the pan gesture to simulate friction on the device’s glass screen.
2015-04-18 19:40:26 -07:00
Minh Nguyễn
09c169d7d2 Merge branch 'master' into 1266-slippy 2015-04-18 13:34:57 -07:00