Commit Graph

5812 Commits

Author SHA1 Message Date
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
Brad Leege
f80238577c [publish ios-v0.2.14] 2015-04-17 17:19:03 -05:00
Brad Leege
41aacc11ae Bumping Podspec to 0.2.14 2015-04-17 17:15:57 -05:00
Peter Liu
4990a70e34 remove noise on emerald 2015-04-17 18:10:07 -04:00
Nicki Dlugash
8d60c7ce03 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2015-04-17 17:42:20 -04:00
Nicki Dlugash
151deec8ed bump styles pin. Updated Streets (colors, added refs for performance), Emerald (colors, added refs for performance, sprite), Light and Dark (changed font) 2015-04-17 17:40:28 -04:00
Minh Nguyễn
2bc63f76a4 Made pan gestures slipperier
Replaced the complex formula for overpanning with a simple one that makes the map feel much slipperier than before. `MGLMapView` now overpans just a little more aggressively than `MKMapView` but still a lot less aggressively than Google Maps.

Fixes #1266.
2015-04-17 12:31:49 -07:00
Konstantin Käfer
71d127220b rename Mode::Static => Mode::Still 2015-04-17 17:55:24 +02:00
Mike Morris
5b479fbfca Merge pull request #113 from mapbox/render-still
Map::renderStill
2015-04-17 17:11:23 +02:00
Konstantin Käfer
f2c9e9fb67 add xcode project target
Use locally installed node-pre-gyp if there's no global one.
This is necessary to be able to run make outside of npm.

Make example executable.

Change path to the request include file.

Bump mbgl to master.
2015-04-17 16:02:29 +02:00
Mike Morris
417741b13f adapt to still image render mode changes
https://github.com/mapbox/mapbox-gl-native/pull/1272

Some tests are hanging with no errors or log messages
when map.load is passed a style but never rendered.
2015-04-17 16:01:54 +02:00
Mike Morris
a11a92f9a4 add LogMessage constructors for default values 2015-04-17 15:57:31 +02:00
Mike Morris
8e790ca322 log environment ID and threadName if in scope 2015-04-17 15:57:31 +02:00
Mike Morris
8671015119 move node log from backend to observer pattern
back to gl-native master branch
2015-04-17 15:57:22 +02:00
Konstantin Käfer
7827d4954c Merge pull request #1272 from mapbox/1272-render-still-images-on-thread
Render still/static images on a separate thread as well, aligning it with the way continuous render mode works
2015-04-17 15:43:20 +02:00
Konstantin Käfer
9072df709d make the request header public as the node module requires it 2015-04-17 15:23:36 +02:00
Konstantin Käfer
60a0e8a4be don't record Debug events to log observers 2015-04-17 13:40:43 +02:00
Konstantin Käfer
5d769f9b62 explicitly call .discard() to resize the view on static renders
- this is only a stopgap; we need to properly pass state between threads
- doesn't fix changing the pixel ratio
2015-04-17 13:40:42 +02:00
Konstantin Käfer
9af3f07e5b don't hide unchecked messages 2015-04-17 13:40:42 +02:00
Konstantin Käfer
6691f7249e remove nativeRun() method as that is now private 2015-04-17 13:40:42 +02:00
Konstantin Käfer
1c920c4332 don't throw an exception in the map thread for bad styles 2015-04-17 13:40:42 +02:00
Konstantin Käfer
46bf226910 align static render mode and still image render mode
- static rendering now also runs in a separate thread; you have to start it with map.start(Map::Mode::Static) and join the thread with map.stop() before destructing the Map object
- map.renderStill() takes a callback with will be invoked on the *map* thread, so you'll have to figure out your own method of dispatching back to the main thread.
2015-04-17 13:40:42 +02:00
Nicki Dlugash
cd496645d4 bump styles pin. Updated Mapbox Streets (mainly fonts, colors, and sprite), updated Light (added dot.sdf to sprite) 2015-04-16 20:27:05 -04:00
Justin R. Miller
b6e2052962 refs #1285: don't use special getters for dot syntax 2015-04-16 15:16:11 -07:00
Justin R. Miller
e9f66d043c Merge pull request #1285 from mapbox/fg-bg-ios-tweaks
fixes #1276: maintain snapshot in hierarchy & hide when appropriate
2015-04-16 15:08:20 -07:00
Justin R. Miller
a28bd361d8 fixes #1276: maintain snapshot in hierarchy & hide when appropriate 2015-04-16 14:04:37 -07:00
Justin R. Miller
7378a1ec71 Merge pull request #1284 from mapbox/fix-cache-resize
fixes #1283: don't fill cache with zeros on reside
2015-04-16 12:41:29 -07:00
Justin R. Miller
14e972ad97 don't auto-resize & fill cache with zeros 2015-04-16 12:14:35 -07:00
Konstantin Käfer
dc1b2efe7b Merge pull request #1282 from mapbox/1282-remove-runloop-message-wrapper
Remove wrapper code from RunLoop Message
2015-04-16 18:47:26 +02:00