Commit Graph

5798 Commits

Author SHA1 Message Date
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
Konstantin Käfer
4518743bd6 Merge pull request #1172 from mapbox/1172-no-stringstream
Use hash instead of string key when merging lines
2015-04-01 18:35:45 +02:00
Konstantin Käfer
c475284a58 use hashes instead of string keys 2015-04-01 17:56:51 +02:00
Konstantin Käfer
0a7424dc60 Merge pull request #1171 from mapbox/1171-auto
Use more auto
2015-04-01 17:16:41 +02:00
Konstantin Käfer
220ebf61dd replace iterator variable types with auto 2015-04-01 16:42:42 +02:00
Konstantin Käfer
cc97675ca1 Merge pull request #1170 from mapbox/1170-no-stringstream-for-hashing
Remove usage of stringstream for line dash atlas
2015-04-01 16:13:37 +02:00
Konstantin Käfer
268129b9c1 use cumulative hash instead of string for linedash lookup 2015-04-01 15:30:57 +02:00
Konstantin Käfer
a0cbe920d8 Merge pull request #1164 from mapbox/1164-parsing-speed-regression
Fix tile parsing performance regression
2015-04-01 12:24:53 +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
Justin R. Miller
1cf4799ea1 Merge pull request #1167 from mapbox/style-url-tests
add style URL tests
2015-03-31 14:24:06 -07:00
Justin R. Miller
78085458f5 add style URL tests 2015-03-31 13:54:51 -07:00
John Firebaugh
f2e658d962 Remove unused 2015-03-31 12:08:57 -07:00
Brad Leege
1bb04ce65b Merge pull request #1165 from mapbox/1162-app-bundle
App Bundle Id
2015-03-31 10:24:40 -05:00
Brad Leege
adcbf48ff5 #1162 - Adding appBundleId as an event attribute 2015-03-31 09:46:28 -05:00
Justin R. Miller
48a987c373 Merge pull request #1163 from mapbox/cocoa-map-id-api
refs #892: Cocoa support for map ID style URLs
2015-03-30 23:47:50 -07:00
Justin R. Miller
af0c89c2aa expose style URL setting 2015-03-30 22:37:00 -07:00
Justin R. Miller
33f14328c4 move to actual NSURL type 2015-03-30 22:30:06 -07:00
Justin R. Miller
2782a8ce5b refs #892: Cocoa support for map ID style URLs 2015-03-30 22:09:47 -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
7e878d04c7 Merge pull request #1161 from mapbox/mapbox-style-urls
fixes #892: support mapbox:// style URLs
2015-03-30 16:44:05 -07:00
Justin R. Miller
a8833c34d4 fixes #892: support mapbox:// style URLs 2015-03-30 15:33:02 -07:00
Minh Nguyễn
3ed1e7a695 Merge pull request #1149 from mapbox/1ec5-subview
Child GLKView should be bottommost child
2015-03-30 10:52:15 -07:00