diff --git a/.gitmodules b/.gitmodules index 594a71c2b..52ba48274 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,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 "maplibre-gl-js"] + path = maplibre-gl-js + url = https://github.com/maplibre/maplibre-gl-js.git diff --git a/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp index 9edc3b986..ebd6fa94c 100644 --- a/expression-test/expression_test_parser.cpp +++ b/expression-test/expression_test_parser.cpp @@ -338,7 +338,7 @@ std::tuple, bool, uint32_t> pars exit(2); } - filesystem::path rootPath {std::string(TEST_RUNNER_ROOT_PATH).append("/mapbox-gl-js/test/integration/expression-tests")}; + filesystem::path rootPath {std::string(TEST_RUNNER_ROOT_PATH).append("/maplibre-gl-js/test/integration/expression-tests")}; if (!filesystem::exists(rootPath)) { Log::Error(Event::General, "Test path '%s' does not exist.", rootPath.string().c_str()); exit(3); diff --git a/maplibre-gl-js b/maplibre-gl-js new file mode 160000 index 000000000..fe03b706f --- /dev/null +++ b/maplibre-gl-js @@ -0,0 +1 @@ +Subproject commit fe03b706ff6fbda2ff4796bbf581aa667c6fbc7d diff --git a/metrics/FIXME-linux-asan-style.json b/metrics/FIXME-linux-asan-style.json index 7c99b2784..09eafcc96 100644 --- a/metrics/FIXME-linux-asan-style.json +++ b/metrics/FIXME-linux-asan-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/android-render-test-runner-style.json b/metrics/android-render-test-runner-style.json index efc42d732..9754c1662 100644 --- a/metrics/android-render-test-runner-style.json +++ b/metrics/android-render-test-runner-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all", diff --git a/metrics/linux-clang8-release-style.json b/metrics/linux-clang8-release-style.json index 93f530b68..8e3c90f47 100644 --- a/metrics/linux-clang8-release-style.json +++ b/metrics/linux-clang8-release-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/linux-gcc8-debug-coverage-style.json b/metrics/linux-gcc8-debug-coverage-style.json index 7c99b2784..09eafcc96 100644 --- a/metrics/linux-gcc8-debug-coverage-style.json +++ b/metrics/linux-gcc8-debug-coverage-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/linux-gcc8-release-style.json b/metrics/linux-gcc8-release-style.json index 1ee499069..accfaf300 100644 --- a/metrics/linux-gcc8-release-style.json +++ b/metrics/linux-gcc8-release-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/linux-tsan-style.json b/metrics/linux-tsan-style.json index 7c99b2784..09eafcc96 100644 --- a/metrics/linux-tsan-style.json +++ b/metrics/linux-tsan-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/linux-ubsan-style.json b/metrics/linux-ubsan-style.json index 7c99b2784..09eafcc96 100644 --- a/metrics/linux-ubsan-style.json +++ b/metrics/linux-ubsan-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/macos-xcode11-debug-style.json b/metrics/macos-xcode11-debug-style.json index 083f78450..40f339dc9 100644 --- a/metrics/macos-xcode11-debug-style.json +++ b/metrics/macos-xcode11-debug-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/metrics/macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json index 9d709dc95..ffeb381ce 100644 --- a/metrics/macos-xcode11-release-style.json +++ b/metrics/macos-xcode11-release-style.json @@ -1,5 +1,5 @@ { - "base_test_path": "../mapbox-gl-js/test/integration", + "base_test_path": "../maplibre-gl-js/test/integration", "cache_path": "cache-style.db", "expectation_paths": [ "expectations/platform-all" diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index cd977856f..365a63d9b 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,6 +2,14 @@ Mapbox welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) to get started. +## master + +### Features + +### Other + +* mapbox-gl-js submodule has been replaced with maplibre-gl-js + ## 9.3.0 - January 6, 2021 ### Features - Added the mbtiles file source for rendering vector tiles from file stored locally on the device. diff --git a/platform/android/Makefile b/platform/android/Makefile index 4016b47e8..82906709c 100644 --- a/platform/android/Makefile +++ b/platform/android/Makefile @@ -91,13 +91,13 @@ android-core-test-$1: android-test-lib-$1 run-android-core-test-$1-%: android-core-test-$1 # Ensure clean state on the device - adb shell "rm -Rf $(MBGL_ANDROID_LOCAL_WORK_DIR) && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/test && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference" + adb shell "rm -Rf $(MBGL_ANDROID_LOCAL_WORK_DIR) && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/test && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/maplibre-gl-js/src/style-spec/reference" # Push all needed files to the device adb push $(MBGL_ANDROID_CORE_TEST_DIR)/classes.dex $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 adb push test/fixtures $(MBGL_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 - adb push mapbox-gl-js/src/style-spec/reference/v8.json $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference > /dev/null 2>&1 + adb push maplibre-gl-js/src/style-spec/reference/v8.json $(MBGL_ANDROID_LOCAL_WORK_DIR)/maplibre-gl-js/src/style-spec/reference > /dev/null 2>&1 adb push MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 # Create gtest filter for skipped tests. @@ -176,7 +176,7 @@ run-android-render-test-$1: $(BUILD_DEPS) gradle/configuration.gradle rm -rf build/render-test/mapbox/ # copy test definitions & ignore file to test app assets folder, clear old ones first rm -rf MapboxGLAndroidSDKTestApp/src/main/assets/integration - cp -r mapbox-gl-js/test/integration MapboxGLAndroidSDKTestApp/src/main/assets + cp -r maplibre-gl-js/test/integration MapboxGLAndroidSDKTestApp/src/main/assets cp platform/node/test/ignores.json MapboxGLAndroidSDKTestApp/src/main/assets/integration/ignores.json # run RenderTest.java to generate static map images $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="com.mapbox.mapboxsdk.testapp.render.RenderTest" diff --git a/platform/android/scripts/run-render-test.py b/platform/android/scripts/run-render-test.py index 408571589..afc041ca9 100644 --- a/platform/android/scripts/run-render-test.py +++ b/platform/android/scripts/run-render-test.py @@ -9,7 +9,7 @@ testCounter = 0 for cat in os.listdir(catPath): testPath = catPath + cat + "/" for test in os.listdir(testPath): - inputPath = os.getcwd() + "../../../mapbox-gl-js/test/integration/render-tests/" + cat + "/" + test + inputPath = os.getcwd() + "../../../maplibre-gl-js/test/integration/render-tests/" + cat + "/" + test outputPath = testPath + test expected = outputPath + "/expected.png" diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 2eb98b113..7233d64ac 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -415,7 +415,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, auto &style = view->map->getStyle(); if (!style.getSource("states")) { - std::string url = "https://docs.mapbox.com/mapbox-gl-js/assets/us_states.geojson"; + std::string url = "https://docs.mapbox.com/maplibre-gl-js/assets/us_states.geojson"; auto source = std::make_unique("states"); source->setURL(url); style.addSource(std::move(source)); diff --git a/platform/ios/.npmignore b/platform/ios/.npmignore index d2490da83..ca7143595 100644 --- a/platform/ios/.npmignore +++ b/platform/ios/.npmignore @@ -14,6 +14,7 @@ vendor include mason_packages mapbox-gl-js +maplibre-gl-js test lib next diff --git a/platform/ios/ios-test-runners.cmake b/platform/ios/ios-test-runners.cmake index d407f615d..09f76a078 100644 --- a/platform/ios/ios-test-runners.cmake +++ b/platform/ios/ios-test-runners.cmake @@ -91,8 +91,8 @@ if(MBGL_IOS_UNIT_TEST) execute_process(COMMAND ditto ${PROJECT_SOURCE_DIR}/test/fixtures ${CMAKE_CURRENT_BINARY_DIR}/test-data/test/fixtures) execute_process( COMMAND - ditto ${PROJECT_SOURCE_DIR}/mapbox-gl-js/src/style-spec/reference - ${CMAKE_CURRENT_BINARY_DIR}/test-data/mapbox-gl-js/src/style-spec/reference + ditto ${PROJECT_SOURCE_DIR}/maplibre-gl-js/src/style-spec/reference + ${CMAKE_CURRENT_BINARY_DIR}/test-data/maplibre-gl-js/src/style-spec/reference ) set(RESOURCES ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Main.storyboard diff --git a/platform/ios/platform/ios/CHANGELOG.md b/platform/ios/platform/ios/CHANGELOG.md index c3484e68e..e0f535877 100644 --- a/platform/ios/platform/ios/CHANGELOG.md +++ b/platform/ios/platform/ios/CHANGELOG.md @@ -2,6 +2,13 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. +## master + +### Features + +### Other + +* mapbox-gl-js submodule has been replaced with maplibre-gl-js ## 5.10.0 - January 6, 2021 diff --git a/platform/ios/platform/macos/CHANGELOG.md b/platform/ios/platform/macos/CHANGELOG.md index 5d2cd6b23..2b22ae005 100644 --- a/platform/ios/platform/macos/CHANGELOG.md +++ b/platform/ios/platform/macos/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog for Mapbox Maps SDK for macOS +## master + +### Features + +### Other + +* mapbox-gl-js submodule has been replaced with maplibre-gl-js + ## 0.17.0 - January 6, 2021 ### Features diff --git a/platform/ios/scripts/generate-shaders.js b/platform/ios/scripts/generate-shaders.js index cb0c945f3..75105af42 100755 --- a/platform/ios/scripts/generate-shaders.js +++ b/platform/ios/scripts/generate-shaders.js @@ -7,7 +7,7 @@ const outputPath = 'src/mbgl/programs'; const zlib = require('zlib'); const crypto = require('crypto'); -var shaders = require('../mapbox-gl-js/src/shaders'); +var shaders = require('../maplibre-gl-js/src/shaders'); require('./style-code'); diff --git a/platform/ios/scripts/nitpick/submodule-pin.js b/platform/ios/scripts/nitpick/submodule-pin.js index 7ca129e09..b8bf4fb88 100755 --- a/platform/ios/scripts/nitpick/submodule-pin.js +++ b/platform/ios/scripts/nitpick/submodule-pin.js @@ -2,12 +2,12 @@ const nitpick = require('.'); const child_process = require('child_process'); -// Make sure that the mapbox-gl-js submodule pin is up to date -const head = child_process.execSync('git -C mapbox-gl-js rev-parse HEAD').toString().trim(); -const revs = child_process.execSync(`git -C mapbox-gl-js branch -a --contains ${head}`).toString().split('\n'); +// Make sure that the maplibre-gl-js submodule pin is up to date +const head = child_process.execSync('git -C maplibre-gl-js rev-parse HEAD').toString().trim(); +const revs = child_process.execSync(`git -C maplibre-gl-js branch -a --contains ${head}`).toString().split('\n'); if (revs.indexOf(' remotes/origin/master') >= 0) { - nitpick.ok(`mapbox-gl-js submodule pin is merged to master`); + nitpick.ok(`maplibre-gl-js submodule pin is merged to master`); } else { - nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to master`); + nitpick.fail(`maplibre-gl-js submodule is pinned to ${head}, which isn't merged to master`); } diff --git a/platform/ios/scripts/style-spec.js b/platform/ios/scripts/style-spec.js index 0038e7302..499340e5f 100644 --- a/platform/ios/scripts/style-spec.js +++ b/platform/ios/scripts/style-spec.js @@ -1 +1 @@ -module.exports = require('../../../mapbox-gl-js/src/style-spec/reference/v8'); +module.exports = require('../../../maplibre-gl-js/src/style-spec/reference/v8'); diff --git a/platform/node/test/expression.test.js b/platform/node/test/expression.test.js index b5f39cb4e..531d2a6ad 100644 --- a/platform/node/test/expression.test.js +++ b/platform/node/test/expression.test.js @@ -1,4 +1,4 @@ -const {run} = require('../../../mapbox-gl-js/test/integration/lib/expression'); +const {run} = require('../../../maplibre-gl-js/test/integration/lib/expression'); const mbgl = require('../index'); const ignores = require('./ignores.json'); diff --git a/platform/node/test/query.test.js b/platform/node/test/query.test.js index 3dfce4474..982e0274d 100644 --- a/platform/node/test/query.test.js +++ b/platform/node/test/query.test.js @@ -1,4 +1,4 @@ -import {run} from '../../../mapbox-gl-js/test/integration/lib/query'; +import {run} from '../../../maplibre-gl-js/test/integration/lib/query'; import implementation from './suite_implementation'; import ignores from './ignores.json'; diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js index 950f8eb7a..aeec0e876 100644 --- a/platform/node/test/render.test.js +++ b/platform/node/test/render.test.js @@ -1,4 +1,4 @@ -import {run} from '../../../mapbox-gl-js/test/integration/lib/render'; +import {run} from '../../../maplibre-gl-js/test/integration/lib/render'; import implementation from './suite_implementation'; import ignores from './ignores.json'; diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js index 386bd4109..dd713dd49 100644 --- a/platform/node/test/suite_implementation.js +++ b/platform/node/test/suite_implementation.js @@ -104,7 +104,7 @@ export default function (style, options, callback) { applyOperations(operations.slice(1), callback); }, operation[1]); } else if (operation[0] === 'addImage' || operation[0] === 'updateImage') { - const img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../mapbox-gl-js/test/integration', operation[2]))); + const img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../maplibre-gl-js/test/integration', operation[2]))); const testOpts = (operation.length > 3) ? operation[3] : {}; const options = { diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt index 29b6315cc..b2cf8df31 100644 --- a/render-test/android/app/src/main/assets/to_zip.txt +++ b/render-test/android/app/src/main/assets/to_zip.txt @@ -1,5 +1,5 @@ -mapbox-gl-js/test/integration/render-tests/ -mapbox-gl-js/test/integration/query-tests/ +maplibre-gl-js/test/integration/render-tests/ +maplibre-gl-js/test/integration/query-tests/ metrics/expectations/ metrics/ignores/ metrics/tests/ diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh index 6e4377991..48cb76105 100755 --- a/render-test/ios/setup_test_data.sh +++ b/render-test/ios/setup_test_data.sh @@ -12,8 +12,8 @@ rm -rf $BASE_DIR/test-data/ mkdir -p $BASE_DIR/test-data/integration/ mkdir -p $BASE_DIR/test-data/baselines/ -cp -r mapbox-gl-js/test/integration/render-tests $BASE_DIR/test-data/integration/ -cp -r mapbox-gl-js/test/integration/query-tests $BASE_DIR/test-data/integration/ +cp -r maplibre-gl-js/test/integration/render-tests $BASE_DIR/test-data/integration/ +cp -r maplibre-gl-js/test/integration/query-tests $BASE_DIR/test-data/integration/ cp -r metrics/expectations $BASE_DIR/test-data/ cp -r metrics/ignores $BASE_DIR/test-data/ cp -r metrics/tests $BASE_DIR/test-data/ diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index 0461bd745..6212fcd13 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -7,7 +7,7 @@ const outputPath = 'src/mbgl/programs'; const zlib = require('zlib'); const crypto = require('crypto'); -var shaders = require('../mapbox-gl-js/src/shaders'); +var shaders = require('../maplibre-gl-js/src/shaders'); require('./style-code'); diff --git a/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js index 7ca129e09..b8bf4fb88 100755 --- a/scripts/nitpick/submodule-pin.js +++ b/scripts/nitpick/submodule-pin.js @@ -2,12 +2,12 @@ const nitpick = require('.'); const child_process = require('child_process'); -// Make sure that the mapbox-gl-js submodule pin is up to date -const head = child_process.execSync('git -C mapbox-gl-js rev-parse HEAD').toString().trim(); -const revs = child_process.execSync(`git -C mapbox-gl-js branch -a --contains ${head}`).toString().split('\n'); +// Make sure that the maplibre-gl-js submodule pin is up to date +const head = child_process.execSync('git -C maplibre-gl-js rev-parse HEAD').toString().trim(); +const revs = child_process.execSync(`git -C maplibre-gl-js branch -a --contains ${head}`).toString().split('\n'); if (revs.indexOf(' remotes/origin/master') >= 0) { - nitpick.ok(`mapbox-gl-js submodule pin is merged to master`); + nitpick.ok(`maplibre-gl-js submodule pin is merged to master`); } else { - nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to master`); + nitpick.fail(`maplibre-gl-js submodule is pinned to ${head}, which isn't merged to master`); } diff --git a/scripts/style-spec.js b/scripts/style-spec.js index fc16849de..909412b1d 100644 --- a/scripts/style-spec.js +++ b/scripts/style-spec.js @@ -1,4 +1,4 @@ -const referenceSpec = require('../mapbox-gl-js/src/style-spec/reference/v8'); +const referenceSpec = require('../maplibre-gl-js/src/style-spec/reference/v8'); referenceSpec.layer.type.values["location-indicator"] = {}; referenceSpec["layout_location-indicator"] = { diff --git a/test/android/app/src/main/assets/to_zip.txt b/test/android/app/src/main/assets/to_zip.txt index 14725b708..3a2a6f35f 100644 --- a/test/android/app/src/main/assets/to_zip.txt +++ b/test/android/app/src/main/assets/to_zip.txt @@ -1,3 +1,3 @@ test/results/ test/fixtures/ -mapbox-gl-js/src/style-spec/reference/ +maplibre-gl-js/src/style-spec/reference/ diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp index f14099d2f..de2e2ae6d 100644 --- a/test/map/transform.test.cpp +++ b/test/map/transform.test.cpp @@ -110,7 +110,7 @@ TEST(Transform, PerspectiveProjection) { // 0.9 rad ~ 51.56620156 deg transform.jumpTo(CameraOptions().withCenter(LatLng { 38.0, -77.0 }).withZoom(10.0).withPitch(51.56620156)); - // expected values are from mapbox-gl-js + // expected values are from maplibre-gl-js loc = transform.getLatLng(); ASSERT_DOUBLE_EQ(-77, loc.longitude()); diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp index 07f6cf173..1e194a85a 100644 --- a/test/style/expression/expression.test.cpp +++ b/test/style/expression/expression.test.cpp @@ -17,7 +17,7 @@ using namespace mbgl::style; TEST(Expression, IsExpression) { rapidjson::GenericDocument, rapidjson::CrtAllocator> spec; - spec.Parse<0>(util::read_file("mapbox-gl-js/src/style-spec/reference/v8.json").c_str()); + spec.Parse<0>(util::read_file("maplibre-gl-js/src/style-spec/reference/v8.json").c_str()); ASSERT_FALSE(spec.HasParseError()); ASSERT_TRUE(spec.IsObject() && spec.HasMember("expression_name") &&