Commit Graph

418 Commits

Author SHA1 Message Date
Konstantin Käfer
dd4c8a67ba add explicit true type == "no filter" 2014-06-02 11:14:09 +02:00
Konstantin Käfer
99b6a700ef move both variant options to recursive_wrapper 2014-06-02 11:14:09 +02:00
Konstantin Käfer
1d3d0bd85c add missing files 2014-06-02 11:14:09 +02:00
Konstantin Käfer
606ad56220 implement nested expression parsing 2014-06-02 11:14:09 +02:00
Konstantin Käfer
3bc5e03253 simple expression support 2014-06-02 11:14:09 +02:00
Justin R. Miller
38dd25a85a fixes #279: remove forced rotation animations for now 2014-06-01 18:00:28 -07:00
Justin R. Miller
e5a78c931a make some more getter functions constant 2014-06-01 15:32:03 -07:00
Justin R. Miller
3c249e7c9e Merge branch 'master' of github.com:mapbox/llmr-native 2014-06-01 11:21:04 -07:00
Justin R. Miller
4d66a51d22 get rid of brittle hardcoded style toggling method
Conflicts:
	ios/mapbox-gl-cocoa
2014-06-01 11:20:55 -07:00
Konstantin Käfer
67bbcd5334 allow setting prerender state with a function too 2014-06-01 18:12:44 +02:00
Konstantin Käfer
1be972eb15 Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
fixes #253
2014-06-01 17:43:12 +02:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Dane Springmeyer
5f03cc1595 [hardening] fix double const& declaration 2014-05-30 13:41:07 -07:00
Dane Springmeyer
7124580294 fix function signature 2014-05-30 12:13:26 -07:00
Mike Morris
59774f7e93 shaped to shaping, pass by reference instead of returning a copy 2014-05-30 14:19:22 -04:00
Ansis Brammanis
0dd78c96e3 Merge remote-tracking branch 'origin/linebreak' 2014-05-30 13:06:25 -04:00
Ansis Brammanis
c0c43ef518 fix compile error 2014-05-30 13:06:08 -04:00
Konstantin Käfer
d5e63cea21 retain the uv loop until all things deconstructed
fixes #261
2014-05-30 17:32:09 +02:00
Konstantin Käfer
78fda8bb62 make sure we retain shared state when destructing the map object
refs #261
2014-05-30 17:00:47 +02:00
Young Hahn
2d0b3482ec Merge branch 'master' into linebreak
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-30 09:00:29 -04:00
Konstantin Käfer
31d9dbefea pass shaping directly instead of looking it up 2014-05-30 14:01:53 +02:00
Konstantin Käfer
461a19dfa2 fallback to default properties instead of not rendering when we don't have a style
refs #272
2014-05-30 13:36:53 +02:00
Konstantin Käfer
ca41046dff Merge pull request #275 from mapbox/correct-calloc
Correct calloc
2014-05-30 11:26:19 +02:00
Ansis Brammanis
9ac55e0d74 add text letterSpacing 2014-05-30 04:02:23 -04:00
Ansis Brammanis
7c653895c6 translate as a text bucket property
When used, text is translated before being checked for collisions.
2014-05-30 03:50:25 -04:00
Ansis Brammanis
41c310c762 add verticalAlign for text
Default is center. Other options are "top" and "bottom"
2014-05-30 03:11:57 -04:00
Ansis Brammanis
9057c4980d line wrapping 2014-05-30 01:32:15 -04:00
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Young Hahn
6e53a0328b Remove VectorTileGlyph, VectorTileFace, IndexedFaces, Faces and glyph related parts of vector_tile.proto. Refs #274. 2014-05-29 22:54:46 -04:00
Dane Springmeyer
c9a1d9efd4 remove unused member variable 2014-05-29 14:17:22 -07:00
Dane Springmeyer
30a34d73f8 fix static analyzer warning: Result of 'calloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' 2014-05-29 13:23:00 -07:00
Dane Springmeyer
f83f4a6d63 include <memory> / fix compile issues with g++-4.9 2014-05-29 12:16:25 -07:00
Young Hahn
6c38107e4d Merge branch 'glyphrange' into glyphrange-yh-guesses 2014-05-29 12:19:05 -04:00
Mike Morris
67a3e4651f include locale, ref #270 2014-05-29 12:08:37 -04:00
Young Hahn
bdb16b9ae7 Merge branch 'master' into glyphrange-master
Conflicts:
	bin/style.js
	src/text/placement.cpp
2014-05-29 11:59:12 -04:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-29 06:06:57 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Dane Springmeyer
da0d436572 missing semicolon 2014-05-28 20:28:37 -07:00
Dane Springmeyer
6b0465448d fix utf.hpp linux compile 2014-05-28 20:04:40 -07:00
Dane Springmeyer
5c46bef717 fallback to boost::locale on linux 2014-05-28 19:57:01 -07:00
Dane Springmeyer
45eba8d29f fix #268 2014-05-28 19:20:37 -07:00
Konstantin Käfer
6f68cd3676 return font stack 2014-05-28 22:12:31 +02:00
Konstantin Käfer
906b4839c6 parse glyph pbf 2014-05-28 21:55:14 +02:00
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Vladimir Agafonkin
7dc706b063 Merge pull request #257 from mapbox/optimize-placement
Ignore flipped glyphs when placing labels for perf
2014-05-28 17:17:34 +03:00
Konstantin Käfer
cca9d81ee7 add debug warnings 2014-05-28 15:51:09 +02:00
Konstantin Käfer
5b38927c5f use an unordered map for bucket name => bucket 2014-05-28 14:54:54 +02:00
Konstantin Käfer
192b5a30e4 make PropertyTransitions optional 2014-05-28 10:49:56 +02:00
Vladimir Agafonkin
88a5de2aa6 ignore flipped glyphs when placing labels for perf 2014-05-27 18:49:18 +03:00
Vladimir Agafonkin
6ab1dcbeeb remove some leftover code 2014-05-27 18:19:24 +03:00