John Firebaugh
d2314aedc6
Extract SourceInfo::tileURL
2015-04-06 12:58:52 -07:00
Ansis Brammanis
34a5bf665e
fix bboxify where first box should be placed after anchor
...
-js: e99ed95aaba5e79c322733b32e03518b12203a79
2015-04-06 12:35:16 -07:00
John Firebaugh
15969f1369
Remove Map dependency from Source::invalidateTiles
2015-04-06 10:30:02 -07:00
John Firebaugh
750cfb6f58
Remove Map dependency from Source::load
2015-04-06 10:30:01 -07:00
John Firebaugh
e72ee04482
Move SourceInfo into source.hpp/cpp
2015-04-06 10:30:01 -07:00
John Firebaugh
7e0e55e542
Eliminate StyleSource
...
Fixes #695
2015-04-06 10:30:01 -07:00
John Firebaugh
41c4d50f8a
Remove unused
2015-04-03 13:51:33 -07:00
John Firebaugh
cca7f6978a
Remove unused
2015-04-03 13:51:33 -07:00
Minh Nguyễn
6a1e7d5707
Fixed race condition after setting access token
...
`Map` should be able to deal with having no access token or JSON even while it’s running. Most of `Map` accounts for this situation, but `reloadStyle()` incorrectly assumes that one or the other is set. This change corrects the assumption in `reloadStyle()`.
Also expose the access token and style name to clients as ordinary KVO-compliant properties. Actually, they’re not so ordinary because they’re inspectable!
Ref #1070 , #1147
2015-04-03 12:07:53 -07:00
Ansis Brammanis
148294d3ac
Merge branch 'master' into new-labelling
...
Conflicts:
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/renderer/symbol_bucket.hpp
src/mbgl/text/collision.cpp
src/mbgl/text/glyph_store.cpp
src/mbgl/text/placement.cpp
src/mbgl/text/rotation_range.cpp
2015-04-03 12:04:31 -07:00
Justin R. Miller
0a736c3a76
fixes #1181 : fix lat/lng & zoom ordering problems
2015-04-02 19:56:47 -07:00
Ansis Brammanis
466febd615
don't create infinitely many boxes for zero or negative height symbols
...
line-height or padding can make the height of a shaped object <= 0.
In these cases either create no boxes, or create boxes with a minimum
height to avoid creating too many of them.
-js: 9e78c02d8b22b60a08fdb28fd29eef1642f62d94
2015-04-02 16:48:43 -07:00
John Firebaugh
12c07b916b
Rework easing transition code
...
This brings the easing transition code a bit closer to how easings work
in gl-js. Instead of having an array of individual transitions for scale,
rotate, and pan, there is a single transition function that does all the
required calculations. This permits us to:
* Eliminate the "timeout" transition. (Fixes #126 )
* Replace start/stopPanning() et al with setGestureInProgress(). Apps or
SDKs are expected to make paired calls to setGestureInProgress(). This
state will be ORed with the active easing state to determine when to
use texture interpolation. (Fixes #79 )
* Run style recalculations only when an ease transition that affects the
zoom is in progress. (Fixes #1155 )
2015-04-02 16:12:29 -07:00
John Firebaugh
7f58840991
Remove unused
2015-04-02 15:30:12 -07:00
Ansis Brammanis
68ae21d8f4
fix android and Release builds
2015-04-02 13:33:50 -07:00
Ansis Brammanis
02d2ddef52
fix quad offsets by subtracting buffer
...
-js doesn't have this here because it subtracts the buffer earlier.
617e590c83/js/symbol/glyph_source.js (L75)
We should match -js eventually.
2015-04-02 12:39:30 -07:00
Ansis Brammanis
7b02800ad9
remove old symbol collision types
2015-04-02 12:16:42 -07:00
Ansis Brammanis
07b85043c8
port clipLines from -js
2015-04-02 11:54:28 -07:00
Konstantin Käfer
5ab6274f8b
some cleanup
2015-04-02 15:45:39 +02:00
John Firebaugh
9331acf8e6
Add typedefs for std::chrono::steady_clock types
2015-04-02 12:28:12 +02:00
Ansis Brammanis
2767a9b04e
port checkMaxAngle from -js
2015-04-01 21:01:49 -07:00
Ansis Brammanis
c49e1ac733
port getAnchors from -js
2015-04-01 20:31:25 -07:00
Ansis Brammanis
1d50485e5b
port bboxifyLabel from -js
2015-04-01 19:03:01 -07:00
Ansis Brammanis
c200053951
don't add upside-down glyphs to buffers
2015-04-01 16:26:33 -07:00
Ansis Brammanis
dea7b32070
remove old collision and rotation range code
2015-04-01 16:11:49 -07:00
Ansis Brammanis
e1059e7125
port SymbolBucket::placeFeatures
2015-04-01 16:11:48 -07:00
Ansis Brammanis
fd526ae68e
port the remained of CollisionTile
2015-04-01 16:11:48 -07:00
Ansis Brammanis
dda1b770da
port collision box debug rendering
2015-04-01 16:11:48 -07:00
Ansis Brammanis
8fd42f371f
start porting CollisionTile and CollisionFeature
2015-04-01 16:11:48 -07:00
Ansis Brammanis
128ed1f26f
start porting symbol bucket changes
2015-04-01 16:11:48 -07:00
John Firebaugh
13991cf786
Rename methods to match gl-js
2015-04-01 12:37:41 -07:00
John Firebaugh
71227e4645
StyleLayer is noncopyable
2015-04-01 11:26:46 -07:00
John Firebaugh
db5e9d1302
Remove unused
2015-04-01 11:22:32 -07:00
John Firebaugh
1db044d3c0
Remove unused
2015-04-01 11:21:05 -07:00
John Firebaugh
5264982ba7
Eliminate StyleLayerGroup
2015-04-01 11:14:20 -07:00
Konstantin Käfer
c475284a58
use hashes instead of string keys
2015-04-01 17:56:51 +02:00
Konstantin Käfer
220ebf61dd
replace iterator variable types with auto
2015-04-01 16:42:42 +02:00
Konstantin Käfer
268129b9c1
use cumulative hash instead of string for linedash lookup
2015-04-01 15:30:57 +02:00
John Firebaugh
2beb836a07
Parse VT tags lazily
2015-04-01 12:07:13 +02:00
Ansis Brammanis
9309f59de3
split generating symbol quads from collision code
...
Collision prevention is temporarily disabled.
2015-03-31 15:33:57 -07:00
John Firebaugh
3d9b441c8b
Eliminate some unnecessary pointer indirection
...
Buckets had a pointer to the associated layout type, when they can just
have a direct member.
2015-03-31 15:23:40 -07:00
John Firebaugh
f2e658d962
Remove unused
2015-03-31 12:08:57 -07:00
Ansis Brammanis
7b29c5b257
port some of the text shaping changes
2015-03-30 18:52:25 -07:00
Ansis Brammanis
19ddaae6cc
remove in-shader label flipping
2015-03-30 17:48:52 -07:00
John Firebaugh
fd5b2dbed0
Remove unused variable
2015-03-30 16:44:45 -07:00
Justin R. Miller
a8833c34d4
fixes #892 : support mapbox:// style URLs
2015-03-30 15:33:02 -07:00
Konstantin Käfer
1b0564a850
normalize font stack
...
- split all fontstack names at the comma character, trim, the join
- capitalization is important and may not be changed
2015-03-30 16:31:16 +02:00
Thiago Marcos P. Santos
78dce1477c
Merge pull request #1137 from mapbox/clang-3.5
...
Fix build failure when using clang-3.5 on Linux
2015-03-30 11:06:11 +03:00
Konstantin Käfer
743619dee9
Disable all Sources when terminating
2015-03-27 17:09:25 +01:00
Thiago Marcos P. Santos
6a5c9c44e8
Fix build failure when using clang-3.5 on Linux
2015-03-27 17:41:57 +02:00