Merge branch 'main' into rust-wrp-alpha

Author: nyurik

.github/workflows/rust-ci.yaml

@@ -9,13 +9,20 @@ on:
 
 defaults:
   run:
-    shell: bash
     working-directory: rustutils/
 
 jobs:
   test:
     name: Rust tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - os: macos-latest  # M-series CPU
+          - os: macos-13  # x64 CPU
+          - os: windows-latest
+          - os: ubuntu-latest
     steps:
       - uses: taiki-e/install-action@v2
         with: { tool: just }

.gitignore

@@ -52,3 +52,8 @@ cache.sqlite
 cache.sqlite-journal
 out.png
 /test/android/app/build
+
+# Rust
+**/target/
+**/*.rs.bk
+**/*.profraw

.pre-commit-config.yaml

@@ -1,41 +1,56 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
-    - id: check-yaml
-      args: [--allow-multiple-documents, --unsafe]
-    - id: end-of-file-fixer
-    - id: trailing-whitespace
-      # FIXME: these autogenerate files contain trailing whitespace. Need to fix generator.
-      exclude: 'platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/(location/LocationIndicatorLayer|style/layers/PropertyFactory)\.java'
-- repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v19.1.7
-  hooks:
-  - id: clang-format
-    files: '.*\.(hpp|cpp|h)'
-    exclude: 'vendor/.*'
-- repo: https://github.com/keith/pre-commit-buildifier
-  rev: 8.0.1
-  hooks:
-    - id: buildifier
-- repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-  rev: v1.7.7.23
-  hooks:
-    - id: actionlint
-      additional_dependencies: [shellcheck-py]
-- repo: https://github.com/nicklockwood/SwiftFormat
-  rev: "0.55.5"
-  hooks:
-    - id: swiftformat
-      args: [--swiftversion, "5.8"]
--   repo: local
+      - id: check-added-large-files
+      - id: check-toml
+      - id: check-yaml
+        args: [ --allow-multiple-documents, --unsafe ]
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [ --fix=lf ]
+        # these are generated by Gradle
+        exclude: 'gradlew\.bat$'
+      - id: trailing-whitespace
+        # FIXME: these autogenerate files contain trailing whitespace. Need to fix generator.
+        exclude: 'platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/(location/LocationIndicatorLayer|style/layers/PropertyFactory)\.java$'
+
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v19.1.7
     hooks:
-    -   id: rustfmt
+      - id: clang-format
+        files: '.*\.(hpp|cpp|h)'
+        exclude: 'vendor/.*'
+
+  - repo: https://github.com/keith/pre-commit-buildifier
+    rev: 8.0.1
+    hooks:
+      - id: buildifier
+
+  - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
+    rev: v1.7.7.23
+    hooks:
+      - id: actionlint
+        additional_dependencies: [ shellcheck-py ]
+
+  - repo: https://github.com/nicklockwood/SwiftFormat
+    rev: "0.55.5"
+    hooks:
+      - id: swiftformat
+        args: [ --swiftversion, "5.8" ]
+
+  - repo: local
+    hooks:
+      - id: rustfmt
         name: rustfmt
-        entry: bash -c 'cd rustutils && cargo fmt' --
+        entry: sh -c 'cd rustutils && cargo fmt --all'
         language: rust
-        types: [rust]
+        types: [ rust ]
+
 ci:
   # sometimes fails https://github.com/keith/pre-commit-buildifier/issues/13
-  skip: [buildifier]
+  skip: [ buildifier ]
   autoupdate_schedule: monthly

docs/mdbook/src/ios/ios-tests.md

@@ -1,5 +1,14 @@
 # iOS Tests
 
+## iOS Unit Tests
+
+To run the iOS unit tests via XCTest, run tests for the `ios_test` target in Xcode
+or use the following bazel command:
+
+```
+bazel test //platform/ios/test:ios_test --test_output=errors --//:renderer=metal
+```
+
 ## Render Tests
 
 To run the render tests, run the `RenderTest` target from iOS.

include/mbgl/util/tile_server_options.hpp

@@ -265,7 +265,7 @@ class TileServerOptions final {
     TileServerOptions& withDefaultStyles(std::vector<mbgl::util::DefaultStyle> styles);
 
     /**
-     * @brief Sets the default style by name. The style name must exists in
+     * @brief Sets the default style by name. The style name must exist in
      * defaultStyles collection
      *
      * @param defaultStyle The style name

platform/android/resources/dot-arrow.svg

@@ -104,9 +104,13 @@ @implementation MLNAttributionInfo
             [attributedString removeAttribute:NSStrokeWidthAttributeName range:range];
         }
 
-        // Omit whitespace-only strings.
+        // Clean up strings by stripping punctuation and whitespace (often present for the web).
+        NSMutableCharacterSet *charset = [NSMutableCharacterSet whitespaceAndNewlineCharacterSet];
+        [charset formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]];
         NSAttributedString *title = [[attributedString attributedSubstringFromRange:range]
-                                     mgl_attributedStringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+                                     mgl_attributedStringByTrimmingCharactersInSet:charset];
+
+        // Omit strings that are empty after cleaning.
         if (!title.length) {
             return;
         }

platform/darwin/src/MLNAttributionInfo.mm

@@ -20,7 +20,7 @@ - (void)tearDown {
 - (void)testParsing {
     static NSString * const htmlStrings[] = {
         @"<a href=\"https://www.mapbox.com/about/maps/\" target=\"_blank\">&copy; Mapbox</a> "
-        @"<a href=\"http://www.openstreetmap.org/about/\" target=\"_blank\">©️ OpenStreetMap</a> "
+        @"<a href=\"http://www.openstreetmap.org/about/\" target=\"_blank\">©️ OpenStreetMap</a>, "
         @"CC&nbsp;BY-SA "
         @"<a class=\"mapbox-improve-map\" href=\"https://apps.mapbox.com/feedback/\" target=\"_blank\">Improve this map</a>",
     };