功能:增加 iOS 27 中国大陆/国际混合地图支持#20
Merged
VirgilClyne merged 16 commits intoJul 27, 2026
Merged
Conversation
|
@patrickyanxxxxx is attempting to deploy a commit to the 001 Team on Vercel. A member of the Team first needs to authorize it. |
|
我刚发现类似的问题,发现已经解决了,做了一个 url 自用,LGTM |
Member
|
合并可能要过一段时间,27 的 protobuf 解析还在进行中 |
Author
辛苦大佬🙏 |
VirgilClyne
force-pushed
the
dev
branch
4 times, most recently
from
July 27, 2026 07:05
987b4df to
528821c
Compare
Member
|
@copilot resolve the merge conflicts in this pull request |
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
maps | 9c6e0b2 | Jul 27 2026, 07:36 AM |
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
maps | 9c6e0b2 | Jul 27 2026, 07:36 AM |
VirgilClyne
merged commit Jul 27, 2026
5acf48d
into
NSRingo:integration/pr-20-ios27-hybrid
1 of 3 checks passed
VirgilClyne
added a commit
that referenced
this pull request
Jul 27, 2026
VirgilClyne
pushed a commit
that referenced
this pull request
Jul 27, 2026
将 PR #20 中新增的 TileSetStyle case 融入现有 GEOResourceManifest switch 分组。 原作者: https://github.com/patrickyanxxxxx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
概述
根据此前 PR #18 的维护者反馈重新提交。本次保留完整的独立提交记录,不压缩提交,方便逐项审查与后续维护。
为 iOS 27 增加可选的中国大陆/国际地图混合模式:中国大陆保留标准地图、道路、地点、POI 与坐标修正,中国大陆以外保留 Apple 国际卫星、3D、Flyover、地球与 Look Around 资源。
主要更改
Hybrid.Enabled、Hybrid.MainlandLayers、Hybrid.Mainland3D和Hybrid.ServiceMode配置;Geo Manifest为主体,选择性注入中国大陆二维地图和服务数据;.com与.cnGeoManifest 请求;style=98/v=226;style=7/v=68,国外请求保持不变;invalid int 32: string;提交结构
本 PR 未压缩为单个提交,按功能拆分为:
默认行为
混合功能默认关闭:
因此不会改变原项目的默认行为。只有用户明确启用后,才会执行中国大陆与国际资源的选择性合并。
Preview 与验证
git diff --check通过;@nsringo/mapkitGitHub Packages 访问权限限制,返回 401,未将该项标记为通过。PR 范围
本 PR 仅包含上游可维护的核心源码、配置、独立路由入口与回归测试,不包含:
已知限制
style=98/v=226卫星请求;感谢维护者在 #18 中的反馈。