Commit Graph

5798 Commits

Author SHA1 Message Date
Minh Nguyễn
a91b1d73e2 Merge pull request #1611 from friedbunny/1519-actionsheet-metrics-squash
[squash] Add action sheet shortcut to Settings.app metrics opt-out
2015-05-21 01:55:17 -07:00
Minh Nguyễn
c718d2ea66 Made accessToken uninspectable 2015-05-21 01:51:18 -07:00
Minh Nguyễn
70381d2705 Fixed up various Info.plist edge cases
Need to look in the main bundle for Info.plist settings, because the developer has no access to the framework’s Info.plist. Need to check MGLMapboxMetricsEnabledSettingShownInApp before MGLMapboxAccessToken; otherwise, `MGLMapboxEvents` inspects the Settings bundle plist before MGLMapboxMetricsEnabledSettingShownInApp is even checked.
2015-05-21 01:49:53 -07:00
Jason Wray
911a8ffc60 Add action sheet shortcut to Settings.app metrics opt-out
Only applicable to iOS 8+. Checks if metrics setting has been declared to be offered in app, if not: adds ℹ️ action to open the app's Settings.app section.

Fixes #1519. Squash of #1529.
2015-05-21 00:12:49 -07:00
Leith Bade
8a83c31e05 Merge pull request #1610 from mapbox/android-latlng-swap
Fix swapped lat/lng
2015-05-21 10:16:35 +10:00
Leith Bade
a89a75f5c7 Merge pull request #1609 from mapbox/android-gradle-123
Update Android gradle plugin to 1.2.3
2015-05-21 09:53:40 +10:00
Leith Bade
cea926c62e Fix swapped lat/lng 2015-05-21 09:51:43 +10:00
Ansis Brammanis
0bd39ae44a place symbols with correct angle on initial load 2015-05-20 19:18:53 -04:00
Leith Bade
710ec54a55 Update Android gradle plugin to 1.2.3 2015-05-21 09:00:03 +10:00
Ansis Brammanis
d41bfa2679 redo placement when map rotates 2015-05-20 17:52:00 -04:00
Minh Nguyễn
256b748458 Merge branch '1ec5-plist-1535' 2015-05-20 14:38:36 -07:00
Brad Leege
8f8631963b Merge pull request #1603 from mapbox/1595-internal-billing
Counting App Users For Billing
2015-05-20 15:56:18 -05:00
Brad Leege
a47438d42a #1595 - Changing to strongSelf 2015-05-20 15:12:48 -05:00
Brad Leege
cbcc3a3e49 #1595 - Separating pushTurnstileEvent from primary pushEvent infrastructure. Adding event, created, and appBundleId to posted Turnstile Event data model. 2015-05-20 15:05:56 -05:00
Brad Leege
a29587726c #1595 - Moving MGLEventTypeAppUserTurnstile event to end of MGLMapboxEvents init method to ensure it only gets called once 2015-05-20 14:32:16 -05:00
Brad Leege
44caf2c7a9 #1595 - Improving stability by moving MGLEventTypeAppUserTurnstile after the strongSelf check 2015-05-20 14:18:39 -05:00
Minh Nguyễn
90a50c0c41 Observe access token changes
The singleton `MGLAccountManager` wants to be the sole arbiter of the access token, but each instance of `mbgl::Map` (`mbgl::DefaultFileSource` in #1607) has its own copy of the access token. Now `MGLMapView` observes for changes to the `MGLAccountManager`’s access token and synchronizes `mbgl::Map` with it.
2015-05-20 11:49:59 -07:00
Justin R. Miller
51618c35d7 update README to mention desktop style toggling 2015-05-20 11:07:23 -07:00
Minh Nguyễn
a081f1af5b Removed redundant declaration 2015-05-20 10:47:42 -07:00
Minh Nguyễn
9a57464f82 Removed accessToken from MGLMapView public API
With helpful instructions for migrating to Info.plist or the `MGLAccountManager` API.
2015-05-20 10:45:26 -07:00
Brad Leege
a5bd2fa3c6 #1595 - Adding exception so that Turnstile event will always be sent in 2015-05-20 12:31:20 -05:00
Brad Leege
58b967605a Implementing suggestions to tighten up MGLAccountManager and rename MGLEventTypeUserCount to MGLEventTypeAppUserTurnstile 2015-05-20 11:32:57 -05:00
Minh Nguyễn
b6765a2eb1 Merge pull request #1453 from mapbox/1ec5-whee-2
Prevent full-circle spin during animated rotation
2015-05-19 16:18:26 -07:00
Minh Nguyễn
2a02f42b4a Merge pull request #1601 from mapbox/1ec5-metrics-param-url
Compare hostname for adding events=true
2015-05-19 16:14:14 -07:00
Brad Leege
f3d7212137 #1595 - Adding App User count event to be triggered and immediately sent when Access Token is set. 2015-05-19 17:02:54 -05:00
Minh Nguyễn
d474f35371 Check account type before comparing hostname 2015-05-19 14:33:19 -07:00
Minh Nguyễn
52670f0560 Cache account type user default 2015-05-19 14:31:30 -07:00
Minh Nguyễn
90b70180c5 Compare hostname for adding events=true
ref #1596, #1599
2015-05-19 13:44:29 -07:00
Brad Leege
f74fe69cb8 Merge pull request #1599 from mapbox/1596-non-mapbox-tiles
Adding mapbox.com checking to http requests
2015-05-19 14:37:16 -05:00
Brad Leege
ec4cd494cb #1596 - Adding mapbox.com checking to http requests 2015-05-19 14:23:21 -05:00
John Firebaugh
bd4fca2ec3 Update test suite 2015-05-19 11:28:00 -07:00
Ansis Brammanis
03d5e2da80 port sprite atlas pollution fix
fixes #1398

js: 212760981493460b438f1cc117001825773fad91
https://github.com/mapbox/mapbox-gl-js/pull/1195

The sprite atlas already had two empty pixels between each each icon.
But the icon's real boundary isn't used for drawing. Drawing uses an
icon's box rounded up to the nearest multiple of four. Sometimes this
rounded boundary was directly on the edge of another icon. When the icon
was sampled with linear interpolation it's edge would get polluted with
values from the other icon.

This commit shifts all icons and glyphs by 1px so that there is padding
on all sides of the box being drawn. The quads used for drawing are
shifted in the opposite direction by 1px to compensate for this.
2015-05-19 10:04:46 -07:00
Konstantin Käfer
d7bd429619 bump test suite 2015-05-19 17:56:20 +02:00
Ansis Brammanis
7abd7950c9 Merge branch 'master' into new-labelling
Conflicts:
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/tile_parser.hpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_symbol.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/collision.hpp
	src/mbgl/text/placement.cpp
2015-05-19 11:09:33 -04:00
Konstantin Käfer
bcf66b7449 only return locked FontStack objects 2015-05-19 16:13:36 +02:00
Konstantin Käfer
b0c89e7f44 extend the FontStack lock to returned values 2015-05-19 16:13:36 +02:00
Konstantin Käfer
ab3105aac9 don't mark the glyphs as parsed until we've actually parsed them 2015-05-19 16:13:36 +02:00
Konstantin Käfer
58c9e2687d Merge pull request #1591 from mapbox/1591-always-upload-tests
Upload test results regardless of outcome
2015-05-19 16:13:00 +02:00
Konstantin Käfer
a87c58fcb1 fix Travis stage name 2015-05-19 15:58:14 +02:00
Brad Leege
5572504d38 Merge pull request #1589 from mapbox/1396-info-plist-only
Manage Metrics TEST URL Via Info.plist
2015-05-18 21:40:26 -05:00
Minh Nguyễn
1102f85a83 Less bland default title for user dot annotation
What’s a map without a You Are Here sticker?
2015-05-18 17:21:49 -07:00
Minh Nguyễn
b7b4515d48 Marked unused parameters with __unused
Replaced haphazard usage of pragmas and `(void)` expressions with the `__unused` keyword.
2015-05-18 17:11:12 -07:00
John Firebaugh
63ea3d4bef Don't crash if VAO extensions are not available
Fixes #1585
2015-05-18 16:47:20 -07:00
John Firebaugh
4af4c817f1 Fix typos and add access token reminder
[skip ci]
2015-05-18 16:43:24 -07:00
Brad Leege
d56daf7480 #1396 - Backing out accidental commit from fa34b53964 2015-05-18 18:26:26 -05:00
Brad Leege
fa34b53964 #1396 - Refactoring Metrics Test Server URL configuration to be drive via Info.plist 2015-05-18 18:15:15 -05:00
Leith Bade
e946d93c06 Add README instructions for running on Android emulator and devices 2015-05-19 08:57:36 +10:00
Mike Morris
c439024f47 Merge pull request #124 from mapbox/pngjs
Drop compressPNG, use pngjs for tests
2015-05-18 17:54:41 -04:00
John Firebaugh
14c62744c7 Update token.txt location in README
[skip ci]
2015-05-18 14:48:02 -07:00
John Firebaugh
f44894e295 Remove clean from ipackage* dependencies
Fixes #1584
2015-05-18 13:14:09 -07:00