diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll
index 6f098ca..6677c0d 100644
Binary files a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll differ
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json
index d9a1beb..8973a95 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json
@@ -49,12 +49,6 @@
"Avalonia": {
"target": "Package",
"version": "[11.3.9, )"
- },
- "Microsoft.NET.ILLink.Tasks": {
- "suppressParent": "All",
- "target": "Package",
- "version": "[8.0.31, )",
- "autoReferenced": true
}
},
"imports": [
@@ -68,16 +62,6 @@
],
"assetTargetFallback": true,
"warn": true,
- "downloadDependencies": [
- {
- "name": "Microsoft.AspNetCore.App.Runtime.win-arm64",
- "version": "[8.0.31, 8.0.31]"
- },
- {
- "name": "Microsoft.NETCore.App.Runtime.win-arm64",
- "version": "[8.0.31, 8.0.31]"
- }
- ],
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
@@ -85,11 +69,6 @@
},
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json"
}
- },
- "runtimes": {
- "win-arm64": {
- "#import": []
- }
}
}
}
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props
index 8d169b0..49d666c 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props
@@ -13,11 +13,9 @@
-
- /Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31
/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2
/Users/morris/.nuget/packages/avalonia/11.3.9
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs
index 8f530c2..b1ab235 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+936aec81850fb15f55014c66116d174dc9e2f967")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+874c97ee271617592f530440ae8879461e91488b")]
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache
index 0bd2cec..d2538cd 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1f535105af85de59d3ced8e39e19db7d5ce25d28d2d77df0d87a42c9c0bf481e
+1e556d89cb334279dd738ee053373abdd6a4398ad2892bf59fdbda53299c0ae5
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig
index 04db23a..ebf0815 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,8 +1,4 @@
is_global = true
-build_property.EnableAotAnalyzer =
-build_property.EnableSingleFileAnalyzer = true
-build_property.EnableTrimAnalyzer =
-build_property.IncludeAllContentForSelfExtract =
build_property.AvaloniaNameGeneratorIsEnabled = true
build_property.AvaloniaNameGeneratorBehavior = InitializeComponent
build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache
index e206ee9..33ee2d4 100644
Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache differ
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt
index 8c90239..f094db0 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt
@@ -9,3 +9,5 @@
/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll
/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll
/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll
+/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.pdb
+/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.pdb
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll
index 6f098ca..6677c0d 100644
Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll differ
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll
index b50bfdf..4628680 100644
Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll differ
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll
index b50bfdf..4628680 100644
Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll differ
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json
index 5f52cca..5e1f0ac 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json
@@ -111,130 +111,6 @@
"runtime": {
"lib/net5.0/MicroCom.Runtime.dll": {}
}
- },
- "Microsoft.NET.ILLink.Tasks/8.0.31": {
- "type": "package",
- "build": {
- "build/Microsoft.NET.ILLink.Tasks.props": {}
- }
- }
- },
- "net8.0/win-arm64": {
- "Avalonia/11.3.9": {
- "type": "package",
- "dependencies": {
- "Avalonia.BuildServices": "11.3.2",
- "Avalonia.Remote.Protocol": "11.3.9",
- "MicroCom.Runtime": "0.11.0"
- },
- "compile": {
- "ref/net8.0/Avalonia.Base.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.Controls.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.DesignerSupport.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.Dialogs.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.Markup.Xaml.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.Markup.dll": {
- "related": ".Xaml.xml;.xml"
- },
- "ref/net8.0/Avalonia.Metal.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.MicroCom.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.OpenGL.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.Vulkan.dll": {
- "related": ".xml"
- },
- "ref/net8.0/Avalonia.dll": {
- "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml"
- }
- },
- "runtime": {
- "lib/net8.0/Avalonia.Base.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.Controls.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.DesignerSupport.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.Dialogs.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.Markup.Xaml.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.Markup.dll": {
- "related": ".Xaml.xml;.xml"
- },
- "lib/net8.0/Avalonia.Metal.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.MicroCom.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.OpenGL.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.Vulkan.dll": {
- "related": ".xml"
- },
- "lib/net8.0/Avalonia.dll": {
- "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml"
- }
- },
- "build": {
- "buildTransitive/Avalonia.props": {},
- "buildTransitive/Avalonia.targets": {}
- }
- },
- "Avalonia.BuildServices/11.3.2": {
- "type": "package",
- "build": {
- "buildTransitive/Avalonia.BuildServices.targets": {}
- }
- },
- "Avalonia.Remote.Protocol/11.3.9": {
- "type": "package",
- "compile": {
- "lib/net8.0/Avalonia.Remote.Protocol.dll": {
- "related": ".xml"
- }
- },
- "runtime": {
- "lib/net8.0/Avalonia.Remote.Protocol.dll": {
- "related": ".xml"
- }
- }
- },
- "MicroCom.Runtime/0.11.0": {
- "type": "package",
- "compile": {
- "lib/net5.0/MicroCom.Runtime.dll": {}
- },
- "runtime": {
- "lib/net5.0/MicroCom.Runtime.dll": {}
- }
- },
- "Microsoft.NET.ILLink.Tasks/8.0.31": {
- "type": "package",
- "build": {
- "build/Microsoft.NET.ILLink.Tasks.props": {}
- }
}
}
},
@@ -457,63 +333,11 @@
"microcom.runtime.0.11.0.nupkg.sha512",
"microcom.runtime.nuspec"
]
- },
- "Microsoft.NET.ILLink.Tasks/8.0.31": {
- "sha512": "OJdAGATV2QoVWL11zlDLEluA06q8rK+cgZR47ohrO8V+Qj5z9dlvN7bG9/0e5t0IOe+yD8tREC0bpsEgDGrzIQ==",
- "type": "package",
- "path": "microsoft.net.illink.tasks/8.0.31",
- "hasTools": true,
- "files": [
- ".nupkg.metadata",
- ".signature.p7s",
- "Icon.png",
- "LICENSE.TXT",
- "Sdk/Sdk.props",
- "THIRD-PARTY-NOTICES.TXT",
- "analyzers/dotnet/cs/ILLink.CodeFixProvider.dll",
- "analyzers/dotnet/cs/ILLink.RoslynAnalyzer.dll",
- "build/Microsoft.NET.ILLink.Analyzers.props",
- "build/Microsoft.NET.ILLink.Tasks.props",
- "build/Microsoft.NET.ILLink.targets",
- "microsoft.net.illink.tasks.8.0.31.nupkg.sha512",
- "microsoft.net.illink.tasks.nuspec",
- "tools/net472/ILLink.Tasks.dll",
- "tools/net472/ILLink.Tasks.dll.config",
- "tools/net472/Mono.Cecil.Mdb.dll",
- "tools/net472/Mono.Cecil.Pdb.dll",
- "tools/net472/Mono.Cecil.Rocks.dll",
- "tools/net472/Mono.Cecil.dll",
- "tools/net472/Sdk/Sdk.props",
- "tools/net472/System.Buffers.dll",
- "tools/net472/System.Collections.Immutable.dll",
- "tools/net472/System.Memory.dll",
- "tools/net472/System.Numerics.Vectors.dll",
- "tools/net472/System.Reflection.Metadata.dll",
- "tools/net472/System.Runtime.CompilerServices.Unsafe.dll",
- "tools/net472/build/Microsoft.NET.ILLink.Analyzers.props",
- "tools/net472/build/Microsoft.NET.ILLink.Tasks.props",
- "tools/net472/build/Microsoft.NET.ILLink.targets",
- "tools/net8.0/ILLink.Tasks.deps.json",
- "tools/net8.0/ILLink.Tasks.dll",
- "tools/net8.0/Mono.Cecil.Mdb.dll",
- "tools/net8.0/Mono.Cecil.Pdb.dll",
- "tools/net8.0/Mono.Cecil.Rocks.dll",
- "tools/net8.0/Mono.Cecil.dll",
- "tools/net8.0/Sdk/Sdk.props",
- "tools/net8.0/build/Microsoft.NET.ILLink.Analyzers.props",
- "tools/net8.0/build/Microsoft.NET.ILLink.Tasks.props",
- "tools/net8.0/build/Microsoft.NET.ILLink.targets",
- "tools/net8.0/illink.deps.json",
- "tools/net8.0/illink.dll",
- "tools/net8.0/illink.runtimeconfig.json",
- "useSharedDesignerContext.txt"
- ]
}
},
"projectFileDependencyGroups": {
"net8.0": [
- "Avalonia >= 11.3.9",
- "Microsoft.NET.ILLink.Tasks >= 8.0.31"
+ "Avalonia >= 11.3.9"
]
},
"packageFolders": {
@@ -564,12 +388,6 @@
"Avalonia": {
"target": "Package",
"version": "[11.3.9, )"
- },
- "Microsoft.NET.ILLink.Tasks": {
- "suppressParent": "All",
- "target": "Package",
- "version": "[8.0.31, )",
- "autoReferenced": true
}
},
"imports": [
@@ -583,16 +401,6 @@
],
"assetTargetFallback": true,
"warn": true,
- "downloadDependencies": [
- {
- "name": "Microsoft.AspNetCore.App.Runtime.win-arm64",
- "version": "[8.0.31, 8.0.31]"
- },
- {
- "name": "Microsoft.NETCore.App.Runtime.win-arm64",
- "version": "[8.0.31, 8.0.31]"
- }
- ],
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
@@ -600,11 +408,6 @@
},
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json"
}
- },
- "runtimes": {
- "win-arm64": {
- "#import": []
- }
}
}
}
\ No newline at end of file
diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache
index 839ed83..d3eb6b2 100644
--- a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache
+++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache
@@ -1,16 +1,13 @@
{
"version": 2,
- "dgSpecHash": "1rhPDKvFVIw=",
+ "dgSpecHash": "XCy7zfNs4zI=",
"success": true,
"projectFilePath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj",
"expectedPackageFiles": [
"/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512",
"/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512",
"/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512",
- "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512",
- "/Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31/microsoft.net.illink.tasks.8.0.31.nupkg.sha512",
- "/Users/morris/.nuget/packages/microsoft.netcore.app.runtime.win-arm64/8.0.31/microsoft.netcore.app.runtime.win-arm64.8.0.31.nupkg.sha512",
- "/Users/morris/.nuget/packages/microsoft.aspnetcore.app.runtime.win-arm64/8.0.31/microsoft.aspnetcore.app.runtime.win-arm64.8.0.31.nupkg.sha512"
+ "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll
index baf6111..0babb0a 100644
Binary files a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll and b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll differ
diff --git a/model/earth-geography/earth-geography.model/continents.json b/model/earth-geography/earth-geography.model/continents.json
new file mode 100644
index 0000000..58fa3d4
--- /dev/null
+++ b/model/earth-geography/earth-geography.model/continents.json
@@ -0,0 +1,44 @@
+{
+ "continents": [
+ {
+ "id": "eurasia",
+ "nameI18n": { "zh-CN": "亚欧大陆", "en": "Eurasia" },
+ "label": [85, 52],
+ "lines": [
+ [[-10,36],[-9,43],[-2,48],[3,52],[8,58],[12,65],[20,70],[30,71],[45,68],[60,72],[80,74],[100,76],[120,73],[140,70],[160,62],[170,60],[160,54],[145,50],[140,42],[130,38],[122,30],[120,22],[110,20],[105,10],[100,5],[103,-2],[98,2],[92,20],[88,22],[80,8],[77,8],[72,20],[68,24],[62,25],[57,25],[50,28],[45,38],[35,36],[28,40],[26,40],[20,42],[15,38],[10,37],[0,36],[-10,36]]
+ ]
+ },
+ {
+ "id": "africa",
+ "nameI18n": { "zh-CN": "非洲大陆", "en": "Africa" },
+ "label": [18, 2],
+ "lines": [
+ [[-17,15],[-16,21],[-10,27],[-6,36],[10,37],[20,33],[32,31],[35,24],[38,18],[43,12],[51,11],[48,5],[42,-2],[41,-12],[40,-20],[35,-26],[30,-31],[25,-35],[18,-34],[15,-27],[12,-18],[9,-5],[8,4],[3,6],[-4,5],[-8,5],[-13,10],[-17,15]]
+ ]
+ },
+ {
+ "id": "america",
+ "nameI18n": { "zh-CN": "美洲大陆", "en": "America" },
+ "label": [-88, 8],
+ "lines": [
+ [[-168,66],[-160,70],[-145,70],[-130,68],[-115,70],[-100,72],[-85,70],[-75,63],[-62,60],[-55,52],[-60,47],[-66,45],[-70,42],[-75,36],[-81,30],[-80,25],[-83,22],[-87,21],[-90,18],[-88,16],[-83,10],[-78,9],[-77,8],[-79,2],[-81,-5],[-76,-14],[-71,-18],[-70,-24],[-72,-38],[-74,-45],[-70,-52],[-68,-55],[-72,-54],[-75,-48],[-73,-40],[-71,-30],[-70,-20],[-75,-10],[-80,0],[-83,8],[-88,14],[-95,16],[-105,20],[-110,24],[-114,30],[-117,33],[-122,38],[-124,45],[-130,52],[-135,58],[-145,60],[-155,58],[-165,60],[-168,66]]
+ ]
+ },
+ {
+ "id": "australia",
+ "nameI18n": { "zh-CN": "澳大利亚大陆", "en": "Australia" },
+ "label": [134, -25],
+ "lines": [
+ [[113,-22],[114,-27],[116,-33],[122,-34],[129,-32],[134,-33],[138,-35],[141,-38],[147,-38],[150,-35],[153,-29],[153,-25],[149,-21],[146,-19],[142,-11],[138,-12],[136,-14],[132,-11],[129,-15],[125,-14],[122,-17],[117,-20],[113,-22]]
+ ]
+ },
+ {
+ "id": "antarctica",
+ "nameI18n": { "zh-CN": "南极大陆", "en": "Antarctica" },
+ "label": [20, -78],
+ "lines": [
+ [[-180,-72],[-150,-75],[-120,-73],[-90,-75],[-60,-70],[-45,-73],[-20,-70],[0,-69],[30,-68],[60,-67],[90,-66],[120,-66],[150,-70],[170,-72],[180,-78],[150,-80],[120,-80],[90,-79],[60,-78],[30,-76],[0,-75],[-30,-76],[-60,-77],[-90,-78],[-120,-77],[-150,-76],[-180,-72]]
+ ]
+ }
+ ]
+}
diff --git a/model/earth-geography/earth-geography.model/plates.json b/model/earth-geography/earth-geography.model/plates.json
index 157250a..a3d6546 100644
--- a/model/earth-geography/earth-geography.model/plates.json
+++ b/model/earth-geography/earth-geography.model/plates.json
@@ -1 +1,53 @@
-{"plates":[{"id":"pacific","lines":[[[-180,60],[-150,55],[-130,45],[-110,25],[-95,10],[-80,0],[-75,-15],[-90,-30],[-110,-45],[-130,-55],[-160,-60],[-180,-55],[-180,60]]]},{"id":"north-american","lines":[[[-168,72],[-140,70],[-120,60],[-100,50],[-80,45],[-60,42],[-52,28],[-62,12],[-82,8],[-95,16],[-110,25],[-130,45],[-150,55],[-168,72]]]},{"id":"south-american","lines":[[[-82,12],[-62,10],[-45,-2],[-35,-8],[-30,-20],[-40,-35],[-55,-42],[-70,-52],[-78,-40],[-80,-20],[-82,12]]]},{"id":"african","lines":[[[-20,35],[10,37],[32,32],[43,12],[51,10],[42,-8],[40,-25],[25,-35],[15,-30],[8,-5],[-8,5],[-17,15],[-20,35]]]},{"id":"eurasian","lines":[[[-10,36],[0,45],[15,55],[30,68],[60,72],[100,76],[140,70],[160,60],[140,42],[120,30],[100,20],[75,8],[60,22],[45,30],[30,32],[10,37],[-10,36]]]},{"id":"indo-australian","lines":[[[95,5],[115,10],[130,5],[145,-5],[150,-20],[145,-35],[130,-42],[115,-38],[105,-25],[95,-10],[95,5]]]},{"id":"antarctic","lines":[[[-180,-60],[-120,-62],[-60,-60],[0,-62],[60,-60],[120,-62],[180,-60],[180,-90],[-180,-90],[-180,-60]]]},{"id":"nazca","lines":[[[-95,-5],[-85,-10],[-75,-25],[-78,-40],[-90,-42],[-100,-30],[-95,-5]]]},{"id":"cocos","lines":[[[-105,10],[-95,12],[-90,5],[-100,2],[-105,10]]]},{"id":"caribbean","lines":[[[-88,15],[-75,18],[-62,15],[-60,8],[-72,6],[-85,8],[-88,15]]]},{"id":"philippine","lines":[[[118,20],[128,18],[130,8],[125,2],[118,8],[118,20]]]},{"id":"arabian","lines":[[[35,32],[48,30],[58,22],[55,12],[42,10],[35,20],[35,32]]]}]}
\ No newline at end of file
+{
+ "plates": [
+ {
+ "id": "eurasian",
+ "nameI18n": { "zh-CN": "亚欧板块", "en": "Eurasian Plate" },
+ "label": [85, 55],
+ "lines": [
+ [[-10,36],[0,45],[15,55],[30,68],[60,72],[100,76],[140,70],[160,60],[140,42],[125,32],[110,28],[95,28],[80,30],[72,28],[60,25],[45,30],[32,32],[10,37],[-10,36]]
+ ]
+ },
+ {
+ "id": "african",
+ "nameI18n": { "zh-CN": "非洲板块", "en": "African Plate" },
+ "label": [12, 2],
+ "lines": [
+ [[-20,35],[10,37],[32,32],[43,12],[51,10],[42,-8],[40,-25],[25,-35],[15,-30],[8,-5],[-8,5],[-17,15],[-20,35]]
+ ]
+ },
+ {
+ "id": "american",
+ "nameI18n": { "zh-CN": "美洲板块", "en": "American Plate" },
+ "label": [-100, 12],
+ "lines": [
+ [[-168,72],[-140,70],[-115,70],[-90,72],[-60,60],[-52,45],[-60,30],[-80,25],[-82,8],[-78,0],[-70,-15],[-72,-40],[-75,-52],[-80,-55],[-95,-45],[-105,-25],[-95,-5],[-90,10],[-105,20],[-120,35],[-135,50],[-155,60],[-168,72]]
+ ]
+ },
+ {
+ "id": "pacific",
+ "nameI18n": { "zh-CN": "太平洋板块", "en": "Pacific Plate" },
+ "label": [-150, 0],
+ "lines": [
+ [[-180,60],[-150,55],[-130,45],[-110,25],[-95,10],[-80,0],[-75,-15],[-90,-30],[-110,-45],[-130,-55],[-160,-60],[-180,-58],[-180,60]],
+ [[145,55],[158,45],[152,30],[145,15],[140,0],[148,-15],[158,-30],[168,-45],[180,-55],[180,60],[165,60],[145,55]]
+ ]
+ },
+ {
+ "id": "indian-ocean",
+ "nameI18n": { "zh-CN": "印度洋板块", "en": "Indian Ocean Plate" },
+ "label": [95, -8],
+ "lines": [
+ [[35,32],[50,30],[60,22],[68,24],[75,8],[88,5],[95,5],[115,10],[130,5],[145,-5],[150,-20],[145,-35],[130,-42],[115,-38],[105,-25],[95,-10],[80,-10],[65,-5],[55,10],[42,10],[35,20],[35,32]]
+ ]
+ },
+ {
+ "id": "antarctic",
+ "nameI18n": { "zh-CN": "南极洲板块", "en": "Antarctic Plate" },
+ "label": [0, -76],
+ "lines": [
+ [[-180,-60],[-120,-62],[-60,-60],[0,-62],[60,-60],[120,-62],[180,-60],[180,-90],[-180,-90],[-180,-60]]
+ ]
+ }
+ ]
+}
diff --git a/model/earth-geography/earth-geography.model/scene.json b/model/earth-geography/earth-geography.model/scene.json
index 914cf41..73f2ca4 100644
--- a/model/earth-geography/earth-geography.model/scene.json
+++ b/model/earth-geography/earth-geography.model/scene.json
@@ -12,8 +12,8 @@
"en": "Earth Geography"
},
"descriptionI18n": {
- "zh-CN": "五带划分 · 七大洲四大洋 · 六大板块与洲界",
- "en": "Climate zones · continents & oceans · plates & borders"
+ "zh-CN": "五带划分 · 七大洲四大洋 · 六大板块 · 五大陆与洲界",
+ "en": "Climate zones · continents & oceans · six plates · five mainlands & borders"
},
"tropicDeg": 23.5,
"axialTiltDeg": 23.5,
diff --git a/model/earth-geography/src/GeoModels.cs b/model/earth-geography/src/GeoModels.cs
index 310878a..e7e481e 100644
--- a/model/earth-geography/src/GeoModels.cs
+++ b/model/earth-geography/src/GeoModels.cs
@@ -13,6 +13,8 @@ public sealed class PlateEntry
{
[JsonPropertyName("id")] public string Id { get; set; } = "";
[JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; }
+ /// 标签锚点 [lon, lat];缺省时用轮廓质心。
+ [JsonPropertyName("label")] public double[]? Label { get; set; }
[JsonPropertyName("lines")] public List> Lines { get; set; } = new();
}
@@ -21,6 +23,12 @@ public sealed class PlateData
[JsonPropertyName("plates")] public List Plates { get; set; } = new();
}
+/// 大陆(六块大陆里的教材五块写法)。结构与板块一致,纯线稿。
+public sealed class ContinentData
+{
+ [JsonPropertyName("continents")] public List Continents { get; set; } = new();
+}
+
public sealed class BorderEntry
{
/// 分界的两个大洲,如「亚洲-非洲」。
diff --git a/model/earth-geography/src/GeographyRuntime.cs b/model/earth-geography/src/GeographyRuntime.cs
index 13fbfcf..3ed6609 100644
--- a/model/earth-geography/src/GeographyRuntime.cs
+++ b/model/earth-geography/src/GeographyRuntime.cs
@@ -19,6 +19,7 @@ public sealed class GeographyRuntime : IModelRuntime
private GeoScene? _scene;
private GeoData? _coast;
private PlateData? _plates;
+ private ContinentData? _continents;
private BorderData? _borders;
private LabelData? _labels;
private GeographyView? _view;
@@ -30,13 +31,15 @@ public sealed class GeographyRuntime : IModelRuntime
_scene = ModelJson.Read(Path.Combine(dir, "scene.json")) ?? new GeoScene();
_coast = ModelJson.Read(Path.Combine(dir, "coastline.json")) ?? new GeoData();
_plates = ModelJson.Read(Path.Combine(dir, "plates.json")) ?? new PlateData();
+ _continents = ModelJson.Read(Path.Combine(dir, "continents.json")) ?? new ContinentData();
_borders = ModelJson.Read(Path.Combine(dir, "borders.json")) ?? new BorderData();
context.ReportProgress(0.45, "加载名称标注");
_labels = ModelJson.Read(Path.Combine(dir, "labels.json")) ?? new LabelData();
context.ReportProgress(0.72, "构建轮廓");
- context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,板块 {_plates.Plates.Count} 个,洲界 {_borders.Borders.Count} 条");
+ context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,六大板块 {_plates.Plates.Count} 个," +
+ $"大陆 {_continents.Continents.Count} 块,洲界 {_borders.Borders.Count} 条");
}
public Control CreateView(IModelContext context)
@@ -44,10 +47,11 @@ public sealed class GeographyRuntime : IModelRuntime
_scene ??= new GeoScene();
_coast ??= new GeoData();
_plates ??= new PlateData();
+ _continents ??= new ContinentData();
_borders ??= new BorderData();
_labels ??= new LabelData();
- _view = new GeographyView(context, _scene, _coast, _plates, _borders, _labels);
+ _view = new GeographyView(context, _scene, _coast, _plates, _continents, _borders, _labels);
context.ReportProgress(1.0, "准备就绪");
return BuildLayout(_scene, _view, context);
}
@@ -90,7 +94,8 @@ public sealed class GeographyRuntime : IModelRuntime
actions.Children.Add(MakeModeSwitch(view));
actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on));
actions.Children.Add(MakeToggle("大洲轮廓", view.ShowCoast, on => view.ShowCoast = on));
- actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on));
+ actions.Children.Add(MakeToggle("六大板块", view.ShowPlates, on => view.ShowPlates = on));
+ actions.Children.Add(MakeToggle("五大陆", view.ShowContinents, on => view.ShowContinents = on));
actions.Children.Add(MakeToggle("洲界", view.ShowBorders, on => view.ShowBorders = on));
actions.Children.Add(MakeButton("复位", () => view.ResetView()));
Grid.SetColumn(actions, 2);
@@ -122,7 +127,8 @@ public sealed class GeographyRuntime : IModelRuntime
{
var panel = new StackPanel { Spacing = 6 };
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#DEEEFF")), "大洲海岸线"));
- panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "板块边界"));
+ panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "六大板块边界"));
+ panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFD24A")), "五大陆轮廓"));
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线"));
return new Border
{
diff --git a/model/earth-geography/src/GeographyView.cs b/model/earth-geography/src/GeographyView.cs
index 1beb359..27dee7e 100644
--- a/model/earth-geography/src/GeographyView.cs
+++ b/model/earth-geography/src/GeographyView.cs
@@ -23,6 +23,7 @@ public sealed class GeographyView : Control
private readonly GeoScene _scene;
private readonly GeoData _coast;
private readonly PlateData _plates;
+ private readonly ContinentData _continents;
private readonly BorderData _borders;
private readonly LabelData _labels;
@@ -35,6 +36,7 @@ public sealed class GeographyView : Control
private bool _showZones = true;
private bool _showCoast = true;
private bool _showPlates;
+ private bool _showContinents = true;
private bool _showBorders = true;
private bool _showLabels = true;
private GeoMode _mode = GeoMode.Sphere3D;
@@ -42,11 +44,12 @@ public sealed class GeographyView : Control
public event Action? StateChanged;
public GeographyView(IModelContext context, GeoScene scene, GeoData coast,
- PlateData plates, BorderData borders, LabelData labels)
+ PlateData plates, ContinentData continents, BorderData borders, LabelData labels)
{
_scene = scene;
_coast = coast;
_plates = plates;
+ _continents = continents;
_borders = borders;
_labels = labels;
ClipToBounds = true;
@@ -56,6 +59,7 @@ public sealed class GeographyView : Control
public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } }
public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } }
public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } }
+ public bool ShowContinents { get => _showContinents; set { _showContinents = value; Redraw(); } }
public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } }
public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } }
public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } }
@@ -164,6 +168,7 @@ public sealed class GeographyView : Control
if (_showZones) DrawZones3D(ctx, m, cx, cy, r);
if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r);
if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r);
+ if (_showContinents) DrawContinents3D(ctx, m, cx, cy, r);
if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r);
if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r);
@@ -308,13 +313,16 @@ public sealed class GeographyView : Control
var pen = PlatePenFor(p.Id);
foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
}
- if (!_showLabels) return;
+ if (_showLabels) DrawPlateLabels3D(ctx, m, cx, cy, r);
+ }
+ private void DrawPlateLabels3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
+ {
foreach (var p in _plates.Plates)
{
- var center = Centroid(p.Lines);
- if (center == null) continue;
- var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), Matrix4x4.Identity, m);
+ var at = p.Label is { Length: >= 2 } ? p.Label : Centroid(p.Lines);
+ if (at == null) continue;
+ var cam = Geometry.ToCamera(Geometry.LatLonToUnit(at[1], at[0]), Matrix4x4.Identity, m);
if (cam.Z <= 0.2f) continue;
var pos = Geometry.Project(cam, r, cx, cy);
DrawText(ctx, Pick(p.NameI18n, p.Id), pos.X, pos.Y, 10.5 * TextScale,
@@ -322,6 +330,27 @@ public sealed class GeographyView : Control
}
}
+ /// 五块大陆:与板块独立的线稿图层,便于讲清「板块 ≠ 大陆」。
+ private void DrawContinents3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
+ {
+ var pen = ContinentPen;
+ foreach (var c in _continents.Continents)
+ foreach (var line in c.Lines)
+ DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
+
+ if (!_showLabels) return;
+ foreach (var c in _continents.Continents)
+ {
+ var at = c.Label is { Length: >= 2 } ? c.Label : Centroid(c.Lines);
+ if (at == null) continue;
+ var cam = Geometry.ToCamera(Geometry.LatLonToUnit(at[1], at[0]), Matrix4x4.Identity, m);
+ if (cam.Z <= 0.2f) continue;
+ var pos = Geometry.Project(cam, r, cx, cy);
+ DrawText(ctx, Pick(c.NameI18n, c.Id), pos.X, pos.Y, 12 * TextScale,
+ MainlandBrush, TextAlignment.Center, FontStyle.Normal);
+ }
+ }
+
private void DrawBorders3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
{
foreach (var b in _borders.Borders)
@@ -482,7 +511,7 @@ public sealed class GeographyView : Control
DrawFlatPolyline(ctx, line, P, pen);
if (!_showLabels) continue;
- var c = Centroid(pl.Lines);
+ var c = pl.Label is { Length: >= 2 } ? pl.Label : Centroid(pl.Lines);
if (c == null) continue;
var at = P(c[0], c[1]);
DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5 * TextScale,
@@ -490,6 +519,23 @@ public sealed class GeographyView : Control
}
}
+ // 五大陆
+ if (_showContinents)
+ {
+ foreach (var c in _continents.Continents)
+ {
+ foreach (var line in c.Lines)
+ DrawFlatPolyline(ctx, line, P, ContinentPen);
+
+ if (!_showLabels) continue;
+ var a = c.Label is { Length: >= 2 } ? c.Label : Centroid(c.Lines);
+ if (a == null) continue;
+ var at = P(a[0], a[1]);
+ DrawText(ctx, Pick(c.NameI18n, c.Id), at.X, at.Y, 12 * TextScale,
+ MainlandBrush, TextAlignment.Center);
+ }
+ }
+
// 洲界
if (_showBorders)
{
@@ -584,20 +630,15 @@ public sealed class GeographyView : Control
private static IPen PlatePenFor(string id)
{
+ // 教材六大板块,每块一个颜色
var c = id switch
{
- "pacific" => Color.FromRgb(255, 110, 110),
- "north-american" => Color.FromRgb(255, 176, 84),
- "south-american" => Color.FromRgb(255, 226, 96),
- "african" => Color.FromRgb(150, 230, 110),
- "eurasian" => Color.FromRgb(110, 214, 230),
- "indo-australian" => Color.FromRgb(126, 160, 255),
- "antarctic" => Color.FromRgb(208, 190, 255),
- "nazca" => Color.FromRgb(255, 140, 200),
- "cocos" => Color.FromRgb(255, 200, 130),
- "caribbean" => Color.FromRgb(180, 240, 160),
- "philippine" => Color.FromRgb(255, 160, 230),
- "arabian" => Color.FromRgb(200, 220, 255),
+ "eurasian" => Color.FromRgb(110, 214, 230), // 青
+ "african" => Color.FromRgb(150, 230, 110), // 绿
+ "american" => Color.FromRgb(255, 176, 84), // 橙
+ "pacific" => Color.FromRgb(255, 110, 110), // 红
+ "indian-ocean" => Color.FromRgb(126, 160, 255), // 蓝紫
+ "antarctic" => Color.FromRgb(208, 190, 255), // 淡紫
_ => Color.FromRgb(255, 150, 100)
};
return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55,
@@ -614,6 +655,11 @@ public sealed class GeographyView : Control
private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75)
{ LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round };
+ /// 五大陆轮廓:金黄色实线,与板块虚线明显区分。
+ private static readonly IPen ContinentPen = new Pen(new SolidColorBrush(Color.FromArgb(240, 255, 210, 74)), 2.0)
+ { LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round };
+ private static readonly IBrush MainlandBrush = new SolidColorBrush(Color.FromRgb(255, 218, 110));
+
private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(220, 255, 190, 100)), 1.3);
private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(210, 150, 205, 255)), 1.3);
private static readonly IPen ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(110, 200, 225, 255)), 0.9);
diff --git a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll
index baf6111..0babb0a 100644
Binary files a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll and b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll differ
diff --git a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb
index a9811b7..72c7d1b 100644
Binary files a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb and b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb differ
diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs
index c397542..27d3a59 100644
--- a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs
+++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+936aec81850fb15f55014c66116d174dc9e2f967")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+874c97ee271617592f530440ae8879461e91488b")]
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
[assembly: System.Reflection.AssemblyTitleAttribute("EarthGeographyModel")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache
index 2eb646e..4dd61a9 100644
--- a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache
+++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ed259fd40e43f2cdb14b0deef0da4645edb339d430e473fbc89582da08e3d2b5
+d4fd061fd66be936bfe3ff861ab130f2046842e22ccd1d5d0250ed8beb77769b
diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache
index 1324542..a05322f 100644
Binary files a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache differ
diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll
index baf6111..0babb0a 100644
Binary files a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll differ
diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb
index a9811b7..72c7d1b 100644
Binary files a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb differ
diff --git a/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll
index 9c427ff..4ed4ff1 100644
Binary files a/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll and b/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll differ
diff --git a/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll
index 9c427ff..4ed4ff1 100644
Binary files a/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll and b/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll differ
diff --git a/model/scale-calculator/scale-calculator.model/preview.png b/model/scale-calculator/scale-calculator.model/preview.png
index 8a816a4..7916b9a 100644
Binary files a/model/scale-calculator/scale-calculator.model/preview.png and b/model/scale-calculator/scale-calculator.model/preview.png differ