Commit Graph

6248 Commits

Author SHA1 Message Date
Brad Leege
4a18e1cf77 [android] #3354 - Setting Android Version to 3.1.0-SNAPSHOT 2015-12-21 18:29:57 -06:00
Brad Leege
8b033231d4 Merge branch 'master' into release-android-v2.4.0
# Conflicts:
#	src/mbgl/map/transform.cpp
2015-12-21 18:23:38 -06:00
Thiago Marcos P. Santos
373916420a [tests] Create less threads on the AsyncTask tests
So we open less fds as new versions of OSX have
a smaller limit (256).
2015-12-21 22:22:11 +02:00
John Firebaugh
913f49c701 [core] Prepare for OfflineFileSource
* Rename existing DefaultFileSource to OnlineFileSource
* Restore a DefaultFileSource that's a passthrough to OnlineFileSource
2015-12-21 11:35:00 -08:00
Brad Leege
4814ce1124 [android] #3354 - Android 3.0.0 Change Log 2015-12-21 13:15:34 -06:00
Brad Leege
19f2f62609 [android] #3354 - Incrementing Version to 3.0.0 for release 2015-12-21 12:22:43 -06:00
Brad Leege
9c4cbb4fcd [android] #3348 - Updating customLayerClass package name in JNI code 2015-12-21 11:51:54 -06:00
Brad Leege
e8e485f83e [android] #3348 - Moved ExampleCustomLayer into it's own package. Moved Custom Layer to Main Activity Controls in Nav Drawer with new icon. 2015-12-21 10:09:33 -06:00
Brad Leege
3bffd6456f [android] #3358 - easeTo() uses nanoseconds instead of milliseconds 2015-12-20 10:00:08 -06:00
Brad Leege
77d62baa50 [android] #3358 - Created easeCamera() API method. 2015-12-20 09:46:59 -06:00
Brad Leege
8f532eeefa [android] #3358 - Making Core GL camera methods private. Adding moveCamera() API method. Updating CameraActivity to use only animateCamera() and moveCamera() API. 2015-12-20 09:19:03 -06:00
Minh Nguyễn
49bfdd662f [ios, osx] Optional peak altitude for flying 2015-12-20 04:11:14 -08:00
Minh Nguyễn
b7223f249d [ios, osx] Avoid transition to current camera
Fixes #2456.
2015-12-20 03:57:51 -08:00
Minh Nguyễn
d668c0fa84 [ios, osx] Better zoom level–altitude conversion
Greatly simplified conversions between zoom level and altitude. Adjusted field of view to more closely match MapKit. Conversions are now well within the same order of magnitude as MapKit at all latitudes.

Fixes #2266.
2015-12-20 03:57:28 -08:00
Tobrun
f3de446bd9 [android] #3304 - refactor SpriteFactory to IconFactory, changed all the sprite names to icon for convention 2015-12-20 11:57:36 +01:00
Minh Nguyễn
cafe591d2a [osx] Flipped drag-rotate center point 2015-12-19 23:30:21 -08:00
Minh Nguyễn
a5230f3e11 [core] Clamp pitch in easeTo(), flyTo()
Also factored out the maximum pitch into a constant.
2015-12-19 23:14:01 -08:00
Minh Nguyễn
70ae0cc172 [ios, osx] Allow zero-duration flight
For consistency with -setCamera:…, a duration of 0 jumps instantaneously to the new location, while a negative value uses the distance-dependent default.

Due to the produced curve and applied easing, flyTo() doesn’t model a parabola or ballistic trajectory, but it does simulate powered flight to some extent.
2015-12-19 20:48:34 -08:00
Minh Nguyễn
d1d96dfe91 [core] Reformulated flyTo options
The speed and curve fields in CameraOptions have been replaced with velocity and minZoom fields, which expressed in screen units. Scaling and easing make it difficult to derive options that are expressed in physical units.
2015-12-19 20:48:34 -08:00
Minh Nguyễn
225a17d775 [core] Fly across the meridian or antemeridian, whichever is shorter
ref mapbox/mapbox-gl-js#1853
2015-12-19 20:48:34 -08:00
Minh Nguyễn
a68589b6c7 [core] Refined and commented flyTo
Rewrote the flyTo implementation to more closely match GL JS’s implementation and the paper on which it is based.

Rewrote CameraOptions documentation. Only document units for generic types like double. The semantics of LatLng and Duration are already baked into the types; one just needs to look up the types’ definitions. Also, the […) is set notation, so the braces are supposed to be mismatched.

Fixes #3296.
2015-12-19 20:48:34 -08:00
Minh Nguyễn
2cb70eac3c [ios, osx] Allow zero-duration flight
For consistency with -setCamera:…, a duration of 0 jumps instantaneously to the new location, while a negative value uses the distance-dependent default.

Due to the produced curve and applied easing, flyTo() doesn’t model a parabola or ballistic trajectory, but it does simulate powered flight to some extent.
2015-12-19 20:33:37 -08:00
Minh Nguyễn
0a9b6a82e4 [core] Reformulated flyTo options
The speed and curve fields in CameraOptions have been replaced with velocity and minZoom fields, which expressed in screen units. Scaling and easing make it difficult to derive options that are expressed in physical units.
2015-12-19 20:33:18 -08:00
Minh Nguyễn
97c143a338 [core] Fly across the meridian or antemeridian, whichever is shorter
ref mapbox/mapbox-gl-js#1853
2015-12-19 20:33:18 -08:00
Minh Nguyễn
af9de6c0ac [core] Refined and commented flyTo
Rewrote the flyTo implementation to more closely match GL JS’s implementation and the paper on which it is based.

Rewrote CameraOptions documentation. Only document units for generic types like double. The semantics of LatLng and Duration are already baked into the types; one just needs to look up the types’ definitions. Also, the […) is set notation, so the braces are supposed to be mismatched.

Fixes #3296.
2015-12-19 20:31:40 -08:00
Minh Nguyễn
182380c4b1 [ios, osx] Corrected MGLMapCamera debug description
It’s MGLMapCamera (or a subclass), not MKMapCamera.
2015-12-19 20:08:07 -08:00
Minh Nguyễn
b8378420d4 [osx] Typo in osxapp help 2015-12-19 14:36:22 -08:00
John Firebaugh
ec5afdd8b7 [core] Merge default_file_source_impl.hpp into default_file_source.cpp
After previous refactors, no other files include default_file_source_imp.hpp.
2015-12-18 15:48:20 -08:00
Bruno de Oliveira Abinader
20d2ceef4b [osx] Use framebuffer width/height in GLFW port
Framebuffer width/height takes pixel ration in consideration.

Part of #3294.
2015-12-18 15:31:36 -08:00
Brad Leege
925687ab06 [android] #3244 - Removing debug log statements 2015-12-18 14:39:02 -06:00
Brad Leege
f7d1a40350 [android] Camera API 2015-12-18 11:33:40 -08:00
John Firebaugh
e2ad0e008a [core] Fix background-pattern origin
Regressed in 6e41664cb0. This restores it
to the same behavior as gl-js, backed by test-suite tests.
2015-12-18 10:46:10 -08:00
Tobrun
b8aee77299 [android] #3107 - allow other type of drawable to be used from a resource drawable other than BitmapDrawables 2015-12-18 15:47:54 +01:00
Tobrun
f31ff44d79 [android] #3317 #3239 - SpriteFactory Singleton, added different custom markers to InfoWindowActivity 2015-12-18 09:03:13 +01:00
Oguz Babaoglu
9e90934438 [Android] MapFragment null container fix 2015-12-18 08:10:47 +01:00
Tobrun
5c4ac72d5a [android] #3277 - update android support lib + new configuration to manage these 2015-12-18 08:00:07 +01:00
Bruno de Oliveira Abinader
3e00ab1582 [core] Add more tests to on-demand source load 2015-12-17 18:15:06 -08:00
Bruno de Oliveira Abinader
9d3fe01991 [core] Tests for style with unused sources 2015-12-17 16:53:37 -08:00
Bruno de Oliveira Abinader
93725e062a [core] Load sources only if there is at least one visible layer 2015-12-17 16:53:37 -08:00
Bruno de Oliveira Abinader
5a63ce5576 [core] Avoid loading source if a source request is currently ongoing 2015-12-17 16:53:37 -08:00
John Firebaugh
bf37904883 [core] Unbind current VAO before calling custom layer render function 2015-12-17 15:15:55 -08:00
John Firebaugh
fd248c1894 [core] Don't crash when destroying a copied CustomLayer 2015-12-17 15:15:55 -08:00
John Firebaugh
110f1ec796 [ios, android] Add methods to remove a custom layer 2015-12-17 15:15:55 -08:00
Minh Nguyễn
d3c92a8b5c [osx] Fixed path to embedded framework
Xcode (or perhaps gyp’s Xcode adapter) doesn’t understand \$ inside a copy files run phase path.

ref #3337
2015-12-17 13:15:43 -08:00
Bruno de Oliveira Abinader
c08a97e453 [osx] Fixed 'make compdb' target'
[skip ci]
2015-12-17 12:28:36 -08:00
Minh Nguyễn
986e0ae39e [core] Added special case for atomic flyTo()
startTransition isn’t well-suited to atomic transitions, which are expected to be synchronous and end up at the final state.
2015-12-17 10:24:58 -08:00
John Firebaugh
a7e4e6bb1c [ios] Move source to src folder, matching osx 2015-12-17 10:16:22 -08:00
John Firebaugh
7a4e7376e1 Move platform scripts into platforms 2015-12-16 17:49:22 -08:00
Thiago Marcos P. Santos
a903d2eef0 [glfw] Set viewport size from the Map thread
Setting the viewport size from the main thread has no affect
on Linux and thus, the map doesn't scale. We now set the
viewport size on the beforeRender() hook that gets called
from the Map thread.
2015-12-16 17:18:54 -08:00
John Firebaugh
9f18ed9a3c [android] Add CustomLayerRenderParameters to example code 2015-12-16 16:30:30 -08:00