summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* [core] Align URL token replacement behavior with GL JSJohn Firebaugh2018-05-183-7/+17
| | | | I.e. preserve unknown tokens in URLs rather than replacing them with an empty string.
* [core] Align match behavior with case/==John Firebaugh2018-05-181-2/+16
| | | | Makes `["match", ["get", k], label, match, otherwise]` equivalent to `["case", ["==", ["get", k], label], match, otherwise]`. This changes the behavior of match expressions where the runtime type of the input does not match the type of the labels: previously such expressions produced a runtime type error and then fell back to the property default value; now they produce the fallback value from the match expression.
* Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-masterFabian Guerra2018-05-1735-882/+990
|\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # mapbox-gl-js # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/gradle.properties # platform/android/gradle/dependencies.gradle # platform/darwin/src/MGLVectorTileSource.mm # platform/darwin/src/MGLVectorTileSource_Private.h # platform/ios/CHANGELOG.md # src/mbgl/style/expression/compound_expression.cpp
| * [core] Convert null to empty string, not “null”Minh Nguyễn2018-05-141-0/+1
| |
| * [core] Convert "legacy" filters directly into expressions (#11610)Lucas Wojciechowski2018-05-1012-647/+434
| | | | | | Ports the specialized filter-* expressions from GL JS, adding them to src/mbgl/style/expression/compound_expression.cpp
| * [core] Don't crash when attribute count is exceededKonstantin Käfer2018-05-0323-237/+557
| |
| * [core] Don't copy TileLayerIndexes on every frame.Chris Loer2018-05-021-1/+1
| | | | | | | | Fixes issue #11811 (too much CPU time spent in CrossTileSymbolIndex).
* | Fix bug (always true + incorrect calculation) in fill_extrusion_bucket ↵Lauren Budorick2018-05-161-2/+2
| | | | | | | | edgedistance check
* | [qt] Fix build when building the Qt Location pluginThiago Marcos P. Santos2018-05-141-1/+1
| | | | | | | | | | - MinGW has to explicitly know that is building a static library. - Android doesn't have 'round' on the std:: namespace when using g++.
* | [core] Only run placement for first layer per SymbolBucketChris Loer2018-05-038-14/+32
| | | | | | | | | | | | | | | | | | Native version of mapbox/mapbox-gl-js#6548. Port of mapbox/mapbox-gl-js#6550. Prevents symbols that share the same layout properties from colliding against each other. Bump GL JS pin to get regression test. Rename "bucketName" -> "bucketLeaderID" to make it clearer what it represents.
* | [core] Don't copy TileLayerIndexes on every frame.Chris Loer2018-05-011-1/+1
| | | | | | | | Fixes issue #11811 (too much CPU time spent in CrossTileSymbolIndex).
* | [core] Remove unused 'Throttler' class.Chris Loer2018-04-303-59/+0
| | | | | | | | Throttler was previously used to control how frequently background placement ran.
* | [core] Port is-supported-script to native.Chris Loer2018-04-273-2/+42
| | | | | | | | Native port is much simpler because RTL text support is always enabled.
* | [core] only index features within tile boundariesAnsis Brammanis2018-04-263-5/+11
| | | | | | | | | | | | | | Previously we relied on tile buffers for querying features who's rendered representations cross tile boundaries. Now we query multiple tiles making it unnecessary to index features that are completely outside a tile's boundaries.
* | [core] fix circle querying for scale and alignmentChris Loer2018-04-2639-68/+186
| | | | | | | | | | | | | | This fixes circle querying for cases where either circle-pitch-alignment=map or circle-pitch-scaling=viewport
* | [core] fix querying circles across tile boundariesChris Loer2018-04-267-16/+30
| |
* | [core] Streaming TileCover for polygonal regions (#11267)Asheem Mamoowala2018-04-265-25/+559
| | | | | | A per-tile streaming algorithm for tile cover on points, lines, and polygons. Works for individual zoom levels, and not zoom ranges.
* | Review changes:Chris Loer2018-04-251-3/+5
| | | | | | | | | | - assert symbol layer tiles must be geometry tiles, instead of dynamically checking - re-use retainedBucketQuery iterator instead of calling find twice.
* | Bump GL JS pin to get tests for global symbol querying.Chris Loer2018-04-251-0/+3
| | | | | | | | | | | | - Pulls over an update to line.vertex.glsl (looks like a no-op?) - Add test ignores for collator, is-supported-script, line-gradient - Exclude collator, is-supported-script, line-gradient from code generation.
* | Port global symbol query from GL JS:Chris Loer2018-04-2534-196/+219
| | | | | | | | | | | | | | - Symbol querying is now global instead of per-tile - Symbols that bleed over tile boundaries no longer missed in queries - Symbol results now sorted based on rendering order (ie overlapping symbols change their sort order when a bearing change causes their render order to change) - Placement::retainedQueryData now responsible for maintaining symbol querying data for buckets that may no longer be in the TilePyramid.
* | Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0Fabian Guerra2018-04-2339-377/+411
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # circle.yml # include/mbgl/style/expression/let.hpp # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml # platform/android/gradle/dependencies.gradle # platform/android/src/example_custom_layer.cpp # platform/android/src/geojson/point.cpp # platform/darwin/src/NSPredicate+MGLAdditions.mm # platform/darwin/test/MGLExpressionTests.mm # platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec # platform/ios/Mapbox-iOS-SDK-symbols.podspec # platform/ios/Mapbox-iOS-SDK.podspec # platform/ios/app/MBXViewController.m # src/mbgl/renderer/layers/render_custom_layer.cpp # src/mbgl/style/conversion/filter.cpp # src/mbgl/style/expression/interpolate.cpp # src/mbgl/style/expression/value.cpp # test/style/filter.test.cpp
| * Don't crash on placing symbols with 0 renderable glyphsChris Loer2018-04-192-2/+8
| | | | | | | | | | | | Fixes issue #11729. Close relative of issue #10956. It is possible for us to receive Glyphs from the server that are valid, but have an invalid bitmap. In that case, the glyphs will be present in the `GlyphMap` used for shaping, but not present in the `GlyphPositions` used in `getGlyphQuads`. `SymbolInstance::hasText` looked at the shaping instead of the actual quads. `symbol_projection.cpp` should never try to project a label without any quads, but we'll also try to make it so that it doesn't crash if it does.
| * Don't enforce ["zoom"] constraints for filters (#11672)Anand Thakker2018-04-122-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | * Don't enforce ["zoom"] constraints for filters Fixes #11594 * Add a couple of comments * Fix ambiguous constructor call * ParsingContext(optional<Type>) => ParsingContext(Type)
| * Update layer immediately when changing its max/min zoom level (#11399)Łukasz Paczos2018-04-1210-0/+20
| | | | | | | | | | | | * [android][core] update layer immediately when changing it's max/min zoom * [core] node bindings for layer zoom range
| * Add abs, round, floor, ceil operators (#11653)Anand Thakker2018-04-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add abs, round, floor, ceil operators Port of https://github.com/mapbox/mapbox-gl-js/pull/6496 * [ios, macos] Simplified abs, ceiling, floor expressions * [ios, macos] Added rounding expression function * [android] - binding integration for round, ceil, floor and abs expressions * Update mapbox-gl-js to include non-integer rounding test * Drop extra braces * mapbox-gl-js -> master * Update style-spec docs -> PropertyFactory.java
| * Fix style parsing bug for constant expressions (#11606)Anand Thakker2018-04-091-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix style parsing bug for constant expressions Closes #10849 * Ignore tests for unported GL JS change Refs https://github.com/mapbox/mapbox-gl-js/pull/6429 * Fuller fix * Update mapbox-gl-js
| * [core] re-bind uniform locations after re-linking program (#11618)Łukasz Paczos2018-04-061-0/+5
| | | | | | | | | | - On some gl implementations the uniform locations are shifted after linking the program a second time, resulting in errors when using any uniform. On some implementations they are actually doubled. Re-binding the uniforms after selectively binding the vertex attributes prevents this. (cherry picked from commit 4a0e025)
| * [core] Add Projection matrix to CustomLayerRenderParameters to transform web ↵Asheem Mamoowala2018-04-051-0/+4
| | | | | | | | mercator world coordinates to GL coordinates.
| * Use a host interface for CustomLayer instead of function pointers (#11553)Asheem Mamoowala2018-04-025-52/+22
| | | | | | | | | | | | Use a host interface for CustomLayer instead of function pointers Co-authored-by: Julian Rex <julian.rex@mapbox.com>
| * [core] Make FeatureIndex own GeometryTileData.Chris Loer2018-04-025-30/+27
| | | | | | | | | | Prevents querying a FeatureIndex built against a separate set of data, which can lead to invalid index exceptions. The GeometryTileWorker 'data' member can still change independently of the data in the feature index, at the time 'setData' is called. The GeometryTileWorker maintains ownership of its local data (which may be used to re-parse) and clones the data for use by the FeatureIndex in the foreground.
| * [core] Consolidate GeometryTile symbol/nonSymbolBucketsChris Loer2018-04-024-24/+11
| | | | | | | | Conversion to one-phase tile loading removed any need to track them separately.
| * [core] Convert GeometryTileWorker to "one-phase" loadingChris Loer2018-04-024-129/+141
| | | | | | | | | | Modest simplification refactoring (issue #10457). Also, fixes issue #11538, which was caused in part by a hole in the vestigial two-phase loading.
| * [core] Fixed to-rgba with zero opacityMinh Nguyễn2018-03-303-14/+24
| |
| * [core] Round-trip linear interpolatorsMinh Nguyễn2018-03-301-1/+5
| |
| * [core] Fix potential race condition crash in symbol querying..Chris Loer2018-03-292-8/+25
| | | | | | | | | | | | Second half of fix for issue #11538. If a global placement took place between the time a tile's non-symbol layout updated and the time new symbol buckets arrived, the tile's new FeatureIndex would be committed, but the global CollisionIndex would be generated against the old symbolBuckets. The mismatch could cause the CollisionIndex to contain indices that didn't exist in the new FeatureIndex, and attempting to access them would generate an out-of-bounds exception.
| * [core] Fix potential race condition crash in symbol querying..Chris Loer2018-03-292-6/+8
| | | | | | | | | | | | | | | | First half of fix for issue #11538. Testing `if (pendingData)` didn't work if there _was_ a data update, but the update was "the data for this tile is now null". In that case, the tile's FeatureIndex would be updated, but the tile's data member would remain unchanged. In the case of a tile's data being deleted, the matching FeatureIndex would have an empty set of bucketLayerIDs, but the _old_ data would still be in place for querying, and the symbolBuckets might not be updated yet (pending onPlacement). In this case `bucketLayerIDs.at(indexedFeature.bucketName)` could throw an out-of-range exception.
| * [core] Don't resolve tokens after evaluating a text-field or icon-image ↵John Firebaugh2018-03-221-2/+2
| | | | | | | | expression (#11509)
| * [core] Double maximum label width by reducing glyph precision.Chris Loer2018-03-223-4/+4
| | | | | | | | | | Fixes issue #11507. Port of GL JS PR #6375.
| * [core] Avoid flashing on pitched overzoomed tiles.Chris Loer2018-03-213-3/+12
| | | | | | | | | | | | Clamps perspective ratios in shaders. Fixes issue #11487. Port of GL JS PR #6365.
| * [core] don't hide icons if text is an empty stringAnsis Brammanis2018-03-191-3/+3
| |
| * [core] Update mapbox-gl-jsJohn Firebaugh2018-03-141-2/+8
| |
| * [core] Stringify expression syntax, not function syntaxJohn Firebaugh2018-03-141-125/+6
| |
| * [core] TileJSON conversion clamps bounds longitude to [-180,180], per specAsheem Mamoowala2018-03-091-0/+2
| |
| * [core] Add expression filter support (#11251)Lucas Wojciechowski2018-03-0910-12/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP * WIP * WIP * Remove Filter::operator()(const Feature&) * WIP * WIP * WIP * WIP * Hook up expression filter evaluator * Replace `shared_ptr` with &reference * Fill in implementation of `void operator()(const ExpressionFilter&)` * Fix failing tests * Switch back to a shared_ptr per chat with @anandthakker * Fix benchmark compilation * Shot in the dark to fix CI * Shot in the dark to fix CI (part 2) * Shot in the dark to fix CI (part 3) * In src/mbgl/style/conversion/filter.cpp, add a port of isExpressionFilter and use it to decide in Converter<Filter>::operator() whether to parse the incoming JSON as an ExpressionFilter or one of the legacy filter types * Remove bool Filter::operator()(const GeometryTileFeature&) const * Ensure the map zoom is passed into filtering operations wherever applicable * Add expression filter tests * Addressed PR feedback * Implement `NSPredicate *operator()(mbgl::style::ExpressionFilter filter)` * Fix formatting& nit
| * [android] calculating camera's LatLng for bounds without map padding (#11410)Łukasz Paczos2018-03-081-1/+0
| |
| * Port fix for "at" expression off-by-1 error (#11375)Anand Thakker2018-03-021-4/+10
| | | | | | | | | | | | | | | | | | | | * Port fix for "at" expression off-by-1 error Refs https://github.com/mapbox/mapbox-gl-js/pull/6269 * Consistency * Add ignores for symbol positiong differences in real-world tests
| * Relax type checking for "length"John Firebaugh2018-03-013-7/+68
| |
| * Infer type assertions for objectJohn Firebaugh2018-03-011-1/+1
| | | | | | | | Cross-ports https://github.com/mapbox/mapbox-gl-js/pull/6243.
| * [core] blacklist vao usage on mali t720 (sapphire 650)Ivo van Dongen2018-03-011-2/+9
| | | | | | | | Avoids problems on (amongst others) Samsung Galaxy J3
| * [core] check opengl error state after custom layer invocationsIvo van Dongen2018-03-011-3/+4
| |
View Lorry Controller Status