summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update docs for umbrella headerios-v0.2.7ios-beta-preview-sirius-0.0.8Justin R. Miller2015-04-031-1/+1
|
* Merge pull request #1201 from mapbox/1ec5-objcMinh Nguyễn2015-04-031-2/+3
|\ | | | | iOS projects require -ObjC in OTHER_LDFLAGS
| * iOS projects require -ObjC in OTHER_LDFLAGSMinh Nguyễn2015-04-031-2/+3
|/ | | #1184 added `-[NSProcessInfo(MGLAdditions) mgl_isInterfaceBuilderDesignablesAgent]`, which only gets pulled in if you add `-ObjC` to `OTHER_LDFLAGS`.
* Remove unusedJohn Firebaugh2015-04-034-15/+4
|
* Remove unusedJohn Firebaugh2015-04-031-2/+0
|
* Merge pull request #1184 from mapbox/1070-kvoMinh Nguyễn2015-04-0312-155/+467
|\ | | | | Style API cleanup, designables, inspectables
| * Inspectable togglesMinh Nguyễn2015-04-032-1/+70
| | | | | | | | Added inspectables for toggling zooming, panning, rotating, and showing the user location for parity with `MKMapView`.
| * allow setting nil mapID for default styleJustin R. Miller2015-04-032-2/+11
| |
| * formatting & docs changesJustin R. Miller2015-04-034-28/+25
| | | | | | | | | | | | | | | | Ran this through `./ios/docs/install_docs.sh` to double-check things. * Less-specific initializers above more-specific per Apple convention. * Shores up `accessToken` docs as property, not a method. * Edited comments for consistency and/or to keep them out of the docs.
| * Made lat/lon/zoom inspectableMinh Nguyễn2015-04-034-7/+103
| | | | | | | | | | | | Declared these IB-specific inspectables in a separate category that developers are not expected to import. Currently these inspectables are order-dependent due to #1181. Ref #929
| * Made MGLMapView designable in IBMinh Nguyễn2015-04-036-30/+199
| | | | | | | | | | | | | | | | | | | | When an access token is set in the Attributes inspector (or as a user-defined runtime attribute), we draw some lovely Mapbox branding so the view shows up. (Manipulating invisible rectangles is a frustrating exercise, I’m told.) In the absence of an access token, the view displays a helpful message with directions for obtaining and setting the access token. Along the way, completely opt out of `MGLMapboxEvents` when targeting Interface Builder, because touching Core Location throws an exception in that environment and it doesn’t make sense to record any metrics when designing on the Interface Builder canvas. Also, don’t start `mbgl::Map` at all (and don’t update it) because none of the runtime drawing code should ever be run in the designable. Normally these chunks of code would be excluded in IB using the TARGET_INTERFACE_BUILDER preprocessor macro. However, Mapbox GL is being packaged as a static library, so the macro is only evaluated when the library is prebuilt, even if the library eventually makes its way into the CocoaPods-generated framework. Instead, we detect that we’re being run by the IBDesignablesAgentCocoaTouch process. Overrode `-[MGLMapView initWithFrame:]` to call `-commonInit`. We’ve marked this initializer unavailable in the header, but IB still calls it regardless. Fixes #929.
| * Removed redundant initializers and settersMinh Nguyễn2015-04-033-125/+53
| | | | | | | | This change removes most of the ways you used to be able to apply a style to the map. Building on #1163, `styleURL` (HTTP(S), mapbox:, asset:) is the canonical way to apply a style, and `mapID` is a convenient shorthand for Mapbox-hosted styles. A relative style URL is interpreted as a path relative to the app’s main bundle. We now construct asset: URLs in lieu of “bundled style names”.
| * Fixed race condition after setting access tokenMinh Nguyễn2015-04-038-22/+66
|/ | | | | | | | `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
* Merge pull request #1194 from mapbox/fix-lat-lon-zoom-orderJustin R. Miller2015-04-032-6/+16
|\ | | | | fixes #1181: fix lat/lng & zoom ordering problems
| * account for GL-level min zoomJustin R. Miller2015-04-031-5/+10
| |
| * fixes #1181: fix lat/lng & zoom ordering problemsJustin R. Miller2015-04-022-6/+11
| |
* | Merge pull request #1196 from mapbox/1195-speed-courseBrad Leege2015-04-033-1/+7
|\ \ | | | | | | Speed And Course Attributes
| * | #1195 - Adding speed and course attributes to location eventBrad Leege2015-04-033-1/+7
|/ /
* | Merge pull request #1187 from mapbox/1ec5-settingsMinh Nguyễn2015-04-032-16/+2
|\ \ | |/ |/| Polished privacy settings
| * Polished privacy settingsMinh Nguyễn2015-04-022-16/+2
| | | | | | | | 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.
* | Merge pull request #1193 from mapbox/location-fixesJustin R. Miller2015-04-023-2/+8
|\ \ | | | | | | fix compilation error with private category property
| * | fix compilation error with private category propertyJustin R. Miller2015-04-023-2/+8
|/ /
* | Merge pull request #1192 from mapbox/location-and-docs-tweaksJustin R. Miller2015-04-026-35/+70
|\ \ | | | | | | improvements to iOS docs & user location framework
| * | reverting to title/subtitle setters for user locationJustin R. Miller2015-04-022-7/+8
| | |
| * | Improvements to docs & user location framework.Justin R. Miller2015-04-026-39/+73
| | | | | | | | | | | | | | | | | | | | | * 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.
* | | Merge pull request #1155 from mapbox/1155-update-as-neededJohn Firebaugh2015-04-0213-309/+163
|\ \ \ | |/ / |/| | Only run Style::updateProperties when required
| * | Rework easing transition codeJohn Firebaugh2015-04-0211-277/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Move Update to its own header fileJohn Firebaugh2015-04-022-8/+19
| | |
| * | Remove unusedJohn Firebaugh2015-04-022-24/+0
|/ /
* | Merge pull request #1188 from mapbox/1185-events-querystringBrad Leege2015-04-021-1/+12
|\ \ | |/ |/| Events = True
| * #1185 - Adding "events=true" query string to all non metrics http requests ↵Brad Leege2015-04-021-1/+12
|/ | | | if metrics are not disabled
* Merge pull request #1179 from mapbox/1178-location-location-locationios-v0.2.6ios-beta-preview-sirius-0.0.7Brad Leege2015-04-021-1/+1
|\ | | | | Changing "Location" to "location"
| * #1178 - Changing "Location" to "location"Brad Leege2015-04-021-1/+1
|/
* Merge pull request #1177 from mapbox/cleanupKonstantin Käfer2015-04-024-27/+11
|\ | | | | Some minor cleanups
| * some cleanupKonstantin Käfer2015-04-024-27/+11
|/
* Merge pull request #1175 from mapbox/chronoKonstantin Käfer2015-04-0234-182/+203
|\ | | | | Make std::chrono use less painful
| * Add typedefs for std::chrono::steady_clock typesJohn Firebaugh2015-04-0234-182/+203
|/
* Merge branch 'master' of https://github.com/mapbox/mapbox-gl-nativePeter Liu2015-04-0189-1979/+2343
|\
| * Merge pull request #1174 from mapbox/style-layer-groupJohn Firebaugh2015-04-0115-199/+79
| |\ | | | | | | Style code cleanup
| | * Rename methods to match gl-jsJohn Firebaugh2015-04-013-14/+14
| | |
| | * StyleLayer is noncopyableJohn Firebaugh2015-04-011-1/+2
| | |
| | * Remove unusedJohn Firebaugh2015-04-012-7/+0
| | |
| | * Remove unusedJohn Firebaugh2015-04-012-10/+3
| | |
| | * Eliminate StyleLayerGroupJohn Firebaugh2015-04-0115-170/+63
| |/
| * Merge pull request #1172 from mapbox/1172-no-stringstreamKonstantin Käfer2015-04-011-22/+24
| |\ | | | | | | Use hash instead of string key when merging lines
| | * use hashes instead of string keysKonstantin Käfer2015-04-011-22/+24
| |/
| * Merge pull request #1171 from mapbox/1171-autoKonstantin Käfer2015-04-0122-55/+55
| |\ | | | | | | Use more auto
| | * replace iterator variable types with autoKonstantin Käfer2015-04-0122-55/+55
| |/
| * Merge pull request #1170 from mapbox/1170-no-stringstream-for-hashingKonstantin Käfer2015-04-012-13/+16
| |\ | | | | | | Remove usage of stringstream for line dash atlas
| | * use cumulative hash instead of string for linedash lookupKonstantin Käfer2015-04-012-13/+16
| |/