Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JGD2011 support to formats supporting WGS 84 #701

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Add JGD2011 support to formats supporting WGS 84 #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions app/src/lib/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)' },
Expand Down Expand Up @@ -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: {
Expand All @@ -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',
Expand All @@ -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)' },
Expand Down
2 changes: 1 addition & 1 deletion nusamai-projection/src/vshift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
}
Expand Down