Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java (revision 30729) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java (revision 30730) @@ -2,5 +2,25 @@ package org.openstreetmap.josm.plugins.opendata.core.io.geographic; -import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.*; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.AIRY; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.AUSTRALIAN_NATIONAL; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.BESSEL; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.BESSEL_1841; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.CLARKE_1866; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.CLARKE_1880; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.EVEREST; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.GRS_67; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.GRS_80; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.HELMERT_1906; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.HOUGH; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.INTERNATIONAL; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.KRASSOVSKY; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.MODIFIED_AIRY; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.MODIFIED_CLARKE_1866; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.MODIFIED_EVEREST; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.MODIFIED_FISCHER_1960; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.WGS_60; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.WGS_66; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.WGS_72; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifEllipsoid.WGS_84; /** @@ -11,127 +31,127 @@ */ public enum MifDatum { - Adindan(1, "Ethiopia, Mali, Senegal, Sudan", Clarke_1880), - Afgooye(2, "Somalia", Krassovsky), - Ain_el_Abd_1970(3, "Bahrain Island", International), - Anna_1_Astro_1965(4, "Cocos Islands", Australian_National), - Arc_1950(5, "Botswana, Lesotho, Malawi, Swaziland, Zaire, Zambia, Zimbabwe", Clarke_1880), - Arc_1960(6, "Kenya, Tanzania", Clarke_1880), - Ascension_Island_1958(7, "Ascension Island", International), - Astro_Beacon_E(8, "Iwo Jima Island", International), - Astro_B4_Sorol_Atoll(9, "Tern Island", International), - Astro_DOS_71_4(10, "St. Helena Island", International), - Astronomic_Station_1952(11, "Marcus Island", International), - Australian_Geodetic_1966_AGD_66(12, "Australia and Tasmania Island", Australian_National), - Australian_Geodetic_1984_AGD_84(13, "Australia and Tasmania Island", Australian_National), - Belgium(110, "Belgium", International), - Bellevue_IGN(14, "Efate and Erromango Islands", International), - Bermuda_1957(15, "Bermuda Islands", Clarke_1866), - Bogota_Observatory(16, "Colombia", International), - Campo_Inchauspe(17, "Argentina", International), - Canton_Astro_1966(18, "Phoenix Islands", International), - Cape(19, "South Africa", Clarke_1880), - Cape_Canaveral(20, "Florida and Bahama Islands", Clarke_1866), - Carthage(21, "Tunisia", Clarke_1880), - Chatham_1971(22, "Chatham Island (New Zealand)", International), - Chua_Astro(23, "Paraguay", International), - Corrego_Alegre(24, "Brazil", International), - Deutsches_Hauptdreicksnetz_DHDN(1000, "Germany", Bessel), - Djakarta_Batavia(25, "Sumatra Island (Indonesia)", Bessel_1841), - DOS_1968(26, "Gizo Island (New Georgia Islands)", International), - Easter_Island_1967(27, "Easter Island", International), - European_1950_ED_50(28, "Austria, Belgium, Denmark, Finland, France, Germany, Gibraltar, Greece, Italy, Luxembourg, Netherlands, Norway, Portugal, Spain, Sweden, Switzerland", International), - European_1979_ED_79(29, "Austria, Finland, Netherlands, Norway, Spain, Sweden, Switzerland", International), - European_1987_ED_87(108, "Europe", International), - Gandajika_Base(30, "Republic of Maldives", International), - Geodetic_Datum_1949(31, "New Zealand", International), - Geodetic_Reference_System_1967_GRS_67(32, "Worldwide", GRS_67), - Geodetic_Reference_System_1980_GRS_80(33, "Worldwide", GRS_80), - Guam_1963(34, "Guam Island", Clarke_1866), - GUX_1_Astro(35, "Guadalcanal Island", International), - Hito_XVIII_1963(36, "South Chile (near 53°S)", International), - Hjorsey_1955(37, "Iceland", International), - Hong_Kong_1963(38, "Hong Kong", International), - Hu_Tzu_Shan(39, "Taiwan", International), - Indian_40(40, "Thailand and Vietnam", Everest), - Indian_41(41, "Bangladesh, India, Nepal", Everest), - Ireland_1965(42, "Ireland", Modified_Airy), - ISTS_073_Astro_1969(43, "Diego Garcia", International), - Johnston_Island_1961(44, "Johnston Island", International), - Kandawala(45, "Sri Lanka", Everest), - Kerguelen_Island(46, "Kerguelen Island", International), - Kertau_1948(47, "West Malaysia and Singapore", Modified_Everest), - LC_5_Astro(48, "Cayman Brac Island", Clarke_1866), - Liberia_1964(49, "Liberia", Clarke_1880), - Lisboa_DLx(113, "Portugal", International), - Luzon_50(50, "Philippines (excluding Mindanao Island)", Clarke_1866), - Luzon_51(51, "Mindanao Island", Clarke_1866), - Mahe_1971(52, "Mahe Island", Clarke_1880), - Marco_Astro(53, "Salvage Islands", International), - Massawa(54, "Eritrea (Ethiopia)", Bessel_1841), - Melrica_1973_D73(114, "Portugal", International), - Merchich(55, "Morocco", Clarke_1880), - Midway_Astro_1961(56, "Midway Island", International), - Minna(57, "Nigeria", Clarke_1880), - Nahrwan_58(58, "Masirah Island (Oman)", Clarke_1880), - Nahrwan_59(59, "United Arab Emirates", Clarke_1880), - Nahrwan_60(60, "Saudi Arabia", Clarke_1880), - Naparima_BWI(61, "Trinidad and Tobago", International), - Netherlands(109, "Netherlands", Bessel), - North_American_1927_NAD_27_CONTINENTAL(62, "Continental US", Clarke_1866), - North_American_1927_NAD_27_ALASKA(63, "Alaska", Clarke_1866), - North_American_1927_NAD_27_BAHAMAS(64, "Bahamas (excluding San Salvador Island)", Clarke_1866), - North_American_1927_NAD_27_SAN_SALVADOR(65, "San Salvador Island", Clarke_1866), - North_American_1927_NAD_27_CANADA(66, "Canada (including Newfoundland Island)", Clarke_1866), - North_American_1927_NAD_27_CANAL_ZONE(67, "Canal Zone", Clarke_1866), - North_American_1927_NAD_27_CARIBBEAN(68, "Caribbean (Turks and Caicos Islands)", Clarke_1866), - North_American_1927_NAD_27_CENTRAL_AMERICA(69, "Central America (Belize, Costa Rica, El Salvador, Guatemala, Honduras, Nicaragua)", Clarke_1866), - North_American_1927_NAD_27_CUBA(70, "Cuba", Clarke_1866), - North_American_1927_NAD_27_GREENLAND(71, "Greenland (Hayes Peninsula)", Clarke_1866), - North_American_1927_NAD_27_MEXICO(72, "Mexico", Clarke_1866), - North_American_1927_NAD_27_MICHIGAN(73, "Michigan (used only for State Plane Coordinate System 1927)", Modified_Clarke_1866), - North_American_1983_NAD_83(74, "Alaska, Canada, Central America, Continental US, Mexico", GRS_80), - Nouvelle_Triangulation_Francaise_NTF(107, "France", Clarke_1880), - Nouvelle_Triangulation_Francaise_NTF_Greenwich_Prime_Meridian(1002, "France", Clarke_1880), + ADINDAN(1, "Ethiopia, Mali, Senegal, Sudan", CLARKE_1880), + AFGOOYE(2, "Somalia", KRASSOVSKY), + AIN_EL_ABD_1970(3, "Bahrain Island", INTERNATIONAL), + ANNA_1_ASTRO_1965(4, "Cocos Islands", AUSTRALIAN_NATIONAL), + ARC_1950(5, "Botswana, Lesotho, Malawi, Swaziland, Zaire, Zambia, Zimbabwe", CLARKE_1880), + ARC_1960(6, "Kenya, Tanzania", CLARKE_1880), + ASCENSION_ISLAND_1958(7, "Ascension Island", INTERNATIONAL), + ASTRO_BEACON_E(8, "Iwo Jima Island", INTERNATIONAL), + ASTRO_B4_SOROL_ATOLL(9, "Tern Island", INTERNATIONAL), + ASTRO_DOS_71_4(10, "St. Helena Island", INTERNATIONAL), + ASTRONOMIC_STATION_1952(11, "Marcus Island", INTERNATIONAL), + AUSTRALIAN_GEODETIC_1966_AGD_66(12, "Australia and Tasmania Island", AUSTRALIAN_NATIONAL), + AUSTRALIAN_GEODETIC_1984_AGD_84(13, "Australia and Tasmania Island", AUSTRALIAN_NATIONAL), + BELGIUM(110, "Belgium", INTERNATIONAL), + BELLEVUE_IGN(14, "Efate and Erromango Islands", INTERNATIONAL), + BERMUDA_1957(15, "Bermuda Islands", CLARKE_1866), + BOGOTA_OBSERVATORY(16, "Colombia", INTERNATIONAL), + CAMPO_INCHAUSPE(17, "Argentina", INTERNATIONAL), + CANTON_ASTRO_1966(18, "Phoenix Islands", INTERNATIONAL), + CAPE(19, "South Africa", CLARKE_1880), + CAPE_CANAVERAL(20, "Florida and Bahama Islands", CLARKE_1866), + CARTHAGE(21, "Tunisia", CLARKE_1880), + CHATHAM_1971(22, "Chatham Island (New Zealand)", INTERNATIONAL), + CHUA_ASTRO(23, "Paraguay", INTERNATIONAL), + CORREGO_ALEGRE(24, "Brazil", INTERNATIONAL), + DEUTSCHES_HAUPTDREICKSNETZ_DHDN(1000, "Germany", BESSEL), + DJAKARTA_BATAVIA(25, "Sumatra Island (Indonesia)", BESSEL_1841), + DOS_1968(26, "Gizo Island (New Georgia Islands)", INTERNATIONAL), + EASTER_ISLAND_1967(27, "Easter Island", INTERNATIONAL), + EUROPEAN_1950_ED_50(28, "Austria, Belgium, Denmark, Finland, France, Germany, Gibraltar, Greece, Italy, Luxembourg, Netherlands, Norway, Portugal, Spain, Sweden, Switzerland", INTERNATIONAL), + EUROPEAN_1979_ED_79(29, "Austria, Finland, Netherlands, Norway, Spain, Sweden, Switzerland", INTERNATIONAL), + EUROPEAN_1987_ED_87(108, "Europe", INTERNATIONAL), + GANDAJIKA_BASE(30, "Republic of Maldives", INTERNATIONAL), + GEODETIC_DATUM_1949(31, "New Zealand", INTERNATIONAL), + GEODETIC_REFERENCE_SYSTEM_1967_GRS_67(32, "Worldwide", GRS_67), + GEODETIC_REFERENCE_SYSTEM_1980_GRS_80(33, "Worldwide", GRS_80), + GUAM_1963(34, "Guam Island", CLARKE_1866), + GUX_1_ASTRO(35, "Guadalcanal Island", INTERNATIONAL), + HITO_XVIII_1963(36, "South Chile (near 53°S)", INTERNATIONAL), + HJORSEY_1955(37, "Iceland", INTERNATIONAL), + HONG_KONG_1963(38, "Hong Kong", INTERNATIONAL), + HU_TZU_SHAN(39, "Taiwan", INTERNATIONAL), + INDIAN_40(40, "Thailand and Vietnam", EVEREST), + INDIAN_41(41, "Bangladesh, India, Nepal", EVEREST), + IRELAND_1965(42, "Ireland", MODIFIED_AIRY), + ISTS_073_ASTRO_1969(43, "Diego Garcia", INTERNATIONAL), + JOHNSTON_ISLAND_1961(44, "Johnston Island", INTERNATIONAL), + KANDAWALA(45, "Sri Lanka", EVEREST), + KERGUELEN_ISLAND(46, "Kerguelen Island", INTERNATIONAL), + KERTAU_1948(47, "West Malaysia and Singapore", MODIFIED_EVEREST), + LC_5_ASTRO(48, "Cayman Brac Island", CLARKE_1866), + LIBERIA_1964(49, "Liberia", CLARKE_1880), + LISBOA_DLX(113, "Portugal", INTERNATIONAL), + LUZON_50(50, "Philippines (excluding Mindanao Island)", CLARKE_1866), + LUZON_51(51, "Mindanao Island", CLARKE_1866), + MAHE_1971(52, "Mahe Island", CLARKE_1880), + MARCO_ASTRO(53, "Salvage Islands", INTERNATIONAL), + MASSAWA(54, "Eritrea (Ethiopia)", BESSEL_1841), + MELRICA_1973_D73(114, "Portugal", INTERNATIONAL), + MERCHICH(55, "Morocco", CLARKE_1880), + MIDWAY_ASTRO_1961(56, "Midway Island", INTERNATIONAL), + MINNA(57, "Nigeria", CLARKE_1880), + NAHRWAN_58(58, "Masirah Island (Oman)", CLARKE_1880), + NAHRWAN_59(59, "United Arab Emirates", CLARKE_1880), + NAHRWAN_60(60, "Saudi Arabia", CLARKE_1880), + NAPARIMA_BWI(61, "Trinidad and Tobago", INTERNATIONAL), + NETHERLANDS(109, "Netherlands", BESSEL), + NORTH_AMERICAN_1927_NAD_27_CONTINENTAL(62, "Continental US", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_ALASKA(63, "Alaska", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_BAHAMAS(64, "Bahamas (excluding San Salvador Island)", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_SAN_SALVADOR(65, "San Salvador Island", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_CANADA(66, "Canada (including Newfoundland Island)", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_CANAL_ZONE(67, "Canal Zone", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_CARIBBEAN(68, "Caribbean (Turks and Caicos Islands)", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_CENTRAL_AMERICA(69, "Central America (Belize, Costa Rica, El Salvador, Guatemala, Honduras, Nicaragua)", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_CUBA(70, "Cuba", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_GREENLAND(71, "Greenland (Hayes Peninsula)", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_MEXICO(72, "Mexico", CLARKE_1866), + NORTH_AMERICAN_1927_NAD_27_MICHIGAN(73, "Michigan (used only for State Plane Coordinate System 1927)", MODIFIED_CLARKE_1866), + NORTH_AMERICAN_1983_NAD_83(74, "Alaska, Canada, Central America, Continental US, Mexico", GRS_80), + NOUVELLE_TRIANGULATION_FRANCAISE_NTF(107, "France", CLARKE_1880), + NOUVELLE_TRIANGULATION_FRANCAISE_NTF_GREENWICH_PRIME_MERIDIAN(1002, "France", CLARKE_1880), NWGL_10(111, "Worldwide", WGS_72), - Observatorio_1966(75, "Corvo and Flores Islands (Azores)", International), - Old_Egyptian(76, "Egypt", Helmert_1906), - Old_Hawaiian(77, "Hawaii", Clarke_1866), - Oman(78, "Oman", Clarke_1880), - Ordnance_Survey_of_Great_Britain_1936(79, "England, Isle of Man, Scotland, Shetland Islands, Wales", Airy), - Pico_de_las_Nieves(80, "Canary Islands", International), - Pitcairn_Astro_1967(81, "Pitcairn Island", International), - Potsdam(1000, "Germany", Bessel), - Provisional_South_Chilean_1963(36, "South Chile (near 53°S)", International), - Provisional_South_American_1956(82, "Bolivia, Chile, Colombia, Ecuador, Guyana, Peru, Venezuela", International), - Puerto_Rico(83, "Puerto Rico and Virgin Islands", Clarke_1866), - Pulkovo_1942(1001, "Germany", Krassovsky), - Qatar_National(84, "Qatar", International), - Qornoq(85, "South Greenland", International), - Rauenberg(1000, "Germany", Bessel), - Reunion(86, "Mascarene Island", International), - Rikets_Triangulering_1990_RT_90(112, "Sweden", Bessel), - Rome_1940(87, "Sardinia Island", International), - Santo_DOS(88, "Espirito Santo Island", International), - Sao_Braz(89, "São Miguel, Santa Maria Islands (Azores)", International), - Sapper_Hill_1943(90, "East Falkland Island", International), - Schwarzeck(91, "Namibia Modified", Bessel_1841), - South_American_1969(92, "Argentina, Bolivia, Brazil, Chile, Colombia, Ecuador, Guyana, Paraguay, Peru, Venezuela, Trinidad, and Tobago", MifEllipsoid.South_American_1969), - South_Asia(93, "Singapore", Modified_Fischer_1960), - Southeast_Base(94, "Porto Santo and Madeira Islands", International), - Southwest_Base(95, "Faial, Graciosa, Pico, Sao Jorge, Terceira Islands (Azores)", International), - Switzerland_CH_1903(1003, "Switzerland", Bessel), - Timbalai_1948(96, "Brunei and East Malaysia (Sarawak and Sabah)", Everest), - Tokyo(97, "Japan, Korea, Okinawa", Bessel_1841), - Tristan_Astro_1968(98, "Tristan da Cunha", International), - Viti_Levu_1916(99, "Viti Levu Island (Fiji Islands)", Clarke_1880), - Wake_Eniwetok_1960(100, "", Hough), - World_Geodetic_System_1960_WGS_60(101, "", WGS_60), - World_Geodetic_System_1966_WGS_66(102, "", WGS_66), - World_Geodetic_System_1972_WGS_72(103, "", WGS_72), - World_Geodetic_System_1984_WGS_84(104, "", WGS_84), - Yacare(105, "", International), - Zanderij(106, "", International), - Custom(999, null, null); - + OBSERVATORIO_1966(75, "Corvo and Flores Islands (Azores)", INTERNATIONAL), + OLD_EGYPTIAN(76, "Egypt", HELMERT_1906), + OLD_HAWAIIAN(77, "Hawaii", CLARKE_1866), + OMAN(78, "Oman", CLARKE_1880), + ORDNANCE_SURVEY_OF_GREAT_BRITAIN_1936(79, "England, Isle of Man, Scotland, Shetland Islands, Wales", AIRY), + PICO_DE_LAS_NIEVES(80, "Canary Islands", INTERNATIONAL), + PITCAIRN_ASTRO_1967(81, "Pitcairn Island", INTERNATIONAL), + POTSDAM(1000, "Germany", BESSEL), + PROVISIONAL_SOUTH_CHILEAN_1963(36, "South Chile (near 53°S)", INTERNATIONAL), + PROVISIONAL_SOUTH_AMERICAN_1956(82, "Bolivia, Chile, Colombia, Ecuador, Guyana, Peru, Venezuela", INTERNATIONAL), + PUERTO_RICO(83, "Puerto Rico and Virgin Islands", CLARKE_1866), + PULKOVO_1942(1001, "Germany", KRASSOVSKY), + QATAR_NATIONAL(84, "Qatar", INTERNATIONAL), + QORNOQ(85, "South Greenland", INTERNATIONAL), + RAUENBERG(1000, "Germany", BESSEL), + REUNION(86, "Mascarene Island", INTERNATIONAL), + RIKETS_TRIANGULERING_1990_RT_90(112, "Sweden", BESSEL), + ROME_1940(87, "Sardinia Island", INTERNATIONAL), + SANTO_DOS(88, "Espirito Santo Island", INTERNATIONAL), + SAO_BRAZ(89, "São Miguel, Santa Maria Islands (Azores)", INTERNATIONAL), + SAPPER_HILL_1943(90, "East Falkland Island", INTERNATIONAL), + SCHWARZECK(91, "Namibia Modified", BESSEL_1841), + SOUTH_AMERICAN_1969(92, "Argentina, Bolivia, Brazil, Chile, Colombia, Ecuador, Guyana, Paraguay, Peru, Venezuela, Trinidad, and Tobago", MifEllipsoid.SOUTH_AMERICAN_1969), + SOUTH_ASIA(93, "Singapore", MODIFIED_FISCHER_1960), + SOUTHEAST_BASE(94, "Porto Santo and Madeira Islands", INTERNATIONAL), + SOUTHWEST_BASE(95, "Faial, Graciosa, Pico, Sao Jorge, Terceira Islands (Azores)", INTERNATIONAL), + SWITZERLAND_CH_1903(1003, "Switzerland", BESSEL), + TIMBALAI_1948(96, "Brunei and East Malaysia (Sarawak and Sabah)", EVEREST), + TOKYO(97, "Japan, Korea, Okinawa", BESSEL_1841), + TRISTAN_ASTRO_1968(98, "Tristan da Cunha", INTERNATIONAL), + VITI_LEVU_1916(99, "Viti Levu Island (Fiji Islands)", CLARKE_1880), + WAKE_ENIWETOK_1960(100, "", HOUGH), + WORLD_GEODETIC_SYSTEM_1960_WGS_60(101, "", WGS_60), + WORLD_GEODETIC_SYSTEM_1966_WGS_66(102, "", WGS_66), + WORLD_GEODETIC_System_1972_WGS_72(103, "", WGS_72), + WORLD_GEODETIC_System_1984_WGS_84(104, "", WGS_84), + YACARE(105, "", INTERNATIONAL), + ZANDERIJ(106, "", INTERNATIONAL), + CUSTOM(999, null, null); + private final Integer code; private final String area; Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java (revision 30729) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java (revision 30730) @@ -9,23 +9,23 @@ */ public enum MifEllipsoid { - Airy, - Modified_Airy, - Australian_National, - Bessel, - Bessel_1841, - Clarke_1866, - Modified_Clarke_1866, - Clarke_1880, - Modified_Clarke_1880, - Everest, - Modified_Fischer_1960, - Helmert_1906, - Hough, - Modified_Everest, + AIRY, + MODIFIED_AIRY, + AUSTRALIAN_NATIONAL, + BESSEL, + BESSEL_1841, + CLARKE_1866, + MODIFIED_CLARKE_1866, + CLARKE_1880, + MODIFIED_CLARKE_1880, + EVEREST, + MODIFIED_FISCHER_1960, + HELMERT_1906, + HOUGH, + MODIFIED_EVEREST, GRS_67, GRS_80, - International, - Krassovsky, - South_American_1969, + INTERNATIONAL, + KRASSOVSKY, + SOUTH_AMERICAN_1969, WGS_60, WGS_66, Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 30729) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 30730) @@ -2,6 +2,6 @@ package org.openstreetmap.josm.plugins.opendata.core.io.geographic; -import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifDatum.Custom; -import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifDatum.Geodetic_Reference_System_1980_GRS_80; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifDatum.CUSTOM; +import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifDatum.GEODETIC_REFERENCE_SYSTEM_1980_GRS_80; import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifProjection.Hotine_Oblique_Mercator; import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifProjection.Longitude_Latitude; @@ -55,7 +55,7 @@ END_POLYLINE } - + private final AbstractDataSetHandler handler; - + private File file; private InputStream stream; @@ -64,7 +64,7 @@ private Character delimiter = '\t'; - + private State state = State.UNKNOWN; - + private Projection josmProj; private DataSet ds; @@ -87,16 +87,16 @@ private Double maxx; private Double maxy; - + // Region clause private int numpolygons = -1; private int numpts = -1; - + // PLine clause private int numsections = -1; - + private MifReader(AbstractDataSetHandler handler) { this.handler = handler; } - + public static DataSet parseDataSet(InputStream in, File file, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException { @@ -117,5 +117,5 @@ Main.warn("TODO Index: "+line); } - + private static String param(Param p, Object value) { return " +"+p.key+"="+value; @@ -127,5 +127,5 @@ // Custom datum: TODO: use custom decalage values - int offset = datum == Custom ? 4 : 0; + int offset = datum == CUSTOM ? 4 : 0; if (proj == Longitude_Latitude) { @@ -133,16 +133,16 @@ return; } - + // Initialize proj4-like parameters String params = param(Param.proj, proj.getProj4Id()); - + // Units units = words[5+offset]; params += param(Param.units, units); - + // Origin, longitude originLon = Double.parseDouble(words[6+offset]); params += param(Param.lon_0, originLon); - + // Origin, latitude switch(proj) { @@ -167,5 +167,5 @@ break; } - + // Standard Parallel 1 switch (proj) { @@ -194,5 +194,5 @@ break; } - + // Azimuth if (proj == Hotine_Oblique_Mercator) { @@ -217,5 +217,5 @@ break; } - + // False Easting/Northing switch (proj) { @@ -250,5 +250,5 @@ break; } - + // Range switch (proj) { @@ -261,5 +261,5 @@ switch (proj) { case Lambert_Conformal_Conic: - if ((datum == Geodetic_Reference_System_1980_GRS_80 || datum == Custom) && equals(originLon, 3.0)) { + if ((datum == GEODETIC_REFERENCE_SYSTEM_1980_GRS_80 || datum == CUSTOM) && equals(originLon, 3.0)) { // This sounds good for Lambert 93 or Lambert CC 9 if (equals(originLat, 46.5) && equals(stdP1, 44.0) && equals(stdP2, 49.0) && equals(falseEasting, 700000.0) && equals(falseNorthing, 6600000.0)) { @@ -275,5 +275,5 @@ break; } - + // TODO: handle cases with Affine declaration int index = parseAffineUnits(words); @@ -281,5 +281,5 @@ // handle cases with Bounds declaration parseBounds(words, index); - + if (josmProj == null) { Main.info(line); @@ -292,10 +292,10 @@ // handle cases with Affine declaration int index = parseAffineUnits(words); - + units = words[index+1]; - + parseBounds(words, index+2); } - + private int parseAffineUnits(String[] words) { // TODO: handle affine units @@ -326,13 +326,13 @@ case "nonearth": parseCoordSysSyntax2(words); - + // Syntax2 is not meant to be used for maps, and still... # 9592 happened // From MapInfo documentation: // http://testdrive.mapinfo.com/TDC/mxtreme4java.nsf/22fbc128f401ad818525666a00646bda/50100fdbe3e0a85085256a770053be1a/$FILE/coordsys.txt - // Use syntax 1 (above) to explicitly define a coordinate system for an Earth map (a map having coordinates which are specified with respect to a - // location on the surface of the Earth). The optional Projection parameters dictate what map projection, if any, should be used in conjunction with - // the coordinate system. If the Projection clause is omitted, MapBasic uses a longitude, latitude coordinate system using the North American Datum of 1927 (NAD-27). - // Use syntax 2 to explicitly define a non-Earth coordinate system, such as the coordinate system used in a floor plan or other CAD drawing. - + // Use syntax 1 (above) to explicitly define a coordinate system for an Earth map (a map having coordinates which are specified with respect to a + // location on the surface of the Earth). The optional Projection parameters dictate what map projection, if any, should be used in conjunction with + // the coordinate system. If the Projection clause is omitted, MapBasic uses a longitude, latitude coordinate system using the North American Datum of 1927 (NAD-27). + // Use syntax 2 to explicitly define a non-Earth coordinate system, such as the coordinate system used in a floor plan or other CAD drawing. + if (handler != null && handler.getMifHandler() != null && handler.getMifHandler().getCoordSysNonEarthProjection() != null) { josmProj = handler.getMifHandler().getCoordSysNonEarthProjection(); @@ -367,5 +367,5 @@ } } - + private void parsePoint(String[] words) throws IOException { readAttributes(createNode(words[1], words[2])); @@ -379,5 +379,5 @@ line.addNode(createNode(words[3], words[4])); } - + private void startPolyLineSegment(boolean initial) throws IOException { Way previousPolyline = polyline; @@ -392,5 +392,5 @@ state = State.READING_POINTS; } - + private void parsePLine(String[] words) throws IOException { numsections = 1; @@ -463,5 +463,5 @@ midReader = getDataReader(file, ".mid", charset); } - + private DataSet parse(InputStream in, File file, ProgressMonitor instance, Charset cs) throws IOException { try { @@ -513,9 +513,9 @@ } state = State.READING_POINTS; - + } else if (state == State.START_POLYLINE_SEGMENT) { numpts = Integer.parseInt(words[0]); startPolyLineSegment(polyline != null); - + } else if (state == State.READING_POINTS && numpts > 0) { if (josmProj != null) { @@ -587,7 +587,7 @@ } } - + protected void readAttributes(OsmPrimitive p) throws IOException { - if (midReader != null) { + if (midReader != null) { String midLine = midReader.readLine(); if (midLine != null) { @@ -608,5 +608,5 @@ } } - + protected final Node createNode(String x, String y) { Node node = new Node(josmProj.eastNorth2latlon(new EastNorth(Double.parseDouble(x), Double.parseDouble(y)))); @@ -614,5 +614,5 @@ return node; } - + /** Compare two doubles within a default epsilon */ public static boolean equals(Double a, Double b) {