[core] Prepare changelog for maps-v1.3.0 (2020.02-release-vanillashake) release

.cmake-format

@@ -54,6 +54,18 @@ additional_commands = {
       "PUBLIC": "*"
     }
   },
+  "set_target_properties": {
+    "kwargs": {
+      "PROPERTIES": {
+        "kwargs": {
+          "INTERFACE_MAPBOX_NAME": "*",
+          "INTERFACE_MAPBOX_URL": "*",
+          "INTERFACE_MAPBOX_AUTHOR": "*",
+          "INTERFACE_MAPBOX_LICENSE": "*"
+        }
+      }
+    }
+  },
   "target_sources": {
     "kwargs": {
       "INTERFACE": "*",

.gitmodules

@@ -1,27 +1,18 @@
 [submodule "mapbox-gl-js"]
 	path = mapbox-gl-js
 	url = https://github.com/mapbox/mapbox-gl-js.git
-[submodule "platform/ios/vendor/mapbox-events-ios"]
-	path = platform/ios/vendor/mapbox-events-ios
-	url = https://github.com/mapbox/mapbox-events-ios.git
 [submodule "vendor/nunicode"]
 	path = vendor/nunicode
 	url = https://bitbucket.org/alekseyt/nunicode.git
 [submodule "vendor/earcut.hpp"]
 	path = vendor/earcut.hpp
 	url = https://github.com/mapbox/earcut.hpp.git
-[submodule "vendor/geojson-vt-cpp"]
-	path = vendor/geojson-vt-cpp
-	url = https://github.com/mapbox/geojson-vt-cpp.git
 [submodule "vendor/polylabel"]
 	path = vendor/polylabel
 	url = https://github.com/mapbox/polylabel.git
 [submodule "vendor/protozero"]
 	path = vendor/protozero
 	url = https://github.com/mapbox/protozero.git
-[submodule "vendor/shelf-pack-cpp"]
-	path = vendor/shelf-pack-cpp
-	url = https://github.com/mapbox/shelf-pack-cpp.git
 [submodule "vendor/vector-tile"]
 	path = vendor/vector-tile
 	url = https://github.com/mapbox/vector-tile.git
@@ -61,9 +52,6 @@
 [submodule "platform/android/vendor/mapbox-events-android"]
 	path = platform/android/vendor/mapbox-events-android
 	url = https://github.com/mapbox/mapbox-events-android.git
-[submodule "platform/darwin/docs/theme"]
-	path = platform/darwin/docs/theme
-	url = https://github.com/mapbox/jazzy-theme.git
 [submodule "vendor/mapbox-base"]
 	path = vendor/mapbox-base
 	url = https://github.com/mapbox/mapbox-base.git

CHANGELOG.md

@@ -2,12 +2,58 @@
 
 ## master
 
+## maps-v1.3.0 (2020.02-relvanillashake)
+
+### 🐞 Bug fixes
+
+- [core] Fix offline region download freezing ([#16230](https://github.com/mapbox/mapbox-gl-native/pull/16230))
+
+  Downloaded resources are put in the buffer and inserted in the database in batches.
+
+  Before this change, the buffer was flushed only at the network response callback and thus it never got flushed if the last required resources were present locally and did not initiate network requests - it caused freezing.
+
+  Now the buffer is flushed every time the remaining resources container gets empty.
+
+### ✨ New features
+
+- [core] Add Layer::serialize() method ([#16231](https://github.com/mapbox/mapbox-gl-native/pull/16231))
+
+  New method allows serialization of a layer into a Value type, including all modifications done via runtime style API. New method is also an enabler for Style object serialization (sources, layers, etc).
+
+- [android] Add jni binding for min and max pitch ([#16236](https://github.com/mapbox/mapbox-gl-native/pull/16236))
+
+- [offline] Offline tool does not hang on 404 error ([#16240](https://github.com/mapbox/mapbox-gl-native/pull/16240))
+
+  The missing resource gets skipped and teh offline region download continues.
+
+##### ⚠️  Breaking changes
+
+- Changes to `mbgl::FileSourceManager::getFileSource()` ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
+
+  It returns now `mbgl::PassRefPtr<FileSource>` (previously was `std::shared_ptr<FileSource>`) in order to enforce keeping the strong reference to the returned object.
+
+  Breaking code example:
+  `auto fs = FileSourceManager::getFileSource(); fs->..`
+
+  Posible fix:
+  `std::shared_ptr<FileSource> fs = `;
+
+- The `mbgl::OnlineFileSource` class cannot be used directly ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238))
+
+  Clients must use the parent `mbgl::FileSource` interface instead.
+
+  Breaking code example:
+  `std::shared_ptr<OnlineFileSource> onlineSource = std::static_pointer_cast<OnlineFileSource>(FileSourceManager::get()->getFileSource(..));`
+
+  Possible fix:
+  `std::shared_ptr<FileSource> onlineSource = FileSourceManager::get()->getFileSource(..);`
+
 ## maps-v1.2.1 (2020.02-release-vanillashake)
 
 ### 🐞 Bug fixes
 
 - [core] Revert shader changes from [#16189](https://github.com/mapbox/mapbox-gl-native/pull/16189), which will cause incorrect label positioning ([#16235](https://github.com/mapbox/mapbox-gl-native/pull/16235))
-  
+
   This is a back porting from GL JS [#9333](https://github.com/mapbox/mapbox-gl-js/pull/9333)
 
 - [ios] Restored support for iOS 9–11 by default ([#16241](https://github.com/mapbox/mapbox-gl-native/pull/16242))
@@ -42,6 +88,10 @@
 
   The `in expression` enables checking whether a Number/String/Boolean type item is in a String/Array and returns a boolean value.
 
+- [core] Add support for using `within expression` with features having `'LineString'` geometry type. ([#16220](https://github.com/mapbox/mapbox-gl-native/pull/16220))
+
+  `within expression` now supports features with geometry types: `'Point'` or `'LineString'`.
+
 ### 🐞 Bug fixes
 
 - [core] Don't provide multiple responses with the same data for 304 replies ([#16200](https://github.com/mapbox/mapbox-gl-native/pull/16200))

CMakeLists.txt

@@ -1,26 +1,6 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 project("Mapbox GL Native" LANGUAGES CXX C)
 
-find_program(CCACHE_PROGRAM ccache)
-if(CCACHE_PROGRAM AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    # Set up wrapper scripts
-    set(C_LAUNCHER "${CCACHE_PROGRAM}")
-    set(CXX_LAUNCHER "${CCACHE_PROGRAM}")
-    configure_file(${PROJECT_SOURCE_DIR}/scripts/ci/ccache-c.in ccache-c)
-    configure_file(${PROJECT_SOURCE_DIR}/scripts/ci/ccache-cxx.in ccache-cxx)
-    execute_process(
-        COMMAND
-            chmod
-            a+rx
-            "${CMAKE_BINARY_DIR}/ccache-c"
-            "${CMAKE_BINARY_DIR}/ccache-cxx"
-    )
-
-    # Set Xcode project attributes to route compilation and linking through our scripts
-    set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/ccache-c")
-    set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_BINARY_DIR}/ccache-cxx")
-endif()
-
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER Core)
 
@@ -266,6 +246,7 @@ add_library(
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/logging.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/noncopyable.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/optional.hpp
+    ${PROJECT_SOURCE_DIR}/include/mbgl/util/pass_types.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/platform.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/premultiply.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/projection.hpp
@@ -284,8 +265,6 @@ add_library(
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_request.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task_impl.hpp
-    ${PROJECT_SOURCE_DIR}/src/csscolorparser/csscolorparser.cpp
-    ${PROJECT_SOURCE_DIR}/src/csscolorparser/csscolorparser.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/actor/mailbox.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/actor/scheduler.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/algorithm/update_renderables.hpp
@@ -532,8 +511,6 @@ add_library(
     ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader_observer.hpp
-    ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader_worker.cpp
-    ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_loader_worker.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_parser.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/sprite/sprite_parser.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/storage/asset_file_source.hpp
@@ -765,6 +742,8 @@ add_library(
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp
+    ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.cpp
+    ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/hash.hpp
@@ -818,8 +797,6 @@ add_library(
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/version.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/version.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/work_request.cpp
-    ${PROJECT_SOURCE_DIR}/src/parsedate/parsedate.cpp
-    ${PROJECT_SOURCE_DIR}/src/parsedate/parsedate.hpp
 )
 
 if(MBGL_WITH_OPENGL)
@@ -952,18 +929,14 @@ target_include_directories(
     PUBLIC ${PROJECT_SOURCE_DIR}/include
 )
 
-if(NOT TARGET mapbox-base)
-    add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/mapbox-base/mapbox)
-    add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/mapbox-base/extras)
-endif()
-
 include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake)
+include(${PROJECT_SOURCE_DIR}/vendor/csscolorparser.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/eternal.cmake)
-include(${PROJECT_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
+include(${PROJECT_SOURCE_DIR}/vendor/mapbox-base.cmake)
+include(${PROJECT_SOURCE_DIR}/vendor/parsedate.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake)
-include(${PROJECT_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)
@@ -973,14 +946,16 @@ target_link_libraries(
     PRIVATE
         Mapbox::Base::Extras::kdbush.hpp
         Mapbox::Base::supercluster.hpp
+        Mapbox::Base::shelf-pack-cpp
+        Mapbox::Base::geojson-vt-cpp
         mbgl-compiler-options
         mbgl-vendor-boost
+        mbgl-vendor-csscolorparser
         mbgl-vendor-earcut.hpp
         mbgl-vendor-eternal
-        mbgl-vendor-geojson-vt-cpp
+        mbgl-vendor-parsedate
         mbgl-vendor-polylabel
         mbgl-vendor-protozero
-        mbgl-vendor-shelf-pack-cpp
         mbgl-vendor-unique_resource
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu
@@ -996,6 +971,17 @@ target_link_libraries(
         Mapbox::Base::weak
 )
 
+set_target_properties(
+    mbgl-core
+    PROPERTIES
+        INTERFACE_MAPBOX_NAME "Mapbox GL Native"
+        INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-gl-native"
+        INTERFACE_MAPBOX_AUTHOR "Mapbox"
+        INTERFACE_MAPBOX_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md
+)
+
+include(${PROJECT_SOURCE_DIR}/scripts/license.cmake)
+
 set_property(TARGET mbgl-core PROPERTY FOLDER Core)
 
 add_library(