Commit Graph

8640 Commits

Author SHA1 Message Date
John Firebaugh
91ddcbce20 [core] Merge GeoJSONTileSource into GeoJSONTileData 2016-06-10 12:42:14 +02:00
John Firebaugh
d62baffb1b [core] Merge AnnotationTileSource into AnnotationTileData 2016-06-10 12:42:14 +02:00
John Firebaugh
b45713e5e9 [core] Eliminate TileData dependency on TileSource 2016-06-10 12:42:14 +02:00
John Firebaugh
dbf16440a6 [core] Eliminate Source dependency on TileSource 2016-06-10 12:42:14 +02:00
John Firebaugh
c3a8534a43 [core] Push conditional initialization into subclasses 2016-06-10 12:42:14 +02:00
John Firebaugh
908f3f0832 [core] Introduce GeometryTileData subclasses 2016-06-10 12:42:14 +02:00
John Firebaugh
a7cc291ce1 [core] Move setObserver out of Source::createTile 2016-06-10 12:42:14 +02:00
John Firebaugh
5f05294118 [core] Move cache lookup out of Source::createTile 2016-06-10 12:42:14 +02:00
John Firebaugh
7235ba0bfb [core] Repeat some code so that all branches are parallel 2016-06-10 12:42:14 +02:00
John Firebaugh
ebd19db42a [core] Remove unused includes 2016-06-10 12:42:14 +02:00
Konstantin Käfer
4e5d065000 [core] load parents of missing tiles as optional 2016-06-10 12:42:14 +02:00
Konstantin Käfer
fce5dd5f6a [core] TileData objects now store whether an optional load attempt was performed 2016-06-10 12:42:14 +02:00
Konstantin Käfer
8a8f828e41 [core] rename onPlacementRedone -> onNeedsRepaint 2016-06-10 12:42:14 +02:00
Konstantin Käfer
2c7f7fb566 [core] createTile callback can load optional and required tiles 2016-06-10 12:42:14 +02:00
Konstantin Käfer
4673a9d6b3 [core] remove unused TileSource::loaded 2016-06-10 12:42:14 +02:00
Konstantin Käfer
913d28e745 [core] TileSources always start out as Optional 2016-06-10 12:42:14 +02:00
Konstantin Käfer
91895b9aec [core] only perform optional requests if the FileSource supports it 2016-06-10 12:42:14 +02:00
Konstantin Käfer
f180179d1b [core] allow changing the necessity of a TileSource 2016-06-10 12:42:14 +02:00
Konstantin Käfer
4357fed93b [core] merge similar implementation of VectorTileSource and ImageTileSource 2016-06-10 12:42:14 +02:00
Konstantin Käfer
971807d3b0 [core] move parsePending() call to TileData 2016-06-10 12:42:14 +02:00
Konstantin Käfer
436d8eb5e0 [core] introduce TileDataObserver
avoids passing around bound callback functions
2016-06-10 12:42:14 +02:00
Konstantin Käfer
2b6d0751cf [core] restructure TileSource construction and callbacks 2016-06-10 12:42:14 +02:00
Konstantin Käfer
6b729ccb46 [core] store Resource instead of dependents to build URL 2016-06-10 12:42:14 +02:00
Konstantin Käfer
46b0ebcd3c [core] rename VectorTileData => GeometryTileData 2016-06-10 12:42:14 +02:00
Konstantin Käfer
99b1df4e46 [core] introduce a RasterTileMonitor 2016-06-10 12:42:14 +02:00
Konstantin Käfer
e8d8f52d2e [core] *TileMonitor => *TileSource 2016-06-10 12:42:14 +02:00
Minh Nguyễn
383df9dd21 [ios] Updated changelog for #5302
Cherry-picked from 6998479d05.
2016-06-09 17:11:31 -07:00
Minh Nguyễn
6998479d05 [ios] Updated changelog for #5302 2016-06-09 17:11:01 -07:00
Minh Nguyễn
1eead5ee10 Revert "[ios] Updated changelog for #5302"
This reverts commit 066d9ebdd6.
2016-06-09 17:09:54 -07:00
Minh Nguyễn
066d9ebdd6 [ios] Updated changelog for #5302 2016-06-09 17:09:06 -07:00
Mark Allen
dd565b701b [ios] Support for a customizable zoom gesture centering strategy. (#5302)
* [ios] Support for a customizable zoom gesture centering strategy.

We introduce a new MGLZoomGestureCentering enum and corresponding zoomGestureCentering property on MGLMapView.

Currently, Mapbox automatically adjusts the center of the map relative to the user's gesture location, but for some applications (e.g Uber, Lyft) it is preferable to keep the map center "locked" in response to zoom gestures.

Exisiting code will retain its current behavior without modification and will implicitly use the default value of MGLZoomGestureCenteringFollowsTouch. New code can specify MGLZoomGestureCenteringLockedInPlace to get the new "locked" behavior.

* [ios] Added -anchorPointForGesture: to MGLMapView

Cherry-picked from b915f05a06.
2016-06-09 17:05:50 -07:00
Mark Allen
b915f05a06 [ios] Support for a customizable zoom gesture centering strategy. (#5302)
* [ios] Support for a customizable zoom gesture centering strategy.

We introduce a new MGLZoomGestureCentering enum and corresponding zoomGestureCentering property on MGLMapView.

Currently, Mapbox automatically adjusts the center of the map relative to the user's gesture location, but for some applications (e.g Uber, Lyft) it is preferable to keep the map center "locked" in response to zoom gestures.

Exisiting code will retain its current behavior without modification and will implicitly use the default value of MGLZoomGestureCenteringFollowsTouch. New code can specify MGLZoomGestureCenteringLockedInPlace to get the new "locked" behavior.

* [ios] Added -anchorPointForGesture: to MGLMapView
2016-06-09 17:05:15 -07:00
Brad Leege
511801c17a [android] #5303 - Updating code to take properly merge what each branch intended for nativeUpdateMarker 2016-06-09 17:01:23 -05:00
Brad Leege
acfa2ce0fd [android] #5291 - Fixing merge error for .travis.yml 2016-06-09 15:36:41 -05:00
Minh Nguyễn
7329a40e73 Tile count, tile size columns in osxapp (#5301)
* [osx] Added tile count, tile size columns

Added tile count and tile size columns to osxapp’s Offline Packs window. Also expanded the byte count formatters to include the raw byte count for debugging purposes.

* [osx] Corrected resource count formatters

Use grouping separators consistently.
2016-06-09 13:31:32 -07:00
Brad Leege
3972044308 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2016-06-09 15:10:05 -05:00
Brad Leege
b90571107d [android] #5291 - Fixing merge conflicts 2016-06-09 14:35:10 -05:00
Brad Leege
d67b88dba9 Merge branch 'release-android-v4.1.0'
# Conflicts:
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
#	platform/android/src/jni.cpp
#	src/mbgl/geometry/buffer.hpp
#	src/mbgl/geometry/glyph_atlas.cpp
#	src/mbgl/geometry/glyph_atlas.hpp
#	src/mbgl/geometry/line_atlas.cpp
#	src/mbgl/geometry/vao.cpp
#	src/mbgl/gl/gl_object_store.cpp
#	src/mbgl/gl/gl_object_store.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/shader/shader.cpp
#	src/mbgl/sprite/sprite_atlas.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/text/glyph_pbf.hpp
2016-06-09 14:00:49 -05:00
Thiago Marcos P. Santos
40211abd9a [test] Rename Stress test to Load
Too slow to run on valgrind.
2016-06-09 19:56:35 +03:00
Thiago Marcos P. Santos
c4e5ebbfee [Qt][build] Run Qt valgrind test on the bots 2016-06-09 19:56:35 +03:00
Thiago Marcos P. Santos
8bbb721636 [Qt][build] Updated valgrind supression and make it a target for Qt 2016-06-09 19:56:35 +03:00
Minh Nguyễn
fd87537482 [osx] MGLMapView needs to be layer-backed
Clarified the installation instructions to explain how to make the map view layer-backed on OS X.
2016-06-09 09:29:42 -07:00
Ivo van Dongen
5782c9a6ba [android] #5285 - bring selected MarkerView to the front
Fixes #5285
2016-06-09 10:41:56 +02:00
John Firebaugh
6c05e51cbc [linux] Mesa 11.2.2 (#5290) 2016-06-08 16:24:39 -07:00
Brad Leege
c9d78f3f62 [android] #5284 - Restoring 4.1.0-SNAPSHOT version 2016-06-08 17:12:28 -05:00
Brad Leege
6ce55ac2e8 [android] #5284 - Android 4.1.0-beta.2 Changelog 2016-06-08 17:08:37 -05:00
Minh Nguyễn
4e808994cb [ios] Update annotation views before informing delegate (#5287)
On each frame update, update annotation views before informing the delegate of the new frame. This allows the delegate to manipulate annotation views without fear of the SDK overriding those modifications.
2016-06-08 14:25:08 -07:00
Jesse Bounds
0b6daae05d [ios] Updated changelog for v3.2.3 2016-06-08 13:18:25 -07:00
Brad Leege
acdaae177b [android] #5284 - Fixing JavaDoc link error that prevented JavaDoc generation 2016-06-08 14:53:01 -05:00
Brad Leege
64df50018f [android] #5284 - Setting 4.1.0-beta.2 version information 2016-06-08 14:04:41 -05:00