Vector styles, tile work and the street-tree sample, with every module on its develop

.github/workflows/test.yml

@@ -0,0 +1,97 @@
+name: Test
+
+# ios-sdk-core のユニットテスト。
+#
+# これまで CI は api-surface.yml（公開 API の凍結）と deploy 系だけで、
+# **テストを走らせるワークフローが無かった。** 凍結ゲートが見るのは型の形だけ
+# なので、シグネチャが同じまま中身が壊れる変更は素通りする。
+#
+# ## なぜ `swift test` ではないのか
+#
+# 通らないため。ios-sdk-core は TilePng.xcframework（Rust の PNG エンコーダ）に
+# 依存していて、この xcframework は ios-arm64 と ios-arm64-simulator しか持た
+# ない。macOS 向けにビルドしようとすると:
+#
+#   error: TilePng.xcframework While building for macOS,
+#          no library for this platform was found
+#
+# したがって iOS シミュレータ宛に xcodebuild で回す。`swift test` を復活させたい
+# なら TilePng.xcframework に macOS スライスを足すことになる
+# （mapconductor-vectortile の scripts/build-ios-core-png.sh）。ローカルでの反復
+# は速くなるが、CI に必要なのはこちらではない。
+#
+# スキーム名 `mapconductor-core` は Package.swift の `name:` に由来する。
+# product 名（MapConductorCore）ではない。
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
+    branches:
+      - main
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  unit-test:
+    if: github.event.pull_request.draft == false
+    runs-on: macos-15
+    name: ios-sdk-core tests
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      # ベースラインは Swift コンパイラの出力をそのまま記録しているので、
+      # 違う Xcode を引くと API を変えていなくても数千行の差分が出る。
+      # 3,000 行の diff ではなく、ここで「ツールチェインが違う」と言って落とす。
+      - name: Pin Xcode
+        run: |
+          set -euo pipefail
+          source ios-sdk-core/api/TOOLCHAIN
+          app="/Applications/Xcode_${XCODE_VERSION}.app"
+          if [ ! -d "$app" ]; then
+            echo "Xcode ${XCODE_VERSION} がこのランナーにありません。利用可能:" >&2
+            ls -d /Applications/Xcode*.app >&2
+            echo "ランナーのイメージを合わせるか、その Xcode で dump し直して" >&2
+            echo "ios-sdk-core/api/TOOLCHAIN を更新してください。" >&2
+            exit 1
+          fi
+          sudo xcode-select -s "$app"
+          xcodebuild -version
+
+      # 名前を決め打ちにしない。ランナーのイメージが変わるたびに
+      # 「iPhone 16 が無い」で落ちるのは、コードの問題ではない。
+      - name: Pick a simulator
+        id: sim
+        run: |
+          set -euo pipefail
+          name=$(xcrun simctl list devices available --json \
+            | python3 -c "import json,sys;d=json.load(sys.stdin)['devices'];print(next(x['name'] for k,v in d.items() if 'iOS' in k for x in v))")
+          echo "Using simulator: $name"
+          echo "name=$name" >> "$GITHUB_OUTPUT"
+
+      - name: Test
+        working-directory: ios-sdk-core
+        run: |
+          set -euo pipefail
+          xcodebuild test \
+            -scheme mapconductor-core \
+            -destination "platform=iOS Simulator,name=${{ steps.sim.outputs.name }}" \
+            -resultBundlePath TestResults.xcresult
+
+      - name: Upload result bundle
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: xcresult
+          path: ios-sdk-core/TestResults.xcresult
+          retention-days: 7

.gitignore

@@ -24,3 +24,7 @@ maps-core/
 app1786472922370i267371265/
 samples/MapConductorSampleApp/Resources/mappls.i.conf
 samples/MapConductorSampleApp/Resources/mappls.i.olf
+
+# Xcode per-user state: window layout, open tabs, breakpoints. Tracked by
+# accident; it changes on every launch and belongs to one machine.
+xcuserdata/

ios-vectorstyle/MvtStyle.xcframework/Info.plist

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libmvt_style_ffi.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libmvt_style_ffi.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libmvt_style_ffi.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libmvt_style_ffi.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

ios-vectorstyle/Package.swift

@@ -0,0 +1,56 @@
+// swift-tools-version: 5.9
+import Foundation
+import PackageDescription
+
+let frameworkLibraryType: Product.Library.LibraryType? =
+    ProcessInfo.processInfo.environment["MAPCONDUCTOR_BUILD_XCFRAMEWORK"] == "1" ? .dynamic : nil
+let usingLocalCore = FileManager.default.fileExists(atPath: "../ios-sdk-core/Package.swift")
+let coreDependency: Package.Dependency = usingLocalCore
+    ? .package(path: "../ios-sdk-core")
+    : .package(url: "https://github.com/MapConductor/ios-sdk-core", from: "1.3.2")
+
+let package = Package(
+    name: "mapconductor-vectorstyle",
+    platforms: [
+        // See ios-sdk-core/Package.swift's comment: "15.0" must not be used here.
+        .iOS("15.1"),
+    ],
+    products: [
+        .library(
+            name: "MapConductorVectorStyle",
+            type: frameworkLibraryType,
+            targets: ["MapConductorVectorStyle"]
+        ),
+    ],
+    dependencies: [
+        coreDependency,
+    ],
+    targets: [
+        // The Rust style compiler. Built and packaged by the
+        // mapconductor-vectortile repo (scripts/build-ios-style.sh) and
+        // copied here by its scripts/sync-sdk.sh.
+        //
+        // Its own binary rather than a corner of MvtRender: an app using
+        // MapLibre, Mapbox or MapTiler adjusts a style without ever
+        // rasterising one, and must not have to link the rasteriser to do it.
+        .binaryTarget(name: "MvtStyle", path: "MvtStyle.xcframework"),
+        // The header travels as a C target rather than inside the
+        // XCFramework: Xcode merges every linked framework's Headers into
+        // one include directory, and two module.modulemaps collide there --
+        // which anything depending on both this and MvtRender would hit.
+        .target(name: "CMvtStyle"),
+        .target(
+            name: "MapConductorVectorStyle",
+            dependencies: [
+                .product(name: "MapConductorCore", package: "ios-sdk-core"),
+                "CMvtStyle",
+                "MvtStyle",
+            ],
+        ),
+        .testTarget(
+            name: "MapConductorVectorStyleTests",
+            dependencies: ["MapConductorVectorStyle"],
+            resources: [.process("Resources")],
+        ),
+    ]
+)

ios-vectorstyle/Sources/CMvtStyle/include/mvt_style.h

@@ -0,0 +1,38 @@
+// The vector style compiler for the iOS SDK. Mirrors crates/mvt-style-ffi.
+//
+// Travels as a source header in ios-vectorstyle rather than inside the
+// XCFramework: Xcode merges every linked framework's Headers into one include
+// directory, and two frameworks shipping a module.modulemap collide there --
+// which anything depending on both this and MvtRender would hit.
+#ifndef MVT_STYLE_H
+#define MVT_STYLE_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Applies a rules document to a style document.
+//
+// Returns JSON: the adjusted style, the mutations, what they affect and the
+// diagnostics -- or {"error": "..."} when either document could not be read.
+// NULL only when an argument was not valid UTF-8 or the compiler panicked.
+// Release the result with mvt_style_string_free.
+char *mvt_style_compile(const char *style_json, const char *rules_json);
+
+// The style's layers and the role each would be given, as a JSON array, or
+// {"error": "..."}. Release with mvt_style_string_free.
+char *mvt_style_describe(const char *style_json);
+
+// The rules document version this library understands.
+uint32_t mvt_style_schema_version(void);
+
+// Releases a string this library returned. NULL is accepted.
+void mvt_style_string_free(char *text);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // MVT_STYLE_H

ios-vectorstyle/Sources/CMvtStyle/shim.c

@@ -0,0 +1,3 @@
+// SwiftPM needs a target to have at least one source file. This one exists so
+// CMvtStyle can be a target whose only real content is its public header; the
+// implementation is linked from the MvtStyle XCFramework.