Skip to content

Commit

Permalink
Update to si.uom.SI
Browse files Browse the repository at this point in the history
  • Loading branch information
@jericks
jericks committed Apr 27, 2018
1 parent 3ccd3de commit 33fb915
Showing 1 changed file with 43 additions and 43 deletions.
86 changes: 43 additions & 43 deletions src/main/groovy/geoscript/proj/Geodetic.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package geoscript.proj

import geoscript.geom.Point
import javax.measure.unit.SI
import si.uom.SI;
import org.geotools.referencing.GeodeticCalculator
import org.geotools.referencing.datum.DefaultEllipsoid

Expand All @@ -23,48 +23,48 @@ import org.geotools.referencing.datum.DefaultEllipsoid
class Geodetic {

// Ellipsoids from pyproj
static final DefaultEllipsoid MERIT = DefaultEllipsoid.createFlattenedSphere("MERIT 1983", 6378137.0, 298.257, SI.METER)
static final DefaultEllipsoid SGC84 = DefaultEllipsoid.createFlattenedSphere("Soviet Geodetic System 85", 6378136.0, 298.257, SI.METER)
static final DefaultEllipsoid GRS80 = DefaultEllipsoid.createFlattenedSphere("GRS 1980(IUGG, 1980)", 6378137.0, 298.257222101, SI.METER)
static final DefaultEllipsoid IAU76 = DefaultEllipsoid.createFlattenedSphere("IAU 1976", 6378140.0, 298.257, SI.METER)
static final DefaultEllipsoid AIRY = DefaultEllipsoid.createEllipsoid("Airy 1830", 6377563.396, 6356256.910, SI.METER)
static final DefaultEllipsoid APL4_9 = DefaultEllipsoid.createFlattenedSphere("Appl. Physics. 1965", 6378137.0, 298.25, SI.METER)
static final DefaultEllipsoid NWL9D = DefaultEllipsoid.createFlattenedSphere("Naval Weapons Lab., 1965", 6378145.0, 298.25, SI.METER)
static final DefaultEllipsoid MOD_AIRY = DefaultEllipsoid.createEllipsoid("Modified Airy", 6377340.189, 6356034.446, SI.METER)
static final DefaultEllipsoid ANDRAE = DefaultEllipsoid.createFlattenedSphere("Andrae 1876 (Den., Iclnd.)", 6377104.43, 300.0, SI.METER)
static final DefaultEllipsoid AUST_SA = DefaultEllipsoid.createFlattenedSphere("Australian Natl & S. Amer. 1969", 6378160.0, 298.25, SI.METER)
static final DefaultEllipsoid GRS67 = DefaultEllipsoid.createFlattenedSphere("GRS 67(IUGG 1967)", 6378160.0, 298.2471674270, SI.METER)
static final DefaultEllipsoid BESSEL = DefaultEllipsoid.createFlattenedSphere("Bessel 1841", 6377397.155, 299.1528128, SI.METER)
static final DefaultEllipsoid BESS_NAM = DefaultEllipsoid.createFlattenedSphere("Bessel 1841 (Namibia)", 6377483.865, 299.1528128, SI.METER)
static final DefaultEllipsoid CLRK66 = DefaultEllipsoid.createEllipsoid("Clarke 1866", 6378206.4, 6356583.8, SI.METER)
static final DefaultEllipsoid CLRK80 = DefaultEllipsoid.createFlattenedSphere("Clarke 1880 mod.", 6378249.145, 293.4663, SI.METER)
static final DefaultEllipsoid CPM = DefaultEllipsoid.createFlattenedSphere("Comm. des Poids et Mesures 1799", 6375738.7, 334.29, SI.METER)
static final DefaultEllipsoid DELMBR = DefaultEllipsoid.createFlattenedSphere("Delambre 1810 (Belgium)", 6376428.0, 311.5, SI.METER)
static final DefaultEllipsoid ENGELIS = DefaultEllipsoid.createFlattenedSphere("Engelis 1985", 6378136.05, 298.2566, SI.METER)
static final DefaultEllipsoid EVRST30 = DefaultEllipsoid.createFlattenedSphere("Everest 1830", 6377276.345, 300.8017, SI.METER)
static final DefaultEllipsoid EVRST48 = DefaultEllipsoid.createFlattenedSphere("Everest 1948", 6377304.063, 300.8017, SI.METER)
static final DefaultEllipsoid EVRST56 = DefaultEllipsoid.createFlattenedSphere("Everest 1956", 6377301.243, 300.8017, SI.METER)
static final DefaultEllipsoid EVRST69 = DefaultEllipsoid.createFlattenedSphere("Everest 1969", 6377295.664, 300.8017, SI.METER)
static final DefaultEllipsoid EVRSTSS = DefaultEllipsoid.createFlattenedSphere("Everest (Sabah & Sarawak)", 6377298.556, 300.8017, SI.METER)
static final DefaultEllipsoid FSCHR60 = DefaultEllipsoid.createFlattenedSphere("Fischer (Mercury Datum) 1960", 6378166.0, 298.3, SI.METER)
static final DefaultEllipsoid FSCHR60M = DefaultEllipsoid.createFlattenedSphere("Modified Fischer 1960", 6378155.0, 298.3, SI.METER)
static final DefaultEllipsoid FSCHR68 = DefaultEllipsoid.createFlattenedSphere("Fischer 1968", 6378150.0, 298.3, SI.METER)
static final DefaultEllipsoid HELMERT = DefaultEllipsoid.createFlattenedSphere("Helmert 1906", 6378200.0, 298.3, SI.METER)
static final DefaultEllipsoid HOUGH = DefaultEllipsoid.createFlattenedSphere("Hough", 6378270.0, 297.0, SI.METER)
static final DefaultEllipsoid INTL = DefaultEllipsoid.createFlattenedSphere("International 1909 (Hayford)", 6378388.0,297.0, SI.METER)
static final DefaultEllipsoid KRASS = DefaultEllipsoid.createFlattenedSphere("Krassovsky, 1942", 6378245.0, 298.3, SI.METER)
static final DefaultEllipsoid KAULA = DefaultEllipsoid.createFlattenedSphere("Kaula 1961", 6378163.0, 298.24, SI.METER)
static final DefaultEllipsoid LERCH = DefaultEllipsoid.createFlattenedSphere("Lerch 1979", 6378139.0, 298.257, SI.METER)
static final DefaultEllipsoid MPRTS = DefaultEllipsoid.createFlattenedSphere("Maupertius 1738", 6397300.0, 191.0, SI.METER)
static final DefaultEllipsoid NEW_INTL = DefaultEllipsoid.createEllipsoid("New International 1967", 6378157.5, 6356772.2, SI.METER)
static final DefaultEllipsoid PLESSIS = DefaultEllipsoid.createEllipsoid("Plessis 1817 (France)", 6376523.0, 6355863.0, SI.METER)
static final DefaultEllipsoid SEASIA = DefaultEllipsoid.createEllipsoid("Southeast Asia", 6378155.0,6356773.3205, SI.METER)
static final DefaultEllipsoid WALBECK = DefaultEllipsoid.createEllipsoid("Walbeck", 6376896.0, 6355834.8467, SI.METER)
static final DefaultEllipsoid WGS60 = DefaultEllipsoid.createFlattenedSphere("WGS 60", 6378165.0, 298.3, SI.METER)
static final DefaultEllipsoid WGS66 = DefaultEllipsoid.createFlattenedSphere("WGS 66", 6378145.0, 298.25, SI.METER)
static final DefaultEllipsoid WGS72 = DefaultEllipsoid.createFlattenedSphere("WGS 72", 6378135.0, 298.26, SI.METER)
static final DefaultEllipsoid WGS84 = DefaultEllipsoid.createFlattenedSphere("WGS 84", 6378137.0, 298.257223563, SI.METER)
static final DefaultEllipsoid SPHERE = DefaultEllipsoid.createEllipsoid("Normal Sphere (r=6370997)", 6370997.0, 6370997.0, SI.METER)
static final DefaultEllipsoid MERIT = DefaultEllipsoid.createFlattenedSphere("MERIT 1983", 6378137.0, 298.257, SI.METRE)
static final DefaultEllipsoid SGC84 = DefaultEllipsoid.createFlattenedSphere("Soviet Geodetic System 85", 6378136.0, 298.257, SI.METRE)
static final DefaultEllipsoid GRS80 = DefaultEllipsoid.createFlattenedSphere("GRS 1980(IUGG, 1980)", 6378137.0, 298.257222101, SI.METRE)
static final DefaultEllipsoid IAU76 = DefaultEllipsoid.createFlattenedSphere("IAU 1976", 6378140.0, 298.257, SI.METRE)
static final DefaultEllipsoid AIRY = DefaultEllipsoid.createEllipsoid("Airy 1830", 6377563.396, 6356256.910, SI.METRE)
static final DefaultEllipsoid APL4_9 = DefaultEllipsoid.createFlattenedSphere("Appl. Physics. 1965", 6378137.0, 298.25, SI.METRE)
static final DefaultEllipsoid NWL9D = DefaultEllipsoid.createFlattenedSphere("Naval Weapons Lab., 1965", 6378145.0, 298.25, SI.METRE)
static final DefaultEllipsoid MOD_AIRY = DefaultEllipsoid.createEllipsoid("Modified Airy", 6377340.189, 6356034.446, SI.METRE)
static final DefaultEllipsoid ANDRAE = DefaultEllipsoid.createFlattenedSphere("Andrae 1876 (Den., Iclnd.)", 6377104.43, 300.0, SI.METRE)
static final DefaultEllipsoid AUST_SA = DefaultEllipsoid.createFlattenedSphere("Australian Natl & S. Amer. 1969", 6378160.0, 298.25, SI.METRE)
static final DefaultEllipsoid GRS67 = DefaultEllipsoid.createFlattenedSphere("GRS 67(IUGG 1967)", 6378160.0, 298.2471674270, SI.METRE)
static final DefaultEllipsoid BESSEL = DefaultEllipsoid.createFlattenedSphere("Bessel 1841", 6377397.155, 299.1528128, SI.METRE)
static final DefaultEllipsoid BESS_NAM = DefaultEllipsoid.createFlattenedSphere("Bessel 1841 (Namibia)", 6377483.865, 299.1528128, SI.METRE)
static final DefaultEllipsoid CLRK66 = DefaultEllipsoid.createEllipsoid("Clarke 1866", 6378206.4, 6356583.8, SI.METRE)
static final DefaultEllipsoid CLRK80 = DefaultEllipsoid.createFlattenedSphere("Clarke 1880 mod.", 6378249.145, 293.4663, SI.METRE)
static final DefaultEllipsoid CPM = DefaultEllipsoid.createFlattenedSphere("Comm. des Poids et Mesures 1799", 6375738.7, 334.29, SI.METRE)
static final DefaultEllipsoid DELMBR = DefaultEllipsoid.createFlattenedSphere("Delambre 1810 (Belgium)", 6376428.0, 311.5, SI.METRE)
static final DefaultEllipsoid ENGELIS = DefaultEllipsoid.createFlattenedSphere("Engelis 1985", 6378136.05, 298.2566, SI.METRE)
static final DefaultEllipsoid EVRST30 = DefaultEllipsoid.createFlattenedSphere("Everest 1830", 6377276.345, 300.8017, SI.METRE)
static final DefaultEllipsoid EVRST48 = DefaultEllipsoid.createFlattenedSphere("Everest 1948", 6377304.063, 300.8017, SI.METRE)
static final DefaultEllipsoid EVRST56 = DefaultEllipsoid.createFlattenedSphere("Everest 1956", 6377301.243, 300.8017, SI.METRE)
static final DefaultEllipsoid EVRST69 = DefaultEllipsoid.createFlattenedSphere("Everest 1969", 6377295.664, 300.8017, SI.METRE)
static final DefaultEllipsoid EVRSTSS = DefaultEllipsoid.createFlattenedSphere("Everest (Sabah & Sarawak)", 6377298.556, 300.8017, SI.METRE)
static final DefaultEllipsoid FSCHR60 = DefaultEllipsoid.createFlattenedSphere("Fischer (Mercury Datum) 1960", 6378166.0, 298.3, SI.METRE)
static final DefaultEllipsoid FSCHR60M = DefaultEllipsoid.createFlattenedSphere("Modified Fischer 1960", 6378155.0, 298.3, SI.METRE)
static final DefaultEllipsoid FSCHR68 = DefaultEllipsoid.createFlattenedSphere("Fischer 1968", 6378150.0, 298.3, SI.METRE)
static final DefaultEllipsoid HELMERT = DefaultEllipsoid.createFlattenedSphere("Helmert 1906", 6378200.0, 298.3, SI.METRE)
static final DefaultEllipsoid HOUGH = DefaultEllipsoid.createFlattenedSphere("Hough", 6378270.0, 297.0, SI.METRE)
static final DefaultEllipsoid INTL = DefaultEllipsoid.createFlattenedSphere("International 1909 (Hayford)", 6378388.0,297.0, SI.METRE)
static final DefaultEllipsoid KRASS = DefaultEllipsoid.createFlattenedSphere("Krassovsky, 1942", 6378245.0, 298.3, SI.METRE)
static final DefaultEllipsoid KAULA = DefaultEllipsoid.createFlattenedSphere("Kaula 1961", 6378163.0, 298.24, SI.METRE)
static final DefaultEllipsoid LERCH = DefaultEllipsoid.createFlattenedSphere("Lerch 1979", 6378139.0, 298.257, SI.METRE)
static final DefaultEllipsoid MPRTS = DefaultEllipsoid.createFlattenedSphere("Maupertius 1738", 6397300.0, 191.0, SI.METRE)
static final DefaultEllipsoid NEW_INTL = DefaultEllipsoid.createEllipsoid("New International 1967", 6378157.5, 6356772.2, SI.METRE)
static final DefaultEllipsoid PLESSIS = DefaultEllipsoid.createEllipsoid("Plessis 1817 (France)", 6376523.0, 6355863.0, SI.METRE)
static final DefaultEllipsoid SEASIA = DefaultEllipsoid.createEllipsoid("Southeast Asia", 6378155.0,6356773.3205, SI.METRE)
static final DefaultEllipsoid WALBECK = DefaultEllipsoid.createEllipsoid("Walbeck", 6376896.0, 6355834.8467, SI.METRE)
static final DefaultEllipsoid WGS60 = DefaultEllipsoid.createFlattenedSphere("WGS 60", 6378165.0, 298.3, SI.METRE)
static final DefaultEllipsoid WGS66 = DefaultEllipsoid.createFlattenedSphere("WGS 66", 6378145.0, 298.25, SI.METRE)
static final DefaultEllipsoid WGS72 = DefaultEllipsoid.createFlattenedSphere("WGS 72", 6378135.0, 298.26, SI.METRE)
static final DefaultEllipsoid WGS84 = DefaultEllipsoid.createFlattenedSphere("WGS 84", 6378137.0, 298.257223563, SI.METRE)
static final DefaultEllipsoid SPHERE = DefaultEllipsoid.createEllipsoid("Normal Sphere (r=6370997)", 6370997.0, 6370997.0, SI.METRE)

// Put the Ellipsoids in a Map by name for easy lookup
static final Map<String, DefaultEllipsoid> ellipsoids = new HashMap<String, DefaultEllipsoid>()
Expand Down

0 comments on commit 33fb915

Please sign in to comment.