John Firebaugh
50b5c15653
Rework GeometryTile* interface
2015-03-09 18:32:08 -07:00
Minh Nguyễn
f82de98899
Merge pull request #966 from mapbox/hybrid-code-tweaks
...
refs #935 : remove dispatch_once, favor property use, and return immutable styles
2015-03-09 17:22:15 -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
Justin R. Miller
2d8bf823fc
unique -> shared ptr
2015-03-09 11:57:34 -07:00
Justin R. Miller
0652174465
reference cleanups
2015-03-09 11:57:34 -07:00
Justin R. Miller
7361f8566b
move to shared pointers for queried layers passed to buckets
2015-03-09 11:57:34 -07:00
Justin R. Miller
a45ae199cf
move from range-based for loop to iterator for to be clearer
2015-03-09 11:57:34 -07:00
Justin R. Miller
fbb2d17f43
fix iterator comparator
2015-03-09 11:57:34 -07:00
Justin R. Miller
a6b6a8d67e
move to abstract interfaces to more be in line with original API
2015-03-09 11:57:34 -07:00
Justin R. Miller
e01fe2fb56
doesn't make sense to move shared pointers
2015-03-09 11:57:33 -07:00
Justin R. Miller
cf623e96c5
safely check points
2015-03-09 11:57:33 -07:00
Justin R. Miller
56bc3052ac
refactor vars
2015-03-09 11:57:33 -07:00
Justin R. Miller
e57703d711
properly iterate geometries
2015-03-09 11:57:33 -07:00
Justin R. Miller
b523d0256b
increment feature filter on creation
2015-03-09 11:57:33 -07:00
Justin R. Miller
c170f8887d
get rid of unused member
2015-03-09 11:57:33 -07:00
Justin R. Miller
405137700b
parse geometry collections from the pbfs; iterate geometries in buckets
2015-03-09 11:57:33 -07:00
Justin R. Miller
685aa01043
pass actual feature pbf when filtering layer features
2015-03-09 11:57:32 -07:00
Justin R. Miller
91dc0ba06f
no need for while loop
2015-03-09 11:57:32 -07:00
Justin R. Miller
e379756f62
proper move
2015-03-09 11:57:32 -07:00
Justin R. Miller
4d9c1a0f33
iterate through fresh copy of layer data
2015-03-09 11:57:32 -07:00
Justin R. Miller
787cedb593
fix reference
2015-03-09 11:57:32 -07:00
Justin R. Miller
0a8a0aee90
move to abstract base classes & shared pointers
2015-03-09 11:57:32 -07:00
Justin R. Miller
41c3b82d3e
refs #928 : bookmarking working build of refactor
2015-03-09 11:57:31 -07:00
Justin R. Miller
831264d530
refs #928 : 90% of way to genericizing VectorTile
2015-03-09 11:57:31 -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
samanpwbb
7864dca80a
remove unused
2015-03-07 18:30:39 -05:00
samanpwbb
cb50c6752c
Merge branch 'master' into test-gzip
2015-03-07 18:12:14 -05:00
samanpwbb
a886cdd695
add working tests for gzip handling
2015-03-07 18:07:52 -05:00
samanpwbb
fffb0f7df5
fix example
...
blah
real test
Still not writing tests correctly
2015-03-07 18:07:26 -05: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
