aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/PJ_isea.c8
-rw-r--r--src/pj_datums.c67
-rw-r--r--src/pj_ellps.c88
-rw-r--r--src/pj_units.c44
4 files changed, 108 insertions, 99 deletions
diff --git a/src/PJ_isea.c b/src/PJ_isea.c
index 3fc508a3..3097e762 100644
--- a/src/PJ_isea.c
+++ b/src/PJ_isea.c
@@ -160,10 +160,10 @@ ISEA_STATIC
struct snyder_constants constants[] = {
{23.80018260, 62.15458023, 60.0, 3.75, 1.033, 0.968, 5.09, 1.195, 1.0},
{20.07675127, 55.69063953, 54.0, 2.65, 1.030, 0.983, 3.59, 1.141, 1.027},
- {0.0},
- {0.0},
- {0.0},
- {0.0},
+ {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
{37.37736814, 36.0, 30.0, 17.27, 1.163, 0.860, 13.14, 1.584, 1.0},
};
diff --git a/src/pj_datums.c b/src/pj_datums.c
index 13488481..899b7173 100644
--- a/src/pj_datums.c
+++ b/src/pj_datums.c
@@ -40,21 +40,30 @@
C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = {
/* id definition ellipse comments */
/* -- ---------- ------- -------- */
-"WGS84", "towgs84=0,0,0", "WGS84", "",
-"GGRS87", "towgs84=-199.87,74.79,246.62", "GRS80",
- "Greek_Geodetic_Reference_System_1987",
-"NAD83", "towgs84=0,0,0", "GRS80",
- "North_American_Datum_1983",
-"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat",
- "clrk66",
- "North_American_Datum_1927",
-"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7", "bessel", "Potsdam Rauenberg 1950 DHDN",
-"carthage", "towgs84=-263.0,6.0,431.0", "clrk80ign", "Carthage 1934 Tunisia",
-"hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232", "bessel", "Hermannskogel",
-"ire65", "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15", "mod_airy", "Ireland 1965",
-"nzgd49", "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", "intl", "New Zealand Geodetic Datum 1949",
-"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894", "airy", "Airy 1830",
-NULL, NULL, NULL, NULL
+{"WGS84", "towgs84=0,0,0", "WGS84", ""},
+{"GGRS87", "towgs84=-199.87,74.79,246.62", "GRS80",
+ "Greek_Geodetic_Reference_System_1987"},
+{"NAD83", "towgs84=0,0,0", "GRS80",
+ "North_American_Datum_1983"},
+{"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat",
+ "clrk66",
+ "North_American_Datum_1927"},
+{"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7",
+ "bessel",
+ "Potsdam Rauenberg 1950 DHDN"},
+{"carthage","towgs84=-263.0,6.0,431.0", "clrk80ign",
+ "Carthage 1934 Tunisia"},
+{"hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232",
+ "bessel",
+ "Hermannskogel"},
+{"ire65", "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15",
+ "mod_airy",
+ "Ireland 1965"},
+{"nzgd49", "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993",
+ "intl", "New Zealand Geodetic Datum 1949"},
+{"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894",
+ "airy", "Airy 1830"},
+{NULL, NULL, NULL, NULL}
};
struct PJ_DATUMS *pj_get_datums_ref()
@@ -66,20 +75,20 @@ struct PJ_DATUMS *pj_get_datums_ref()
C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = {
/* id definition */
/* -- ---------- */
- "greenwich", "0dE",
- "lisbon", "9d07'54.862\"W",
- "paris", "2d20'14.025\"E",
- "bogota", "74d04'51.3\"W",
- "madrid", "3d41'16.58\"W",
- "rome", "12d27'8.4\"E",
- "bern", "7d26'22.5\"E",
- "jakarta", "106d48'27.79\"E",
- "ferro", "17d40'W",
- "brussels", "4d22'4.71\"E",
- "stockholm", "18d3'29.8\"E",
- "athens", "23d42'58.815\"E",
- "oslo", "10d43'22.5\"E",
- NULL, NULL
+ {"greenwich", "0dE"},
+ {"lisbon", "9d07'54.862\"W"},
+ {"paris", "2d20'14.025\"E"},
+ {"bogota", "74d04'51.3\"W"},
+ {"madrid", "3d41'16.58\"W"},
+ {"rome", "12d27'8.4\"E"},
+ {"bern", "7d26'22.5\"E"},
+ {"jakarta", "106d48'27.79\"E"},
+ {"ferro", "17d40'W"},
+ {"brussels", "4d22'4.71\"E"},
+ {"stockholm", "18d3'29.8\"E"},
+ {"athens", "23d42'58.815\"E"},
+ {"oslo", "10d43'22.5\"E"},
+ {NULL, NULL}
};
struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref()
diff --git a/src/pj_ellps.c b/src/pj_ellps.c
index 3da162b4..32fbbd42 100644
--- a/src/pj_ellps.c
+++ b/src/pj_ellps.c
@@ -4,50 +4,50 @@
C_NAMESPACE_VAR struct PJ_ELLPS
pj_ellps[] = {
-"MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983",
-"SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85",
-"GRS80", "a=6378137.0", "rf=298.257222101", "GRS 1980(IUGG, 1980)",
-"IAU76", "a=6378140.0", "rf=298.257", "IAU 1976",
-"airy", "a=6377563.396", "b=6356256.910", "Airy 1830",
-"APL4.9", "a=6378137.0.", "rf=298.25", "Appl. Physics. 1965",
-"NWL9D", "a=6378145.0.", "rf=298.25", "Naval Weapons Lab., 1965",
-"mod_airy", "a=6377340.189", "b=6356034.446", "Modified Airy",
-"andrae", "a=6377104.43", "rf=300.0", "Andrae 1876 (Den., Iclnd.)",
-"aust_SA", "a=6378160.0", "rf=298.25", "Australian Natl & S. Amer. 1969",
-"GRS67", "a=6378160.0", "rf=298.2471674270", "GRS 67(IUGG 1967)",
-"bessel", "a=6377397.155", "rf=299.1528128", "Bessel 1841",
-"bess_nam", "a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)",
-"clrk66", "a=6378206.4", "b=6356583.8", "Clarke 1866",
-"clrk80", "a=6378249.145", "rf=293.4663", "Clarke 1880 mod.",
-"clrk80ign","a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN).",
-"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799",
-"delmbr", "a=6376428.", "rf=311.5", "Delambre 1810 (Belgium)",
-"engelis", "a=6378136.05", "rf=298.2566", "Engelis 1985",
-"evrst30", "a=6377276.345", "rf=300.8017", "Everest 1830",
-"evrst48", "a=6377304.063", "rf=300.8017", "Everest 1948",
-"evrst56", "a=6377301.243", "rf=300.8017", "Everest 1956",
-"evrst69", "a=6377295.664", "rf=300.8017", "Everest 1969",
-"evrstSS", "a=6377298.556", "rf=300.8017", "Everest (Sabah & Sarawak)",
-"fschr60", "a=6378166.", "rf=298.3", "Fischer (Mercury Datum) 1960",
-"fschr60m", "a=6378155.", "rf=298.3", "Modified Fischer 1960",
-"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968",
-"helmert", "a=6378200.", "rf=298.3", "Helmert 1906",
-"hough", "a=6378270.0", "rf=297.", "Hough",
-"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)",
-"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942",
-"kaula", "a=6378163.", "rf=298.24", "Kaula 1961",
-"lerch", "a=6378139.", "rf=298.257", "Lerch 1979",
-"mprts", "a=6397300.", "rf=191.", "Maupertius 1738",
-"new_intl", "a=6378157.5", "b=6356772.2", "New International 1967",
-"plessis", "a=6376523.", "b=6355863.", "Plessis 1817 (France)",
-"SEasia", "a=6378155.0", "b=6356773.3205", "Southeast Asia",
-"walbeck", "a=6376896.0", "b=6355834.8467", "Walbeck",
-"WGS60", "a=6378165.0", "rf=298.3", "WGS 60",
-"WGS66", "a=6378145.0", "rf=298.25", "WGS 66",
-"WGS72", "a=6378135.0", "rf=298.26", "WGS 72",
-"WGS84", "a=6378137.0", "rf=298.257223563", "WGS 84",
-"sphere", "a=6370997.0", "b=6370997.0", "Normal Sphere (r=6370997)",
-0,0,0,0
+{"MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983"},
+{"SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85"},
+{"GRS80", "a=6378137.0", "rf=298.257222101", "GRS 1980(IUGG, 1980)"},
+{"IAU76", "a=6378140.0", "rf=298.257", "IAU 1976"},
+{"airy", "a=6377563.396", "b=6356256.910", "Airy 1830"},
+{"APL4.9", "a=6378137.0.", "rf=298.25", "Appl. Physics. 1965"},
+{"NWL9D", "a=6378145.0.", "rf=298.25", "Naval Weapons Lab., 1965"},
+{"mod_airy", "a=6377340.189", "b=6356034.446", "Modified Airy"},
+{"andrae", "a=6377104.43", "rf=300.0", "Andrae 1876 (Den., Iclnd.)"},
+{"aust_SA", "a=6378160.0", "rf=298.25", "Australian Natl & S. Amer. 1969"},
+{"GRS67", "a=6378160.0", "rf=298.2471674270", "GRS 67(IUGG 1967)"},
+{"bessel", "a=6377397.155", "rf=299.1528128", "Bessel 1841"},
+{"bess_nam", "a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)"},
+{"clrk66", "a=6378206.4", "b=6356583.8", "Clarke 1866"},
+{"clrk80", "a=6378249.145", "rf=293.4663", "Clarke 1880 mod."},
+{"clrk80ign", "a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN)."},
+{"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799"},
+{"delmbr", "a=6376428.", "rf=311.5", "Delambre 1810 (Belgium)"},
+{"engelis", "a=6378136.05", "rf=298.2566", "Engelis 1985"},
+{"evrst30", "a=6377276.345", "rf=300.8017", "Everest 1830"},
+{"evrst48", "a=6377304.063", "rf=300.8017", "Everest 1948"},
+{"evrst56", "a=6377301.243", "rf=300.8017", "Everest 1956"},
+{"evrst69", "a=6377295.664", "rf=300.8017", "Everest 1969"},
+{"evrstSS", "a=6377298.556", "rf=300.8017", "Everest (Sabah & Sarawak)"},
+{"fschr60", "a=6378166.", "rf=298.3", "Fischer (Mercury Datum) 1960"},
+{"fschr60m", "a=6378155.", "rf=298.3", "Modified Fischer 1960"},
+{"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968"},
+{"helmert", "a=6378200.", "rf=298.3", "Helmert 1906"},
+{"hough", "a=6378270.0", "rf=297.", "Hough"},
+{"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)"},
+{"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942"},
+{"kaula", "a=6378163.", "rf=298.24", "Kaula 1961"},
+{"lerch", "a=6378139.", "rf=298.257", "Lerch 1979"},
+{"mprts", "a=6397300.", "rf=191.", "Maupertius 1738"},
+{"new_intl", "a=6378157.5", "b=6356772.2", "New International 1967"},
+{"plessis", "a=6376523.", "b=6355863.", "Plessis 1817 (France)"},
+{"SEasia", "a=6378155.0", "b=6356773.3205", "Southeast Asia"},
+{"walbeck", "a=6376896.0", "b=6355834.8467", "Walbeck"},
+{"WGS60", "a=6378165.0", "rf=298.3", "WGS 60"},
+{"WGS66", "a=6378145.0", "rf=298.25", "WGS 66"},
+{"WGS72", "a=6378135.0", "rf=298.26", "WGS 72"},
+{"WGS84", "a=6378137.0", "rf=298.257223563", "WGS 84"},
+{"sphere", "a=6370997.0", "b=6370997.0", "Normal Sphere (r=6370997)"},
+{NULL, NULL, NULL, NULL}
};
struct PJ_ELLPS *pj_get_ellps_ref()
diff --git a/src/pj_units.c b/src/pj_units.c
index bb39f91b..c6b5ae37 100644
--- a/src/pj_units.c
+++ b/src/pj_units.c
@@ -6,28 +6,28 @@
** numerator/denomenator values (e.g. 1/1000) */
C_NAMESPACE_VAR struct PJ_UNITS
pj_units[] = {
- "km", "1000.", "Kilometer",
- "m", "1.", "Meter",
- "dm", "1/10", "Decimeter",
- "cm", "1/100", "Centimeter",
- "mm", "1/1000", "Millimeter",
- "kmi", "1852.0", "International Nautical Mile",
- "in", "0.0254", "International Inch",
- "ft", "0.3048", "International Foot",
- "yd", "0.9144", "International Yard",
- "mi", "1609.344", "International Statute Mile",
- "fath", "1.8288", "International Fathom",
- "ch", "20.1168", "International Chain",
- "link", "0.201168", "International Link",
- "us-in", "1./39.37", "U.S. Surveyor's Inch",
- "us-ft", "0.304800609601219", "U.S. Surveyor's Foot",
- "us-yd", "0.914401828803658", "U.S. Surveyor's Yard",
- "us-ch", "20.11684023368047", "U.S. Surveyor's Chain",
- "us-mi", "1609.347218694437", "U.S. Surveyor's Statute Mile",
- "ind-yd", "0.91439523", "Indian Yard",
- "ind-ft", "0.30479841", "Indian Foot",
- "ind-ch", "20.11669506", "Indian Chain",
-(char *)0, (char *)0, (char *)0
+ {"km", "1000.", "Kilometer"},
+ {"m", "1.", "Meter"},
+ {"dm", "1/10", "Decimeter"},
+ {"cm", "1/100", "Centimeter"},
+ {"mm", "1/1000", "Millimeter"},
+ {"kmi", "1852.0", "International Nautical Mile"},
+ {"in", "0.0254", "International Inch"},
+ {"ft", "0.3048", "International Foot"},
+ {"yd", "0.9144", "International Yard"},
+ {"mi", "1609.344", "International Statute Mile"},
+ {"fath", "1.8288", "International Fathom"},
+ {"ch", "20.1168", "International Chain"},
+ {"link", "0.201168", "International Link"},
+ {"us-in", "1./39.37", "U.S. Surveyor's Inch"},
+ {"us-ft", "0.304800609601219", "U.S. Surveyor's Foot"},
+ {"us-yd", "0.914401828803658", "U.S. Surveyor's Yard"},
+ {"us-ch", "20.11684023368047", "U.S. Surveyor's Chain"},
+ {"us-mi", "1609.347218694437", "U.S. Surveyor's Statute Mile"},
+ {"ind-yd", "0.91439523", "Indian Yard"},
+ {"ind-ft", "0.30479841", "Indian Foot"},
+ {"ind-ch", "20.11669506", "Indian Chain"},
+ {NULL, NULL, NULL}
};
struct PJ_UNITS *pj_get_units_ref()
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-01 18:34:55 +0000