Commit Graph

3629 Commits

Author SHA1 Message Date
Brad Leege
e4ebee4a8a Merge pull request #1347 from mapbox/1345-ua-build-number
Build Number To User Agent
2015-04-27 13:27:45 -04:00
Brad Leege
50fecb916d #1345 - Adding app build number to user agent. Updating gl test app build number to be different from build version. 2015-04-27 11:43:23 -04:00
Brad Leege
ea8f186a1b Merge pull request #1346 from mapbox/fix-ssl-pin
fix SSL pinning for apps including the framework
2015-04-27 11:30:17 -04:00
Brad Leege
86e90da6d5 #1346 - Removing allFrameworks iteration search for the bundle as it's not needed now 2015-04-27 10:55:12 -04:00
Konstantin Käfer
99ab9c3c6d Merge pull request #1343 from mapbox/get-rid-of-gl-points
match -js line tesselation (get rid of joins drawn with GL_POINTS).
2015-04-27 12:22:24 +02:00
Konstantin Käfer
feade7b4e4 const + code style 2015-04-27 11:44:50 +02:00
Ansis Brammanis
f1edce8e21 remove linejoin shader
The previous commit switched to using triangles for drawing round joins.
2015-04-27 11:44:49 +02:00
Ansis Brammanis
af1537ca79 port LineBucket::addLine from -js 2015-04-27 11:44:49 +02:00
Justin R. Miller
ad1cc3f1ad fix SSL pinning for apps including the framework
Made it clearer when we are referring to the app bundle and
when we need to get the framework bundle for resources such as
pinned certificates.
2015-04-25 10:25:47 -07:00
Ansis Brammanis
8aa2e2fef7 Don't wrap line labels.
fixes #1332

98af024921/js/data/symbol_bucket.js (L74)
2015-04-24 15:41:13 -07:00
Ansis Brammanis
65306490dd icon-rotate is not a paint property
issue #1173
2015-04-24 15:34:53 -07:00
Ansis Brammanis
17010bfd73 make text-max-size not affect rendering size
This way it matches -js. The real fix will eventually be
https://github.com/mapbox/mapbox-gl-style-spec/issues/255
2015-04-24 15:33:58 -07:00
Justin R. Miller
06eabb8b51 Merge pull request #1328 from mapbox/1ec5-constraints-1327
Refactored constraints within MGLMapView
2015-04-24 15:23:26 -07:00
Minh Nguyễn
f9c544a9ea Reset map view frame on every test
To counteract the call to `-insetMapView` in `-testInsetMapView`.
2015-04-24 14:27:25 -07:00
Minh Nguyễn
1dc2cbc280 Test inset MGLMapView
Verify that the ornaments hug the `MGLMapView` when it’s smaller than the view controller’s root view.
2015-04-24 13:30:50 -07:00
Minh Nguyễn
2c436444d7 Made user dot accessible
Added an accessibility label to the user dot.
2015-04-24 13:06:54 -07:00
Minh Nguyễn
0e8b496d31 Merge branch 'master' into 1ec5-constraints-1327 2015-04-24 09:21:46 -07:00
Konstantin Käfer
74cb1ccced Merge pull request #1312 from mapbox/1312-merge-targets
Merge build targets
2015-04-24 15:16:36 +02:00
Konstantin Käfer
0d5568f724 merge build targets so we only have one build file per platform
previously, we used multiple different projects for various targets (app, test, render) that overwrote each other, so it was impossible to have one project to build them all, one project to compile them, one project to run them all and in the darkness bind them
2015-04-24 11:50:50 +02:00
Justin R. Miller
8d76613597 Merge pull request #1168 from mapbox/ios-testing
fixes #830, #880: bring back iOS tests; split OS X & iOS tests
2015-04-23 18:21:57 -07:00
Justin R. Miller
b528d7cc03 fixes #830, #880: bring back iOS functional tests 2015-04-23 17:54:08 -07:00
Justin R. Miller
75980a8905 Merge pull request #1337 from mapbox/fix-ios-compass-opacity
tighten up compass alpha adjustments & remove dupe
2015-04-23 17:42:04 -07:00
Justin R. Miller
7e335cafdc tighten up compass alpha adjustments & remove dupe 2015-04-23 16:19:45 -07:00
Minh Nguyễn
fec1cf0e23 RTL-friendly constraints
Use leading/trailing instead of left/right for subview constraints for eventual right-to-left flippedness.
2015-04-23 15:02:06 -07:00
Justin R. Miller
c7769d9a97 [publish ios-v0.2.15] 2015-04-23 09:00:24 -07:00
Justin R. Miller
38315fd667 bump podspec to 0.2.15 2015-04-23 08:59:26 -07:00
Minh Nguyễn
e85b4b1ce4 Merge pull request #1297 from mapbox/1ec5-strong-self
weakSelf needs strongSelf
2015-04-22 18:28:37 -07:00
Justin R. Miller
6592017a73 Merge pull request #1324 from mapbox/normalize-cache
fixes #1308: normalize tile memory cache keys & allow dupe inserts
2015-04-22 17:29:32 -07:00
John Firebaugh
bf13b31f90 Merge pull request #1323 from mapbox/1315-python-style
Correct build-version.py indentation — fixes #1315
2015-04-22 17:15:25 -07:00
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
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