Commit Graph

3102 Commits

Author SHA1 Message Date
Justin R. Miller
5162f5d77e refs #935: remove dispatch_once, favor property use, and return immutable styles 2015-03-09 16:32:30 -07:00
John Firebaugh
7d06e62363 Fix satellite style label rendering 2015-03-09 10:42:25 -07:00
John Firebaugh
9897ae74ec Fix satellite style contour rendering 2015-03-08 12:44:47 -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
John Firebaugh
a5998dc59b Fix conditional in normalizeSourceURL
The existing conditional would always be false, since it
was comparing a url that begins with "mapbox://". In fact
no conditional is necessary; the secure TileJSON resource
should always be requested.
2015-03-06 18:16:58 -08:00
John Firebaugh
682cc28340 Merge pull request #960 from mapbox/959-2x
Insert {ratio} before extension, not inside access token
2015-03-06 17:52:29 -08:00
Minh Nguyễn
cd83c48ed3 Insert {ratio} before extension, not inside access token
Fixes #959.
2015-03-06 15:33:14 -08:00
John Firebaugh
584a59a87d Update to latest styles again
Regressed in fd45302b80
2015-03-06 15:28:59 -08:00
John Firebaugh
de591b5d7c Merge pull request #924 from mapbox/919-2x-raster
Load 2× raster tiles on HiDPI screens
2015-03-06 14:44:16 -08:00
Minh Nguyễn
8804c47d27 Only add {ratio} to raster tile URLs
Thanks to @mb12 for the suggestion.
2015-03-06 13:51:20 -08:00
Minh Nguyễn
a3d76dad10 Ported util::mapbox tests from mapbox-gl-js
Left out several tests that were redundant because mapbox.cpp only looks at the passed in access token.
2015-03-06 13:51:19 -08:00
Minh Nguyễn
a6c8a76694 Replace regex usage with basic string manipulation
Apparently we can’t rely on the existence of <regex> yet.

Fixes #919.
2015-03-06 13:51:19 -08:00
Minh Nguyễn
41c01373d5 Load 2× raster tiles on HiDPI screens
Based on mapbox.normalizeTileURL() in mapbox/mapbox-gl-js, but insert a “{ratio}” placeholder instead of “@2x” in order to keep the pixelRatio logic in TileData::request().

Fixes #919.
2015-03-06 13:51:19 -08:00
Konstantin Käfer
10d84f6be8 remove unused enum 2015-03-06 20:52:47 +01: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
8408dc9e4d use a reinterpret_cast to return the correct type 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
2075d6bb9a fix ambiguous name (gcc) 2015-03-06 16:09:14 +01:00
Konstantin Käfer
025654a101 throw exception when shader compilation fails 2015-03-06 15:42:34 +01:00
Konstantin Käfer
e8389d82cd guard against concurrent OpenGL extension loading 2015-03-06 15:42:34 +01:00
Konstantin Käfer
c30bb1a9f8 add more locking around GlyphStore and FontStack
this is a stopgap until we have a solution that gives every worker thread their own copy
2015-03-06 15:42:34 +01:00
Konstantin Käfer
e00bae4f1c lock the StyleBucket to avoid crashing
stopgap until we have a solution that doesn't mutate the style objects while parsing a tile
2015-03-06 15:42:34 +01:00
Konstantin Käfer
cf235c6592 move readlock/writelock to uv.hpp and add movable lock/mutex 2015-03-06 15:42:33 +01:00
Konstantin Käfer
86455585ee update mapbox::variant 2015-03-06 14:40:33 +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
Konstantin Käfer
0151fe6c01 pass StyleLayer objects as const ref instead of a shared pointer 2015-03-06 13:26:11 +01:00
Konstantin Käfer
d161e0c3c3 Merge pull request #951 from mapbox/mbgl-render
Update static image rendering executable
2015-03-06 13:24:47 +01:00
Konstantin Käfer
8e42582c52 update static image rendering executable 2015-03-06 12:41:00 +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
Konstantin Käfer
e07e980732 Merge pull request #852 from mapbox/checkout-styles-submodule
iOS error: "Setup: loading style failed: no such file or directory"
2015-03-04 18:12:29 +01:00
Konstantin Käfer
329f617ae8 checkout styles submodule when building makefiles
fixes #852
2015-03-04 17:23:58 +01: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
28228bfae0 ensure correct ordering for bundled styles 2015-03-03 11:46:20 -08:00
Justin R. Miller
6171cbb748 update default iOS style shown v6 -> v7 2015-03-03 11:35:28 -08:00
Justin R. Miller
b63700b1bb Merge branch 'master' into ios-styles-bump 2015-03-03 11:32:52 -08:00
Jason Wray
ef8a5cc0df Bump iOS app styles versions to 7 2015-03-02 23:17:26 -08:00
Justin R. Miller
80d8d153fd Merge pull request #937 from mapbox/tile-parser-cleanups
clean up members, arguments, and formatting
2015-03-02 18:27:59 -08:00
Justin R. Miller
0645300323 move to camelCase & more reference cleanups 2015-03-02 17:31:16 -08:00
Justin R. Miller
4407033b3b clean up members, arguments, and formatting 2015-03-02 17:08:50 -08:00
Brad Leege
e1ff75a47a #923 - Consolidating package namespaces 2015-02-26 16:01:51 -06:00
Leith Bade
394ad762a5 Merge pull request #915 from mapbox/android-conversions
Android conversions
2015-02-26 15:40:01 -05:00
Leith Bade
aa32b41b59 Fix all lint errors 2015-02-26 11:32:35 -08:00
Leith Bade
a5430e8730 Replace setRotation with Matrix 2015-02-26 11:16:14 -08:00
Leith Bade
d0109fb834 Ignore lint error from OkHTTP
Fixes #921
2015-02-26 10:25:36 -08:00
Leith Bade
195fad1b67 Replace constant 2015-02-25 15:51:23 -08:00
Leith Bade
ecd7267fdf Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-conversions 2015-02-25 15:30:17 -08:00
Brad Leege
380fd1fbf4 #823 - Adding JavaDoc for cancel() 2015-02-25 17:17:56 -06:00