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
999ebb371e
Merge pull request #1194 from mapbox/fix-lat-lon-zoom-order
...
fixes #1181 : fix lat/lng & zoom ordering problems
2015-04-03 09:38:47 -07:00
Brad Leege
841fba352b
Merge pull request #1196 from mapbox/1195-speed-course
...
Speed And Course Attributes
2015-04-03 11:36:30 -05:00
Brad Leege
8413da0d68
#1195 - Adding speed and course attributes to location event
2015-04-03 11:10:35 -05:00
Justin R. Miller
c253232473
account for GL-level min zoom
2015-04-03 09:06:20 -07:00
Minh Nguyễn
6a04f3d51d
Merge pull request #1187 from mapbox/1ec5-settings
...
Polished privacy settings
2015-04-03 02:27:08 -07:00
Justin R. Miller
0a736c3a76
fixes #1181 : fix lat/lng & zoom ordering problems
2015-04-02 19:56:47 -07:00
Justin R. Miller
ba5a04e81c
Merge pull request #1193 from mapbox/location-fixes
...
fix compilation error with private category property
2015-04-02 19:55:32 -07:00
Justin R. Miller
540ef12b4e
fix compilation error with private category property
2015-04-02 19:28:37 -07:00
Justin R. Miller
dafce83acd
Merge pull request #1192 from mapbox/location-and-docs-tweaks
...
improvements to iOS docs & user location framework
2015-04-02 17:50:32 -07:00
Justin R. Miller
dbd22ae61a
reverting to title/subtitle setters for user location
2015-04-02 17:12:05 -07:00
Justin R. Miller
9a416c449c
Improvements to docs & user location framework.
...
* Cleans up & documents more APIs, especially in location.
* Moves `coordinate` internal and makes use of `location` to retrieve it.
* Moves `title` & `subtitle` internal since part of `MGLAnnotation` protocol.
* Enables `isUpdating` by privately associating weakly with a map view.
2015-04-02 16:58:24 -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
3bd180dbe8
Merge pull request #1155 from mapbox/1155-update-as-needed
...
Only run Style::updateProperties when required
2015-04-02 16:38:08 -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
9e38d7cc2b
Move Update to its own header file
2015-04-02 15:30:13 -07:00
John Firebaugh
7f58840991
Remove unused
2015-04-02 15:30:12 -07:00
Brad Leege
7c05f941a8
Merge pull request #1188 from mapbox/1185-events-querystring
...
Events = True
2015-04-02 16:57:19 -05:00
Brad Leege
94bc3c811f
#1185 - Adding "events=true" query string to all non metrics http requests if metrics are not disabled
2015-04-02 16:15:25 -05:00
Ansis Brammanis
68ae21d8f4
fix android and Release builds
2015-04-02 13:33:50 -07:00
Ansis Brammanis
1dcd1cf509
remove tests for deleted rotation_range
2015-04-02 12:52:55 -07:00
Minh Nguyễn
44d360501e
Polished privacy settings
...
Added footer text to explain the purpose of the Mapbox Metrics setting. Added strings from the plist to an existing unused .strings file and converted that .strings file to UTF-8 for diffability.
2015-04-02 12:43:32 -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)
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
Brad Leege
94ed06dacb
Merge pull request #1179 from mapbox/1178-location-location-location
...
Changing "Location" to "location"
2015-04-02 11:20:52 -05:00
Brad Leege
418c802d97
#1178 - Changing "Location" to "location"
2015-04-02 10:34:35 -05:00
Konstantin Käfer
9dae9cf06e
Merge pull request #1177 from mapbox/cleanup
...
Some minor cleanups
2015-04-02 16:13:54 +02:00
Konstantin Käfer
5ab6274f8b
some cleanup
2015-04-02 15:45:39 +02:00
Konstantin Käfer
4df0674b1e
Merge pull request #1175 from mapbox/chrono
...
Make std::chrono use less painful
2015-04-02 12:54:18 +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
Peter Liu
440864063e
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
2015-04-01 17:05:22 -07:00
Peter Liu
523295af7e
Updated to latest Emerald style"
2015-04-01 17:04:51 -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
6d1f5aa68c
Merge pull request #1174 from mapbox/style-layer-group
...
Style code cleanup
2015-04-01 14:07:06 -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
