Commit Graph

2294 Commits

Author SHA1 Message Date
Konstantin Käfer
2bdecdf9f9 [core] fix pedantic warning messages 2016-06-13 11:16:19 +02:00
Minh Nguyễn
6998479d05 [ios] Updated changelog for #5302 2016-06-09 17:11:01 -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
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
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
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
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
Jesse Bounds
685d23862b Merge branch 'release-ios-v3.2.2' 2016-06-08 10:19:22 -07:00
Jesse Bounds
87d1191b84 [ios] Update changelog and bump version to 3.2.3 2016-06-07 15:50:55 -07:00
Jesse Bounds
c9c0767a1d [ios] Update telem domain and certs
Change domain from api -> events
Replace old certs with new ones with the same name. The new certs
have an expiry that is further out.
2016-06-07 14:57:51 -07:00
Jesse Bounds
fe92d590bb [ios] Force update from display link when display link is created.
This forces the call of the map view's display link target when the
display link is created. When a map view is shown the first time
this is not required. However, if the display link was torn down
and then recreated due to the map view being removed / obscured in the
view hierarchy the map view delegate may expect to be informed when
the map view did finish loading the map when it is shown again.

This adds a call to `updateFromDisplayLink` just after a display link
is created which helps trigger a full refresh of the map in the sense
that all delegate methods get exercised including
`mapViewDidFinishLoadingMap`.
2016-06-07 14:56:41 -07:00
Minh Nguyễn
e503f9279f Fix crash in userLocationVerticalAlignment, analyzer warning (#5278)
* [ios] Fixed crash in userLocationVerticalAlignment

Avoid creating an array with nil.

Fixes #5274.

* [ios] Fixed analyzer warning

Fixed a write-without-read analyzer warning introduced in #5235.
2016-06-07 14:14:41 -07:00
Jason Wray
9746f76744 [docs] Reorganize and update development instructions (#5233)
iOS
- Add section headers.
- Add more detail to `make` packaging commands and emphasize that Debug
  is the default build type.
- Manually checking out git submodules is no longer necessary.

Core
- Add 'Keeping up to date' section that mentions submodules.
2016-06-07 13:55:14 -07:00
Thiago Marcos P. Santos
62bc6e29c8 [core] Fix deleter mismatch
delete[] was being called for a malloc() allocated C buffer.

Found by valgrind:

```
==23065== Mismatched free() / delete / delete []
==23065==    at 0x4C2F77B: operator delete[](void*) (vg_replace_malloc.c:621)
==23065==    by 0x50C5529: std::default_delete<unsigned char []>::operator()(unsigned char*) const (unique_ptr.h:119)
==23065==    by 0x523EC85: std::unique_ptr<unsigned char [], std::default_delete<unsigned char []> >::reset(unsigned char*) (unique_ptr.h:581)
==23065==    by 0x523E3D4: mbgl::Raster::upload(mbgl::gl::ObjectStore&) (raster.cpp:63)
==23065==    by 0x520CA08: mbgl::RasterBucket::upload(mbgl::gl::ObjectStore&) (raster_bucket.cpp:16)
==23065==    by 0x520E56A: mbgl::Painter::render(mbgl::style::Style const&, mbgl::FrameData const&, mbgl::SpriteAtlas&) (painter.cpp:130)
==23065==    by 0x52BE15A: mbgl::Map::Impl::render() (map.cpp:265)
==23065==    by 0x52BD9BE: mbgl::Map::render() (map.cpp:175)
==23065==    by 0x50C9EB4: QMapboxGL::render() (qmapboxgl.cpp:579)
==23065==    by 0x4056D3: MapWindow::paintGL() (mapwindow.cpp:166)
```
2016-06-07 23:34:50 +03:00
Brad Leege
61a5bea043 [android] #5237 - Enabled Updates To InfoWindow's Title and Snippet 2016-06-07 15:04:11 -05:00
Minh Nguyễn
20fe1d2be4 [ios] Point podspec to API reference (#5267)
The Documentation link on CocoaPods.org should point to the API reference, not to the main ios-sdk front page, which is already linked right above.
2016-06-07 12:22:10 -07:00
Mike Morris
ba5d2a4b4d node-v3.2.1 2016-06-07 11:57:53 -04:00
Minh Nguyễn
b761aad4e6 [ios] Bring annotation view to front when selected
Fixes #991.
2016-06-07 00:53:10 -07:00
Minh Nguyễn
b3d9e125b1 [ios] Avoid adding icon when relocating annotation
Fixed an issue that caused a default annotation icon to appear beneath an annotation view when relocating the annotation.
2016-06-06 16:00:45 -07:00
Minh Nguyễn
654f015639 [ios] Removed unused annotation image code
Removed unused annotation image code from iosapp, now that bulk-added point annotations are backed by annotation views.
2016-06-06 16:00:45 -07:00
Minh Nguyễn
62149410fa [ios, osx] Ignore multipoints
Ignore multipoints (as opposed to polylines and polygons) when adding annotations, just like we ignore multipolylines, multipolygons, and shape collections.

In osxapp, break multipoint features into points before adding them as annotations.
2016-06-06 15:40:52 -07:00
Thiago Marcos P. Santos
b711979e32 [android] #5254 - fix ARMv5 support
Backported patches fixing ARMv5 support for issue #3985.
2016-06-06 23:31:51 +03:00
Thiago Marcos P. Santos
7b8698b47a [core] Naive atomic type for ARMv5
std::atomic<bool> is implemented lock free which doesn't work
on ARMv5 and seems like the compiler is generating bogus code.

This workaround is a naive implementation using regular mutexes.
2016-06-06 22:19:25 +03:00
Thiago Marcos P. Santos
874fa41c12 [android] Do not use lock-free types on Android
They are not supported by ARMv5 and the compiler is generating
bogus code. std::atomic might be implemented lock-free for some
types, but we are going to introduce a naive polyfill to make
sure that doesn't happen on ARMv5 (only).
2016-06-06 22:19:25 +03:00
Brad Leege
f4a82bd367 [android] #5186 - Starting rotateSessionId before Telemetry Starts and ensuring that mapboxSessionId is initialized 2016-06-06 10:56:55 -05:00
Brad Leege
7a97d7bd90 [android] #5186 - Starting rotateSessionId before Telemetry Starts and ensuring that mapboxSessionId is initialized 2016-06-06 10:50:06 -05:00
Tobrun Van Nuland
65330bda8c [android] #5167 - add support annotations to MarkerView 2016-06-06 14:46:16 +02:00
Tobrun Van Nuland
cfca379651 [android] #5241 -float rotation on markerview 2016-06-06 13:58:04 +02:00
Konstantin Käfer
0fe60d398e [build] add benchmark target 2016-06-06 13:50:55 +02:00
Tobrun Van Nuland
eb5ff35d6e [android] #5076 - increase cache size 2016-06-06 12:07:21 +02:00
Tobrun Van Nuland
24b8cb7900 [android] #5076 - invalidate MarkerViews when adding a MarkerView 2016-06-06 12:00:18 +02:00
Tobrun Van Nuland
517545f79e [android] #5076 - add getter for View of MarkerView, update public API javadoc of MarkerView select 2016-06-06 11:54:03 +02:00
Tobrun
0a646b4487 [android] #5076 - fixed update marker for MarkerView, rewrite update marker jni, cleanup animation api 2016-06-06 11:13:40 +02:00
Minh Nguyễn
d3fe798493 [ios] Split out MGLMapViewDelegate into separate header 2016-06-06 01:28:04 -07:00
Tobrun Van Nuland
436c23c40b [android] #5171 - introduce new select/deselect animation system for view markers 2016-06-05 14:23:24 +02:00
Jesse Bounds
2fe7d04e5e [ios] Update podspecs for 3.3.0-beta.1 2016-06-03 16:17:56 -07:00
Minh Nguyễn
aedaef832f [ios] Updated changelog
Added entries to the iOS SDK changelog for #5124, #2444, #5141, #5164. Removed entries for changes made since the last release; they go in the GitHub prerelease notes but not here in this document.
2016-06-03 16:00:26 -07:00
Minh Nguyễn
1f622fe48f [ios] Made annotation views accessible
Annotation views now serve as their own accessibility elements. The developer’s own subclass of MGLAnnotationView can customize the view’s accessibility frame and/or path to more accurately reflect the visual hit target.
2016-06-03 15:13:21 -07:00
Minh Nguyễn
1fdda914e0 [ios] Corrected annotation view accessibility frame
Corrected the accessibility frames of annotation views to match the views’ bounds instead of the bounds of the default annotation image (which could be empty if no default GL point annotation has been added).

Fixes #5038.
2016-06-03 15:13:17 -07:00
Mike Morris
ab5e8fb183 node-v3.2.0 2016-06-03 17:29:12 -04:00
Cameron
32a3d98be0 Merge branch '5193-fix-style-url' of github.com:mapbox/mapbox-gl-native into 5193-fix-style-url 2016-06-03 14:59:01 -04:00
Cameron
ea67a995de changed satellite-hybrid to street in string.xml 2016-06-03 14:58:43 -04:00
Tobrun Van Nuland
aa83245c07 [android] #5193 - fix broken test case on Icon 2016-06-03 19:59:24 +02:00