Ansis Brammanis
|
ff6a5ce5bc
|
Merge remote-tracking branch 'origin/master' into new-labelling
Conflicts:
src/mbgl/map/source.cpp
src/mbgl/map/source.hpp
src/mbgl/map/tile_data.cpp
src/mbgl/map/tile_parser.cpp
src/mbgl/map/vector_tile_data.cpp
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/text/glyph.hpp
src/mbgl/text/glyph_store.cpp
src/mbgl/text/placement.cpp
test/suite
|
2015-05-28 20:01:15 -04:00 |
|
Ansis Brammanis
|
1e044a175c
|
Reparse tiles when zoom level > source maxzoom
so that layout property functions are applied correctly
and so that label placement is redone
js:
https://github.com/mapbox/mapbox-gl-js/pull/1005
and
440bc02505
|
2015-05-28 19:17:07 -04:00 |
|
Konstantin Käfer
|
f4707f72e0
|
Replace mbgl::util::make_unique<> with std::make_unique<>
|
2015-05-26 17:57:38 +02:00 |
|
John Firebaugh
|
691756d7dd
|
Move ClipID to clip_id.hpp/cpp
|
2015-04-09 10:58:11 -07:00 |
|
John Firebaugh
|
d8411f26d2
|
Tile::ID ⇢ TileID
This allows making both Tile and TileID private.
|
2015-04-06 13:58:56 -07:00 |
|
Konstantin Käfer
|
aa09aa321b
|
rearrange tests and make more robust
|
2015-02-04 10:49:06 +01:00 |
|
Konstantin Käfer
|
8a1fce547e
|
rearrange tests and add storage tests
|
2015-02-04 10:49:05 +01:00 |
|