Merge branch 'Knuspel-master'

1 files changed, 268 insertions, 124 deletions

diff --git a/lib/Travel/Status/DE/IRIS/Stations.pm b/lib/Travel/Status/DE/IRIS/Stations.pm
index e749451..5564d89 100644
--- a/lib/Travel/Status/DE/IRIS/Stations.pm
+++ b/lib/Travel/Status/DE/IRIS/Stations.pm
@@ -245,44 +245,45 @@ my @stations = (
 	[ 'MAGM', 'Augsburg Messe',               8000659, 10.8860860, 48.3386840 ],
 	[ 'MAMS', 'Augsburg Morellstr.',          8000660, 10.8929480, 48.3550890 ],
 	[ 'MAHZ', 'Augsburg-Hochzoll',            8000661, 10.9433760, 48.3529770 ],
-	[ 'MAHZH', 'Augsburg-Hochzoll',       8000661, 10.9433760, 48.3529770 ],
-	[ 'MAOB',  'Augsburg-Oberhausen',     8000662, 10.8725330, 48.3807720 ],
-	[ 'HAUG',  'Augustfehn',              8000664, 7.75965900, 53.2208900 ],
-	[ 'AAU',   'Aukrug',                  8003078, 9.78581000, 54.0823980 ],
-	[ 'TAU',   'Aulendorf',               8000014, 9.64404600, 47.9530520 ],
-	[ 'FAUM',  'Aumenau',                 8000668, 8.24924900, 50.4004220 ],
-	[ 'AAH',   'Aumühle',                8000669, 10.3146720, 53.5298530 ],
-	[ 'AAMS',  'Aumühle',                8000669, 10.3146720, 53.5298530 ],
-	[ 'FAM',   'Auringen-Medenbach',      8000671, 8.33209300, 50.1136080 ],
-	[ 'SAUW',  'Auw an der Kyll',         8000674, 6.61452500, 49.9035960 ],
-	[ 'NAUR',  'Außenried',              8000672, 13.1817630, 49.0157630 ],
-	[ 'MAY',   'Aying',                   8000675, 11.7695780, 47.9687620 ],
-	[ 'FAL',   'Aßlar',                  8000633, 8.46275600, 50.5886570 ],
-	[ 'MAG',   'Aßling(Oberbay)',        8000634, 11.9935180, 47.9894910 ],
-	[ 'WBA',   'Baabe',                   8011063, 13.7048060, 54.3623150 ],
-	[ 'LBB',   'Baalberge',               8010013, 11.7846820, 51.7630480 ],
-	[ 'MBAE',  'Baar-Ebenhausen',         8000678, 11.4609290, 48.6744630 ],
-	[ 'FLAS',  'Babenhausen Langstadt',   8003559, 8.94573300, 49.9222740 ],
-	[ 'FBA',   'Babenhausen(Hess)',       8000015, 8.95718200, 49.9579630 ],
-	[ 'RBST',  'Babstadt',                8000681, 9.06070800, 49.2401960 ],
-	[ 'FBCH',  'Bacharach',               8000683, 7.76952300, 50.0561010 ],
-	[ 'MBCN',  'Bachern',                 8000685, 11.3787160, 48.2801590 ],
-	[ 'UB',    'Bachfeld',                8011065, 10.9824510, 50.4057720 ],
-	[ 'RBH',   'Bachheim',                8000686, 8.39939900, 47.8620720 ],
-	[ 'TB',    'Backnang',                8000016, 9.42598900, 48.9426760 ],
-	[ 'NBAB',  'Bad Abbach',              8000689, 11.9943220, 48.9227320 ],
-	[ 'MBAI',  'Bad Aibling',             8000690, 12.0041570, 47.8620280 ],
-	[ 'MBAK',  'Bad Aibling Kurpark',     8000696, 12.0138230, 47.8576170 ],
-	[ 'FAR',   'Bad Arolsen',             8000609, 8.99779200, 51.3816000 ],
-	[ 'RBEL',  'Bad Bellingen',           8000864, 7.55760100, 47.7308040 ],
-	[ 'BBIG',  'Bad Belzig',              8010031, 12.5949810, 52.1359690 ],
-	[ 'HBTH',  'Bad Bentheim',            8000879, 7.15853900, 52.3098500 ],
-	[ 'RBZB',  'Bad Bergzabern',          8000691, 8.00278700, 49.1032090 ],
-	[ 'UBB',   'Bad Berka',               8011066, 11.2815500, 50.8961380 ],
-	[ 'UBBZ',  'Bad Berka Zeughausplatz', 8011067, 11.2800950, 50.9004410 ],
-	[ 'EBLB',  'Bad Berleburg',           8000907, 8.39410900, 51.0511970 ],
-	[ 'ABVS',  'Bad Bevensen',            8000935, 10.5741410, 53.0782470 ],
-	[ 'MBIB',  'Bad Birnbach',            8000988, 13.0740340, 48.4328530 ],
+	[ 'MAHZH', 'Augsburg-Hochzoll',   8000661, 10.9433760, 48.3529770 ],
+	[ 'MAOB',  'Augsburg-Oberhausen', 8000662, 10.8725330, 48.3807720 ],
+	[ 'HAUG',  'Augustfehn',          8000664, 7.75965900, 53.2208900 ],
+	[ 'AAU',   'Aukrug',              8003078, 9.78581000, 54.0823980 ],
+	[ 'TAU',   'Aulendorf',           8000014, 9.64404600, 47.9530520 ],
+	[ 'FAUM',  'Aumenau',             8000668, 8.24924900, 50.4004220 ],
+	[ 'AAH',   'Aumühle',            8000669, 10.3146720, 53.5298530 ],
+	[ 'AAMS',  'Aumühle',            8000669, 10.3146720, 53.5298530 ],
+	[ 'FAM',   'Auringen-Medenbach',  8000671, 8.33209300, 50.1136080 ],
+	[ 'SAUW',  'Auw an der Kyll',     8000674, 6.61452500, 49.9035960 ],
+	[ 'NAUR',  'Außenried',          8000672, 13.1817630, 49.0157630 ],
+	[ 'MAY',   'Aying',               8000675, 11.7695780, 47.9687620 ],
+	[ 'FAL',   'Aßlar',              8000633, 8.46275600, 50.5886570 ],
+	[ 'MAG',   'Aßling(Oberbay)',    8000634, 11.9935180, 47.9894910 ],
+	[ 'WBA',   'Baabe',               8011063, 13.7048060, 54.3623150 ],
+	[ 'LBB',   'Baalberge',           8010013, 11.7846820, 51.7630480 ],
+	[ 'MBAE',  'Baar-Ebenhausen',     8000678, 11.4609290, 48.6744630 ],
+	[ 'ONBR', 'Baarn', 8400086, 5.2808332443237, 52.208332061768 ],
+	[ 'FLAS', 'Babenhausen Langstadt',        8003559, 8.94573300, 49.9222740 ],
+	[ 'FBA',  'Babenhausen(Hess)',            8000015, 8.95718200, 49.9579630 ],
+	[ 'RBST', 'Babstadt',                     8000681, 9.06070800, 49.2401960 ],
+	[ 'FBCH', 'Bacharach',                    8000683, 7.76952300, 50.0561010 ],
+	[ 'MBCN', 'Bachern',                      8000685, 11.3787160, 48.2801590 ],
+	[ 'UB',   'Bachfeld',                     8011065, 10.9824510, 50.4057720 ],
+	[ 'RBH',  'Bachheim',                     8000686, 8.39939900, 47.8620720 ],
+	[ 'TB',   'Backnang',                     8000016, 9.42598900, 48.9426760 ],
+	[ 'NBAB', 'Bad Abbach',                   8000689, 11.9943220, 48.9227320 ],
+	[ 'MBAI', 'Bad Aibling',                  8000690, 12.0041570, 47.8620280 ],
+	[ 'MBAK', 'Bad Aibling Kurpark',          8000696, 12.0138230, 47.8576170 ],
+	[ 'FAR',  'Bad Arolsen',                  8000609, 8.99779200, 51.3816000 ],
+	[ 'RBEL', 'Bad Bellingen',                8000864, 7.55760100, 47.7308040 ],
+	[ 'BBIG', 'Bad Belzig',                   8010031, 12.5949810, 52.1359690 ],
+	[ 'HBTH', 'Bad Bentheim',                 8000879, 7.15853900, 52.3098500 ],
+	[ 'RBZB', 'Bad Bergzabern',               8000691, 8.00278700, 49.1032090 ],
+	[ 'UBB',  'Bad Berka',                    8011066, 11.2815500, 50.8961380 ],
+	[ 'UBBZ', 'Bad Berka Zeughausplatz',      8011067, 11.2800950, 50.9004410 ],
+	[ 'EBLB', 'Bad Berleburg',                8000907, 8.39410900, 51.0511970 ],
+	[ 'ABVS', 'Bad Bevensen',                 8000935, 10.5741410, 53.0782470 ],
+	[ 'MBIB', 'Bad Birnbach',                 8000988, 13.0740340, 48.4328530 ],
 	[ 'UBL',  'Bad Blankenburg(Thüringerw)', 8010014, 11.2754980, 50.6826480 ],
 	[ 'KBOD', 'Bad Bodendorf',                8001049, 7.21721700, 50.5562660 ],
 	[ 'HBOD', 'Bad Bodenteich',               8001052, 10.6733710, 52.8342750 ],
@@ -7279,15 +7280,17 @@ my @stations = (
 	[ 'WRIW',  'Ringenwalde(Templin)',                               8012768 ],
 	[ 'WTAD',  'Templin-Ahrensdorf',                                 8013102 ],
 
-	[ 'XNTH',  't Harde', 8400388 ],
+	[ 'XNTH',  't Harde', 8400388, 5.893611,          52.4091682 ],
 	[ 'XBAAL', 'Aalter',  8800300 ],
-	[ 'XSA', 'Aarau', 8502113, 8.051253542736696, 47.39135533687651 ],
+	[ 'ONAAL', 'Aalten',  8400045, 6.5786272287369,   51.921326524551 ],
+	[ 'XSA',   'Aarau',   8502113, 8.051253542736696, 47.39135533687651 ],
 	[
 		'XSABO', 'Aarburg-Oftringen',
 		8502000, 7.9082037335368085,
 		47.32026671736687
 	],
-	[ 'XFAH', 'Achiet', 8700583 ],
+	[ 'ONAB', 'Abcoude', 8400047, 4.977, 52.2785 ],
+	[ 'XFAH', 'Achiet',  8700583 ],
 	[
 		'XSAA',  'Affoltern am Albis',
 		8502224, 8.446582391429793,
@@ -7308,29 +7311,73 @@ my @stations = (
 	[ 'XFALN', 'Alençon',                8700141 ],
 	[ 'XFALE', 'Ales',                    8700126 ],
 	[ 'XBAE',  'Alken(B)',                8800225 ],
-	[ 'XNAL',  'Alkmaar',                 8400050 ],
+	[ 'XNAL',  'Alkmaar',       8400050, 4.7397222518921, 52.63777923584 ],
+	[ 'ONALN', 'Alkmaar Noord', 8400052, 4.7641668319702, 52.643890380859 ],
+	[ 'ONAK',  'Akkrum',        8400049, 5.843611240387,  53.046390533447 ],
 	[
 		'XAAH',  'Allerheiligenhöfe',
 		8100548, 11.35334003185065,
 		47.26909469363204
 	],
-	[ 'XNAO',  'Almelo',              8400051 ],
-	[ 'XNAOO', 'Almere Oostvaarders', 8400024 ],
-	[ 'XNAR',  'Alphen aan den Rijn', 8400053 ],
+	[ 'XNAO',  'Almelo',         8400051, 6.6538887023926, 52.358055114746 ],
+	[ 'ONAOR', 'Almelo de Riet', 8400520, 6.6666665077209, 52.341945648193 ],
+	[
+		'XNAOO', 'Almere Oostvaarders',
+		8400024, 5.3005557060242,
+		52.403331756592
+	],
+	[ 'ONABU', 'Almere Buiten',     8400081, 5.2780556678772, 52.394165039062 ],
+	[ 'ONA',   'Almere Centrum',    8400080, 5.21764,         52.37503 ],
+	[ 'ONAMU', 'Almere Muziekwijk', 8400082, 5.1902775764465, 52.367500305176 ],
+	[ 'PNABU', 'Almere Parkwijk',   8400104, 5.244722366333,  52.376667022705 ],
+	[ 'PNAP',  'Almere Poort',      8400450, 5.151944,        52.342778 ],
+	[
+		'XNAR', 'Alphen aan den Rijn', 8400053, 4.6577777862549,
+		52.124443054199
+	],
 	[ 'XSADF', 'Altdorf(CH)',   8505113, 8.631565720159527, 46.87574072683762 ],
 	[ 'XSAD',  'Altendorf(CH)', 8503211, 8.822888982910282, 47.19396638397487 ],
 	[ 'XAAL', 'Altenmarkt im Pongau', 8100139 ],
 	[ 'XSAT', 'Altnau', 8506125, 9.265896774078344, 47.62136575370632 ],
 	[ 'XSAS', 'Altstätten SG', 8506319, 9.55651096480567, 47.374229173407485 ],
-	[ 'XFAE',  'Amberieu',                8700045 ],
-	[ 'XNAMV', 'Amersfoort Vathorst',     8400031 ],
-	[ 'XNAM',  'Amersfoort',              8400055 ],
-	[ 'XNAS',  'Amsterdam Sloterdijk',    8400059 ],
-	[ 'XNAB',  'Amsterdam Bijlmer ArenA', 8400074 ],
-	[ 'XNAC',  'Amsterdam Centraal',      8400058 ],
-	[ 'XNAZ',  'Amsterdam Zuid',          8400061 ],
-	[ 'XNAA',  'Amsterdam Amstel',        8400057 ],
-	[ 'XAAS',  'Amstetten NÖ',           8100012 ],
+	[ 'XFAE', 'Amberieu', 8700045 ],
+	[
+		'XNAMV', 'Amersfoort Vathorst',
+		8400031, 5.4338889122009,
+		52.192779541016
+	],
+	[ 'XNAM', 'Amersfoort', 8400055, 5.3705554008484, 52.153888702393 ],
+	[
+		'ONAMS', 'Amersfoort Schothorst',
+		8400054, 5.4038887023926,
+		52.174822137451
+	],
+	[
+		'XNAS',  'Amsterdam Sloterdijk',
+		8400059, 4.8377776145935,
+		52.388889312744
+	],
+	[
+		'XNAB',  'Amsterdam Bijlmer ArenA',
+		8400074, 4.9469442367554,
+		52.3122215271
+	],
+	[ 'XNAC', 'Amsterdam Centraal', 8400058, 4.9002776145935, 52.378887176514 ],
+	[ 'XNAZ', 'Amsterdam Zuid',     8400061, 4.872356,        52.338889 ],
+	[ 'XNAA', 'Amsterdam Amstel',   8400057, 4.9177780151367, 52.346668243408 ],
+
+	#[ undef, 'Amsterdam Holendrecht', 8400231, 4.95972, 52.29844],
+	[ 'ONAL', 'Amsterdam Lelylaan', 8400079, 4.8338890075684, 52.357776641846 ],
+	[
+		'ONAM',  'Amsterdam Muiderpoort',
+		8400060, 4.9311113357544,
+		52.360553741455
+	],
+	[ 'ONAMR', 'Amsterdam RAI', 8400056, 4.8902778625488, 52.337223052979 ],
+
+	#[ undef, 'Amsterdam Science Park', 8400235, 4.94651, 52.35526],
+	#[ undef, 'Amsterdam Van der Madeweg', 8400078, 4.92975, 52.330134],
+	[ 'XAAS', 'Amstetten NÖ', 8100012 ],
 	[ 'XSANF', 'Andelfingen', 8506047, 8.677979535639667,  47.59375898855363 ],
 	[ 'XSAN',  'Andermatt',   8505165, 8.593274879793624,  46.63689230776948 ],
 	[ 'XAAD',  'Andorf',      8100211, 13.565651593388415, 48.36940396731515 ],
@@ -7341,16 +7388,29 @@ my @stations = (
 	[ 'XBAC', 'Antwerpen Centraal', 8800007 ],
 	[ 'XBAZ', 'Antwerpen-Zuid',     8800310 ],
 	[ 'XFAP', 'Apach(Moselle)',     8700187 ],
-	[ 'XNAE', 'Apeldoorn',          8400066 ],
-	[ 'XNAP', 'Appingedam',         8400067 ],
-	[ 'XUA',  'Arad',               5300002 ],
+	[ 'ONAP', 'Anna Paulowna', 8400065, 4.8111109733581, 52.867221832275 ],
+	[ 'XNAE', 'Apeldoorn',     8400066, 5.9702777862549, 52.209167480469 ],
+
+	#[ undef, 'Apeldoorn De Maten', 8400233, 6.0005555152893, 52.205276489258],
+	#[ undef, 'Apeldoorn Osseveld', 8400229, 6.0044445991516, 52.215278625488],
+	[ 'XNAP',  'Appingedam',  8400067, 6.8619577,         53.3258135 ],
+	[ 'ONAKL', 'Arkel',       8400068, 4.9927778244019,   51.87194442749 ],
+	[ 'ONARM', 'Arnemuiden',  8400069, 3.6691665649414,   51.501667022705 ],
+	[ 'XUA',   'Arad',        5300002 ],
 	[ 'XSAB',  'Arbon',       8506308, 9.43333858590703,  47.51058544789499 ],
 	[ 'XSABS', 'Arbon (See)', 8506110, 9.440321008613958, 47.512642131624524 ],
 	[ 'XIAZ',  'Arezzo',      8300179 ],
 	[ 'XFAR',  'Argeles-sur-Mer', 8700487 ],
 	[ 'XFARL', 'Arles',           8700139 ],
 	[ 'XBAR',  'Arlon',           8800022 ],
-	[ 'XNAH',  'Arnhem Centraal', 8400071 ],
+	[ 'XNAH',  'Arnhem Centraal',   8400071, 5.8991665840149, 51.985000610352 ],
+	[ 'ONAHP', 'Arnhem Presikhaaf', 8400075, 5.9438886642456, 51.988056182861 ],
+	[
+		'ONAHV', 'Arnhem Velperpoort', 8400072, 5.9194445610046, 51.985279083252
+	],
+
+	#[ undef, 'Arnhem Zuid', 8400227, 5.8519444465637, 51.955001831055],
+	[ 'ONAS', 'Assen',       8400073, 6.5708332061768,    52.991664886475 ],
 	[ 'XAAR', 'Arnoldstein', 8100056, 13.708026901493023, 46.551561958299864 ],
 	[ 'XSAO', 'Arosa',       8509157, 9.67933313854315,   46.783295717543126 ],
 	[ 'XFAS', 'Arras(F)',    8700071 ],
@@ -7678,8 +7738,21 @@ my @stations = (
 	[ 'XSDE', 'Delémont', 8500109, 7.350053842479432, 47.36200065551522 ],
 	[ 'XNDT', 'Delft',     8400170 ],
 	[ 'XNDZ', 'Delfzijl',  8400171 ],
-	[ 'XNDH',  'Den Haag Centraal',            8400282 ],
-	[ 'XNDHH', 'Den Haag HS',                  8400280 ],
+	[ 'XNDH',  'Den Haag Centraal', 8400282, 4.3249998092651, 52.080276489258 ],
+	[ 'XNDHH', 'Den Haag HS',       8400280, 4.3225002288818, 52.069721221924 ],
+	[
+		'ONDHL', 'Den Haag Laan van Nieuw Oost Indie',
+		8400380, 4.3427777290344,
+		52.078609466553
+	],
+	[
+		'ONDHM', 'Den Haag Mariahoeve',
+		8400278, 4.3694443702698,
+		52.090557098389
+	],
+	[ 'ONHAM', 'Den Haag Moerwijk', 8400279, 4.3086109161377, 52.053890228271 ],
+
+	#[ undef, 'Den Haag Ypenburg', 8400379, 4.39222240448, 52.055278778076],
 	[ 'XNDL',  'Den Helder',                   8400311 ],
 	[ 'XBDL',  'Denderleeuw',                  8800050 ],
 	[ 'XTDS',  'Desenice',                     5400800 ],
@@ -7857,6 +7930,7 @@ my @stations = (
 	[ 'XPGD',  'Gdynia Glowna',   5100010 ],
 	[ 'XAGEI', 'Geinberg', 8100830, 13.291435567583736, 48.266337934350126 ],
 	[ 'XNLU', 'Geleen-Lutterade', 8400248 ],
+	[ 'XNGM', 'Geldermalsen', 8400244, 5.27127,           51.88301 ],
 	[ 'XSGK', 'Gelterkinden', 8500027, 7.847652712645581, 47.46588123955976 ],
 	[ 'XIGF', 'Gemona del Friuli', 8300090 ],
 	[ 'XSGE', 'Genève', 8501008, 6.1424530287470525, 46.21020226686625 ],
@@ -7939,9 +8013,12 @@ my @stations = (
 	],
 	[ 'XAGM', 'Gröbming',   8100135, 13.900740994050947, 47.42683485206192 ],
 	[ 'XBGR', 'Groenendaal', 8800527 ],
-	[ 'XNGR', 'Groningen',   8400263 ],
-	[ 'XAGS', 'Schwechat',   8100259 ],
-	[ 'XDGA', 'Guldager st', 8600809 ],
+	[ 'XNGR', 'Groningen',   8400263, 6.5647220611572,    53.210556030273 ],
+
+	#[ undef, 'Groningen Europapark', 8400238, 6.5854178, 53.20480027],
+	[ 'ONGRN', 'Groningen Noord',       8400264, 6.5563172, 53.2301469 ],
+	[ 'XAGS',  'Schwechat',             8100259 ],
+	[ 'XDGA',  'Guldager st',           8600809 ],
 	[ 'XAGK',  'Guntramsdorf Kaiserau', 8100372 ],
 	[ 'XAGUR', 'Gurten OÖ',            8100263 ],
 	[ 'XSGU', 'Güttingen', 8506124, 9.292227103943052, 47.60874942857897 ],
@@ -7989,16 +8066,18 @@ my @stations = (
 	[ 'XNHM', 'Helmond', 8400313 ],
 	[ 'XFHE', 'Hendaye', 8700149 ],
 	[ 'XSHE', 'Hendschiken', 8502211, 8.20737399628782, 47.389424223716574 ],
-	[ 'XNHL', 'Hengelo',     8400316 ],
-	[ 'XFHB',  'Henin-Beaumont',           8700351 ],
-	[ 'XDHEN', 'Henne st',                 8600960 ],
-	[ 'XBHR',  'Herentals',                8800063 ],
-	[ 'XBHE',  'Hergenrath',               8800116 ],
-	[ 'XAHN',  'Wien Hernals',             8100271 ],
-	[ 'XFHN',  'Herny',                    8701294 ],
-	[ 'XFHH',  'Herrlisheim près Colmar', 8701281 ],
-	[ 'XBHL',  'Herstal',                  8800236 ],
-	[ 'XBHZ',  'Herzele',                  8800369 ],
+	[ 'XNHL', 'Hengelo',     8400316, 6.7938890457153,  52.261665344238 ],
+	[ 'PNHGP', 'Hengelo Gezondheidspark', 8400433, 6.773611, 52.261667 ],
+	[ 'ONHLO', 'Hengelo Oost',   8400312, 6.8194446563721, 52.268890380859 ],
+	[ 'XFHB',  'Henin-Beaumont', 8700351 ],
+	[ 'XDHEN', 'Henne st',       8600960 ],
+	[ 'XBHR',  'Herentals',      8800063 ],
+	[ 'XBHE',  'Hergenrath',     8800116 ],
+	[ 'XAHN',  'Wien Hernals',   8100271 ],
+	[ 'XFHN',  'Herny',          8701294 ],
+	[ 'XFHH', 'Herrlisheim près Colmar', 8701281 ],
+	[ 'XBHL', 'Herstal',                  8800236 ],
+	[ 'XBHZ', 'Herzele',                  8800369 ],
 	[
 		'XSHZ', 'Herzogenbuchsee', 8508008, 7.700946426817969,
 		47.18808133078414
@@ -8051,12 +8130,19 @@ my @stations = (
 	[ 'XSIM', 'Immensee',     8505003, 8.46266014649329,   47.09161377808659 ],
 	[ 'XAIB', 'Imsterberg',   8101000, 10.706152203727884, 47.211258042186294 ],
 	[ 'XAIP', 'Imst-Pitztal', 8100062, 10.761943094904922, 47.21904015771718 ],
-	[ 'XBIM', 'Ingelmunster',          8800346 ],
-	[ 'XFIW', 'Ingwiller',             8700309 ],
-	[ 'XAI',  'Innsbruck Hbf',         8100108 ],
-	[ 'XAIH', 'Innsbruck Hötting',    8100110 ],
-	[ 'XAIW', 'Innsbruck Westbahnhof', 8100109 ],
-	[ 'XPIW', 'Inowroclaw',            5100015 ],
+	[ 'XBIM', 'Ingelmunster', 8800346 ],
+	[ 'XFIW', 'Ingwiller',    8700309 ],
+	[ 'XAI', 'Innsbruck Hbf', 8100108, 11.4010885424296, 47.2634127853823 ],
+	[
+		'XAIH', 'Innsbruck Hötting', 8100110, 11.373714005966,
+		47.2615611390909
+	],
+	[
+		'XAIW',  'Innsbruck Westbahnhof',
+		8100109, 11.3917477933704,
+		47.2556089816207
+	],
+	[ 'XPIW', 'Inowroclaw', 5100015 ],
 	[
 		'XSIO', 'Interlaken Ost', 8507492, 7.8690051374368535,
 		46.69050546005217
@@ -8281,17 +8367,21 @@ my @stations = (
 	[ 'XBLI',  'Liers',             8800238 ],
 	[ 'XSLI',  'Liestal', 8500023, 7.731354687749299,  47.484455130825005 ],
 	[ 'XALZN', 'Liezen',  8100131, 14.241973745690483, 47.56262820461037 ],
-	[ 'XFLI',  'Lille Flandres',       8700030 ],
-	[ 'XFLIE', 'Lille Europe',         8704949 ],
-	[ 'XILMN', 'Limone',               8300381 ],
-	[ 'XAL',   'Linz Hbf',             8100013 ],
-	[ 'XALW',  'Linz/Donau Wegscheid', 8101195 ],
-	[ 'XPLIL', 'Lipinki Luzyckie',     5102094 ],
-	[ 'XTLL',  'Lipova u Sluknova',    5401773 ],
-	[ 'XZLJ',  'Litija',               7900140 ],
-	[ 'XTLM',  'Litomerice mesto',     5401791 ],
-	[ 'XILI',  'Livorno Centrale',     8300157 ],
-	[ 'XZL',   'Ljubljana',            7900003 ],
+	[ 'XFLI',  'Lille Flandres', 8700030 ],
+	[ 'XFLIE', 'Lille Europe',   8704949 ],
+	[ 'XILMN', 'Limone',         8300381 ],
+	[ 'XAL', 'Linz Hbf', 8100013, 14.2919405869061, 48.2901577309329 ],
+	[
+		'XALW',  'Linz/Donau Wegscheid',
+		8101195, 14.2756088399248,
+		48.2496679884762
+	],
+	[ 'XPLIL', 'Lipinki Luzyckie',  5102094 ],
+	[ 'XTLL',  'Lipova u Sluknova', 5401773 ],
+	[ 'XZLJ',  'Litija',            7900140 ],
+	[ 'XTLM',  'Litomerice mesto',  5401791 ],
+	[ 'XILI',  'Livorno Centrale',  8300157 ],
+	[ 'XZL',   'Ljubljana',         7900003 ],
 	[ 'XSLC', 'Locarno', 8505400, 8.801358948645309, 46.17242739651656 ],
 	[
 		'XALH', 'Lochau-Hörbranz', 8100124, 9.742829087822987,
@@ -8329,8 +8419,14 @@ my @stations = (
 	[ 'XFLT',  'Lutzelbourg', 8700505 ],
 	[ 'XLL',   'Luxembourg',  8200100 ],
 	[ 'XSLU', 'Luzern', 8505000, 8.310170920111087, 47.05016976791821 ],
-	[ 'XFLPD', 'Lyon Part Dieu',    8700152 ],
-	[ 'XNMT',  'Maastricht',        8400424 ],
+	[ 'XFLPD', 'Lyon Part Dieu', 8700152 ],
+	[ 'XNMT',  'Maastricht',       8400424, 5.7055554389954, 50.850276947021 ],
+	[ 'PNMAN', 'Maastricht Noord', 8400449, 5.71774,         50.87087 ],
+	[
+		'XNMTR', 'Maastricht Randwyck',
+		8400426, 5.7172222137451,
+		50.838611602783
+	],
 	[ 'XTMC',  'Machnin',           5401888 ],
 	[ 'XTMR',  'Machnin hrad',      5401889 ],
 	[ 'XFMCV', 'Mâcon Ville',      8700032 ],
@@ -8530,9 +8626,19 @@ my @stations = (
 	[ 'XSNB', 'Niederbipp',  8500211, 7.694808253581067,  47.27039639227952 ],
 	[ 'XSNI', 'Niederglatt', 8503313, 8.503296125682324,  47.487468947665704 ],
 	[ 'XLNK', 'Niederkorn',  8270790 ],
-	[ 'XNNA',  'Nieuw Amsterdam',        8400454 ],
-	[ 'XNNS',  'Bad Nieuweschans',       8400457 ],
-	[ 'XNNM',  'Nijmegen',               8400470 ],
+	[ 'XNNA', 'Nieuw Amsterdam',  8400454, 6.8478111,       52.7183348 ],
+	[ 'XNNS', 'Bad Nieuweschans', 8400457 ],
+	[ 'XNNM', 'Nijmegen',         8400470, 5.8522224426269, 51.843612670898 ],
+	[
+		'ONNMD', 'Nijmegen Dukenburg', 8400475, 5.7955555915833, 51.824165344238
+	],
+
+	#[ undef, 'Nijmegen Goffert', 8400477, 5.822722, 51.8273],
+	[
+		'ONNMH', 'Nijmegen Heyendaal', 8400468, 5.8674998283386, 51.826946258545
+	],
+
+	#[ undef, 'Nijmegen Lent', 8400451, 5.859686, 51.861811],
 	[ 'XFNI',  'Nîmes',                 8700151 ],
 	[ 'XDNN',  'Noerre Nebel st',        8601692 ],
 	[ 'XDNP',  'Noerreport st',          8601699 ],
@@ -8809,17 +8915,28 @@ my @stations = (
 	],
 	[ 'XSRR', 'Rothrist', 8508103, 7.879386488358434, 47.306447664410285 ],
 	[ 'XSRK', 'Rotkreuz', 8502202, 8.430474534375334, 47.141758666525355 ],
-	[ 'XNRL',  'Rotterdam Lombardijen', 8400542 ],
-	[ 'XNRN',  'Rotterdam Noord',       8400531 ],
-	[ 'XNRC',  'Rotterdam Centraal',    8400530 ],
-	[ 'XNRS',  'Rotterdam Stadion',     8400015 ],
-	[ 'XTRN',  'Roudnice nad Labem',    5400183 ],
-	[ 'XFROU', 'Rouffach',              8701862 ],
-	[ 'XIRR',  'Rovereto',              8300113 ],
-	[ 'XIRG',  'Rovigo',                8300238 ],
-	[ 'XARU',  'Rum b.Innsbruck',       8100477 ],
-	[ 'XJRU',  'Ruma',                  7200010 ],
-	[ 'XTRU',  'Rumburk',               5400227 ],
+	[
+		'XNRL',  'Rotterdam Lombardijen',
+		8400542, 4.531388759613,
+		51.880001068115
+	],
+	[ 'XNRN', 'Rotterdam Noord',    8400531, 4.4816665649414, 51.942222595215 ],
+	[ 'XNRC', 'Rotterdam Centraal', 8400530, 4.468888759613,  51.92499923706 ],
+	[ 'XNRS', 'Rotterdam Stadion',  8400015, 4.5197219848633, 51.893890380859 ],
+	[
+		'ONROA', 'Rotterdam Alexander',
+		8400507, 4.5536112785339,
+		51.951946258545
+	],
+	[ 'ONRBL', 'Rotterdam Blaak', 8400529, 4.4888887405395, 51.920276641846 ],
+	[ 'ONROZ', 'Rotterdam Zuid',  8400533, 4.5102777481079, 51.904445648193 ],
+	[ 'XTRN',  'Roudnice nad Labem', 5400183 ],
+	[ 'XFROU', 'Rouffach',           8701862 ],
+	[ 'XIRR',  'Rovereto',           8300113 ],
+	[ 'XIRG',  'Rovigo',             8300238 ],
+	[ 'XARU',  'Rum b.Innsbruck',    8100477 ],
+	[ 'XJRU',  'Ruma',               7200010 ],
+	[ 'XTRU',  'Rumburk',            5400227 ],
 	[ 'XSRU', 'Rümlang',    8503311, 8.532745036510972, 47.4540663115926 ],
 	[ 'XSRP', 'Rupperswil',  8502114, 8.126944947624555, 47.40328800432531 ],
 	[ 'XSRL', 'Rüschlikon', 8503201, 8.555151469363317, 47.307132384680976 ],
@@ -8840,26 +8957,30 @@ my @stations = (
 		'XSSZ', 'Salez-Sennwald', 8509402, 9.502320642448307,
 		47.241444244433694
 	],
-	[ 'XAAI',  'Salzburg Aiglhof',   8102048 ],
-	[ 'XASLF', 'Salzburg Liefering', 8102063 ],
+	[ 'XAAI', 'Salzburg Aiglhof', 8102048, 13.0268283771151, 47.8078673204272 ],
+	[
+		'XASLF', 'Salzburg Liefering',
+		8102063, 13.0007765382897,
+		47.8240389720688
+	],
 	[
 		'XASBA', 'Salzburg Aigen', 8101470, 13.07879285060029,
 		47.78857921547915
 	],
-	[ 'XASB', 'Salzburg Hbf', 8100002 ],
+	[ 'XASB', 'Salzburg Hbf', 8100002, 13.046756378102, 47.8136297940914 ],
 	[
 		'XASBP', 'Salzburg Parsch',
 		8101481, 13.073165321601373,
 		47.799079011919076
 	],
-	[ 'XASSA', 'Salzburg Sam', 8102055 ],
+	[ 'XASSA', 'Salzburg Sam', 8102055, 13.063199297621, 47.8195034189248 ],
 	[
 		'XASBS', 'Salzburg Süd',
 		8101917, 13.078529947388532,
 		47.770107876837514
 	],
-	[ 'XASG', 'Salzburg Gnigl', 8100559 ],
-	[ 'XSSD',  'Samedan',    8509251, 9.873635416302262, 46.53376417413068 ],
+	[ 'XASG', 'Salzburg Gnigl', 8100559, 13.0663828956381,  47.8120237445838 ],
+	[ 'XSSD', 'Samedan',        8509251, 9.873635416302262, 46.53376417413068 ],
 	[ 'XSSMT', 'Samstagern', 8503286, 8.685972674894963, 47.19154642069013 ],
 	[ 'XISAR', 'San Remo',   8300182 ],
 	[ 'XLSC',  'Sandweiler-Contern', 8270930 ],
@@ -8870,13 +8991,17 @@ my @stations = (
 	[ 'XFSB', 'Sarrebourg',    8700265 ],
 	[ 'XFSM', 'Sarreguemines', 8700439 ],
 	[ 'XFSI', 'Sarreinsming',  8700528 ],
-	[ 'XFSRI', 'Sathonay Rillieux',        8704456 ],
-	[ 'XFSUD', 'Saumur Rive Droit',        8704969 ],
-	[ 'XFSV',  'Saverne',                  8700266 ],
-	[ 'XISAV', 'Savona',                   8300185 ],
-	[ 'XAML',  'Salzburg Mülln-Altstadt', 8102052 ],
-	[ 'XASVZ', 'Schaan-Vaduz',             8100482 ],
-	[ 'XBS',   'Schaerbeek',               8800001 ],
+	[ 'XFSRI', 'Sathonay Rillieux', 8704456 ],
+	[ 'XFSUD', 'Saumur Rive Droit', 8704969 ],
+	[ 'XFSV',  'Saverne',           8700266 ],
+	[ 'XISAV', 'Savona',            8300185 ],
+	[
+		'XAML',  'Salzburg Mülln-Altstadt',
+		8102052, 13.0337828783657,
+		47.8083899458954
+	],
+	[ 'XASVZ', 'Schaan-Vaduz', 8100482 ],
+	[ 'XBS',   'Schaerbeek',   8800001 ],
 	[ 'XSS',   'Schaffhausen', 8503424, 8.632728485895205,  47.69828146920709 ],
 	[ 'XASFU', 'Schaftenau',   8100483, 12.125417772597354, 47.55882712263548 ],
 	[ 'XASH', 'Schärding', 8100024 ],
@@ -8929,8 +9054,13 @@ my @stations = (
 	[ 'XFSE',  'Sete',              8700099 ],
 	[ 'XSSV', 'Sevelen', 8509406, 9.493824698989405, 47.12537147817187 ],
 	[ 'XZSN', 'Sevnica', 7900018 ],
-	[ 'XNSH', 's-Hertogenbosch', 8400319 ],
-	[ 'XJSI', 'Sid(SRB)',        7200140 ],
+	[ 'XNSH', 's-Hertogenbosch', 8400319, 5.29362, 51.69048 ],
+	[
+		'ONSHO', 's-Hertogenbosch Oost',
+		8400320, 5.3183331489563,
+		51.700553894043
+	],
+	[ 'XJSI', 'Sid(SRB)', 7200140 ],
 	[ 'XSSW', 'Siebnen-Wangen', 8503221, 8.90069892838304, 47.182667489080494 ],
 	[ 'XSSH', 'Siegershausen', 8506195, 9.168238793302592, 47.6109165826381 ],
 	[ 'XPSIZ', 'Sieniawa Zarska',  5103420 ],
@@ -9102,8 +9232,12 @@ my @stations = (
 		8100046, 12.947899003056541,
 		47.292812521519586
 	],
-	[ 'XATX', 'Salzburg Taxham Europark', 8102045 ],
-	[ 'XPTC', 'Tczew',                    5100061 ],
+	[
+		'XATX',  'Salzburg Taxham Europark',
+		8102045, 13.0108233471485,
+		47.8159723773145
+	],
+	[ 'XPTC', 'Tczew', 5100061 ],
 	[ 'XSTE', 'Tecknau', 8500028, 7.887605230238611, 47.44575725936749 ],
 	[
 		'XATP',  'Telfs-Pfaffenhofen',
@@ -9194,7 +9328,17 @@ my @stations = (
 	[ 'XTUS', 'Usti nad Labem-Strekov', 5403255 ],
 	[ 'XTU',  'Usti nad Labem hl.n.',   5400019 ],
 	[ 'XTUZ', 'Usti nad Labem zapad',   5403254 ],
-	[ 'XNU',  'Utrecht Centraal',       8400621 ],
+	[ 'XNU', 'Utrecht Centraal', 8400621, 5.1102776527405, 52.088890075684 ],
+	[ 'PNULR', 'Utrecht Leidsche Rijn', 8400607, 5.06523, 52.09896 ],
+	[ 'ONUL', 'Utrecht Lunetten', 8400623, 5.144166469574, 52.06555557251 ],
+
+	#[ undef, 'Utrecht Maliebaan', 8400624, 5.1313886642456, 52.087776184082],
+	[ 'ONUO', 'Utrecht Overvecht', 8400620, 5.1247220039368, 52.110000610352 ],
+
+	#[ undef, 'Utrecht Terwijde', 8400614, 5.0439547, 52.1000753],
+	[ 'PNUVR', 'Utrecht Vaartsche Rijn', 8400606, 5.121667, 52.078889 ],
+
+	#[ undef, 'Utrecht Zuilen', 8400613, 5.09, 52.103055],
 	[ 'XSUW',  'Uttwil',       8506122, 9.33968840224464, 47.58602142932164 ],
 	[ 'XMV',   'Vac',          5501413 ],
 	[ 'XFVAR', 'Vaires Torcy', 8700378 ],