Update station names for Fahrplanjahr 2023

2 files changed, 68 insertions, 58 deletions

diff --git a/share/renamed.json b/share/renamed.json
index e9c4edf..c2212eb 100644
--- a/share/renamed.json
+++ b/share/renamed.json
@@ -3,6 +3,8 @@
    "Barchel, Oerel" : "Barchel",
    "Berlin Betriebsbf Schöneweide" : "Berlin-Johannisthal",
    "Berlin Gehrenseestr." : "Berlin Gehrenseestraße",
+   "Berlin Wannsee" : "Berlin-Wannsee",
+   "Berlin Wannsee (S)" : "Berlin-Wannsee (S)",
    "Berlin-Schönefeld Flughafen" : "Flughafen BER - Terminal 5 (Schönefeld)",
    "Bernburg" : "Bernburg Hbf",
    "Biedenkopf-Schulzentrum" : "Biedenkopf Campus",
@@ -15,6 +17,7 @@
    "Brügge(Westf)" : "Lüdenscheid-Brügge",
    "Bösensell" : "Senden-Bösensell",
    "Chambery-Challes-E" : "Chambéry-Challes-les-Eaux",
+   "Charleroi Sud" : "Charleroi Central",
    "Cottbus" : "Cottbus Hbf",
    "Delft Zuid" : "Delft Campus",
    "Dieringhausen" : "Gummersbach-Dieringhausen",
@@ -22,6 +25,7 @@
    "Einbeck Salzderhelden" : "Einbeck-Salzderhelden",
    "Eindhoven" : "Eindhoven Centraal",
    "Eisenbach-Matzenbach" : "Matzenbach",
+   "Ergste" : "Schwerte-Ergste",
    "Escherndorf-Vogelburg" : "Escherndorf-Vogelsburg",
    "Essel, Kutenholz" : "Essel",
    "Europapl./PostGalerie (Kaiserstr), Karlsruhe" : "Europaplatz/Postgal. (Kaiser), Karlsruhe",
@@ -30,6 +34,7 @@
    "Europaplatz/Postgal. (Kaiser), Karlsruhe" : "Europaplatz/Postgalerie, Karlsruhe",
    "Europaplatz/Postgalerie (Karls, Karlsruhe" : "Europaplatz/Postgalerie (Karlstr.), Karlsruhe",
    "Freiburg West" : "Freiburg-Landwasser",
+   "Frömern" : "Fröndenberg-Frömern",
    "Furth i Wald" : "Furth im Wald",
    "Fürth-Unterfarrnbach" : "Fürth-Klinikum",
    "Galgenschanze" : "Kaiserslautern Galgenschanze",
@@ -51,6 +56,7 @@
    "Karlsruhe Durlacher Tor / KIT-Campus Süd" : "Karlsruhe Durlacher Tor/KIT-Campus Süd",
    "Karlsruhe Mühlburger Tor" : "Karlsruhe Mühlburger Tor (Kaiserallee)",
    "Karlsruhe Mühlburger Tor (Kaiserallee)" : "Karlsruhe Mühlburger Tor",
+   "Kavelstorf(Kr Rostock)" : "Kavelstorf",
    "Kelenföld" : "Budapest-Kelenföld",
    "Korbach" : "Korbach Hbf",
    "Kronenplatz (Fritz-Erler-Str.), Karlsruhe" : "Kronenplatz, Karlsruhe",
@@ -86,7 +92,9 @@
    "Riegel-Malterdingen NE" : "Riegel-Malterdingen (SWEG)",
    "Ringsheim" : "Ringsheim/Europa-Park",
    "Rudersdorf(Siegen)" : "Wilnsdorf-Rudersdorf",
+   "Sandebeck" : "Steinheim-Sandebeck",
    "Sarnau" : "Lahntal-Sarnau",
+   "Schönow(Angerm)" : "Schönow(Uckermark)",
    "Sennelager" : "Paderborn-Sennelager",
    "Sennestadt" : "Bielefeld-Sennestadt",
    "Siegen" : "Siegen Hbf",
@@ -100,7 +108,9 @@
    "Thalheim (b Oschatz)" : "Thalheim(b Oschatz)",
    "Timmendorferstrand" : "Timmendorfer Strand",
    "Untersulzbach" : "Sulzbachtal",
+   "Urmitz" : "Mülheim-Kärlich",
    "Velesyn mesto" : "Velesin mesto",
+   "Vogelsang(Gransee)" : "Vogelsang(Kr Oberhavel)",
    "Volkswohnung/Staatstheater, Karlsruhe" : "Kongresszentrum, Karlsruhe",
    "Waggonfabrik" : "Mainz Waggonfabrik",
    "Waldkraiburg" : "Waldkraiburg-Kraiburg",
diff --git a/share/stations.json b/share/stations.json
index b5f71ef..65b3bd9 100644
--- a/share/stations.json
+++ b/share/stations.json
@@ -7191,24 +7191,6 @@
       "name" : "Berlin Treptower Park"
    },
    {
-      "ds100" : "BWS",
-      "eva" : 8010405,
-      "latlong" : [
-         52.421058,
-         13.179336
-      ],
-      "name" : "Berlin Wannsee"
-   },
-   {
-      "ds100" : "BWSS",
-      "eva" : 8089190,
-      "latlong" : [
-         52.421058,
-         13.179336
-      ],
-      "name" : "Berlin Wannsee (S)"
-   },
-   {
       "ds100" : "BWRS",
       "eva" : 8089045,
       "latlong" : [
@@ -7830,6 +7812,24 @@
       "name" : "Berlin-Waidmannslust"
    },
    {
+      "ds100" : "BWS",
+      "eva" : 8010405,
+      "latlong" : [
+         52.421058,
+         13.179336
+      ],
+      "name" : "Berlin-Wannsee"
+   },
+   {
+      "ds100" : "BWSS",
+      "eva" : 8089190,
+      "latlong" : [
+         52.421058,
+         13.179336
+      ],
+      "name" : "Berlin-Wannsee (S)"
+   },
+   {
       "ds100" : "BWAB",
       "eva" : 8089093,
       "latlong" : [
@@ -13776,7 +13776,7 @@
          50.404422,
          4.438774
       ],
-      "name" : "Charleroi Sud"
+      "name" : "Charleroi Central"
    },
    {
       "ds100" : "XFCT",
@@ -20898,15 +20898,6 @@
       "name" : "Ergoldsbach"
    },
    {
-      "ds100" : "EERG",
-      "eva" : 8001836,
-      "latlong" : [
-         51.424705,
-         7.577534
-      ],
-      "name" : "Ergste"
-   },
-   {
       "ds100" : "TEK",
       "eva" : 8001838,
       "latlong" : [
@@ -24750,15 +24741,6 @@
       "name" : "Frutigen"
    },
    {
-      "ds100" : "EFRM",
-      "eva" : 8002130,
-      "latlong" : [
-         51.499263,
-         7.735929
-      ],
-      "name" : "Frömern"
-   },
-   {
       "ds100" : "EFOE",
       "eva" : 8000113,
       "latlong" : [
@@ -24768,6 +24750,15 @@
       "name" : "Fröndenberg"
    },
    {
+      "ds100" : "EFRM",
+      "eva" : 8002130,
+      "latlong" : [
+         51.499263,
+         7.735929
+      ],
+      "name" : "Fröndenberg-Frömern"
+   },
+   {
       "ds100" : "UFT",
       "eva" : 8010118,
       "latlong" : [
@@ -38166,7 +38157,7 @@
          54.007081,
          12.197821
       ],
-      "name" : "Kavelstorf(Kr Rostock)"
+      "name" : "Kavelstorf"
    },
    {
       "ds100" : "OAKFM",
@@ -51462,6 +51453,15 @@
       "name" : "Mülheim(Ruhr)West"
    },
    {
+      "ds100" : "KUR",
+      "eva" : 8006035,
+      "latlong" : [
+         50.402613,
+         7.509072
+      ],
+      "name" : "Mülheim-Kärlich"
+   },
+   {
       "ds100" : "RML",
       "eva" : 8004124,
       "latlong" : [
@@ -65691,15 +65691,6 @@
       "name" : "Sande"
    },
    {
-      "ds100" : "ESDB",
-      "eva" : 8005283,
-      "latlong" : [
-         51.818371,
-         8.986954
-      ],
-      "name" : "Sandebeck"
-   },
-   {
       "ds100" : "LSA",
       "eva" : 8012838,
       "latlong" : [
@@ -67644,6 +67635,15 @@
       "name" : "Schwerte(Ruhr)"
    },
    {
+      "ds100" : "EERG",
+      "eva" : 8001836,
+      "latlong" : [
+         51.424705,
+         7.577534
+      ],
+      "name" : "Schwerte-Ergste"
+   },
+   {
       "ds100" : "DSWOP",
       "eva" : 8070693,
       "latlong" : [
@@ -68001,7 +68001,7 @@
          53.184946,
          14.153814
       ],
-      "name" : "Schönow(Angerm)"
+      "name" : "Schönow(Uckermark)"
    },
    {
       "ds100" : "USCS",
@@ -71118,6 +71118,15 @@
       "name" : "Steinheim(Westf)"
    },
    {
+      "ds100" : "ESDB",
+      "eva" : 8005283,
+      "latlong" : [
+         51.818371,
+         8.986954
+      ],
+      "name" : "Steinheim-Sandebeck"
+   },
+   {
       "ds100" : "MSHG",
       "eva" : 8005709,
       "latlong" : [
@@ -75456,15 +75465,6 @@
       "name" : "Urmersbach"
    },
    {
-      "ds100" : "KUR",
-      "eva" : 8006035,
-      "latlong" : [
-         50.402613,
-         7.509072
-      ],
-      "name" : "Urmitz"
-   },
-   {
       "ds100" : "KURR",
       "eva" : 8006036,
       "latlong" : [
@@ -76929,7 +76929,7 @@
          53.037712,
          13.385687
       ],
-      "name" : "Vogelsang(Gransee)"
+      "name" : "Vogelsang(Kr Oberhavel)"
    },
    {
       "ds100" : "SVO",