diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9d3b7328c..cd7d8561a 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - name: "🙏 Q&A - GitHub Discussions" - url: https://github.com/maplibre/maplibre-gl-native/discussions/categories/q-a + url: https://github.com/maplibre/maplibre-native/discussions/categories/q-a about: If you have a question about using MapLibre Native - name: "💬 Chat with us on Slack" url: https://slack.openstreetmap.us/ diff --git a/CHANGELOG.md b/CHANGELOG.md index bdb02f582..d8bd7062a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,15 +5,15 @@ ### ✨ New features - *...Add new stuff here...* -- [windows] Added windows build support for core applications and node [#707](https://github.com/maplibre/maplibre-gl-native/pull/707) -- [core] Add `ClientOptions` to configure client information [#365](https://github.com/maplibre/maplibre-gl-native/pull/365). -- [node] Add workflow to create node binary releases for Ubuntu 20.04 x64 and MacOS 12 x64/arm64 [#378](https://github.com/maplibre/maplibre-gl-native/pull/378), [#459](https://github.com/maplibre/maplibre-gl-native/pull/459). +- [windows] Added windows build support for core applications and node [#707](https://github.com/maplibre/maplibre-native/pull/707) +- [core] Add `ClientOptions` to configure client information [#365](https://github.com/maplibre/maplibre-native/pull/365). +- [node] Add workflow to create node binary releases for Ubuntu 20.04 x64 and MacOS 12 x64/arm64 [#378](https://github.com/maplibre/maplibre-native/pull/378), [#459](https://github.com/maplibre/maplibre-native/pull/459). ### ✨ Technical Improvements - *...Add new stuff here...* -- Bump [maplibre-native-base](https://github.com/maplibre/maplibre-native-base) from 2.0.0 to 2.1.1 ([#397](https://github.com/maplibre/maplibre-gl-native/pull/397), [#406](https://github.com/maplibre/maplibre-gl-native/pull/406)) -- Bump [wagyu](https://github.com/mapbox/wagyu) from 0.4.3 to 0.5.0 [#398](https://github.com/maplibre/maplibre-gl-native/pull/398) +- Bump [maplibre-native-base](https://github.com/maplibre/maplibre-native-base) from 2.0.0 to 2.1.1 ([#397](https://github.com/maplibre/maplibre-native/pull/397), [#406](https://github.com/maplibre/maplibre-native/pull/406)) +- Bump [wagyu](https://github.com/mapbox/wagyu) from 0.4.3 to 0.5.0 [#398](https://github.com/maplibre/maplibre-native/pull/398) - Bump [eternal](https://github.com/mapbox/eternal.git) from 1.0.0 to 1.0.1 - Bump [protozero](https://github.com/mapbox/protozero.git) from 1.7.0 to 1.7.1 - Bump [vector-tile](https://github.com/mapbox/vector-tile.git) from 1.0.3 to 1.0.4 @@ -25,9 +25,9 @@ ### 🐞 Bug fixes - *...Add new stuff here...* -- [core] Fix memory access violation exception in vector_tile_data.cpp [#632](https://github.com/maplibre/maplibre-gl-native/pull/632) -- [iOS] Fix a bug where the compass was determined to be misplaced when hidden [#498](https://github.com/maplibre/maplibre-gl-native/pull/498). -- [core] `MaptilerFileSource` renamed to `MBTilesFileSource` [#198](https://github.com/maplibre/maplibre-gl-native/pull/198). +- [core] Fix memory access violation exception in vector_tile_data.cpp [#632](https://github.com/maplibre/maplibre-native/pull/632) +- [iOS] Fix a bug where the compass was determined to be misplaced when hidden [#498](https://github.com/maplibre/maplibre-native/pull/498). +- [core] `MaptilerFileSource` renamed to `MBTilesFileSource` [#198](https://github.com/maplibre/maplibre-native/pull/198). ## maps-v1.6.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8577ff5d..efe31aaa6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,13 +2,13 @@ ## Documentation -- For a high-level overview of MapLibre Native, check out the [MapLibre Native Markdown Book](https://maplibre.org/maplibre-gl-native/docs/book/). +- For a high-level overview of MapLibre Native, check out the [MapLibre Native Markdown Book](https://maplibre.org/maplibre-native/docs/book/). - See [`DEVELOPING.md`](DEVELOPING.md) for getting started with development. ## Source code checkout ```bash -git clone --recurse-submodules https://github.com/maplibre/maplibre-gl-native.git +git clone --recurse-submodules https://github.com/maplibre/maplibre-native.git ``` ## Building @@ -31,7 +31,7 @@ If you want to contribute code: 1. Please familiarize yourself with the installation process of your chosen platform. -1. Ensure that existing [pull requests](https://github.com/maplibre/maplibre-gl-native/pulls) and [issues](https://github.com/maplibre/maplibre-gl-native/issues) don’t already cover your contribution or question. +1. Ensure that existing [pull requests](https://github.com/maplibre/maplibre-native/pulls) and [issues](https://github.com/maplibre/maplibre-native/issues) don’t already cover your contribution or question. 1. Pull requests are gladly accepted. If there are any changes that developers using one of the GL SDKs should be aware of, please update the **main** section of the relevant `CHANGELOG.md`. diff --git a/FORK.md b/FORK.md index eff176044..7eae33e24 100644 --- a/FORK.md +++ b/FORK.md @@ -16,4 +16,4 @@ Beside merging in platform specific SDKs, the following changes were made compar We'd like to acknowledge the amazing work Mapbox has contributed to open source. The open source community is sad to part ways with them, but we simultaneously feel grateful for everything they already contributed. We're proud to develop on the shoulders of giants, thank you Mapbox 🙇🏽‍♀️. -Please keep in mind: Unauthorized backports are the biggest threat to the MapLibre project. It is unacceptable to backport code from any Mapbox project with a non-free license. If you are unsure about this issue, [please ask](https://github.com/maplibre/maplibre-gl-native/discussions)! +Please keep in mind: Unauthorized backports are the biggest threat to the MapLibre project. It is unacceptable to backport code from any Mapbox project with a non-free license. If you are unsure about this issue, [please ask](https://github.com/maplibre/maplibre-native/discussions)! diff --git a/README.md b/README.md index 40989db2b..484c9f420 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To get started with MapLibre Native, go to your platform below. ## Documentation -The documentation of MapLibre Native is a work in progress. To get an architectural overview and to learn about the current state of the project and its path forward read the [MapLibre Native Markdown Book](https://maplibre.org/maplibre-gl-native/docs/book/). See below for platform-specific documentation. +The documentation of MapLibre Native is a work in progress. To get an architectural overview and to learn about the current state of the project and its path forward read the [MapLibre Native Markdown Book](https://maplibre.org/maplibre-native/docs/book/). See below for platform-specific documentation. ## Platforms diff --git a/design-proposals/2022-10-27-rendering-modularization.md b/design-proposals/2022-10-27-rendering-modularization.md index 20867ec0c..08b1bdf6b 100644 --- a/design-proposals/2022-10-27-rendering-modularization.md +++ b/design-proposals/2022-10-27-rendering-modularization.md @@ -53,7 +53,7 @@ It is useful to split our goals into three sections to articulate what this prop 1. Developers should be able to continue using the OpenGL renderer with this refactor. 2. The resulting binary from the modularized refactor should not increase more than 5% when compiled. 3. The modularization refactor should be visually identical to the current implementation when using OpenGL. All existing render tests should pass, and developers that continue to use this library with an OpenGL renderer should not experience any visual degradation such as artifacts. -4. After refactor, the startup time for applications built with this library should not increase. This will be measured by the startup time of [this](https://github.com/maplibre/maplibre-gl-native/blob/main/platform/ios/platform/ios/iosapp%20UITests/iosapp_UITests.swift) iOS test app. +4. After refactor, the startup time for applications built with this library should not increase. This will be measured by the startup time of [this](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/platform/ios/iosapp%20UITests/iosapp_UITests.swift) iOS test app. 5. When implemented with a given style and set of tilesets, the compiled library should not decrease the rendering frame rate. 6. This refactor will not introduce data loading or other bottlenecks that will negatively impact rendering performance. 7. Developers currently using this library will not see any breaking API changes, and will be able to seamlessly upgrade versions. @@ -75,7 +75,7 @@ The shaders need a representation visible outside the toolkit and we need to cha Individual shaders are represented by an object class with massive amounts of template logic and a minimum of in-line comments. They’re opaque from the outside and only controllable through vector tile data and styles. -The [render_raster_layer](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/layers/render_raster_layer.cpp), as an example, asks for the instantiation of (eventually) RasterProgram. Rather than having the source for the program, that then pokes into a compressed chunk of memory that contains the source, which is then uncompressed and fed into OpenGL for compilation. +The [render_raster_layer](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/layers/render_raster_layer.cpp), as an example, asks for the instantiation of (eventually) RasterProgram. Rather than having the source for the program, that then pokes into a compressed chunk of memory that contains the source, which is then uncompressed and fed into OpenGL for compilation. All of this makes sense in context, but is completely inaccessible outside the toolkit and rather incomprehensible when making changes. @@ -134,9 +134,9 @@ Modern graphics pipelines use more than one pass to create a visual representati Without getting too deep into specifics, early rendering passes allow the developer to use the power of the rasterizer for their own data. Later rendering passes are typically used to decorate the map with effects. #### The way it is now: -The [low level rendering logic](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/renderer_impl.cpp) in the toolkit seems to only support one explicit rendering pass. +The [low level rendering logic](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/renderer_impl.cpp) in the toolkit seems to only support one explicit rendering pass. -However, there is the [RenderPass](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/gl/render_pass.hpp) so some notion of this exists in the toolkit, but it's not clear how complete that is. It may depend on ordering to work things out, rather than the explicit command buffer filling and fences we would use in a more modern approach. +However, there is the [RenderPass](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/gl/render_pass.hpp) so some notion of this exists in the toolkit, but it's not clear how complete that is. It may depend on ordering to work things out, rather than the explicit command buffer filling and fences we would use in a more modern approach. In any case, we need this filled out more explicitly for the render targets. @@ -205,7 +205,7 @@ In WhirlyGlobe we’ve always called out separate objects for drawing certain ki Which is to say that Drawable is a good concept which can encapsulate a lot of complexity. So much so that it eventually encapsulates ALL the complexity, at least at that level of rendering. It’s a good interface between the things that construct geometry and the things that render geometry. -To keep the Drawable somewhat manageable, we added the concept of a Drawable Builder. This is an object that you throw geometry at in a somewhat disordered way and it emits Drawables when you’re done. MapLibre's [Buckets](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/bucket.hpp) are similar, but not quite the same. Perhaps they'll be adaptable. We'll see. +To keep the Drawable somewhat manageable, we added the concept of a Drawable Builder. This is an object that you throw geometry at in a somewhat disordered way and it emits Drawables when you’re done. MapLibre's [Buckets](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/bucket.hpp) are similar, but not quite the same. Perhaps they'll be adaptable. We'll see. Drawables and Builders have a subclass for each supported rendering SDK. One mistake we won’t bring over is using multiple inheritance for that. You’re welcome. @@ -221,7 +221,7 @@ Builders will be used primarily by Layers to emit Drawables for rendering. This is a big topic because it gets to the very heart of the critical changes we want to make to the toolkit. There are a couple of different categories that are revealing and we'll use some examples. -Most commonly there are *render layers*. These are individual classes that know how to render, for instance, the [fill layer](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/layers/render_fill_layer.cpp). You'll see a bunch of these that start with "render" and end with "layer". +Most commonly there are *render layers*. These are individual classes that know how to render, for instance, the [fill layer](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/layers/render_fill_layer.cpp). You'll see a bunch of these that start with "render" and end with "layer". What's going on here is that the toolkit has broken out a bunch of features from a tile, consolidated them together in a Bucket and then handed them off to a Layer to render. Sure enough, if you look in the render_*_layer you can see it doing just that. @@ -230,7 +230,7 @@ Now it's not redoing the work of consolidation each frame, but it is doing a lot - This is more specific logic than we'd want to see in a rendering loop. Remember, this runs every frame. - If your data is not in tile form, it's going to be hard to render. -That last one is really interesting and we can find an example in MapLibre Native itself. Look to the [Render Location Indicator Layer](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/layers/render_location_indicator_layer.cpp). Here's where this approach trips up... rolls down the hill... into a pile of broken glass. You can feel the developers' pain in this module. +That last one is really interesting and we can find an example in MapLibre Native itself. Look to the [Render Location Indicator Layer](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/layers/render_location_indicator_layer.cpp). Here's where this approach trips up... rolls down the hill... into a pile of broken glass. You can feel the developers' pain in this module. If you're not familiar with real time rendering toolkits, I'll put it this way. Managing the logic for a location puck that updates every time the user moves should not involve direct OpenGL calls. It should be abstracted, at least a little. @@ -319,7 +319,7 @@ Every real time rendering toolkit has a main rendering loop or something like it On iOS this runs on the main thread and on Android this runs on its own separate thread. You might think the latter is better, but it has its own problems (gesture lag). In any case, MapLibre Native handles both just fine. -The toolkit's main rendering "loop" lives in [renderer_impl](https://github.com/maplibre/maplibre-gl-native/blob/main/src/mbgl/renderer/renderer_impl.cpp) and it's worth a look. It serves as a central point to begin examining the real time rendering. +The toolkit's main rendering "loop" lives in [renderer_impl](https://github.com/maplibre/maplibre-native/blob/main/src/mbgl/renderer/renderer_impl.cpp) and it's worth a look. It serves as a central point to begin examining the real time rendering. As you might suspect, the rendering loop logic and implementation are heavily influenced by OpenGL. diff --git a/metrics/ignores/platform-linux.json b/metrics/ignores/platform-linux.json index de5bf88d9..613d87c6c 100644 --- a/metrics/ignores/platform-linux.json +++ b/metrics/ignores/platform-linux.json @@ -1,5 +1,5 @@ { - "render-tests/icon-text-fit/enlargen-both": "Not working for unknown reason: https://github.com/maplibre/maplibre-gl-native/issues/355", + "render-tests/icon-text-fit/enlargen-both": "Not working for unknown reason: https://github.com/maplibre/maplibre-native/issues/355", "render-tests/fill-opacity/zoom-and-property-function-pattern": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/15322", "render-tests/fill-pattern/literal": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14423", "render-tests/fill-pattern/opacity": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14870", diff --git a/metrics/ignores/platform-macos.json b/metrics/ignores/platform-macos.json index 8c1bd921e..4dd90d8bd 100644 --- a/metrics/ignores/platform-macos.json +++ b/metrics/ignores/platform-macos.json @@ -1,5 +1,5 @@ { - "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "Failing on GitHub runner for unknown reason https://github.com/maplibre/maplibre-gl-native/issues/377", + "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "Failing on GitHub runner for unknown reason https://github.com/maplibre/maplibre-native/issues/377", "render-tests/regressions/mapbox-gl-js#5642": "Failing with mbgl-render-test", "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test" } diff --git a/package.json b/package.json index 096ff723b..98ff07941 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "types": "platform/node/index.d.ts", "repository": { "type": "git", - "url": "git+https://github.com/maplibre/maplibre-gl-native.git" + "url": "git+https://github.com/maplibre/maplibre-native.git" }, "license": "BSD-2-Clause", "dependencies": { @@ -69,7 +69,7 @@ "binary": { "module_name": "mbgl", "module_path": "./lib/{node_abi}", - "host": "https://github.com/maplibre/maplibre-gl-native/releases/download/", + "host": "https://github.com/maplibre/maplibre-native/releases/download/", "remote_path": "node-v{version}", "package_name": "{node_abi}-{platform}-{arch}-{configuration}.tar.gz" } diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 36ba53ead..c84fb54d3 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -1,16 +1,16 @@ # Changelog for the MapLibre Maps SDK for Android -MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-gl-native/blob/main/CONTRIBUTING.md) to get started. +MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-native/blob/main/CONTRIBUTING.md) to get started. ## main ### ✨ Features and improvements -* Change to a more natural fling animation and allow setting `flingThreshold` and `flingAnimationBaseTime` in `UiSettings` ([#963](https://github.com/maplibre/maplibre-gl-native/pull/963)) +* Change to a more natural fling animation and allow setting `flingThreshold` and `flingAnimationBaseTime` in `UiSettings` ([#963](https://github.com/maplibre/maplibre-native/pull/963)) ### 🐞 Bug fixes -* Fix regression in CameraUpdateFactory#zoomOut ([#1035](https://github.com/maplibre/maplibre-gl-native/pull/1035)) +* Fix regression in CameraUpdateFactory#zoomOut ([#1035](https://github.com/maplibre/maplibre-native/pull/1035)) ### ⛵ Dependencies @@ -18,20 +18,20 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ### 🐞 Bug fixes -* `MapboxFusedLocationEngineImpl` constructor made public to create custom `LocationEngineProvider`([#850](https://github.com/maplibre/maplibre-gl-native/pull/850)) +* `MapboxFusedLocationEngineImpl` constructor made public to create custom `LocationEngineProvider`([#850](https://github.com/maplibre/maplibre-native/pull/850)) ## 10.0.1 - February 22, 2023 ### 🐞 Bug fixes -* Fixed regression with `RasterSource` native code throwing an exception expecting bound after switching to `FloatArray` ([#830](https://github.com/maplibre/maplibre-gl-native/pull/830)). -* `LocationEngineProxy` was made public so that the migration path suggested in the 10.0.0 changelog for those wanting to use GMS Location Services can actually be implemented ([#832](https://github.com/maplibre/maplibre-gl-native/pull/830)). +* Fixed regression with `RasterSource` native code throwing an exception expecting bound after switching to `FloatArray` ([#830](https://github.com/maplibre/maplibre-native/pull/830)). +* `LocationEngineProxy` was made public so that the migration path suggested in the 10.0.0 changelog for those wanting to use GMS Location Services can actually be implemented ([#832](https://github.com/maplibre/maplibre-native/pull/830)). ## 10.0.0 - February 15, 2023 ### ✨ Features and improvements -* 💥 Breaking: Changed resourcePrefix to `maplibre_` from `mapbox_` ([#647](https://github.com/maplibre/maplibre-gl-native/pull/647)) and renamed resources accordingly. Note that this is a breaking change since the names of public resources were renamed as well. Replaced Mapbox logo with MapLibre logo. +* 💥 Breaking: Changed resourcePrefix to `maplibre_` from `mapbox_` ([#647](https://github.com/maplibre/maplibre-native/pull/647)) and renamed resources accordingly. Note that this is a breaking change since the names of public resources were renamed as well. Replaced Mapbox logo with MapLibre logo. > To migrate: > If you use any of the public Android resources, you will get an error that they can not be found. Replace the prefix of each, e.g. `R.style.mapbox_LocationComponent` -> `R.style.maplibre_LocationComponent`. @@ -48,12 +48,12 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C > locationComponent.activateLocationComponent(options) > ``` -* 💥 Breaking: the `LocationEngine` implemented with Google Location Services has been removed to make MapLibre Native for Android fully FLOSS ([#379](https://github.com/maplibre/maplibre-gl-native/issues/379)). +* 💥 Breaking: the `LocationEngine` implemented with Google Location Services has been removed to make MapLibre Native for Android fully FLOSS ([#379](https://github.com/maplibre/maplibre-native/issues/379)). > To migrate: - > Include the source code of the removed [`GoogleLocationEngineImpl`](https://github.com/maplibre/maplibre-gl-native/blob/4a34caab7593f4f1b6d8c09c06a5e25d7c6cfc43/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java) in your source tree. + > Include the source code of the removed [`GoogleLocationEngineImpl`](https://github.com/maplibre/maplibre-native/blob/4a34caab7593f4f1b6d8c09c06a5e25d7c6cfc43/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java) in your source tree. > - > Pass an instance of `LocationEngine` based on `GoogleLocationEngineImpl` to `LocationComponentActivationOptions.Builder.locationEngine` (this was done in a now removed [`LocationEngineProvider`](https://github.com/maplibre/maplibre-gl-native/blob/68d58d6f6f453d5c6cc0fa92fcc6c6cfe0cf967f/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java#L59) class): + > Pass an instance of `LocationEngine` based on `GoogleLocationEngineImpl` to `LocationComponentActivationOptions.Builder.locationEngine` (this was done in a now removed [`LocationEngineProvider`](https://github.com/maplibre/maplibre-native/blob/68d58d6f6f453d5c6cc0fa92fcc6c6cfe0cf967f/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java#L59) class): > ```kotlin > val locationEngine = LocationEngineProxy(GoogleLocationEngineImpl(context)) > val options = LocationComponentActivationOptions.builder(context, style).locationEngine(locationEngine).build() @@ -62,95 +62,95 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C * 💥 Breaking: The static `LocationEngineResult.extractResult` can no longer extract a `LocationEngineResult` from a Google Play intent. - > To migrate, include and use the [previous implementation](https://github.com/maplibre/maplibre-gl-native/blob/ea234edf67bb3aec75f077e15c1c30c99756b926/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java#L97) in your source tree. + > To migrate, include and use the [previous implementation](https://github.com/maplibre/maplibre-native/blob/ea234edf67bb3aec75f077e15c1c30c99756b926/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java#L97) in your source tree. -* Improve Kotlinification of LatLng ([#742](https://github.com/maplibre/maplibre-gl-native/issues)) -* Increment minSdkVersion from 14 to 21, as it covers 99.2%% of the newer devices since 2014 and lessens the backward compatibility burden ([#630](https://github.com/maplibre/maplibre-gl-native/pull/630)) +* Improve Kotlinification of LatLng ([#742](https://github.com/maplibre/maplibre-native/issues)) +* Increment minSdkVersion from 14 to 21, as it covers 99.2%% of the newer devices since 2014 and lessens the backward compatibility burden ([#630](https://github.com/maplibre/maplibre-native/pull/630)) ### 🐞 Bug fixes -* Catches NaN for onMove event ([621](https://github.com/maplibre/maplibre-gl-native/pull/621)) -* `BitmapUtils.mergeBitmap` was deprecated, `BitmapUtils.mergeBitmaps` is a new method that does not offset views rendered on top of snapshots ([#733](https://github.com/maplibre/maplibre-gl-native/issues/733)) -* Fixed a crash when native code was accessing the LatLngBounds class [#655](https://github.com/maplibre/maplibre-gl-native/pull/) +* Catches NaN for onMove event ([621](https://github.com/maplibre/maplibre-native/pull/621)) +* `BitmapUtils.mergeBitmap` was deprecated, `BitmapUtils.mergeBitmaps` is a new method that does not offset views rendered on top of snapshots ([#733](https://github.com/maplibre/maplibre-native/issues/733)) +* Fixed a crash when native code was accessing the LatLngBounds class [#655](https://github.com/maplibre/maplibre-native/pull/) ### ⛵ Dependencies -* Revert "Revert "Gradle update"" - Update Gradle from v3 to v7 ([#619](https://github.com/maplibre/maplibre-gl-native/pull/619)) +* Revert "Revert "Gradle update"" - Update Gradle from v3 to v7 ([#619](https://github.com/maplibre/maplibre-native/pull/619)) ## 9.6.0 - December 18, 2022 ### ✨ Features and improvements -* Add missing header guards ([#543](https://github.com/maplibre/maplibre-gl-native/pull/543)) -* Removing unused versions sdk ([#515](https://github.com/maplibre/maplibre-gl-native/pull/515)) -* (tag: node-v5.0.1-pre.0) Upgrade libs and remove Jetifier ([#218](https://github.com/maplibre/maplibre-gl-native/pull/218)) -* Migrate examples in android TestApp to Kotlin ([#416](https://github.com/maplibre/maplibre-gl-native/pull/416)) -* Add ClientOptions to be able to pass around client name and version ([#365](https://github.com/maplibre/maplibre-gl-native/pull/365)) -* Use maplibre docs for more links ([#354](https://github.com/maplibre/maplibre-gl-native/pull/354)) -* Use the MapLibre style spec docs website ([#353](https://github.com/maplibre/maplibre-gl-native/pull/353)) -* Refresh iOS & Android build docs ([5f679b55b](https://github.com/maplibre/maplibre-gl-native/commit/5f679b55b)) -* Qt build improvements and documentation ([#277](https://github.com/maplibre/maplibre-gl-native/pull/277)) -* Replace Mapbox with MapLibre in README titles ([#297](https://github.com/maplibre/maplibre-gl-native/pull/297)) -* Rename MaptilerFileSource to MBTilesFileSource ([#198](https://github.com/maplibre/maplibre-gl-native/pull/198)) -* Changed missed MapBox reference to MapLibre ([#253](https://github.com/maplibre/maplibre-gl-native/pull/253)) -* Implement map projection functionality ([#254](https://github.com/maplibre/maplibre-gl-native/pull/254)) -* chore: rename master -> main in CI and scripts ([#246](https://github.com/maplibre/maplibre-gl-native/pull/246)) -* Feature - Bring back node support ([#217](https://github.com/maplibre/maplibre-gl-native/pull/217)) -* Remove obsolete CI configurations ([#219](https://github.com/maplibre/maplibre-gl-native/pull/219)) +* Add missing header guards ([#543](https://github.com/maplibre/maplibre-native/pull/543)) +* Removing unused versions sdk ([#515](https://github.com/maplibre/maplibre-native/pull/515)) +* (tag: node-v5.0.1-pre.0) Upgrade libs and remove Jetifier ([#218](https://github.com/maplibre/maplibre-native/pull/218)) +* Migrate examples in android TestApp to Kotlin ([#416](https://github.com/maplibre/maplibre-native/pull/416)) +* Add ClientOptions to be able to pass around client name and version ([#365](https://github.com/maplibre/maplibre-native/pull/365)) +* Use maplibre docs for more links ([#354](https://github.com/maplibre/maplibre-native/pull/354)) +* Use the MapLibre style spec docs website ([#353](https://github.com/maplibre/maplibre-native/pull/353)) +* Refresh iOS & Android build docs ([5f679b55b](https://github.com/maplibre/maplibre-native/commit/5f679b55b)) +* Qt build improvements and documentation ([#277](https://github.com/maplibre/maplibre-native/pull/277)) +* Replace Mapbox with MapLibre in README titles ([#297](https://github.com/maplibre/maplibre-native/pull/297)) +* Rename MaptilerFileSource to MBTilesFileSource ([#198](https://github.com/maplibre/maplibre-native/pull/198)) +* Changed missed MapBox reference to MapLibre ([#253](https://github.com/maplibre/maplibre-native/pull/253)) +* Implement map projection functionality ([#254](https://github.com/maplibre/maplibre-native/pull/254)) +* chore: rename master -> main in CI and scripts ([#246](https://github.com/maplibre/maplibre-native/pull/246)) +* Feature - Bring back node support ([#217](https://github.com/maplibre/maplibre-native/pull/217)) +* Remove obsolete CI configurations ([#219](https://github.com/maplibre/maplibre-native/pull/219)) ### 🐞 Bug fixes -* Fixes potential NaN when calling `NativeMapView::nativeMoveBy` ([#501](https://github.com/maplibre/maplibre-gl-native/pull/501)) -* Fix android ci workflows ([#476](https://github.com/maplibre/maplibre-gl-native/pull/476)) -* Fix typo in geo.cpp ([#412](https://github.com/maplibre/maplibre-gl-native/pull/412)) -* Fix render tests ([#351](https://github.com/maplibre/maplibre-gl-native/pull/351)) -* fix shiftY calculation typo ([#285](https://github.com/maplibre/maplibre-gl-native/pull/285)) -* [msvc] Fix warnings, mainly casting to smaller types ([#270](https://github.com/maplibre/maplibre-gl-native/pull/270)) -* Fix street label appearance while animating near zoom level threshhold ([#267](https://github.com/maplibre/maplibre-gl-native/pull/267)) +* Fixes potential NaN when calling `NativeMapView::nativeMoveBy` ([#501](https://github.com/maplibre/maplibre-native/pull/501)) +* Fix android ci workflows ([#476](https://github.com/maplibre/maplibre-native/pull/476)) +* Fix typo in geo.cpp ([#412](https://github.com/maplibre/maplibre-native/pull/412)) +* Fix render tests ([#351](https://github.com/maplibre/maplibre-native/pull/351)) +* fix shiftY calculation typo ([#285](https://github.com/maplibre/maplibre-native/pull/285)) +* [msvc] Fix warnings, mainly casting to smaller types ([#270](https://github.com/maplibre/maplibre-native/pull/270)) +* Fix street label appearance while animating near zoom level threshhold ([#267](https://github.com/maplibre/maplibre-native/pull/267)) ### ⛵ Dependencies -* Bump semver from 7.3.7 to 7.3.8 in /platform/android ([#530](https://github.com/maplibre/maplibre-gl-native/pull/530)) -* Bump to JDK 11 in android CI and generate Gradle Wrapper ([#474](https://github.com/maplibre/maplibre-gl-native/pull/474)) -* Bump ejs from 3.1.7 to 3.1.8 in /platform/android ([#470](https://github.com/maplibre/maplibre-gl-native/pull/470)) -* Upgrade Gradle from 3.6.3 to 3.6.4 ([#456](https://github.com/maplibre/maplibre-gl-native/pull/456)) -* Bump semver from 5.7.1 to 7.3.7 in /platform/android ([#461](https://github.com/maplibre/maplibre-gl-native/pull/461)) -* Bump pixelmatch from 4.0.2 to 5.3.0 in /platform/android ([#460](https://github.com/maplibre/maplibre-gl-native/pull/460)) -* Bump esm from 3.1.0 to 3.2.25 in /platform/android ([#463](https://github.com/maplibre/maplibre-gl-native/pull/463)) -* Bump ejs from 2.7.4 to 3.1.7 in /platform/android ([#299](https://github.com/maplibre/maplibre-gl-native/pull/299)) -* Bump lodash from 4.17.19 to 4.17.21 in /platform/android ([#195](https://github.com/maplibre/maplibre-gl-native/pull/195)) +* Bump semver from 7.3.7 to 7.3.8 in /platform/android ([#530](https://github.com/maplibre/maplibre-native/pull/530)) +* Bump to JDK 11 in android CI and generate Gradle Wrapper ([#474](https://github.com/maplibre/maplibre-native/pull/474)) +* Bump ejs from 3.1.7 to 3.1.8 in /platform/android ([#470](https://github.com/maplibre/maplibre-native/pull/470)) +* Upgrade Gradle from 3.6.3 to 3.6.4 ([#456](https://github.com/maplibre/maplibre-native/pull/456)) +* Bump semver from 5.7.1 to 7.3.7 in /platform/android ([#461](https://github.com/maplibre/maplibre-native/pull/461)) +* Bump pixelmatch from 4.0.2 to 5.3.0 in /platform/android ([#460](https://github.com/maplibre/maplibre-native/pull/460)) +* Bump esm from 3.1.0 to 3.2.25 in /platform/android ([#463](https://github.com/maplibre/maplibre-native/pull/463)) +* Bump ejs from 2.7.4 to 3.1.7 in /platform/android ([#299](https://github.com/maplibre/maplibre-native/pull/299)) +* Bump lodash from 4.17.19 to 4.17.21 in /platform/android ([#195](https://github.com/maplibre/maplibre-native/pull/195)) ## 9.5.2 - December 02, 2021 ### Bug Fixes -* raster layers stopped working in Android [#161](https://github.com/maplibre/maplibre-gl-native/pull/161) -* remove Mapbox's in favor of MapLibre in attribution dialog [#160](https://github.com/maplibre/maplibre-gl-native/pull/160) -* queryRenderedFeatures returns wrong results - issue #184, [#147](https://github.com/maplibre/maplibre-gl-native/pull/174) +* raster layers stopped working in Android [#161](https://github.com/maplibre/maplibre-native/pull/161) +* remove Mapbox's in favor of MapLibre in attribution dialog [#160](https://github.com/maplibre/maplibre-native/pull/160) +* queryRenderedFeatures returns wrong results - issue #184, [#147](https://github.com/maplibre/maplibre-native/pull/174) ## 9.5.1 - September 06, 2021 ### Bug Fixes -* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-gl-native/pull/107) -* Crash when inflating view on Android [#130](https://github.com/maplibre/maplibre-gl-native/pull/130) +* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-native/pull/107) +* Crash when inflating view on Android [#130](https://github.com/maplibre/maplibre-native/pull/130) ### Other -* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-gl-native/pull/129) -* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-gl-native/pull/148) -* Change NativeMapView.resizeView to use 0 instead of throwing IllegalArgumentException [#151](https://github.com/maplibre/maplibre-gl-native/pull/151) +* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-native/pull/129) +* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-native/pull/148) +* Change NativeMapView.resizeView to use 0 instead of throwing IllegalArgumentException [#151](https://github.com/maplibre/maplibre-native/pull/151) ## 9.5.0 - June 29, 2021 ### Features -* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-gl-native/pull/90) +* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-native/pull/90) ### Other -* Migration from bintray [#77](https://github.com/maplibre/maplibre-gl-native/pull/77) +* Migration from bintray [#77](https://github.com/maplibre/maplibre-native/pull/77) ## 9.4.2 - May 6, 2021 @@ -162,17 +162,17 @@ Switching from mapbox-java libraries to [maplibre fork](https://github.com/mapli ### Bug Fixes -* Fixed an issue where symbols flickered when zooming out. [#16](https://github.com/maplibre/maplibre-gl-native/issues/16) +* Fixed an issue where symbols flickered when zooming out. [#16](https://github.com/maplibre/maplibre-native/issues/16) * Fixes crash caused by NullPointerException MapKeyListener [#464](https://github.com/mapbox/mapbox-gl-native-android/issues/464), cherry picked from [#466](https://github.com/mapbox/mapbox-gl-native-android/pull/466) * Fixed an issue where GPS puck keeps previous value when enabled. [#462]https://github.com/mapbox/mapbox-gl-native-android/issues/462, cherry picked from [#470](https://github.com/mapbox/mapbox-gl-native-android/pull/470) -* Not changing location camera mode while disabled. [#24](https://github.com/maplibre/maplibre-gl-native/issues/24) -* Symbol layer flickering after zooming out. [#16](https://github.com/maplibre/maplibre-gl-native/issues/16) -* Avoid throwing null pointer exception on slow initialization [#22](https://github.com/maplibre/maplibre-gl-native/issues/22) +* Not changing location camera mode while disabled. [#24](https://github.com/maplibre/maplibre-native/issues/24) +* Symbol layer flickering after zooming out. [#16](https://github.com/maplibre/maplibre-native/issues/16) +* Avoid throwing null pointer exception on slow initialization [#22](https://github.com/maplibre/maplibre-native/issues/22) ### Other * mapbox-gl-js submodule has been replaced with maplibre-gl-js -* Removed Telemetry [#7](https://github.com/maplibre/maplibre-gl-native/pull/7) +* Removed Telemetry [#7](https://github.com/maplibre/maplibre-native/pull/7) ## 9.3.0 - January 6, 2021 diff --git a/platform/android/DEVELOPING.md b/platform/android/DEVELOPING.md index 7bd056d8b..b49abc357 100644 --- a/platform/android/DEVELOPING.md +++ b/platform/android/DEVELOPING.md @@ -65,7 +65,7 @@ final draft of the C++14 standard. More information in [DEVELOPING.md](../../DEV * node * `JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home"` * `ANDROID_SDK_ROOT=~/Library/Android/sdk` - * In Android Studio, go to Tools > [SDK Manager](https://developer.android.com/studio/projects/install-ndk#specific-version) to install CMake and the specific NDK version specified in [`dependencies.gradle`](https://github.com/maplibre/maplibre-gl-native/blob/main/platform/android/gradle/dependencies.gradle). + * In Android Studio, go to Tools > [SDK Manager](https://developer.android.com/studio/projects/install-ndk#specific-version) to install CMake and the specific NDK version specified in [`dependencies.gradle`](https://github.com/maplibre/maplibre-native/blob/main/platform/android/gradle/dependencies.gradle). Open `platform/android` with Android Studio. diff --git a/platform/android/MapboxGLAndroidSDK/README.md b/platform/android/MapboxGLAndroidSDK/README.md index 70b2f9618..9fb68f1f7 100644 --- a/platform/android/MapboxGLAndroidSDK/README.md +++ b/platform/android/MapboxGLAndroidSDK/README.md @@ -2,4 +2,4 @@ This is the MapLibre Native API for Android doccumentation. -Visit [https://maplibre.org/maplibre-gl-native/docs/book/android/getting-started-guide.html](https://maplibre.org/maplibre-gl-native/docs/book/android/getting-started-guide.html) to view the Getting Started Guide for MapLibre Native for Android. \ No newline at end of file +Visit [https://maplibre.org/maplibre-native/docs/book/android/getting-started-guide.html](https://maplibre.org/maplibre-native/docs/book/android/getting-started-guide.html) to view the Getting Started Guide for MapLibre Native for Android. \ No newline at end of file diff --git a/platform/android/README.md b/platform/android/README.md index 25d4c4c49..49e458096 100644 --- a/platform/android/README.md +++ b/platform/android/README.md @@ -1,16 +1,16 @@ # MapLibre Native for Android -[![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/android-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/android-release.yml) +[![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/android-ci/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/android-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/android-release/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/android-release.yml) MapLibre Native for Android is a library for embedding interactive map views with scalable, customizable vector maps onto Android devices. ## Getting Started -Visit [https://maplibre.org/maplibre-gl-native/docs/book/android/getting-started-guide.html](https://maplibre.org/maplibre-gl-native/docs/book/android/getting-started-guide.html) to view the Getting Started Guide for MapLibre Native for Android. +Visit [https://maplibre.org/maplibre-native/docs/book/android/getting-started-guide.html](https://maplibre.org/maplibre-native/docs/book/android/getting-started-guide.html) to view the Getting Started Guide for MapLibre Native for Android. ## Documentation -Visit [https://maplibre.org/maplibre-gl-native/android/api/](https://maplibre.org/maplibre-gl-native/android/api/) to view the current API reference Javadoc files for MapLibre Native for Android. +Visit [https://maplibre.org/maplibre-native/android/api/](https://maplibre.org/maplibre-native/android/api/) to view the current API reference Javadoc files for MapLibre Native for Android. ## Contributing diff --git a/platform/android/RELEASE.md b/platform/android/RELEASE.md index 7c519231a..46fa193d0 100644 --- a/platform/android/RELEASE.md +++ b/platform/android/RELEASE.md @@ -14,6 +14,6 @@ To make an Android release, do the following: * You need write access to push the tag, e.g. `git push --atomic origin main android-v9.6.0` * Once the tag is pushed, you can run the `release-android.yml` workflow - * Go to https://github.com/maplibre/maplibre-gl-native/actions + * Go to https://github.com/maplibre/maplibre-native/actions * Press `android-release` * Press `Run workflow` from the tag you pushed diff --git a/platform/darwin/README.md b/platform/darwin/README.md index e3253d6f9..20ace3780 100644 --- a/platform/darwin/README.md +++ b/platform/darwin/README.md @@ -3,8 +3,8 @@ The code in the Darwin platform targets Apple platforms but is not specific to iOS or macOS. This code is not distributed as an SDK in itself, but is required by iOS and macOS builds of MapLibre Native and ultimately by the -[MapLibre Maps SDK for iOS](https://github.com/maplibre/maplibre-gl-native/tree/main/platform/ios) -and [MapLibre Maps SDK for macOS](https://github.com/maplibre/maplibre-gl-native/tree/main/platform/macos). +[MapLibre Maps SDK for iOS](https://github.com/maplibre/maplibre-native/tree/main/platform/ios) +and [MapLibre Maps SDK for macOS](https://github.com/maplibre/maplibre-native/tree/main/platform/macos). These files depend on the Foundation and Core Foundation frameworks but do not depend on iOS- or macOS–specific frameworks, such as UIKit or AppKit. Any diff --git a/platform/ios/CONTRIBUTING.md b/platform/ios/CONTRIBUTING.md index bf8a40d6c..bd75a222c 100644 --- a/platform/ios/CONTRIBUTING.md +++ b/platform/ios/CONTRIBUTING.md @@ -1,12 +1,12 @@ # Contributing -If you have a usage question for a product built on MapLibre Native (such as our iOS or Android SDKs), please create a discussion thread on [GitHub Discussions](https://github.com/maplibre/maplibre-gl-native/discussions/categories/q-a). +If you have a usage question for a product built on MapLibre Native (such as our iOS or Android SDKs), please create a discussion thread on [GitHub Discussions](https://github.com/maplibre/maplibre-native/discussions/categories/q-a). If you want to contribute code: 1. Please familiarize yourself with the [install process](./INSTALL.md). -1. Ensure that existing [pull requests](https://github.com/maplibre/maplibre-gl-native/pulls?q=is%3Aopen+is%3Apr+label%3AiOS) and [issues](https://github.com/maplibre/maplibre-gl-native/issues?q=is%3Aopen+is%3Aissue+label%3AiOS) don’t already cover your contribution or question. +1. Ensure that existing [pull requests](https://github.com/maplibre/maplibre-native/pulls?q=is%3Aopen+is%3Apr+label%3AiOS) and [issues](https://github.com/maplibre/maplibre-native/issues?q=is%3Aopen+is%3Aissue+label%3AiOS) don’t already cover your contribution or question. 2. Pull requests are gladly accepted. If there are any changes that developers using one of the GL SDKs should be aware of, please update the **main** section of the [iOS changelog](platform/ios/CHANGELOG.md) or [macOS changelog](platform/macos/CHANGELOG.md). diff --git a/platform/ios/Makefile b/platform/ios/Makefile index faf9b590e..5b54b8469 100644 --- a/platform/ios/Makefile +++ b/platform/ios/Makefile @@ -7,7 +7,7 @@ export DEV_TEAM ?= "" # When only the dependencies in the package.json are installed # Node.js will error when running a script from the root scripts directory # Getting rid of the duplicate package.json file is an open issue -# https://github.com/maplibre/maplibre-gl-native/issues/657 +# https://github.com/maplibre/maplibre-native/issues/657 export NODE_PATH = ../../node_modules diff --git a/platform/ios/platform/darwin/test/MLNDocumentationGuideTests.swift b/platform/ios/platform/darwin/test/MLNDocumentationGuideTests.swift index 47b29c52e..d475546ad 100644 --- a/platform/ios/platform/darwin/test/MLNDocumentationGuideTests.swift +++ b/platform/ios/platform/darwin/test/MLNDocumentationGuideTests.swift @@ -263,7 +263,7 @@ class MLNDocumentationGuideTests: XCTestCase, MLNMapViewDelegate { let yellow = NSExpression(forConstantValue: UIColor.yellow) - XCTExpectFailure("Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331") + XCTExpectFailure("Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331") layer.circleColor = NSExpression(forMLNMatchingKey: type, in: [earthquake:orange, explosion:red, quarryBlast:yellow], default: defaultColor) diff --git a/platform/ios/platform/darwin/test/MLNExpressionTests.mm b/platform/ios/platform/darwin/test/MLNExpressionTests.mm index 61ecfefb2..00cb84030 100644 --- a/platform/ios/platform/darwin/test/MLNExpressionTests.mm +++ b/platform/ios/platform/darwin/test/MLNExpressionTests.mm @@ -291,7 +291,7 @@ using namespace std::string_literals; { NSDictionary *context = @{@"loremIpsum": MLNConstantExpression(@"Lorem ipsum dolor sit amet")}; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"MLN_LET('loremIpsum', 'Lorem ipsum dolor sit amet', uppercase($loremIpsum))", context]; NSExpression *compatibilityExpression = [NSExpression expressionWithFormat:@"FUNCTION(uppercase($loremIpsum), 'mgl_expressionWithContext:', %@)", context]; @@ -627,7 +627,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionForFunction:@"mgl_round:" arguments:@[MLNConstantExpression(@1.5)]]; NSArray *jsonExpression = @[@"round", @1.5]; @@ -670,7 +670,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionForFunction:@"mgl_log2:" arguments:@[MLNConstantExpression(@1024)]]; NSArray *jsonExpression = @[@"log2", @1024]; @@ -756,7 +756,7 @@ using namespace std::string_literals; MLNPointAnnotation *point = [[MLNPointAnnotation alloc] init]; point.coordinate = CLLocationCoordinate2DMake(1, -1); #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionForFunction:@"mgl_distanceFrom:" arguments:@[MLNConstantExpression(point)]]; NSArray *jsonExpression = @[@"distance", @{@"type": @"Point", @"coordinates": @[@-1, @1]}]; @@ -771,7 +771,7 @@ using namespace std::string_literals; { NSExpression *expression = [NSExpression expressionWithFormat:@"FUNCTION('Old', 'stringByAppendingString:', 'MacDonald')"]; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *aftermarketExpression = [NSExpression expressionWithFormat:@"mgl_join({'Old', 'MacDonald'})"]; NSArray *jsonExpression = @[@"concat", @"Old", @"MacDonald"]; @@ -877,7 +877,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"MLN_FUNCTION('to-color', x, y, z)"]; NSArray *jsonExpression = @[@"to-color", @[@"get", @"x"], @[@"get", @"y"], @[@"get", @"z"]]; @@ -904,7 +904,7 @@ using namespace std::string_literals; - (void)testInterpolationExpressionObject { { NSDictionary *stops = @{@0: MLNConstantExpression(@100), @10: MLNConstantExpression(@200)}; - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_interpolate:withCurveType:parameters:stops:(x, 'linear', nil, %@)", stops]; NSExpression *compatibilityExpression = [NSExpression expressionWithFormat:@"FUNCTION(x, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", stops]; NSArray *jsonExpression = @[@"interpolate", @[@"linear"], @[@"get", @"x"], @0, @100, @10, @200]; @@ -957,7 +957,7 @@ using namespace std::string_literals; - (void)testMatchExpressionObject { { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"MLN_MATCH(2 - 1, %@, %@, %@, %@, 'default')", MLNConstantExpression(@1), MLNConstantExpression(@"one"), @@ -998,7 +998,7 @@ using namespace std::string_literals; - (void)testCoalesceExpressionObject { { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_coalesce(%@)", @[[NSExpression expressionForKeyPath:@"x"], @@ -1038,7 +1038,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"MLN_IF(%@, %@, %@)", [NSExpression expressionWithFormat:@"%@", [NSPredicate predicateWithFormat:@"1 = 2"]], @@ -1131,7 +1131,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionForFunction:@"mgl_does:have:" arguments:@[[NSExpression expressionForEvaluatedObject], @@ -1194,7 +1194,7 @@ using namespace std::string_literals; fontNames:@[] fontScale:nil]; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@, %@, %@, %@)", MLNConstantExpression(attribute1), @@ -1326,7 +1326,7 @@ using namespace std::string_literals; - (void)testGenericExpressionObject { { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [NSExpression expressionWithFormat:@"MLN_FUNCTION('random', 1, 2, 3, 4, 5)"]; NSArray *jsonExpression = @[@"random", @1, @2, @3, @4, @5]; @@ -1397,7 +1397,7 @@ using namespace std::string_literals; NSExpression *original = [NSExpression expressionForConstantValue:attributedExpression]; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *coalesceExpression = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_en", @"name"]; MLNAttributedExpression *expectedAttributedExpression = [MLNAttributedExpression attributedExpression:coalesceExpression attributes:@{}]; @@ -1527,7 +1527,7 @@ using namespace std::string_literals; } { #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *expression = [[NSExpression expressionForConstantValue:@"Old"] mgl_expressionByAppendingExpression:[NSExpression expressionForConstantValue:@"MacDonald"]]; diff --git a/platform/ios/platform/darwin/test/MLNHeatmapColorTests.mm b/platform/ios/platform/darwin/test/MLNHeatmapColorTests.mm index ecc24e43e..0206b967c 100644 --- a/platform/ios/platform/darwin/test/MLNHeatmapColorTests.mm +++ b/platform/ios/platform/darwin/test/MLNHeatmapColorTests.mm @@ -34,7 +34,7 @@ constantExpression = [NSExpression expressionWithFormat:@"%@", [MLNColor redColor]]; NSExpression *constantExpression2 = [NSExpression expressionWithFormat:@"%@", [MLNColor blueColor]]; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif NSExpression *functionExpression = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($heatmapDensity, %@, %@)", constantExpression, @{@12: constantExpression2}]; layer.heatmapColor = functionExpression; @@ -43,7 +43,7 @@ @"Setting heatmapColor to an expression depending on $heatmapDensity should update heatmap-color."); XCTAssertEqual(rawLayer->getHeatmapColor().evaluate(12.0), mbgl::Color::blue(), @"Setting heatmapColor to an expression depending on $heatmapDensity should update heatmap-color."); - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); XCTAssertEqualObjects(layer.heatmapColor, functionExpression, @"heatmapColor should round-trip expressions depending on $heatmapDensity."); diff --git a/platform/ios/platform/darwin/test/MLNPredicateTests.mm b/platform/ios/platform/darwin/test/MLNPredicateTests.mm index 60edd8b97..1f4ddc845 100644 --- a/platform/ios/platform/darwin/test/MLNPredicateTests.mm +++ b/platform/ios/platform/darwin/test/MLNPredicateTests.mm @@ -315,7 +315,7 @@ NSArray *expected = @[@"in", @"📍", @[@"literal", @"Pinole"]]; NSPredicate *predicate = [NSPredicate predicateWithFormat:@"'📍' IN 'Pinole'"]; #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif XCTAssertEqualObjects(predicate.mgl_jsonExpressionObject, expected); XCTAssertEqualObjects([NSPredicate predicateWithMLNJSONObject:expected], predicate); @@ -447,7 +447,7 @@ NSArray *jsonExpression = @[@"==", @[@"get", @"a"], @"b", @[@"collator", @{@"case-sensitive": @NO, @"diacritic-sensitive": @YES}]]; XCTAssertEqualObjects(predicate.mgl_jsonExpressionObject, jsonExpression); #if TARGET_OS_IPHONE - XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-gl-native/issues/331"); + XCTExpectFailure(@"Awaiting unit test refactoring for https://github.com/maplibre/maplibre-native/issues/331"); #endif [self testSymmetryWithPredicate:predicate mustRoundTrip:NO]; diff --git a/platform/ios/platform/darwin/test/MLNStyleLayerTests.mm.ejs b/platform/ios/platform/darwin/test/MLNStyleLayerTests.mm.ejs index cd57bd273..225f32128 100644 --- a/platform/ios/platform/darwin/test/MLNStyleLayerTests.mm.ejs +++ b/platform/ios/platform/darwin/test/MLNStyleLayerTests.mm.ejs @@ -92,7 +92,7 @@ attributes:@{}]; constantExpression = [NSExpression mgl_expressionForAttributedExpressions:@[[NSExpression expressionForConstantValue:attributedConstantExpression]]]; <% } -%> - XCTExpectFailure(@"Awaiting unit test refactoring https://github.com/maplibre/maplibre-gl-native/issues/421"); + XCTExpectFailure(@"Awaiting unit test refactoring https://github.com/maplibre/maplibre-native/issues/421"); NSExpression *functionExpression = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($zoomLevel, %@, %@)", constantExpression, @{@18: constantExpression}]; layer.<%- objCName(property) %> = functionExpression; diff --git a/platform/ios/platform/ios/CHANGELOG.md b/platform/ios/platform/ios/CHANGELOG.md index dcc3caf91..c7141dcb0 100644 --- a/platform/ios/platform/ios/CHANGELOG.md +++ b/platform/ios/platform/ios/CHANGELOG.md @@ -1,65 +1,65 @@ # Changelog for MapLibre Native for iOS -MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-gl-native/blob/master/CONTRIBUTING.md) to get started. +MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-native/blob/master/CONTRIBUTING.md) to get started. ## main -* 💥 Breaking: Changed the prefix of files, classes, methods, variables and everything from `MGL` to `MLN`. ([#919](https://github.com/maplibre/maplibre-gl-native/pull/919)). +* 💥 Breaking: Changed the prefix of files, classes, methods, variables and everything from `MGL` to `MLN`. ([#919](https://github.com/maplibre/maplibre-native/pull/919)). > To migrate: > Change all your `MGL` prefixes to `MLN`. If you are using `NSKeyedArchiver` or similar mechanishm to save the state, the app may crash after this change when trying to unarchive the state using old names of the classes. You need to clean the saved state of the app and save it using new classes. ## 5.13.0 - January 05, 2023 -* Fix missing attribution [#236](https://github.com/maplibre/maplibre-gl-native/pull/236) -* Fix logging format strings [#266](https://github.com/maplibre/maplibre-gl-native/pull/266) -* Implement map projection functionality [#254](https://github.com/maplibre/maplibre-gl-native/pull/254) -* Fix warnings, mainly casting to smaller types [#270](https://github.com/maplibre/maplibre-gl-native/pull/270) +* Fix missing attribution [#236](https://github.com/maplibre/maplibre-native/pull/236) +* Fix logging format strings [#266](https://github.com/maplibre/maplibre-native/pull/266) +* Implement map projection functionality [#254](https://github.com/maplibre/maplibre-native/pull/254) +* Fix warnings, mainly casting to smaller types [#270](https://github.com/maplibre/maplibre-native/pull/270) * Remove an unused static library (savings of 97 KB from iOS binary) -* Add ClientOptions to be able to pass around client name and version [#365](https://github.com/maplibre/maplibre-gl-native/pull/365) -* Remove account from xcconfig [#382](https://github.com/maplibre/maplibre-gl-native/pull/382) -* Remove observation of key-path [#380](https://github.com/maplibre/maplibre-gl-native/pull/380) -* Fix for "NSExpression function is forbidden" [#411](https://github.com/maplibre/maplibre-gl-native/pull/411) -* Xcode 14 compatibility [#494](https://github.com/maplibre/maplibre-gl-native/pull/494) [#599](https://github.com/maplibre/maplibre-gl-native/pull/599) +* Add ClientOptions to be able to pass around client name and version [#365](https://github.com/maplibre/maplibre-native/pull/365) +* Remove account from xcconfig [#382](https://github.com/maplibre/maplibre-native/pull/382) +* Remove observation of key-path [#380](https://github.com/maplibre/maplibre-native/pull/380) +* Fix for "NSExpression function is forbidden" [#411](https://github.com/maplibre/maplibre-native/pull/411) +* Xcode 14 compatibility [#494](https://github.com/maplibre/maplibre-native/pull/494) [#599](https://github.com/maplibre/maplibre-native/pull/599) ## 5.12.2 - December 02, 2021 ### Improvements -* Exposes the windowBit value from zlib in the compress/decompress helper utils [#147](https://github.com/maplibre/maplibre-gl-native/pull/147) -* Fix camera paddings reset on map view gestures performing [#188](https://github.com/maplibre/maplibre-gl-native/pull/188) +* Exposes the windowBit value from zlib in the compress/decompress helper utils [#147](https://github.com/maplibre/maplibre-native/pull/147) +* Fix camera paddings reset on map view gestures performing [#188](https://github.com/maplibre/maplibre-native/pull/188) ## 5.12.1 - September 06, 2021 ### Bug Fixes -* ScaleBar enhancements [#120](https://github.com/maplibre/maplibre-gl-native/pull/120), [#121](https://github.com/maplibre/maplibre-gl-native/pull/121) -* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-gl-native/pull/107) -* Address crash when localFontFamilyName is nil [#109](https://github.com/maplibre/maplibre-gl-native/pull/109) -* Fix for annotations stuttering and drifting when panning [#113](https://github.com/maplibre/maplibre-gl-native/pull/113) -* Adjust local glyphs [#122](https://github.com/maplibre/maplibre-gl-native/pull/122) -* Return correct Mapbox TileServerOptions [#132](https://github.com/maplibre/maplibre-gl-native/pull/132) +* ScaleBar enhancements [#120](https://github.com/maplibre/maplibre-native/pull/120), [#121](https://github.com/maplibre/maplibre-native/pull/121) +* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-native/pull/107) +* Address crash when localFontFamilyName is nil [#109](https://github.com/maplibre/maplibre-native/pull/109) +* Fix for annotations stuttering and drifting when panning [#113](https://github.com/maplibre/maplibre-native/pull/113) +* Adjust local glyphs [#122](https://github.com/maplibre/maplibre-native/pull/122) +* Return correct Mapbox TileServerOptions [#132](https://github.com/maplibre/maplibre-native/pull/132) ### Other -* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-gl-native/pull/129) -* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-gl-native/pull/148) -* Fix build for Xcode 12.5 & 13-beta. [#153](https://github.com/maplibre/maplibre-gl-native/pull/153) +* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-native/pull/129) +* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-native/pull/148) +* Fix build for Xcode 12.5 & 13-beta. [#153](https://github.com/maplibre/maplibre-native/pull/153) ## 5.12.0 - June 29, 2021 ### Features -* Added allowScrollGesturesDuringRotateOrZoom [#60](https://github.com/maplibre/maplibre-gl-native/pull/62) -* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-gl-native/pull/90) +* Added allowScrollGesturesDuringRotateOrZoom [#60](https://github.com/maplibre/maplibre-native/pull/62) +* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-native/pull/90) ### Bug Fixes -* Fix map stuttering by switching render call to use setNeedsDisplay [#60](https://github.com/maplibre/maplibre-gl-native/pull/60) -* Dispatch to main queue, rather than global [#64](https://github.com/maplibre/maplibre-gl-native/pull/64) -* Use DisplayLink to prevent crashes in willResignActive [#68](https://github.com/maplibre/maplibre-gl-native/pull/68) -* Ignore sizing and positioning for hidden elements in assertions [#80](https://github.com/maplibre/maplibre-gl-native/pull/80) -* Disable map snapshots by default [#83](https://github.com/maplibre/maplibre-gl-native/pull/83) +* Fix map stuttering by switching render call to use setNeedsDisplay [#60](https://github.com/maplibre/maplibre-native/pull/60) +* Dispatch to main queue, rather than global [#64](https://github.com/maplibre/maplibre-native/pull/64) +* Use DisplayLink to prevent crashes in willResignActive [#68](https://github.com/maplibre/maplibre-native/pull/68) +* Ignore sizing and positioning for hidden elements in assertions [#80](https://github.com/maplibre/maplibre-native/pull/80) +* Disable map snapshots by default [#83](https://github.com/maplibre/maplibre-native/pull/83) ## 5.11.0 - March 12, 2021 @@ -76,14 +76,14 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ### Bug Fixes * Fixed an issue that caused a crash when custom location managers did not implement `MLNLocationManager.accuracyAuthorization`. (cherry pick from [#474](https://github.com/mapbox/mapbox-gl-native-ios/pull/474)) -* Fixed an issue where symbols flickered when zooming out. [#16](https://github.com/maplibre/maplibre-gl-native/issues/16) +* Fixed an issue where symbols flickered when zooming out. [#16](https://github.com/maplibre/maplibre-native/issues/16) * Benchmark app updated and fixes to the latest xcode version -* iOS performance improvements [#44](https://github.com/maplibre/maplibre-gl-native/pull/44) +* iOS performance improvements [#44](https://github.com/maplibre/maplibre-native/pull/44) ### Other * mapbox-gl-js submodule has been replaced with maplibre-gl-js -* Removed Mapbox Mobile Events and Telemetry [#7](https://github.com/maplibre/maplibre-gl-native/pull/7) +* Removed Mapbox Mobile Events and Telemetry [#7](https://github.com/maplibre/maplibre-native/pull/7) ## 5.10.0 - January 6, 2021 diff --git a/platform/ios/platform/ios/CONTRIBUTING.md b/platform/ios/platform/ios/CONTRIBUTING.md index 7ab136459..205307f08 100644 --- a/platform/ios/platform/ios/CONTRIBUTING.md +++ b/platform/ios/platform/ios/CONTRIBUTING.md @@ -60,7 +60,7 @@ The products of these build commands can be found in the `build/ios/pkg` folder ## Documentation -We are moving away from the legacy Jazzy documentation towards Apple's documentation generator [DocC](https://developer.apple.com/documentation/docc). DocC has great Xcode intergration. See the [open issues](https://github.com/maplibre/maplibre-gl-native/issues?q=is%3Aissue+is%3Aopen+label%3Aios+label%3Adocumentation) if you want to help. +We are moving away from the legacy Jazzy documentation towards Apple's documentation generator [DocC](https://developer.apple.com/documentation/docc). DocC has great Xcode intergration. See the [open issues](https://github.com/maplibre/maplibre-native/issues?q=is%3Aissue+is%3Aopen+label%3Aios+label%3Adocumentation) if you want to help. - For a general introduction to DocC, including for example a demonstration of the custom Markdown that DocC uses that allows for cross-linking, see this WWDC video: https://developer.apple.com/videos/play/wwdc2021/10166/ - For instructions of how to write a tutorial in DooC format: https://developer.apple.com/documentation/docc/building-an-interactive-tutorial @@ -70,14 +70,14 @@ The most convenient way to generate the DocC based documentation locally is usin ### Jazzy Documentation -The code samples in the header files & [iOS API Documentation](https://maplibre.org/maplibre-gl-native/ios/api/) are generated by a unit test. +The code samples in the header files & [iOS API Documentation](https://maplibre.org/maplibre-native/ios/api/) are generated by a unit test. An example of auto generated documentation is the unit test [MLNDocumentationExampleTests.swift](../darwin/test/MLNDocumentationExampleTests.swift) which generates styling examples in the `.h` file for styling either a -[Circle](https://maplibre.org/maplibre-gl-native/ios/api/Classes/MLNCircleStyleLayer.html), -[Heatmap](https://maplibre.org/maplibre-gl-native/ios/api/Classes/MLNHeatmapStyleLayer.html), or -[Line](https://maplibre.org/maplibre-gl-native/ios/api/Classes/MLNLineStyleLayer.html). For more details see [Adding a code example](DEVELOPING.md#adding-a-code-example). +[Circle](https://maplibre.org/maplibre-native/ios/api/Classes/MLNCircleStyleLayer.html), +[Heatmap](https://maplibre.org/maplibre-native/ios/api/Classes/MLNHeatmapStyleLayer.html), or +[Line](https://maplibre.org/maplibre-native/ios/api/Classes/MLNLineStyleLayer.html). For more details see [Adding a code example](DEVELOPING.md#adding-a-code-example). Use `make` to update API documentation: @@ -101,7 +101,7 @@ To add any Objective-C type, constant, or member to the iOS SDK’s public inter 1. Ensure that the symbol is pure Objective-C and does not rely on any language features specific to Objective-C++ or the C11 dialect of C – so no namespaced types or classes named with emoji! 🙃 Most projects that depend on this SDK are either written in pure Objective-C (GNU99 dialect) or Swift, which cannot yet bridge C++ types. 1. Name the symbol according to [Cocoa naming conventions](https://developer.apple.com/library/prerelease/content/documentation/Cocoa/Conceptual/CodingGuidelines/CodingGuidelines.html#//apple_ref/doc/uid/10000146i). Use the `MLN` class prefix to avoid conflicts with client code. If the symbol has an analogue in MapKit, name the symbol according to MapKit. -1. Provide full documentation comments. We use [jazzy](https://github.com/realm/jazzy/) to produce the documentation found in the SDK distribution and [on the website for this SDK](https://maplibre.org/maplibre-gl-native/ios/api/). We also recognize that many developers rely on Xcode’s Quick Help feature. jazzy supports Markdown formatting; however, Quick Help supports only [HeaderDoc](https://developer.apple.com/legacy/library/documentation/DeveloperTools/Conceptual/HeaderDoc/intro/intro.html) syntax and a subset of Doxygen syntax. For hyperlinks, use HTML syntax, which is recognized by both tools. +1. Provide full documentation comments. We use [jazzy](https://github.com/realm/jazzy/) to produce the documentation found in the SDK distribution and [on the website for this SDK](https://maplibre.org/maplibre-native/ios/api/). We also recognize that many developers rely on Xcode’s Quick Help feature. jazzy supports Markdown formatting; however, Quick Help supports only [HeaderDoc](https://developer.apple.com/legacy/library/documentation/DeveloperTools/Conceptual/HeaderDoc/intro/intro.html) syntax and a subset of Doxygen syntax. For hyperlinks, use HTML syntax, which is recognized by both tools. ### Making a type or constant public diff --git a/platform/ios/platform/ios/INSTALL.md b/platform/ios/platform/ios/INSTALL.md index 20753619f..56d5a834b 100644 --- a/platform/ios/platform/ios/INSTALL.md +++ b/platform/ios/platform/ios/INSTALL.md @@ -57,7 +57,7 @@ If you wish to deploy on attached hardware, you need to setup your Apple Develop 1. Clone the git repository: ```bash - git clone --recurse-submodules https://github.com/maplibre/maplibre-gl-native.git + git clone --recurse-submodules https://github.com/maplibre/maplibre-native.git cd maplibre-gl-native ``` Note that you must check out the project's git submodules to build. If you did not include `--recurse-submodules` in the clone, you can later run `git submodule update --init`. diff --git a/platform/ios/platform/ios/README.md b/platform/ios/platform/ios/README.md index 2e38cfe5c..e5ca9bf58 100644 --- a/platform/ios/platform/ios/README.md +++ b/platform/ios/platform/ios/README.md @@ -1,6 +1,6 @@ # MapLibre Native for iOS -[![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/ios-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/ios-release.yml) +[![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/ios-ci/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/ios-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/ios-release/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/ios-release.yml) A library based on [MapLibre Native](https://github.com/maplibre/maplibre-gl-native) for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS using Objective-C, Swift, or Interface Builder. @@ -18,7 +18,7 @@ A library based on [MapLibre Native](https://github.com/maplibre/maplibre-gl-nat ## Documentation -- [MapLibre Native for iOS API Reference](https://maplibre.org/maplibre-gl-native/ios/api/) +- [MapLibre Native for iOS API Reference](https://maplibre.org/maplibre-native/ios/api/) ## Contributing diff --git a/platform/ios/platform/ios/docs/pod-README.md b/platform/ios/platform/ios/docs/pod-README.md index 00de86535..891939193 100644 --- a/platform/ios/platform/ios/docs/pod-README.md +++ b/platform/ios/platform/ios/docs/pod-README.md @@ -2,7 +2,7 @@ MapLibre Native for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 9.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/), and renders them using OpenGL. -For more information, check out the [MapLibre Native for iOS repository](https://github.com/maplibre/maplibre-gl-native) and the [full changelog](https://github.com/maplibre/maplibre-gl-native/blob/main/platform/ios/platform/ios/CHANGELOG.md) online. +For more information, check out the [MapLibre Native for iOS repository](https://github.com/maplibre/maplibre-gl-native) and the [full changelog](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/platform/ios/CHANGELOG.md) online. [![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native-ios/master/platform/ios/docs/img/screenshot.png)]() @@ -94,4 +94,4 @@ class ViewController: UIViewController { Full API documentation is included in this package, within the `documentation` folder. -We welcome your [bug reports, feature requests, and contributions](https://github.com/maplibre/maplibre-gl-native/issues). +We welcome your [bug reports, feature requests, and contributions](https://github.com/maplibre/maplibre-native/issues). diff --git a/platform/ios/platform/ios/jazzy.yml b/platform/ios/platform/ios/jazzy.yml index 627a29645..5b568f9ba 100644 --- a/platform/ios/platform/ios/jazzy.yml +++ b/platform/ios/platform/ios/jazzy.yml @@ -2,7 +2,7 @@ module: MapLibre author: MapLibre Contributors author_url: https://maplibre.org/ github_url: https://github.com/maplibre/maplibre-gl-native -copyright: '[License](https://github.com/maplibre/maplibre-gl-native/blob/main/platform/ios/LICENSE.md)' +copyright: '[License](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/LICENSE.md)' head: | diff --git a/platform/ios/platform/ios/scripts/document.sh b/platform/ios/platform/ios/scripts/document.sh index 3203052ec..726f7f06f 100755 --- a/platform/ios/platform/ios/scripts/document.sh +++ b/platform/ios/platform/ios/scripts/document.sh @@ -45,7 +45,7 @@ jazzy \ --module-version ${SHORT_VERSION} \ --readme ${README} \ --documentation="platform/{darwin,ios}/docs/guides/*.md" \ - --root-url https://maplibre.org/maplibre-gl-native/ios/api/ \ + --root-url https://maplibre.org/maplibre-native/ios/api/ \ --theme ${THEME} \ --head "${CUSTOM_HEAD}" \ --output ${OUTPUT} \ diff --git a/platform/ios/platform/ios/scripts/package.sh b/platform/ios/platform/ios/scripts/package.sh index 3614c550d..fed5ea0b7 100755 --- a/platform/ios/platform/ios/scripts/package.sh +++ b/platform/ios/platform/ios/scripts/package.sh @@ -59,7 +59,7 @@ fi step "Recording library version…" VERSION="${OUTPUT}"/version.txt -echo -n "https://github.com/maplibre/maplibre-gl-native/commit/" > ${VERSION} +echo -n "https://github.com/maplibre/maplibre-native/commit/" > ${VERSION} HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true echo -n "maplibre-gl-native-ios " echo ${HASH} diff --git a/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs b/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs index 27730ec4e..ed865084c 100644 --- a/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs +++ b/platform/ios/platform/ios/scripts/release-notes-jazzy.md.ejs @@ -4,7 +4,7 @@ MapLibre Native for iOS is an open-source framework for embedding interactive ma ![MapLibre Native for iOS screenshots](img/screenshot.png) -We welcome your [bug reports, feature requests, and contributions](https://github.com/maplibre/maplibre-gl-native/issues). +We welcome your [bug reports, feature requests, and contributions](https://github.com/maplibre/maplibre-native/issues). ## Changes in version <%-CURRENTVERSION%> @@ -18,4 +18,4 @@ We welcome your [bug reports, feature requests, and contributions](https://githu <%-release.changelog%> <% }) -%> -See the [full changelog](https://github.com/maplibre/maplibre-gl-native/blob/main/platform/ios/platform/ios/CHANGELOG.md) for previous releases. +See the [full changelog](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/platform/ios/CHANGELOG.md) for previous releases. diff --git a/platform/ios/platform/ios/scripts/update-swift-package.sh b/platform/ios/platform/ios/scripts/update-swift-package.sh index ca6619aef..f106a71c1 100755 --- a/platform/ios/platform/ios/scripts/update-swift-package.sh +++ b/platform/ios/platform/ios/scripts/update-swift-package.sh @@ -26,7 +26,7 @@ PUBLISH_VERSION="5.11.0" BINARY_DIRECTORY='/Volumes/Data/Temp/maplibre' PUBLISH_PRE_FLAG='' S3_DISTRIBUTION=false -MAPBOX_ZIP_FILE_URL="https://github.com/maplibre/maplibre-gl-native/releases/download/ios-v5.11.0/Mapbox-5.11.0.zip" +MAPBOX_ZIP_FILE_URL="https://github.com/maplibre/maplibre-native/releases/download/ios-v5.11.0/Mapbox-5.11.0.zip" MAPBOX_ZIP_FILE="Mapbox-5.11.0.zip" DIST_GITHUB_TOKEN="PUT YOUR TOKEN HERE:" diff --git a/platform/ios/platform/ios/scripts/xcpackage.sh b/platform/ios/platform/ios/scripts/xcpackage.sh index d1d35f94d..3740ea316 100755 --- a/platform/ios/platform/ios/scripts/xcpackage.sh +++ b/platform/ios/platform/ios/scripts/xcpackage.sh @@ -41,7 +41,7 @@ mkdir -p ${BINOUT} step "Recording library version…" VERSION="${OUTPUT}"/version.txt -echo -n "https://github.com/maplibre/maplibre-gl-native/commit/" > ${VERSION} +echo -n "https://github.com/maplibre/maplibre-native/commit/" > ${VERSION} HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true echo -n "maplibre-gl-native-ios " echo ${HASH} diff --git a/platform/ios/platform/macos/CHANGELOG.md b/platform/ios/platform/macos/CHANGELOG.md index d5d3b0cd8..6c0f6374c 100644 --- a/platform/ios/platform/macos/CHANGELOG.md +++ b/platform/ios/platform/macos/CHANGELOG.md @@ -1,26 +1,26 @@ # Changelog for Mapbox Maps SDK for macOS -MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-gl-native/blob/main/CONTRIBUTING.md) to get started. +MapLibre welcomes participation and contributions from everyone. Please read [`Contributing Guide`](https://github.com/maplibre/maplibre-native/blob/main/CONTRIBUTING.md) to get started. ## 0.19.1 - September 06, 2021 ### Bug Fixes -* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-gl-native/pull/107) -* Adjust local glyphs [#122](https://github.com/maplibre/maplibre-gl-native/pull/122) -* Return correct Mapbox TileServerOptions [#132](https://github.com/maplibre/maplibre-gl-native/pull/132) +* Invalid tile url template for MapLibre style [#107](https://github.com/maplibre/maplibre-native/pull/107) +* Adjust local glyphs [#122](https://github.com/maplibre/maplibre-native/pull/122) +* Return correct Mapbox TileServerOptions [#132](https://github.com/maplibre/maplibre-native/pull/132) ### Other -* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-gl-native/pull/129) -* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-gl-native/pull/148) -* Fix build for Xcode 12.5 & 13-beta. [#153](https://github.com/maplibre/maplibre-gl-native/pull/153) +* Fix perf regression in cached tiles of tile pyramid [#129](https://github.com/maplibre/maplibre-native/pull/129) +* Upgrade to newest protozero [#148](https://github.com/maplibre/maplibre-native/pull/148) +* Fix build for Xcode 12.5 & 13-beta. [#153](https://github.com/maplibre/maplibre-native/pull/153) ## 0.19.0 - June 29, 2021 ### Features -* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-gl-native/pull/90) +* Replacing hardcoded configuration with configurable API and removing Mapbox assets and dependencies [#90](https://github.com/maplibre/maplibre-native/pull/90) ## 0.18.0 - March 12, 2021 @@ -31,7 +31,7 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ### Other * mapbox-gl-js submodule has been replaced with maplibre-gl-js -* Removed Mapbox Mobile Events and Telemetry [#7](https://github.com/maplibre/maplibre-gl-native/pull/7) +* Removed Mapbox Mobile Events and Telemetry [#7](https://github.com/maplibre/maplibre-native/pull/7) ## 0.17.0 - January 6, 2021 diff --git a/platform/ios/platform/macos/INSTALL.md b/platform/ios/platform/macos/INSTALL.md index 2810e0e56..ff4fa23aa 100644 --- a/platform/ios/platform/macos/INSTALL.md +++ b/platform/ios/platform/macos/INSTALL.md @@ -38,7 +38,7 @@ To build the SDK from source: 1. Clone the git repository: ```bash - git clone https://github.com/maplibre/maplibre-gl-native.git + git clone https://github.com/maplibre/maplibre-native.git cd maplibre-gl-native ``` Note that this repository uses Git submodules. They'll be automatically checked out when you first run a `make` command, diff --git a/platform/ios/platform/macos/README.md b/platform/ios/platform/macos/README.md index 8a4b85fee..a563d2afd 100644 --- a/platform/ios/platform/macos/README.md +++ b/platform/ios/platform/macos/README.md @@ -1,9 +1,9 @@ # MapLibre Native for macOS > **Note** -> https://github.com/maplibre/maplibre-gl-native/pull/995 introduced OpenGL ES 3.0 shaders which are not supported by macOS without workarounds. That means that while the [Metal backend implementation](https://github.com/maplibre/maplibre-gl-native/blob/main/design-proposals/2022-11-29-metal-port.md) is underway, builds from the `main` branch will not work on macOS. Use the `opengl-2` branch in the meantime. +> https://github.com/maplibre/maplibre-native/pull/995 introduced OpenGL ES 3.0 shaders which are not supported by macOS without workarounds. That means that while the [Metal backend implementation](https://github.com/maplibre/maplibre-native/blob/main/design-proposals/2022-11-29-metal-port.md) is underway, builds from the `main` branch will not work on macOS. Use the `opengl-2` branch in the meantime. -[![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/macos-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/macos-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/macos-release/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/macos-release.yml) +[![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/macos-ci/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/macos-ci.yml) [![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/macos-release/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/macos-release.yml) Put interactive, scalable world maps into your native Cocoa application with MapLibre Native for macOS. diff --git a/platform/linux/README.md b/platform/linux/README.md index 49352bf73..585938d46 100644 --- a/platform/linux/README.md +++ b/platform/linux/README.md @@ -34,7 +34,7 @@ apt install libjpeg-turbo8 libicu66 First, clone the repository. This repository uses git submodules, which are also required to build the project. ```bash -git clone --recurse-submodules -j8 https://github.com/maplibre/maplibre-gl-native.git +git clone --recurse-submodules -j8 https://github.com/maplibre/maplibre-native.git cd maplibre-gl-native ``` diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index 85c3bcf65..a92174402 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -3,42 +3,42 @@ ### ✨ New features - *...Add new stuff here...* -* Make Node Map object options "request" property optional by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/904 +* Make Node Map object options "request" property optional by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/904 ### 🐞 Bug fixes - *...Add new stuff here...* -* Compile Node targets without -std=c++11 option by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/926 +* Compile Node targets without -std=c++11 option by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/926 # 5.2.0 -* Adjust Typings for Node Platform by @etnav in https://github.com/maplibre/maplibre-gl-native/pull/871 -* Node platform improvements (added setSize and a new render call without render options object) by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/891 -* Move node ci+release to self hosted Ubuntu arm64 by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/873 -* Add windows support by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/707 -* Add Typings for Node Platform by @KiwiKilian in https://github.com/maplibre/maplibre-gl-native/pull/766 -* Upgrade nan for node 19.x support by @mnutt in https://github.com/maplibre/maplibre-gl-native/pull/853 -* Improve node docs with available platforms by @KiwiKilian in https://github.com/maplibre/maplibre-gl-native/pull/786 -* Avoid implicit casts by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/787 -* Update node (ubuntu-20.04, arm64) docker build workflow by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/804 -* Move module.cmake out of mapbox/cmake-node-module by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/821 -* Add mbgl-compiler-options to Node targets by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/826 -* Avoid implicit casts and make code more portable by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/716 -* Use `*_t` and `*_v` trait helpers from C++17 STL by @louwers in https://github.com/maplibre/maplibre-gl-native/pull/731 -* Avoid implicit casts and portable printf with size_t by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/722 +* Adjust Typings for Node Platform by @etnav in https://github.com/maplibre/maplibre-native/pull/871 +* Node platform improvements (added setSize and a new render call without render options object) by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/891 +* Move node ci+release to self hosted Ubuntu arm64 by @acalcutt in https://github.com/maplibre/maplibre-native/pull/873 +* Add windows support by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/707 +* Add Typings for Node Platform by @KiwiKilian in https://github.com/maplibre/maplibre-native/pull/766 +* Upgrade nan for node 19.x support by @mnutt in https://github.com/maplibre/maplibre-native/pull/853 +* Improve node docs with available platforms by @KiwiKilian in https://github.com/maplibre/maplibre-native/pull/786 +* Avoid implicit casts by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/787 +* Update node (ubuntu-20.04, arm64) docker build workflow by @acalcutt in https://github.com/maplibre/maplibre-native/pull/804 +* Move module.cmake out of mapbox/cmake-node-module by @acalcutt in https://github.com/maplibre/maplibre-native/pull/821 +* Add mbgl-compiler-options to Node targets by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/826 +* Avoid implicit casts and make code more portable by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/716 +* Use `*_t` and `*_v` trait helpers from C++17 STL by @louwers in https://github.com/maplibre/maplibre-native/pull/731 +* Avoid implicit casts and portable printf with size_t by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/722 # 5.1.1 -* Fix memory access violation exception in vector_tile_data.cpp by @tdcosta100 in https://github.com/maplibre/maplibre-gl-native/pull/632 +* Fix memory access violation exception in vector_tile_data.cpp by @tdcosta100 in https://github.com/maplibre/maplibre-native/pull/632 # 5.1.0 * First Maplibre Native Node Stable Release -* Node workflow - build linux arm64 in a container #520 https://github.com/maplibre/maplibre-gl-native/pull/590 +* Node workflow - build linux arm64 in a container #520 https://github.com/maplibre/maplibre-native/pull/590 # 5.0.1 -* Exclude Node 19 (ABI 111) because it breaks the node build by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/542 -* Fix mode switch not working in node version by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/415 -* Node release workflow by @acalcutt in https://github.com/maplibre/maplibre-gl-native/pull/378 https://github.com/maplibre/maplibre-gl-native/pull/459 https://github.com/maplibre/maplibre-gl-native/pull/505 https://github.com/maplibre/maplibre-gl-native/pull/512 https://github.com/maplibre/maplibre-gl-native/pull/514 +* Exclude Node 19 (ABI 111) because it breaks the node build by @acalcutt in https://github.com/maplibre/maplibre-native/pull/542 +* Fix mode switch not working in node version by @acalcutt in https://github.com/maplibre/maplibre-native/pull/415 +* Node release workflow by @acalcutt in https://github.com/maplibre/maplibre-native/pull/378 https://github.com/maplibre/maplibre-native/pull/459 https://github.com/maplibre/maplibre-native/pull/505 https://github.com/maplibre/maplibre-native/pull/512 https://github.com/maplibre/maplibre-native/pull/514 * Add support for [image expression](https://docs.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-image). ([#15877](https://github.com/mapbox/mapbox-gl-native/pull/15877)) * [Breaking] Remove node 10 support. v5.0.1-pre.0 of the node package can be used a compatibility version. -* Bring back node support by @jutaz in https://github.com/maplibre/maplibre-gl-native/pull/217 +* Bring back node support by @jutaz in https://github.com/maplibre/maplibre-native/pull/217 # 5.0.0 * No longer supporting source-compile fallback ([#15748](https://github.com/mapbox/mapbox-gl-native/pull/15748)) diff --git a/platform/node/README.md b/platform/node/README.md index f41844ba7..327ef88b5 100644 --- a/platform/node/README.md +++ b/platform/node/README.md @@ -1,7 +1,7 @@ # @maplibre/maplibre-gl-native [![Version](https://img.shields.io/npm/v/@maplibre/maplibre-gl-native?style=flat)](https://www.npmjs.com/package/@maplibre/maplibre-gl-native) -[![node-ci](https://github.com/maplibre/maplibre-gl-native/actions/workflows/node-ci.yml/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/node-ci.yml) +[![node-ci](https://github.com/maplibre/maplibre-native/actions/workflows/node-ci.yml/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/node-ci.yml) ## Installing @@ -19,7 +19,7 @@ Run: npm install @maplibre/maplibre-gl-native ``` -Further platforms might work [with additional libraries installed](https://github.com/maplibre/maplibre-gl-native/tree/main/platform/linux#prerequisites). +Further platforms might work [with additional libraries installed](https://github.com/maplibre/maplibre-native/tree/main/platform/linux#prerequisites). ## Testing @@ -139,7 +139,7 @@ If you omit the `request` method, the `map` object will use the default internal } ``` -The `kind` is an enum and defined in [`mbgl.Resource`](https://github.com/maplibre/maplibre-gl-native/blob/main/include/mbgl/storage/resource.hpp): +The `kind` is an enum and defined in [`mbgl.Resource`](https://github.com/maplibre/maplibre-native/blob/main/include/mbgl/storage/resource.hpp): ```json { @@ -230,7 +230,7 @@ Stylesheets are free to use any protocols, but your implementation of `request` ## Listening for log events -The module imported with `require('maplibre-gl-native')` inherits from [`EventEmitter`](https://nodejs.org/api/events.html), and the `NodeLogObserver` will push log events to this. Log messages can have [`class`](https://github.com/maplibre/maplibre-gl-native/blob/node-v2.1.0/include/mbgl/platform/event.hpp#L43-L60), [`severity`](https://github.com/maplibre/maplibre-gl-native/blob/node-v2.1.0/include/mbgl/platform/event.hpp#L17-L23), `code` ([HTTP status codes](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html)), and `text` parameters. +The module imported with `require('maplibre-gl-native')` inherits from [`EventEmitter`](https://nodejs.org/api/events.html), and the `NodeLogObserver` will push log events to this. Log messages can have [`class`](https://github.com/maplibre/maplibre-native/blob/node-v2.1.0/include/mbgl/platform/event.hpp#L43-L60), [`severity`](https://github.com/maplibre/maplibre-native/blob/node-v2.1.0/include/mbgl/platform/event.hpp#L17-L23), `code` ([HTTP status codes](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html)), and `text` parameters. ```js var mbgl = require('@maplibre/maplibre-gl-native'); diff --git a/platform/qt/CHANGELOG.md b/platform/qt/CHANGELOG.md index 68b05c973..5900dc639 100644 --- a/platform/qt/CHANGELOG.md +++ b/platform/qt/CHANGELOG.md @@ -4,7 +4,7 @@ ### ✨ New features -- Support for GeoJSON feature collections using std::list ([#541](https://github.com/maplibre/maplibre-gl-native/pull/541)). +- Support for GeoJSON feature collections using std::list ([#541](https://github.com/maplibre/maplibre-native/pull/541)). - Based on Qt 6.5.0 ### 🐞 Bug fixes @@ -22,5 +22,5 @@ ### ✨ New features - Full Qt5 and Qt6 support for macOS, Linux, Windows, iOS and Android. -- Rename to `QMapLibreGL` ([#338](https://github.com/maplibre/maplibre-gl-native/pull/338)). -- Build user agent based on `ClientOptions`, if available ([#365](https://github.com/maplibre/maplibre-gl-native/pull/365)). +- Rename to `QMapLibreGL` ([#338](https://github.com/maplibre/maplibre-native/pull/338)). +- Build user agent based on `ClientOptions`, if available ([#365](https://github.com/maplibre/maplibre-native/pull/365)). diff --git a/platform/qt/README.md b/platform/qt/README.md index 750fa9eeb..66e238645 100644 --- a/platform/qt/README.md +++ b/platform/qt/README.md @@ -1,6 +1,6 @@ # MapLibre Native for Qt -[![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/qt-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/actions/workflows/qt-ci.yml) +[![GitHub Action build status](https://github.com/maplibre/maplibre-native/workflows/qt-ci/badge.svg)](https://github.com/maplibre/maplibre-native/actions/workflows/qt-ci.yml) This is a community maintained MapLibre SDK for usage in Qt apps. Both Qt5 (minimal 5.6) and Qt6 are supported. diff --git a/platform/windows/README.md b/platform/windows/README.md index 67a18eeb3..757bf3033 100644 --- a/platform/windows/README.md +++ b/platform/windows/README.md @@ -15,7 +15,7 @@ To install the required Visual Studio components, open Visual Studio Installer a Open `x64 Native Tools Command Prompt for VS 2022` and then clone the repository: ```cmd -git clone --recurse-submodules -j8 https://github.com/maplibre/maplibre-gl-native.git +git clone --recurse-submodules -j8 https://github.com/maplibre/maplibre-native.git cd maplibre-gl-native ``` diff --git a/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp index 66ed72377..599170603 100644 --- a/test/actor/actor_ref.test.cpp +++ b/test/actor/actor_ref.test.cpp @@ -104,7 +104,7 @@ TEST(ActorRef, AskOnDestroyedActor) { // the problem is that the ActorRef has a pointer to the actor // whose memory is managed by AspiringActor, which has been destroyed // mitigation would require getting rid of the raw pointer - // See https://github.com/maplibre/maplibre-gl-native/issues/876 + // See https://github.com/maplibre/maplibre-native/issues/876 // auto result = ref.ask(&TestActorRef::receive); // EXPECT_ANY_THROW(result.get());