Skip to content

Commit

Permalink
Name property for Geographic ProjectionInfo (#1244)
Browse files Browse the repository at this point in the history 
 Fixes #1162
  • Loading branch information
@sindizzy @jany-tenaj
sindizzy authored and jany-tenaj committed Dec 26, 2018
1 parent 768af73 commit 5a0461c
Show file tree
Hide file tree
Showing 14 changed files with 592 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Changelog.md
View file
Expand Up @@ -149,4 +149,5 @@ Be aware that code written for 1.9 will not work out of the box because DotSpati
- Shape File Saves with Wrong DataTypes (#1005)
- Calculation of translation param in InRamImageData.GetBitmap is defective (#1203)
- MapImageLayer not drawn correctly on print (#1137)
- Create Categories for symbology is inconsistent with large datasets (#1242)
- Create Categories for symbology is inconsistent with large datasets (#1242)
- Geographic projections now have a Name property
3 changes: 2 additions & 1 deletion Contributors
View file
Expand Up @@ -53,4 +53,5 @@ Trent Muhr
Joe Houghton
Matthias Schider <matthias.schilder1@gmail.com>
Ilya Sosnovsky <yakrewedko@ya.ru>
Bryan Price <southernprogrammer@gmail.com>
Bryan Price <southernprogrammer@gmail.com>
Abel G. Perez <sindizzy@gmail.com>
75 changes: 75 additions & 0 deletions Source/DotSpatial.Projections/GeographicCategories/Africa.cs
View file
Expand Up @@ -190,80 +190,155 @@ public Africa()
YemenNGN1996 = ProjectionInfo.FromProj4String("+proj=longlat +ellps=WGS84 +no_defs ");
Yoff = ProjectionInfo.FromProj4String("+proj=longlat +a=6378249.2 +b=6356514.999904194 +no_defs ");

Abidjan1987.Name = "GCS_Abidjan_1987";
Abidjan1987.GeographicInfo.Name = "GCS_Abidjan_1987";
Accra.Name = "GCS_Accra";
Accra.GeographicInfo.Name = "GCS_Accra";
Adindan.Name = "GCS_Adindan";
Adindan.GeographicInfo.Name = "GCS_Adindan";
Afgooye.Name = "GCS_Afgooye";
Afgooye.GeographicInfo.Name = "GCS_Afgooye";
Agadez.Name = "GCS_Agadez";
Agadez.GeographicInfo.Name = "GCS_Agadez";
AinelAbd1970.Name = "GCS_Ain_el_Abd_1970";
AinelAbd1970.GeographicInfo.Name = "GCS_Ain_el_Abd_1970";
Arc1950.Name = "GCS_Arc_1950";
Arc1950.GeographicInfo.Name = "GCS_Arc_1950";
Arc1960.Name = "GCS_Arc_1960";
Arc1960.GeographicInfo.Name = "GCS_Arc_1960";
AyabelleLighthouse.Name = "GCS_Ayabelle";
AyabelleLighthouse.GeographicInfo.Name = "GCS_Ayabelle";
Beduaram.Name = "GCS_Beduaram";
Beduaram.GeographicInfo.Name = "GCS_Beduaram";
Bissau.Name = "GCS_Bissau";
Bissau.GeographicInfo.Name = "GCS_Bissau";
Camacupa.Name = "GCS_Camacupa";
Camacupa.GeographicInfo.Name = "GCS_Camacupa";
Cape.Name = "GCS_Cape";
Cape.GeographicInfo.Name = "GCS_Cape";
Carthage.Name = "GCS_Carthage";
Carthage.GeographicInfo.Name = "GCS_Carthage";
Carthagedegrees.Name = "GCS_Carthage_Degree";
Carthagedegrees.GeographicInfo.Name = "GCS_Carthage_Degree";
CarthageParis.Name = "GCS_Carthage_Paris";
CarthageParis.GeographicInfo.Name = "GCS_Carthage_Paris";
Conakry1905.Name = "GCS_Conakry_1905";
Conakry1905.GeographicInfo.Name = "GCS_Conakry_1905";
CotedIvoire.Name = "GCS_Cote_d_Ivoire";
CotedIvoire.GeographicInfo.Name = "GCS_Cote_d_Ivoire";
Dabola.Name = "GCS_Dabola";
Dabola.GeographicInfo.Name = "GCS_Dabola";
Douala.Name = "GCS_Douala";
Douala.GeographicInfo.Name = "GCS_Douala";
Douala1948.Name = "GCS_Douala_1948";
Douala1948.GeographicInfo.Name = "GCS_Douala_1948";
Egypt1907.Name = "GCS_Egypt_1907";
Egypt1907.GeographicInfo.Name = "GCS_Egypt_1907";
Egypt1930.Name = "GCS_Egypt_1930";
Egypt1930.GeographicInfo.Name = "GCS_Egypt_1930";
EuropeanDatum1950.Name = "GCS_European_1950";
EuropeanDatum1950.GeographicInfo.Name = "GCS_European_1950";
EuropeanLibyanDatum1979.Name = "GCS_European_Libyan_Datum_1979";
EuropeanLibyanDatum1979.GeographicInfo.Name = "GCS_European_Libyan_Datum_1979";
Garoua.Name = "GCS_Garoua";
Garoua.GeographicInfo.Name = "GCS_Garoua";
Hartebeesthoek1994.Name = "GCS_Hartebeesthoek_1994";
Hartebeesthoek1994.GeographicInfo.Name = "GCS_Hartebeesthoek_1994";
Kousseri.Name = "GCS_Kousseri";
Kousseri.GeographicInfo.Name = "GCS_Kousseri";
KuwaitOilCompany.Name = "GCS_Kuwait_Oil_Company";
KuwaitOilCompany.GeographicInfo.Name = "GCS_Kuwait_Oil_Company";
KuwaitUtility.Name = "GCS_KUDAMS";
KuwaitUtility.GeographicInfo.Name = "GCS_KUDAMS";
Leigon.Name = "GCS_Leigon";
Leigon.GeographicInfo.Name = "GCS_Leigon";
Liberia1964.Name = "GCS_Liberia_1964";
Liberia1964.GeographicInfo.Name = "GCS_Liberia_1964";
Locodjo1965.Name = "GCS_Locodjo_1965";
Locodjo1965.GeographicInfo.Name = "GCS_Locodjo_1965";
Lome.Name = "GCS_Lome";
Lome.GeographicInfo.Name = "GCS_Lome";
Madzansua.Name = "GCS_Madzansua";
Madzansua.GeographicInfo.Name = "GCS_Madzansua";
Mahe1971.Name = "GCS_Mahe_1971";
Mahe1971.GeographicInfo.Name = "GCS_Mahe_1971";
Malongo1987.Name = "GCS_Malongo_1987";
Malongo1987.GeographicInfo.Name = "GCS_Malongo_1987";
Manoca.Name = "GCS_Manoca";
Manoca.GeographicInfo.Name = "GCS_Manoca";
Manoca1962.Name = "GCS_Manoca_1962";
Manoca1962.GeographicInfo.Name = "GCS_Manoca_1962";
Massawa.Name = "GCS_Massawa";
Massawa.GeographicInfo.Name = "GCS_Massawa";
Merchich.Name = "GCS_Merchich";
Merchich.GeographicInfo.Name = "GCS_Merchich";
Merchichdegrees.Name = "GCS_Merchich_Degree";
Merchichdegrees.GeographicInfo.Name = "GCS_Merchich_Degree";
Mhast.Name = "GCS_Mhast_Offshore";
Mhast.GeographicInfo.Name = "GCS_Mhast_Offshore";
Minna.Name = "GCS_Minna";
Minna.GeographicInfo.Name = "GCS_Minna";
Moznet.Name = "GCS_Moznet";
Moznet.GeographicInfo.Name = "GCS_Moznet";
Nahrwan1967.Name = "GCS_Nahrwan_1967";
Nahrwan1967.GeographicInfo.Name = "GCS_Nahrwan_1967";
NationalGeodeticNetworkKuwait.Name = "GCS_NGN";
NationalGeodeticNetworkKuwait.GeographicInfo.Name = "GCS_NGN";
NordSahara1959.Name = "GCS_Nord_Sahara_1959";
NordSahara1959.GeographicInfo.Name = "GCS_Nord_Sahara_1959";
NordSahara1959Paris.Name = "GCS_Nord_Sahara_1959_Paris";
NordSahara1959Paris.GeographicInfo.Name = "GCS_Nord_Sahara_1959_Paris";
Observatario.Name = "GCS_Observatario";
Observatario.GeographicInfo.Name = "GCS_Observatario";
Oman.Name = "GCS_Oman";
Oman.GeographicInfo.Name = "GCS_Oman";
Palestine1923.Name = "GCS_Palestine_1923";
Palestine1923.GeographicInfo.Name = "GCS_Palestine_1923";
PDO1993.Name = "GCS_PDO_1993";
PDO1993.GeographicInfo.Name = "GCS_PDO_1993";
Point58.Name = "GCS_Point_58";
Point58.GeographicInfo.Name = "GCS_Point_58";
PointeNoire.Name = "GCS_Pointe_Noire";
PointeNoire.GeographicInfo.Name = "GCS_Pointe_Noire";
Qatar.Name = "GCS_Qatar";
Qatar.GeographicInfo.Name = "GCS_Qatar";
Qatar1948.Name = "GCS_Qatar_1948";
Qatar1948.GeographicInfo.Name = "GCS_Qatar_1948";
Schwarzeck.Name = "GCS_Schwarzeck";
Schwarzeck.GeographicInfo.Name = "GCS_Schwarzeck";
SierraLeone1924.Name = "GCS_Sierra_Leone_1924";
SierraLeone1924.GeographicInfo.Name = "GCS_Sierra_Leone_1924";
SierraLeone1960.Name = "GCS_Sierra_Leone_1960";
SierraLeone1960.GeographicInfo.Name = "GCS_Sierra_Leone_1960";
SierraLeone1968.Name = "GCS_Sierra_Leone_1968";
SierraLeone1968.GeographicInfo.Name = "GCS_Sierra_Leone_1968";
SouthYemen.Name = "GCS_South_Yemen";
SouthYemen.GeographicInfo.Name = "GCS_South_Yemen";
Sudan.Name = "GCS_Sudan";
Sudan.GeographicInfo.Name = "GCS_Sudan";
Tananarive1925.Name = "GCS_Tananarive_1925";
Tananarive1925.GeographicInfo.Name = "GCS_Tananarive_1925";
Tananarive1925Paris.Name = "GCS_Tananarive_1925_Paris";
Tananarive1925Paris.GeographicInfo.Name = "GCS_Tananarive_1925_Paris";
Tete.Name = "GCS_Tete";
Tete.GeographicInfo.Name = "GCS_Tete";
TrucialCoast1948.Name = "GCS_Trucial_Coast_1948";
TrucialCoast1948.GeographicInfo.Name = "GCS_Trucial_Coast_1948";
Voirol1875.Name = "GCS_Voirol_1875";
Voirol1875.GeographicInfo.Name = "GCS_Voirol_1875";
Voirol1875degrees.Name = "GCS_Voirol_1875_Degree";
Voirol1875degrees.GeographicInfo.Name = "GCS_Voirol_1875_Degree";
Voirol1875Paris.Name = "GCS_Voirol_1875_Paris";
Voirol1875Paris.GeographicInfo.Name = "GCS_Voirol_1875_Paris";
VoirolUnifie1960.Name = "GCS_Voirol_Unifie_1960";
VoirolUnifie1960.GeographicInfo.Name = "GCS_Voirol_Unifie_1960";
VoirolUnifie1960degrees.Name = "GCS_Voirol_Unifie_1960_Degree";
VoirolUnifie1960degrees.GeographicInfo.Name = "GCS_Voirol_Unifie_1960_Degree";
VoirolUnifie1960Paris.Name = "GCS_Voirol_Unifie_1960_Paris";
VoirolUnifie1960Paris.GeographicInfo.Name = "GCS_Voirol_Unifie_1960_Paris";
YemenNGN1996.Name = "GCS_Yemen_NGN_1996";
YemenNGN1996.GeographicInfo.Name = "GCS_Yemen_NGN_1996";
Yoff.Name = "GCS_Yoff";
Yoff.GeographicInfo.Name = "GCS_Yoff";

Abidjan1987.GeographicInfo.Datum.Name = "D_Abidjan_1987";
Expand Down
7 changes: 6 additions & 1 deletion Source/DotSpatial.Projections/GeographicCategories/Antarctica.cs
View file
Expand Up @@ -44,11 +44,16 @@ public Antarctica()
DeceptionIsland = ProjectionInfo.FromProj4String("+proj=longlat +ellps=clrk80 +no_defs ");
Petrels1972 = ProjectionInfo.FromProj4String("+proj=longlat +ellps=intl +no_defs ");
PointeGeologiePerroud1950 = ProjectionInfo.FromProj4String("+proj=longlat +ellps=intl +no_defs ");


AustralianAntarctic1998.Name = "GCS_Australian_Antarctic_1998";
AustralianAntarctic1998.GeographicInfo.Name = "GCS_Australian_Antarctic_1998";
CampAreaAstro.Name = "GCS_Camp_Area";
CampAreaAstro.GeographicInfo.Name = "GCS_Camp_Area";
DeceptionIsland.Name = "GCS_Deception_Island";
DeceptionIsland.GeographicInfo.Name = "GCS_Deception_Island";
Petrels1972.Name = "GCS_Petrels_1972";
Petrels1972.GeographicInfo.Name = "GCS_Petrels_1972";
PointeGeologiePerroud1950.Name = "GCS_Pointe_Geologie_Perroud_1950";
PointeGeologiePerroud1950.GeographicInfo.Name = "GCS_Pointe_Geologie_Perroud_1950";

AustralianAntarctic1998.GeographicInfo.Datum.Name = "D_Australian_Antarctic_1998";
Expand Down
70 changes: 69 additions & 1 deletion Source/DotSpatial.Projections/GeographicCategories/Asia.cs
View file
Expand Up @@ -170,74 +170,142 @@ public Asia()
Tokyo = ProjectionInfo.FromProj4String("+proj=longlat +ellps=bessel +no_defs ");
TrucialCoast1948 = ProjectionInfo.FromProj4String("+proj=longlat +ellps=helmert +no_defs ");
Xian1980 = ProjectionInfo.FromProj4String("+proj=longlat +a=6378140 +b=6356755.288157528 +no_defs ");


AinelAbd1970.Name = "GCS_Ain_el_Abd_1970";
AinelAbd1970.GeographicInfo.Name = "GCS_Ain_el_Abd_1970";
Batavia.Name = "GCS_Batavia";
Batavia.GeographicInfo.Name = "GCS_Batavia";
BataviaJakarta.Name = "GCS_Batavia_Jakarta";
BataviaJakarta.GeographicInfo.Name = "GCS_Batavia_Jakarta";
Beijing1954.Name = "GCS_Beijing_1954";
Beijing1954.GeographicInfo.Name = "GCS_Beijing_1954";
BukitRimpah.Name = "GCS_Bukit_Rimpah";
BukitRimpah.GeographicInfo.Name = "GCS_Bukit_Rimpah";
DeirezZor.Name = "GCS_Deir_ez_Zor";
DeirezZor.GeographicInfo.Name = "GCS_Deir_ez_Zor";
European1950ED77.Name = "GCS_European_1950_ED77";
European1950ED77.GeographicInfo.Name = "GCS_European_1950_ED77";
EuropeanDatum1950.Name = "GCS_European_1950";
EuropeanDatum1950.GeographicInfo.Name = "GCS_European_1950";
EverestBangladesh.Name = "GCS_Everest_Bangladesh";
EverestBangladesh.GeographicInfo.Name = "GCS_Everest_Bangladesh";
EverestIndiaandNepal.Name = "GCS_Everest_India_Nepal";
EverestIndiaandNepal.GeographicInfo.Name = "GCS_Everest_India_Nepal";
Everestdef1962.Name = "GCS_Everest_def_1962";
Everestdef1962.GeographicInfo.Name = "GCS_Everest_def_1962";
Everestdef1967.Name = "GCS_Everest_def_1967";
Everestdef1967.GeographicInfo.Name = "GCS_Everest_def_1967";
Everestdef1975.Name = "GCS_Everest_def_1975";
Everestdef1975.GeographicInfo.Name = "GCS_Everest_def_1975";
Everest1830.Name = "GCS_Everest_1830";
Everest1830.GeographicInfo.Name = "GCS_Everest_1830";
EverestModified.Name = "GCS_Everest_Modified";
EverestModified.GeographicInfo.Name = "GCS_Everest_Modified";
Fahud.Name = "GCS_Fahud";
Fahud.GeographicInfo.Name = "GCS_Fahud";
FD1958.Name = "GCS_FD_1958";
FD1958.GeographicInfo.Name = "GCS_FD_1958";
Gandajika1970.Name = "GCS_Gandajika_1970";
Gandajika1970.GeographicInfo.Name = "GCS_Gandajika_1970";
GunungSegara.Name = "GCS_Gunung_Segara";
GunungSegara.GeographicInfo.Name = "GCS_Gunung_Segara";
GunungSegaraJakarta.Name = "GCS_Gunung_Segara_Jakarta";
GunungSegaraJakarta.GeographicInfo.Name = "GCS_Gunung_Segara_Jakarta";
Hanoi1972.Name = "GCS_Hanoi_1972";
Hanoi1972.GeographicInfo.Name = "GCS_Hanoi_1972";
HeratNorth.Name = "GCS_Herat_North";
HeratNorth.GeographicInfo.Name = "GCS_Herat_North";
HongKong1963.Name = "GCS_Hong_Kong_1963";
HongKong1963.GeographicInfo.Name = "GCS_Hong_Kong_1963";
HongKong1980.Name = "GCS_Hong_Kong_1980";
HongKong1980.GeographicInfo.Name = "GCS_Hong_Kong_1980";
HuTzuShan.Name = "GCS_Hu_Tzu_Shan";
HuTzuShan.GeographicInfo.Name = "GCS_Hu_Tzu_Shan";
IGM1995.Name = "GCS_IGM_1995";
IGM1995.GeographicInfo.Name = "GCS_IGM_1995";
IKBD1992.Name = "GCS_IKBD_1992";
IKBD1992.GeographicInfo.Name = "GCS_IKBD_1992";
Indian1954.Name = "GCS_Indian_1954";
Indian1954.GeographicInfo.Name = "GCS_Indian_1954";
Indian1960.Name = "GCS_Indian_1960";
Indian1960.GeographicInfo.Name = "GCS_Indian_1960";
Indian1975.Name = "GCS_Indian_1975";
Indian1975.GeographicInfo.Name = "GCS_Indian_1975";
IndonesianDatum1974.Name = "GCS_Indonesian_1974";
IndonesianDatum1974.GeographicInfo.Name = "GCS_Indonesian_1974";
Israel.Name = "GCS_Israel";
Israel.GeographicInfo.Name = "GCS_Israel";
JGD2000.Name = "GCS_JGD_2000";
JGD2000.GeographicInfo.Name = "GCS_JGD_2000";
Jordan.Name = "GCS_Jordan";
Jordan.GeographicInfo.Name = "GCS_Jordan";
Kalianpur1880.Name = "GCS_Kalianpur_1880";
Kalianpur1880.GeographicInfo.Name = "GCS_Kalianpur_1880";
Kalianpur1937.Name = "GCS_Kalianpur_1937";
Kalianpur1937.GeographicInfo.Name = "GCS_Kalianpur_1937";
Kalianpur1962.Name = "GCS_Kalianpur_1962";
Kalianpur1962.GeographicInfo.Name = "GCS_Kalianpur_1962";
Kalianpur1975.Name = "GCS_Kalianpur_1975";
Kalianpur1975.GeographicInfo.Name = "GCS_Kalianpur_1975";
Kandawala.Name = "GCS_Kandawala";
Kandawala.GeographicInfo.Name = "GCS_Kandawala";
Kertau.Name = "GCS_Kertau";
Kertau.GeographicInfo.Name = "GCS_Kertau";
KoreanDatum1985.Name = "GCS_Korean_Datum_1985";
KoreanDatum1985.GeographicInfo.Name = "GCS_Korean_Datum_1985";
KoreanDatum1995.Name = "GCS_Korean_Datum_1995";
KoreanDatum1995.GeographicInfo.Name = "GCS_Korean_Datum_1995";
KuwaitOilCompany.Name = "GCS_Kuwait_Oil_Company";
KuwaitOilCompany.GeographicInfo.Name = "GCS_Kuwait_Oil_Company";
KuwaitUtility.Name = "GCS_KUDAMS";
KuwaitUtility.GeographicInfo.Name = "GCS_KUDAMS";
Luzon1911.Name = "GCS_Luzon_1911";
Luzon1911.GeographicInfo.Name = "GCS_Luzon_1911";
Makassar.Name = "GCS_Makassar";
Makassar.GeographicInfo.Name = "GCS_Makassar";
MakassarJakarta.Name = "GCS_Makassar_Jakarta";
MakassarJakarta.GeographicInfo.Name = "GCS_Makassar_Jakarta";
Nahrwan1967.Name = "GCS_Nahrwan_1967";
Nahrwan1967.GeographicInfo.Name = "GCS_Nahrwan_1967";
NationalGeodeticNetworkKuwait.Name = "GCS_NGN";
NationalGeodeticNetworkKuwait.GeographicInfo.Name = "GCS_NGN";
ObservatorioMeteorologico1965.Name = "GCS_Observatorio_Meteorologico_1965";
ObservatorioMeteorologico1965.GeographicInfo.Name = "GCS_Observatorio_Meteorologico_1965";
Oman.Name = "GCS_Oman";
Oman.GeographicInfo.Name = "GCS_Oman";
Padang1884.Name = "GCS_Padang_1884";
Padang1884.GeographicInfo.Name = "GCS_Padang_1884";
Padang1884Jakarta.Name = "GCS_Padang_1884_Jakarta";
Padang1884Jakarta.GeographicInfo.Name = "GCS_Padang_1884_Jakarta";
Palestine1923.Name = "GCS_Palestine_1923";
Palestine1923.GeographicInfo.Name = "GCS_Palestine_1923";
Pulkovo1942.Name = "GCS_Pulkovo_1942";
Pulkovo1942.GeographicInfo.Name = "GCS_Pulkovo_1942";
Pulkovo1995.Name = "GCS_Pulkovo_1995";
Pulkovo1995.GeographicInfo.Name = "GCS_Pulkovo_1995";
Qatar.Name = "GCS_Qatar";
Qatar.GeographicInfo.Name = "GCS_Qatar";
Qatar1948.Name = "GCS_Qatar_1948";
Qatar1948.GeographicInfo.Name = "GCS_Qatar_1948";
QND1995.Name = "GCS_QND_1995";
QND1995.GeographicInfo.Name = "GCS_QND_1995";
Rassadiran.Name = "GCS_Rassadiran";
Rassadiran.GeographicInfo.Name = "GCS_Rassadiran";
Samboja.Name = "GCS_Samboja";
Samboja.GeographicInfo.Name = "GCS_Samboja";
Segora.Name = "GCS_Segora";
Segora.GeographicInfo.Name = "GCS_Segora";
Serindung.Name = "GCS_Serindung";
Serindung.GeographicInfo.Name = "GCS_Serindung";
SouthAsiaSingapore.Name = "GCS_South_Asia_Singapore";
SouthAsiaSingapore.GeographicInfo.Name = "GCS_South_Asia_Singapore";
Timbalai1948.Name = "GCS_Timbalai_1948";
Timbalai1948.GeographicInfo.Name = "GCS_Timbalai_1948";
Tokyo.Name = "GCS_Tokyo";
Tokyo.GeographicInfo.Name = "GCS_Tokyo";
TrucialCoast1948.Name = "GCS_Trucial_Coast_1948";
TrucialCoast1948.GeographicInfo.Name = "GCS_Trucial_Coast_1948";
Xian1980.Name = "GCS_Xian_1980";
Xian1980.GeographicInfo.Name = "GCS_Xian_1980";

AinelAbd1970.GeographicInfo.Datum.Name = "D_Ain_el_Abd_1970";
Expand Down

0 comments on commit 5a0461c

Please sign in to comment.