Add JGD2011 support to formats supporting WGS 84 (#701)

Resolves #700
MIERUNE · Feb 1, 2025 · ae13509 · ae13509
1 parent 15be0e7
commit ae13509
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/src/lib/settings.ts b/app/src/lib/settings.ts
@@ -6,7 +6,8 @@ const filetypeOptions: Record<string, { label: string; extensions: string[]; eps
 			label: 'GeoPackage',
 			extensions: ['gpkg'],
 			epsg: [
-				{ value: 4979, label: 'WGS 84 (EPSG:4979)' },
+				{ value: 4979, label: 'WGS 84 (EPSG:4979) (楕円体高)' },
+				{ value: 6697, label: 'JGD2011 + 標高 (EPSG:6697)' },
 				{ value: 3857, label: 'Web Mercator (EPSG:3857)' },
 				{ value: 6669, label: 'JGD2011 / 平面直角座標系 I (EPSG:6669)' },
 				{ value: 6670, label: 'JGD2011 / 平面直角座標系 II (EPSG:6670)' },
@@ -45,14 +46,17 @@ const filetypeOptions: Record<string, { label: string; extensions: string[]; eps
 		geojson: {
 			label: 'GeoJSON',
 			extensions: [],
-			epsg: [{ value: 4979, label: 'WGS 84 (EPSG:4979)' }]
+			epsg: [
+				{ value: 4979, label: 'WGS 84 (EPSG:4979) (楕円体高)' },
+				{ value: 6697, label: 'JGD2011 + 標高 (EPSG:6697)' }
+			]
 		},
 		cesiumtiles: {
 			label: '3D Tiles',
 			extensions: [''],
 			epsg: [
 				{ value: 4979, label: 'WGS 84 (EPSG:4979) (楕円体高)' },
-				{ value: 6697, label: '特殊: JGD2011 (EPSG:6697) (標高)' }
+				{ value: 6697, label: '特殊: JGD2011 + 標高 (EPSG:6697)' }
 			]
 		},
 		mvt: {
@@ -68,7 +72,7 @@ const filetypeOptions: Record<string, { label: string; extensions: string[]; eps
 		kml: {
 			label: 'KML',
 			extensions: ['kml'],
-			epsg: [{ value: 6697, label: 'JGD2011 (EPSG:6697)' }]
+			epsg: [{ value: 6697, label: 'JGD2011 + 標高 (EPSG:6697)' }]
 		},
 		gltf: {
 			label: 'glTF',
@@ -79,7 +83,8 @@ const filetypeOptions: Record<string, { label: string; extensions: string[]; eps
 			label: 'Shapefile',
 			extensions: [''],
 			epsg: [
-				{ value: 4979, label: 'WGS 84 (EPSG:4979)' },
+				{ value: 4979, label: 'WGS 84 (EPSG:4979) (楕円体高)' },
+				{ value: 6697, label: 'JGD2011 + 標高 (EPSG:6697)' },
 				{ value: 3857, label: 'Web Mercator (EPSG:3857)' },
 				{ value: 6669, label: 'JGD2011 / 平面直角座標系 I (EPSG:6669)' },
 				{ value: 6670, label: 'JGD2011 / 平面直角座標系 II (EPSG:6670)' },

diff --git a/nusamai-projection/src/vshift.rs b/nusamai-projection/src/vshift.rs
@@ -1,6 +1,6 @@
 use japan_geoid::{gsi::MemoryGrid, Geoid};
 
-/// Convert from JGD 2011 Geograhpic 3D (EPSG:6697) to WGS84 Geograhpic 3D (EPSG:4979)
+/// Convert from JGD2011 Geograhpic 3D (EPSG:6697) to WGS84 Geograhpic 3D (EPSG:4979)
 pub struct Jgd2011ToWgs84 {
     geoid: MemoryGrid<'static>,
 }