Commit Graph

212 Commits

Author SHA1 Message Date
Justin R. Miller
8b21104eba more safe return when no selection 2015-03-22 10:45:47 -07:00
Justin R. Miller
fbd90ff48a safety checks & no-op returns 2015-03-22 10:43:10 -07:00
Justin R. Miller
ecb8e2800d Cocoa annotations API 2015-03-22 00:53:36 -07:00
Minh Nguyễn
f43661115f Show Emerald by default
a1a7ab62e1 only added an Emerald option to the test app, but `MGLMapView` itself has its own default style.

Fixes #964.
2015-03-20 22:52:21 -07:00
Thiago Marcos P. Santos
490c172b35 Delete the GLFWView object at exit
Also destroy the glfwWindow we create. This leak was probably harmless
but a nice cleanup helps us debug other serious memory leaks.
2015-03-20 14:38:08 +02:00
Minh Nguyễn
0cdf21c62d Merge pull request #1020 from mapbox/init-bundled-style
API for initializing with bundled style
2015-03-19 13:39:05 -07:00
Minh Nguyễn
3d195b467a Added API for initializing with bundled style
As a best practice for the beta and a workaround for #1014.

Also reversed the argument order of the existing init method. Reads better this way, but you’ll likely have to change your initialization to match the new signatures.
2015-03-19 10:29:04 -07:00
Thiago Marcos P. Santos
3254cdc85c Log the Environment ID and the Thread name
To make it easier to debug, add the Environment ID and the Thread name
to the log messages. For instance log messages from the TileParser will look like:

[WARNING] {0}{TileWorker_15/18653/9486}[ParseTile]: some relevant warning message
   |       |             |                  |
   |       |             |                  +-> Component
   |       |             +--------------------> Thread name
   |       +----------------------------------> Environment ID
   +------------------------------------------> Severity level

Log messages that are not inside an Environment::Scope will work
normally and will look like:

[WARNING] [JNI]: some relevant warning message

Fixes #882.
2015-03-18 12:51:33 +01:00
Justin R. Miller
7b996012a5 Merge pull request #1012 from mapbox/1011-bundle
Look inside MapboxGL.bundle when present
2015-03-17 20:30:23 -07:00
Konstantin Käfer
48c55af5c1 fix sprites for pixel ratios that are not 1 and 2
- OpenGL ES 2 doesn't allow NPOT textures with wrap-around
- The Sprite object reported the map's pixelRatio, even though it loaded @2x assets
- Copying icons from the sprite into the atlas now uses bilinear scaling to scale up to the actual size
2015-03-17 12:30:40 +01:00
Minh Nguyễn
3ba72da74f Look inside MapboxGL.bundle when present
Fixes #1011.
2015-03-16 16:22:16 -07:00
Justin R. Miller
bcc4c9e78d iOS setAppliedStyleClasses -> setStyleClasses 2015-03-13 08:02:02 -07:00
Justin R. Miller
5225a2ce5b Merge pull request #994 from mapbox/990-paintItBlack
paint it black
2015-03-12 22:04:05 -07:00
John Firebaugh
ba933b3f45 Merge pull request #984 from mapbox/log_stderr_printf
Get rid of printf and cout by using Log::*
2015-03-12 15:39:07 -07:00
Brad Leege
d659517e7f #990 - Changing to clear color instead of black 2015-03-12 17:17:08 -05:00
Brad Leege
a4e0732a78 #990 - Changing background color from white to black 2015-03-12 17:15:28 -05:00
Minh Nguyễn
4c7939b96e Avoid building a redundant array
Followup to 28e28934c7.
2015-03-12 09:25:39 -07:00
Anthony Picciano
28e28934c7 Remove the file extensions from the bundledStyleNames method 2015-03-12 16:29:45 +01:00
Thiago Marcos P. Santos
124b49562d Get rid of printf and cout by using Log::*
Use our logging system that will route the message accordingly on
the target platform.

Fixes #613
2015-03-12 14:19:32 +02:00
Thiago Marcos P. Santos
2b6afe6a54 Merge pull request #972 from mapbox/log_cleanup
Refactoring of the log system
2015-03-12 14:18:25 +02:00
Thiago Marcos P. Santos
51bc265db3 Make the logging system static
No initialization is needed anymore and we can use the logging functions
safely at any point of the code (threading is not handled though, so you
might get multiplexed messages if you log from two threads
simultaneously).
2015-03-12 13:28:41 +02:00
Thiago Marcos P. Santos
2948e7d121 Simplify the logging mechanism
Move the implementation of the more specialized methods to the base
class and let the platform implement only the most generic method that
takes all the possible arguments.

These specialized methods will then map to the generic implementation
that must be provided by the platforms we support.
2015-03-12 13:28:40 +02:00
Konstantin Käfer
47ede853c4 fixes black flicker on rotating the device
fixes #838

instead of rendering ad libitum on the map thread, we are now driving rendering from the UI thread on iOS via the map.renderSync() function. There are still white bars during the rotation, but the general content of the view is kept visible.

- upgrades GLFW to 3.1
- removes swapped/needsSwap in favor of a more explicit scheme
- View#invalidate() now replaces View#swap() and is called whenever the View needs to trigger a rerender. GLFW and Android to this right away, while iOS goes back to the main thread and does the Map redrawing as part of the GLKView update
- sets all iOS deployment targets to 7.0
- disables SQLite3 version check, since the library version changed on iOS 8.2
2015-03-12 12:16:38 +01:00
John Firebaugh
bb73dbcd30 Relax sqlite version check to major version only
iOS 8.2 updates the included SQLite version to 3.8.4, while iOS 7.0 up
to iOS 8.1 provides version 3.7.13. When compiling with the 8.2 SDK and
running on 8.1 or below, or vice versa, a strict check fails.

Fixes #968.
2015-03-11 10:21:26 -07:00
Justin R. Miller
5162f5d77e refs #935: remove dispatch_once, favor property use, and return immutable styles 2015-03-09 16:32:30 -07:00
Minh Nguyễn
78900c6eee Alias hybrid to satellite
Looks terrible at the moment, but the API is closer to what developers would expect.

Fixes #935.
2015-03-08 12:14:22 -07:00
Konstantin Käfer
9781785ab7 scope Requests to an Environment object for easier cancelation
we are now scoping all file requests to an environment object. The FileSource implementation treats
this as an opaque pointer, but allows canceling all Requests that are associated with that pointer.
This is necessary to abort all file requests that originated from a particular Map object. Aborting
a file request is different from canceling a file request: A canceled request doesn't have its
callback called, while an aborted request will have its callback called with an error, indicating
that the environment is going to be shut down.
2015-03-06 08:21:47 -08:00
Konstantin Käfer
8c0acecbe3 fix handling around unique_ptr releases 2015-03-06 16:17:49 +01:00
Konstantin Käfer
d62bf415f0 Fail early in case there is no display 2015-03-06 16:17:49 +01:00
Konstantin Käfer
e8389d82cd guard against concurrent OpenGL extension loading 2015-03-06 15:42:34 +01:00
Konstantin Käfer
fb44fc81bd make Map::resize() private
they can only be called by View::resize
2015-03-06 13:52:25 +01:00
Justin R. Miller
5821be029c Merge pull request #950 from friedbunny/3x-assets
Add optimized 3x assets
2015-03-05 20:01:00 -08:00
Justin R. Miller
58a97063cb refs #950: add 3x Mapbox wordmark 2015-03-05 20:00:42 -08:00
Jason Wray
7ef669ba8c Add optimized 3x assets 2015-03-05 19:34:07 -08:00
Brad Leege
4fd4351a2f #869 - Configuring cache.db to live in /Library/Caches for iOS 2015-03-04 09:57:18 -06:00
Justin R. Miller
6171cbb748 update default iOS style shown v6 -> v7 2015-03-03 11:35:28 -08:00
Minh Nguyễn
6565836a25 Fixed new clang errors in Xcode 6.3b2 2015-02-23 13:50:04 -08:00
Konstantin Käfer
d16974264c update uv_zip 2015-02-17 11:42:55 -08:00
Konstantin Käfer
8f32c8ae7a wrong symbol name 2015-02-17 11:42:55 -08:00
Konstantin Käfer
b29bce0936 add ca bundle loading back to CURL 2015-02-17 11:42:47 -08:00
Konstantin Käfer
fe0baffe0d update uv_zip and add tests 2015-02-16 18:30:19 -08:00
Konstantin Käfer
8d3c2b3d30 add libzip fix 2015-02-16 11:47:53 -08:00
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Justin R. Miller
bba8ff0364 Revert "put cache.db in the caches folder" 2015-02-12 17:27:06 -08:00
Jay Mooney
a855ec1bd9 put cache.db in the caches folder 2015-02-12 10:27:33 -08:00
Leith Bade
8f416ee2d5 Add assetRoot for Android 2015-02-10 19:33:22 -08:00
Justin R. Miller
4fe94a202b Merge pull request #845 from mapbox/scale-factor-3
fixes #621: better performance for iPhone 6 Plus through smaller render buffer
2015-02-10 15:27:14 -08:00
Mike Morris
b864d69606 Merge pull request #840 from mapbox/glx-cleanup
forward declare GLX typedefs to limit conflicts from glx.h
2015-02-10 14:28:35 -08:00
Justin R. Miller
49e76dba95 fixes #621: better performance for iPhone 6 Plus through smaller renderbuffer 2015-02-10 14:15:49 -08:00
Mike Morris
e8a2c39365 forward declare GLX typedefs to limit conflicts from glx.h 2015-02-10 13:38:45 -08:00