summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure explicit newlines get considered as breakpoints before being ↵upstream/cloer_no_parentheses_breakChris Loer2016-12-291-2/+4
| | | | passed to ICU.
* Disallow line breaking within parentheses.Chris Loer2016-12-291-1/+10
|
* Port raggedness-minimizing line breaking from gl-js.Chris Loer2016-12-217-71/+130
|
* Render newlines in labels even if there's nothing else on the line.Chris Loer2016-12-211-10/+10
|
* Cleaning up line breaking code.Chris Loer2016-12-214-79/+72
| | | | | | * Don't include trailing spacing (as opposed to whitespace) in lineLength * Modify BiDi interface to require initial bidi layout and linebreaking to happen in one call. * Code style changes suggested by @kkaefer
* [android] - update components with latest camera values (#7499)Tobrun2016-12-211-1/+1
|
* [android] - fix null pointer on trackingsettings (#7505)Tobrun2016-12-211-1/+3
|
* [android] - harden MapboxMapOptions, extract duplicate fragment logic, fixup ↵Tobrun2016-12-216-72/+90
| | | | DoubleMapActivity (#7507)
* [core] Remove unused BucketParameter membersJohn Firebaugh2016-12-212-30/+8
|
* [core] Convert BucketParameters#layer to a separate parameterJohn Firebaugh2016-12-2120-39/+36
| | | | This parameter varies between Buckets, while the others are constant. It makes more sense as an individual parameter.
* [core] refactor URL parsingKonstantin Käfer2016-12-215-137/+421
|
* [android] - update lost to 2.0.0, gradle cleanup (#7494)Tobrun2016-12-213-27/+43
|
* Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-masterMinh Nguyễn2016-12-20153-2337/+4781
|\ | | | | | | Also reran make style-code and manually discarded anything related to fill extrusion layers.
| * [ios, macos] Document when it's safe to call runtime styling functions (#7335)Eric Wolfe2016-12-181-7/+17
| | | | | | | | | | | | * Add notes to wait for map to finish loading before adding sources or layers * Move style loading notes to class documentation
| * [ios, macos] Highlight current topic in documentation (#7468)Minh Nguyễn2016-12-163-2/+16
| | | | | | | | | | | | * [ios, macos] Highlight current topic in docs * highlight style
| * iOS jazzy theme improvements (#7422)Maya Gao2016-12-1617-142/+276
| | | | | | some small improvements to the theme
| * Use appropriate part of speech for properties (#7457)Minh Nguyễn2016-12-1629-243/+751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ios, macos] Use appropriate part of speech for properties Fixed overridden property references in requirements lists. Boolean-typed properties can now have getters beginning with “is”. Renamed a number of layout properties according to the following rules: Boolean-typed properties should include a verb; other properties must be noun phrases; all properties must be grammatical. * [ios, macos] Added style spec names as unavailable aliases Renamed properties now have aliases based on their style specification names, marked unavailable, for wayfinding purposes. * [ios, macos] Fixed autosynthesis warnings * [ios, macos] Moved style layer test template to test folder * [ios, macos] Customized iconOptional getter * [ios, macos] Avoid autosynthesis of aliases * [ios, macos] Test that property names are grammatical Run property getter names through a basic battery of tests to see if they’re grammatical. Most part-of-speech tagging tests are guarded by a compile-time flag, off by default, because NSLinguisticTagger does a poor job of telling nouns from verbs, and we’ve intentionally kept many words in property names that could be read as either verbs or nouns (like “transform” or “scale”).
| * [ios, macos] Corrected return type of MGLShape factory methodMinh Nguyễn2016-12-162-2/+2
| |
| * [ios] [osx] Make theme configurable (#7420)Tom MacWright2016-12-151-1/+4
| | | | | | | | | | | | * Make theme configurable * [ios][osx] Make jazzy theme configurable
| * [ios] Remove last remnants of appledoc & docsets (#7418)Jason Wray2016-12-142-41/+0
| | | | | | These scripts are broken and no longer useful in a post-jazzy world.
| * [ios] Updated changelog for iOS 3.4.0 beta 5ios-v3.4.0-beta.5Jesse Bounds2016-12-141-0/+1
| |
| * [ios] Update podspec for release 3.4.0 beta 5Jesse Bounds2016-12-142-2/+2
| |
| * [core] Port ensure a non-zero source tile cache size (#7438)Jesse Bounds2016-12-141-2/+2
| | | | | | | | | | This ports https://github.com/mapbox/mapbox-gl-native/pull/7242/ commits/2d323211af54499d5c822b8e45d7415bf92112f0 to the iOS 3.4.0 release branch.
| * [ios] Fix dequeue view variable scope (#7423)Jesse Bounds2016-12-141-17/+11
| | | | | | | | | | | | Fix a bug where an annotation view variable was incorrectly re-declared which caused annotation views to not appear in some cases. This also refactors the guard that spot checks that annotation view are or are not visible.
| * [ios]] Remove transaction in callout view update (#7425)Jesse Bounds2016-12-141-4/+0
| |
| * [ios, macos] Streamlined a string formatMinh Nguyễn2016-12-131-1/+1
| |
| * [ios, macos] Simplify MGLSource and subclasses (#7377)Minh Nguyễn2016-12-1355-1067/+1443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ios, macos] Audited source headers for nullability * [macos] Made MGLTileSet public * [ios, macos] Replaced MGLTileSet with MGLTileSource MGLRasterSource and MGLVectorSource now share a common abstract superclass, MGLTileSource. MGLTileSet has been removed. MGLTileSource is modeled after mbgl::style::RasterSource and mbgl::style::VectorSource. It has initializers that incorporate the parameters of MGLTileSet’s initializers, but it lacks getters for everything but the attribution string. MGLTileSet’s properties have been converted into options that can be passed into MGLTileSource’s initializers in a dictionary. Properly implement rawSource as a covariant property so that it doesn’t end up getting autosynthesized as a shadow ivar. This prevents concrete subclasses of MGLSource from setting _rawSource directly but getting a different value out of self.rawSource. Marked -[MGLSource init] as unavailable and ensured that concrete subclasses of MGLSource have the right set of initializers marked as designated initializers. Documentation comments for each concrete source class identify the corresponding source type in the style specification. Clarified the purpose of MGLTileSetScheme, now known as MGLTileCoordinateSystem. * [ios, macos] Clarified tile size interpretation Sticking to a default value of 256 for mapbox: URLs, but other URLs get the standard 512 value. * [ios, macos] rawSource is always set * [ios, macos] Cleaned up MGLShapeSource initialization rawSource is never nil, so there’s no need for a -commonInit method. Extracted -geoJSONOptions from MGLShapeSource into a standalone function for easier testing. * [ios, macos] Synchronized headers in project Realphabetized headers in groups. Added headers missing from one project or the other. * [ios, macos] Added MGLShape methods to (de)serialize GeoJSON data Added a class initializer and instance method to MGLShape that deserialize and serialize the shape as GeoJSON data, respectively. The new initializer handles parsing errors gracefully. Removed methods specific to GeoJSON data from MGLShapeSource, in an effort to reduce parallel state. Developers are now expected to go through the new MGLShape initializer to get an MGLShape representation. Alternatively, a local file URL can be passed into the other MGLShapeSource initializer. * [ios, macos] Typo in assertion message * [ios, macos] Simplified GeoJSON serialization Every MGLShape now knows its most specific mbgl::GeoJSON representation. * [ios, macos] Reremoved MGLFeaturePrivate mbgl::GeoJSON, which is a variant, allows a single GeoJSON representation method to traffic in whatever type is needed for a particular shape class. This change removes some hidden private protocols, which are a bug waiting to happen. * [ios, macos] Fixed covariant rawLayer property Properly implement rawLayer as a covariant property so that it doesn’t end up getting autosynthesized as a shadow ivar. This prevents concrete subclasses of MGLStyleLayer from setting _rawLayer directly but getting a different value out of self.rawLayer. * [ios, macos] Use MGLAttributionInfo for source attribution Made MGLAttributionInfo public. Replaced MGLTileSource’s attribution property with an attributionInfos property set to an array of MGLAttributionInfo objects. Added an MGLTileSourceOption for specifying an array of MGLAttributionInfo objects instead of an HTML string (either is acceptable when creating an MGLTileSource). * [ios, macos] Corrected method references in documentation
| * [core] Swap order of Style::recalculate and Style::relayoutIvo van Dongen2016-12-131-4/+4
| | | | | | | | Style::relayout uses source.baseImpl->loaded, a flag which is updated by Style::recalculate. So recalculate first, then relayout.
| * [ios] Fixed crash on launch in iosappMinh Nguyễn2016-12-131-1/+1
| | | | | | | | Use NSLocaleLanguageCode instead of -[NSLocale languageCode], which is newer than the minimum deployment target.
| * [ios] Fix iosapp runtime styling examples (#7395)Jesse Bounds2016-12-131-2/+7
| | | | | | | | This fixes a few bugs in our iosapp examples that were exposed by recent refinements to the APIs they use.
| * [ios, macos] handle duplicate layer errorIvo van Dongen2016-12-132-7/+49
| |
| * [core] guard against duplicate layer idsIvo van Dongen2016-12-132-0/+37
| |
| * [core] use raii to guard backend deactivationIvo van Dongen2016-12-134-27/+36
| |
| * [ios, macos] Override references to property names in property requirements ↵Minh Nguyễn2016-12-124-26/+50
| | | | | | | | | | | | | | | | | | | | lists (#7391) * [ios, macos] Refer to template images in documentation SDF icons are known as template images in AppKit and UIKit. * [ios, macos] Override property names in requirements
| * [ios, macos] Load features into shape source if possible (#7339)Jesse Bounds2016-12-127-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks the kind of MGLShape passed into the source and, if it is a feature, it mbgl feature objects to pass to core. This keeps the feature id and attributes data intact. If the shape is a `MGLShapeCollectionFeature` it creates an `mbgl::FeatureCollection` object (also to keep feature properties). If the shape is not any sort of feature, it passes along just the geometry. This also uses the MGLFeatureFromMBGLFeature converter for the case where GeoJSON data passed in to a source contains a single feature. The converter has logic to keep the id and attributes properties intact. Before, these properties were lost because only geometry conversion was done. Finally, logic to handle (and associated tests) of nested shape collection features is removed since that is not supported by the GeoJSON spec or the core implementation. [ios] Add test of drawing plain shape to iosapp
| * [ios, macos] Expanded source documentationMinh Nguyễn2016-12-109-34/+64
| | | | | | | | Also fixed a few stray references to GeoJSON sources.
| * [ios, macos] Rename MGLGeoJSONSource to MGLShapeSource (#7334)Jesse Bounds2016-12-0925-208/+208
| |
| * [ios, macos] Silence -Wc++11-narrowing warning in open gl layer (#7355)Jesse Bounds2016-12-091-2/+2
| |
| * [ios, macos] Source-driven attribution (#5999)Minh Nguyễn2016-12-0833-212/+824
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ios, macos] Source-driven attribution Refactored MGLSource initialization. Implemented a new private class, MGLAttributionInfo, that parses an HTML attribution string from TileJSON and stores the resulting structured data. Added methods to MGLTileSet and MGLStyle to aggregate MGLAttributionInfos. On macOS, update the attribution view as soon as the source attribution changes. On iOS, fetch the current attribution information when displaying the action sheet. Removed hard-coded attribution strings. * [macos] Respect inline formatting in attribution HTML Apply a default font and color to attribution HTML as it is imported into an attributed string. Pass the attributed string into MGLAttributionButton as is, without stripping formatting. Avoid overriding the font and color after importing the HTML, in case these attributes are explicitly specified rather than intrinsic to a hyperlink. Constrain the top of the attribution view to all the attribution buttons, in case one of them needs additional headspace. * [ios, macos] Display unlinked attribution strings Unlinked attribution strings are represented on macOS as buttons that have the default cursor and do nothing when clicked. On iOS, they are action sheet buttons that do nothing but dismiss the action sheet. * [macos] Fixed random Auto Layout exception Auto Layout randomly finds itself unable to satisfy constraints when updating attribution, due to some spurious constraints between attribution buttons. Regenerate the entire attribution view every time the source attribution changes. * [ios, macos] Thoroughly dedupe attribution infos Also added a test to verify parity with the GL JS implementation. This implementation avoids sorting. * [ios, macos] Trim whitespace from attribution strings Also added parsing tests. * [ios, macos] Added attribution parsing tests for styles Included an emoji test to ensure that attribution strings are interpreted as UTF-8, to avoid mojibake. Included a test of removing the underline from a leading copyright symbol. * [ios, macos] Derive feedback link from source MGLAttributionInfo now detects feedback links in the attribution HTML code, and it is responsible for tailoring the feedback URL to the current viewport. Removed the hard-coded feedback action from the attribution sheet on iOS in favor of a source-derived feedback title and URL. Moved the feedback action from macosapp to MGLMapView; applications are now expected to hook an Improve This Map menu item to an MGLMapView action.
| * [ios, macos] renamed raster-hue-rotateFredrik Karlsson2016-12-084-9/+12
| |
| * [ios, macos] Warn about special characters in predicates (#7317)Jesse Bounds2016-12-071-0/+6
| |
| * [ios, macos] Fix typo in exception name for style source identifier (#7315)Jesse Bounds2016-12-073-3/+3
| |
| * Prevent stopless functions (#7309)Fredrik Karlsson2016-12-078-9/+40
| | | | | | | | | | | | * [ios, macos] prevent stopless functions * [ios, macos] removed unused bridging header and fixed naming
| * [ios, macos] fixed compiler warningsFredrik Karlsson2016-12-071-2/+2
| |
| * [ios, macos] Corrected -setNeedsDisplay documentationMinh Nguyễn2016-12-071-1/+1
| | | | | | | | Followup to #7250.
| * [ios, macos] Migrate MGLCustomStyleLayerAdditions to style layer API (#7250)Minh Nguyễn2016-12-0726-176/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ios, macos] Replaced custom style layer API with MGLOpenGLStyleLayer Replaced the custom style layer API on MGLMapView with an equally unsupported MGLOpenGLStyleLayer API that nonetheless is consistent with the broader runtime styling API and is compatible with macOS. Fixed an unrecognized selector crash when wrapping a layer of unrecognized type coming from mbgl. * [macos] Added lime green layer demo to macosapp Reprised the demo removed from iosapp in #5091. * [ios, macos] Rationalized MGLOpenGLStyleLayer API MGLStyle now strongly references any MGLOpenGLStyleLayer object that’s added to it, in order to prevent pointers from going stale and make it easy for layer drawing code to get more information about the map view. Replaced the MGLOpenGLStyleLayer callback blocks with overridable instance methods. Added internal documentation for each method. Subclassed MGLOpenGLStyleLayer as LimeGreenStyleLayer inside macosapp. Consolidated -addToMapView: into -addToMapView:belowLayer: to ensure that MGLRedundantLayerException gets raised even if the layer is being inserted rather than added to the bottom of the stack. * [core] Clarified that rendering happens on the main thread * [ios, macos] Fixed removing and re-adding MGLOpenGLStyleLayer Don’t allow index-based layer removal to circumvent -removeFromMapView:, which MGLOpenGLStyleLayer relies on to synchronize the style’s array of MGLOpenGLStyleLayers. When obtaining an MGLOpenGLStyleLayer, get the instance already added to the style instead of creating a new one to wrap the underlying CustomLayer.
| * [ios, macos] More ways to reshape an MGLMultiPoint (#7251)Minh Nguyễn2016-12-069-85/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ios, macos] Completed API for mutating multipoints Added the complete set of methods for mutating the vertices of an MGLMultiPoint. Also rewrote MGLMultiPoint documentation to refer to vertices instead of points. * [ios, macos] Removed inaccurate MGLOverlay commentary This paragraph is full of references to features that exist in MKOverlay but not MGLOverlay. * [ios, macos] Lazily compute multipoint bounds Invalidate the bounds whenever the coordinates change, but don’t recompute the bounds until they’re requested. Simplified -intersectsOverlayBounds: for immutable overlay classes. Added a utility function for testing whether two MGLCoordinateBounds intersect, based on mbgl::LatLngBounds::intersects(). Removed unused color conversion code.
| * [ios] s/iconSize/iconScale/Minh Nguyễn2016-12-061-1/+1
| | | | | | | | Followup to #7310.
| * [ios, macos] Template images as style imagesMinh Nguyễn2016-12-063-3/+29
| | | | | | | | Convert template images to SDF icons and back when storing them as style images.
| * [ios, macos] Note corresponding style spec propertiesMinh Nguyễn2016-12-064-0/+18
| | | | | | | | Documentation for attributes whose names we’ve overridden now mention the original style specification property name, with a link to the style specification documentation for the property.