Commit Graph

834 Commits

Author SHA1 Message Date
Konstantin Käfer
18176605f6 [core] support "scheme": "tms" in TileJSON files 2016-08-16 11:04:30 +02:00
Jesse Bounds
d4271d993e [core] Compare unsigned int to unsigned int to pass tidy check (#5986) 2016-08-12 17:08:52 -07:00
Minh Nguyễn
e147887e35 [core, android, ios, macos] Replaced getPointAnnotationsInBounds() w/ queryPointAnnotations() (#5165)
queryPointAnnotations() accepts a screen rectangle instead of a geographic bounding box, so marker hit testing works at the edges of a rotated, tilted map view.

Fixes #5151.
2016-08-12 15:45:18 -07:00
Amy Lee Walton
b0cb8715ed CJK overflow - update to match gl-shader (#5908)
* update vertex array ushorts

* update atlas size

* testing latest cjk test-suite branch

* update shader ref

* update shaders

* update icon buffer

* shaders

* updated tests

* buffer fix

* updated make tests

* annotation expected updates

* final push

* final fonts

* a_data1 removal

* remove cjk-mixed test

* hiring threshold for cjk-chinese

* update to new test suite

* Rename a_data2 to a_data in sdf and icon shaders

* update test-suite sha
2016-08-11 09:49:36 -07:00
Konstantin Käfer
e46b580c67 [build] unify naming of Makefile targets
`make foo` just builds
`make run-foo` builds and runs
2016-08-05 11:42:22 +02:00
Konstantin Käfer
692fe1f3ff [build] switch to CMake
This is very much a work in progress.
2016-08-05 11:42:22 +02: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
Thiago Marcos P. Santos
65e2822f21 [Qt] Use Qt text codec instead of nunicode
Remove one extra dependency. Qt has some bugs on the text codec it
seems, but it is also important to keep the behavior aligned with
the client API.
2016-07-22 18:56:30 +03:00
Thiago Marcos P. Santos
0f367c93d0 [tests] Added a PT string on text conversions tests 2016-07-22 16:59:01 +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
Minh Nguyễn
53131def65 [core] Fixed test build errors
Missed this bad merge from #5729.
2016-07-19 15:26:09 -07:00
Minh Nguyễn
1cf6b5de0c Merge branch 'release-ios-v3.3.0' 2016-07-19 15:22:17 -07:00
Brad Leege
1972d932d5 Merge branch 'release-android-v4.1.1'
# Conflicts:
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	test/util/mapbox.cpp
2016-07-19 16:32:45 -05: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
6e830725de [android] #5725 - Cherry picking 559f3a654b 2016-07-19 13:31:11 -05:00
Konstantin Käfer
559f3a654b [core] add check for missing sprite URL file extension 2016-07-19 16:01:24 +02: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
Vladimir Agafonkin
a9e4e98e8e Revert "add supercluster dependency"
This reverts commit f84e9fdb2b.
2016-07-18 16:58:32 +03:00
Vladimir Agafonkin
f84e9fdb2b add supercluster dependency
[skip ci]
2016-07-18 16:21:28 +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
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
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
Thiago Marcos P. Santos
2425cf4ef8 Revert "[android] Do not create Timers on Default main loops"
This reverts commit 13cd75f099.
2016-07-06 17:43:09 +03:00
Thiago Marcos P. Santos
13cd75f099 [android] Do not create Timers on Default main loops
Not supported, because we don't have control over the Looper
timeout like we do for Loopers we create. On the main thread,
Android takes care of making the application sleep and sets
an arbitrary timeout. This could be properly fixed by implementing
timers in Java, but we don't really have the use case of timers
in the main thread.
2016-07-05 21:04:27 +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
33a8856c2a [test] Added max zoom annotation tests 2016-06-28 12:02:43 +03:00
John Firebaugh
8956179ce0 [core] Merge TexturePool into ObjectStore; pool all textures (#5477) 2016-06-27 13:44:46 -07:00
John Firebaugh
b8326870e1 [core] Increment completedTileCount when appropriate (#5475) 2016-06-24 15:28:10 -07:00
John Firebaugh
021d4199cb [core, node] Implement bindings for addSource 2016-06-24 09:39:51 -07:00
John Firebaugh
16c435b151 [core, node] Implement bindings for addLayer 2016-06-24 09:39:51 -07:00
John Firebaugh
c4e4cc5081 [core] Adjust layer source properties to better reflect reality
* Layer source ID is immutable; must be provided to the constructor
* Layer source layer is mutable
* Layers with GeoJSON sources do not have a source layer

While here, make Layer::copy impl-private.
2016-06-24 09:39:15 -07:00
John Firebaugh
089c4e413f [core] Split up and clean up conversion.hpp 2016-06-24 09:39:15 -07:00
John Firebaugh
699076c2fa [core] Remove TexturePool from style::UpdateParameters (#5442) 2016-06-22 12:32:06 -07:00
John Firebaugh
3459b83736 [core, node] Node bindings for setFilter 2016-06-21 18:24:49 -07:00
John Firebaugh
a18d6dda5d [core] Rewrite style parsing logic for reuse in node bindings 2016-06-21 15:38:13 -07:00
Thiago Marcos P. Santos
ddc6bc330f [tests] Add memory tests
Simple tests that will render a raster and a vector map and
hopefully the valgrind bot will detect something wrong if any.

The other test will look for application lifetime leaks that cannot
be detected with valgrind. It can also detect GL leaks if they are
very expressive.  A threshold is needed because of memory will grow
anyway due to fragmentation.
2016-06-21 19:12:32 +02:00
Thiago Marcos P. Santos
178e0e9da9 [tests] Add resources for rendering offline
The StupFileSource of the memory test will do the rendering
completely offline with a vector tile that is densly populated
with features and a raster tile of the same region.

The styles are streets and satellite respectivelly.
2016-06-21 18:58:48 +02:00
Thiago Marcos P. Santos
2be2340c30 [tests] Do not re-trigger answered requests
This happens on real file sources when tiles expire or in case
of error. Here we only retry on error.
2016-06-21 18:58:48 +02:00
John Firebaugh
2921127bdb [core] Avoid unnecessary work when a symbol annotation is updated
In particular, if only the geometry changes, don't cascade and recalculate the style.
2016-06-17 11:38:04 -07:00
John Firebaugh
11dd4afc5b [core] Bring optimized animated annotations to Android release branch
Part of #5385
2016-06-17 13:24:22 -04:00
John Firebaugh
900568cfb0 [core] Runtime source API: private impls 2016-06-16 13:27:15 -07:00
John Firebaugh
a0b2982119 [core] Prepare Filter and FilterEvaluator for extraction (#5366) 2016-06-15 14:55:45 -07:00
Young Hahn
199ea2a82a Support for icon-text-fit, icon-text-fit-padding (#5334)
* Add support for icon-text-fit

* Port unit tests for getIconQuads() from js => cpp

* Add support for padding in all 4 directions.

* Update all hashes post-merge
2016-06-15 17:13:31 -04:00
John Firebaugh
87edff4047 [core] Use variant<std::string, Tileset> in TileSource
A tile source can either specify a URL to TileJSON, or inline TileJSON.
2016-06-15 11:28:34 -07:00
Young Hahn
24b66bc8cd Color class (#5361)
* Color class

* Switch to list initialization
2016-06-15 11:38:22 -04:00