Commit Graph

1230 Commits

Author SHA1 Message Date
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
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
Minh Nguyễn
cd83c48ed3 Insert {ratio} before extension, not inside access token
Fixes #959.
2015-03-06 15:33:14 -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
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
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
8408dc9e4d use a reinterpret_cast to return the correct type 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
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
8e42582c52 update static image rendering executable 2015-03-06 12:41:00 +01: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
Minh Nguyễn
1c4369fd52 Removed special cased zoom level for HiDPI
No need to load higher-resolution vector tiles for HiDPI displays.

Fixes #907.
2015-02-24 16:12:49 -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
c07fa06994 rename StyleBucket* => StyleLayout*
and remove a few unused variables

refs #881
2015-02-17 18:27:51 -08:00
Konstantin Käfer
89c0ff5f39 make StyleBucket mutable
refs #881
2015-02-17 18:27:51 -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
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Konstantin Käfer
f4e9908045 code style 2015-02-13 13:28:40 -08:00
Konstantin Käfer
aecef6da1a make sure that the async handle always gets closed 2015-02-13 13:28:40 -08:00
Konstantin Käfer
5d2ed0326e fix double-free in race conditions when notify() was called twice 2015-02-13 13:28:39 -08:00
Leith Bade
acfeda9899 Fix #include <uv.h> mixing between C and C++ modes 2015-02-11 19:01:30 -08:00
Ansis Brammanis
c621441def Fix line label interpolation offset. 2015-02-11 14:12:32 -08:00
Ansis Brammanis
b53b24a6bc Merge remote-tracking branch 'origin/master' into line-label-density 2015-02-10 15:21:36 -08:00
Ansis Brammanis
8e459c2a73 improve line label density
Place the first label as close to the beginning of the line as possible.

js: 316ed0bd9bff8cd430ad81d0b6397f396fbce124
2015-02-10 15:21:18 -08:00
John Firebaugh
ad481f6f12 Merge pull request #821 from mapbox/pattern-functions
functions for everything
2015-02-10 14:41:44 -08:00
Ansis Brammanis
6d47e9b684 use correct interpolation for background images 2015-02-10 10:59:32 -08:00
Ansis Brammanis
fdc9283c5c fix raster-brightness 2015-02-09 12:03:47 -08:00
Ansis Brammanis
97f19e8b84 support constants within dasharrays 2015-02-09 11:48:36 -08:00
Ansis Brammanis
5eb08baf14 tweak style parsing error messages 2015-02-05 18:33:00 -08:00
Ansis Brammanis
fe5b618484 fix compilation errors 2015-02-05 17:42:51 -08:00
Ansis Brammanis
968d6812db make raster-brightness two separate properties 2015-02-05 17:35:13 -08:00
Ansis Brammanis
f99bd1c6ec switch to functions of arrays (from arrays of fns)
for properties like *-translate, *-offset

https://github.com/mapbox/mapbox-gl-style-spec/issues/237
2015-02-05 17:30:34 -08:00
Ansis Brammanis
3a8aaad6a7 make everything a function 2015-02-05 16:46:13 -08:00
Ansis Brammanis
6e95c3b2e1 fix compilation on android 2015-02-04 19:47:31 -08:00
Ansis Brammanis
f07de8dd23 make pattern and dasharray properties use duration
from "*-transition" properties
2015-02-04 18:46:47 -08:00
Justin R. Miller
d093364d29 only ignore warning on Clang 2015-02-04 17:13:09 -08:00
Justin R. Miller
e1a3b9ff8e fixes #782: ignore 64->32 conversion warnings for Boost 2015-02-04 17:05:57 -08:00
Ansis Brammanis
a49737e542 fix durations by making them milliseconds 2015-02-04 13:51:52 -08:00
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
93b07c3675 rename FadedFunction to PiecewiseConstant function 2015-02-04 11:36:31 -08:00