Commit Graph

2632 Commits

Author SHA1 Message Date
Bruno de Oliveira Abinader
3ae506ee13 [core] Use NDEBUG instead of DEBUG
CMake defines 'NDEBUG' by default for release build, so we can check if
that's not defined instead of using 'DEBUG' for debug build.
2016-08-05 11:42:22 +02:00
Thiago Marcos P. Santos
045a644a7d [core] Respect minzoom and maxzoom properties
Fixes #5811
2016-07-29 15:26:30 +03:00
Vladimir Agafonkin
9ecc0d9597 GeoJSON point clustering (#5724)
* add supercluster dependency
* prepare GeoJSONTile for Supercluster
* prepare GeoJSONSource for accepting options
* try removing mbgl::GeoJSON
* fix setGeoJSON types
* add GeoJSONSource getURL
* add geojson to include path
* add Supercluster index in GeoJSONSource
* fix GeoJSONSource getZoomRange
* bring back mbgl::GeoJSON header
* fix tidy warnings hopefully
* try test-suite with enabled cluster test
* fix formatting in clustering-related files
2016-07-27 20:18:41 +03:00
Bruno de Oliveira Abinader
253a3dbc58 [core] Revert annotation source maxZoom to 22 2016-07-26 16:35:29 +03:00
Bruno de Oliveira Abinader
427773d31a [core] Micro-optimizations in geometry code 2016-07-26 16:35:29 +03:00
Konstantin Käfer
03ebae0f2e [core] don't crash when the version number is not a number 2016-07-20 15:33:09 +02:00
Konstantin Käfer
a07fbe8e34 [core] fix crash when the style JSON doesn't have an object at its root 2016-07-20 15:33:09 +02:00
Bruno de Oliveira Abinader
30f5aa72de [core] Make MapDebugOptions::StencilClip a no-op in Release mode 2016-07-20 12:48:52 +03:00
Bruno de Oliveira Abinader
a709ea2656 [core] Make MapDebugOptions::Overdraw a no-op in Release mode 2016-07-20 12:48:52 +03:00
Minh Nguyễn
1cf6b5de0c Merge branch 'release-ios-v3.3.0' 2016-07-19 15:22:17 -07:00
Konstantin Käfer
c261d0b2a8 [core] use more const, auto and refs
Cherry-picked from 40ea4247d8.
2016-07-19 12:23:02 -07:00
Konstantin Käfer
d640c2215f [core] add check for missing sprite URL file extension
Cherry-picked from 559f3a654b.
2016-07-19 12:22:54 -07:00
jingsam
12b431ee03 mapbox: URL containing query string causes infinite loop (#5554)
* correct all EXPECT_EQ(actual, expected) to EXPECT_EQ(expected, actual)

* fix getMapboxURLPathname() of URL with querystring

* add test for normalizeSourceURL of non-mapbox protocal

* Update mapbox.cpp

Cherry-picked from e82ecc60ac.
2016-07-19 12:22:34 -07:00
Konstantin Käfer
40ea4247d8 [core] use more const, auto and refs 2016-07-19 16:03:28 +02:00
Konstantin Käfer
559f3a654b [core] add check for missing sprite URL file extension 2016-07-19 16:01:24 +02:00
Bruno de Oliveira Abinader
2a0e296199 [core] Set annotation tileset max zoom to 18 2016-07-19 15:11:46 +03:00
Minh Nguyễn
8179f2f6b2 [core] Restored shape annotation z-order
Shapes are once again always added to the top z-index.

Fixes #5691.

Cherry-picked from 74fe96d261.
2016-07-18 15:21:35 -07:00
Minh Nguyễn
74fe96d261 [core] Restored shape annotation z-order
Shapes are once again always added to the top z-index.

Fixes #5691.
2016-07-18 14:43:44 -07:00
John Firebaugh
da35ef9f49 [core] Add support for $id key to filters
https://github.com/mapbox/mapbox-gl-style-spec/issues/391
2016-07-18 12:37:36 -07:00
Thiago Marcos P. Santos
4a1a7937ae [core] Move set/get thread names to platform::
Android needs its own implementation.
2016-07-16 10:38:42 +03:00
Jason Wray
09221ecf1a [core] Guard against camera's minScale being NaN
Fixes a bug where calculating the padded bounds for a single point would cause division by zero, resulting in NaN for `minScale`. This invalid `minScale` would then be used to create an invalid padded `centerPixel`.
2016-07-15 12:20:56 -04:00
Bruno de Oliveira Abinader
9ef30c2352 [core] Update color layer properties code generator 2016-07-14 16:24:11 +03:00
Thiago Marcos P. Santos
389c7615eb [core] Revert workaround for std::atomic on ARMv5
Got fix on r12.

https://github.com/android-ndk/ndk/issues/31
2016-07-13 17:56:51 +03:00
Bruno de Oliveira Abinader
174d367699 [core] Prefer color aliases for default property values 2016-07-13 11:57:09 +03:00
Bruno de Oliveira Abinader
c670b08ecb [core] Use PropertyValue<T> for Annotation line/fill 2016-07-13 11:57:09 +03:00
Minh Nguyễn
08d0a9a0e2 Quadkey tokens in tile URL templates, limited WMS support (#5628)
* [core] Quadkey tokens in tile URL templates

Fixes #5485.

* [core] WMS tokens in tile URL templates

Fixes #822.

* [macos] Added WMS debug style

Added a style to the macosapp resource bundle that can be used to test WMS support. To use it, zoom in to somewhere in New Jersey, then go to View ‣ Custom Style and enter “wms.json”.
2016-07-12 10:57:18 -07:00
Thiago Marcos P. Santos
86cebd4cca [core] Report conversion errors using std::string
char* increases the risk of pointing to a invalid reference. Qt had
to use a static variable as retainer to workaround.
2016-07-12 16:04:20 +03:00
Bruno de Oliveira Abinader
e197540f9a [core] Fix matrix when panning around the world
Partially reverts commit 1d46e83.
2016-07-12 11:36:26 +03:00
John Firebaugh
fe99295970 [core] Remove unused 2016-07-11 18:39:50 -07:00
John Firebaugh
ae838b397b [core] Move translatedMatrix to RenderTile 2016-07-11 18:39:50 -07:00
John Firebaugh
a27b5586e5 [core] Pass RenderTile rather than individual parameters 2016-07-11 18:39:50 -07:00
John Firebaugh
6e77149c13 [core] Introduce PaintParameters
Use it to DRY selection of regular vs. overdraw shaders and VAOs.
2016-07-11 18:39:50 -07:00
John Firebaugh
822ec091da [core] Introduce non-anonymous Shaders class 2016-07-11 18:39:50 -07:00
Bruno de Oliveira Abinader
5d64cde6d9 [core] Fix raster shader opacity in some cases 2016-07-11 15:47:41 +03:00
Jesse Bounds
626cf54be2 Merge branch 'boundsj-merge-3.3.0.rc.1' 2016-07-08 09:30:22 -07:00
Konstantin Käfer
4f26c8122a [core] track texture state to avoid redundand binds 2016-07-08 13:11:25 +02:00
Jesse Bounds
23caa9f7aa Merge branch 'release-ios-v3.3.0' into master 2016-07-07 15:40:07 -07:00
John Firebaugh
c09fb0f519 [core] Add support for circle-pitch-scale 2016-07-07 14:32:27 -07:00
John Firebaugh
c8e87128b1 [core] Make extrudeScale calculations more similar to JS 2016-07-07 14:18:00 -07:00
Konstantin Käfer
2e10c0a866 [core] don't force GL state to be set when calling .reset()
We are using Value::reset() to change a piece of GL state to its default value. However, the current implementation always executes the GL call, even if our state tracking system knows that it's already at that value. The new implementation of Value::reset() now respects that, resulting in a lot fewer GL calls.
2016-07-07 16:29:34 +02:00
Konstantin Käfer
69c529e264 [core] move shaders to anon struct and alias them 2016-07-07 15:06:59 +02:00
Jesse Bounds
c4bd946f9b [core] Re-close polygons after clipping with clipper (#5596)
This pulls in the implementation change in https://github.com/mapbox/
mapbox-gl-native/commit/903d609b40b6d0f4873f7bb46d96f4a06d7b17d6 from
the master branch for the iOS 3.3.0 release.
2016-07-06 15:25:37 -07:00
Young Hahn
71a3b1d0db [core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)
* [core] geometry.hpp 0.8.0

* geojsonvt @ 6.0.0

* Update platform deps, build scripts

* Perf optimizations/cleanup

* Rebase in geometry@080

* D.R.Y. etc

* Ensure fill annotation geometries have closed rings.

* Optimizations

* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt

* Apply close multi/poly geoms for line annotations as well
2016-07-06 17:29:34 -04:00
John Firebaugh
903d609b40 [core] Re-close polygons after clipping with clipper 2016-07-06 11:24:49 -07:00
Fredrik Karlsson
546469459f [ios] #3979 compress telemetry events (#5490)
* [ios] #3979 wip gzip telemetry events

* [ios] expose compression from core instead of adding a new dependency

* [ios] #3979 Exposed decompress from mbgl and added a test case

* [ios] #3979 cleanup

* [ios] #3979 cleaned up test case

* [ios] #3979 cleanup

* [ios] #3979 gzip -> deflate
2016-07-05 22:46:04 +02:00
John Firebaugh
d58bee6d90 [core] Avoid unnecessary copies in GlyphSet::insert 2016-07-04 17:35:20 -07:00
Konstantin Käfer
1311ed24ad [core] refactor Raster and allow explicit mipmapping levels 2016-07-04 14:24:32 +02:00
Bruno de Oliveira Abinader
9f18d19a20 [core] Fix typo in coveringPlainOverdrawArray 2016-07-04 12:33:05 +03:00
jingsam
e82ecc60ac mapbox: URL containing query string causes infinite loop (#5554)
* correct all EXPECT_EQ(actual, expected) to EXPECT_EQ(expected, actual)

* fix getMapboxURLPathname() of URL with querystring

* add test for normalizeSourceURL of non-mapbox protocal

* Update mapbox.cpp
2016-07-04 00:26:28 -07:00
Bruno de Oliveira Abinader
aa1fa49af5 [core] Update RasterShader
Ref: https://github.com/mapbox/mapbox-gl-shaders/issues/1
2016-07-02 18:04:20 +03:00