From 0dec5101e46b0c424f46845510a6ba7280982534 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Sun, 28 Sep 2025 18:00:43 +0200 Subject: [PATCH 1/5] Liegnitz -> Stadt nocht regierungsbezirk --- XML/orte.xml | 1164 +++++++++++++++++++++++++------------------------- 1 file changed, 582 insertions(+), 582 deletions(-) diff --git a/XML/orte.xml b/XML/orte.xml index daa2c75..0c8ed91 100644 --- a/XML/orte.xml +++ b/XML/orte.xml @@ -1,8 +1,8 @@ - - - Königsberg - https://www.geonames.org/554234 - - - - London - https://www.geonames.org/11591955 - - - - Kassel - https://www.geonames.org/6547484 - - - - Flensburg - https://www.geonames.org/6551295 - - - - Regensburg - https://www.geonames.org/6556611 - - - - Coburg - https://www.geonames.org/2939951 - - - - Neuenburg - https://www.geonames.org/2659496 - - - - Chemnitz - https://www.geonames.org/6548487 - - - - Altorf - https://www.geonames.org/6452473 - - - - Gotha - https://www.geonames.org/2918752 - - - - Köln - https://www.geonames.org/2886242 - - - - Preussisch Holland - https://www.geonames.org/7533014 - - - - St. Petersburg - https://www.geonames.org/536203 - - - - Lindau - https://www.geonames.org/2877550 - - - - Schleswig - https://www.geonames.org/2838632 - - - - Stuttgart - https://www.geonames.org/2825297 - - - - Haarlem - https://www.geonames.org/2755002 - - - - Aurich - https://www.geonames.org/6557459 - - - - Frankfurt am Main - https://www.geonames.org/6553153 - - - - Frankfurt an der Oder - https://www.geonames.org/2925535 - - - - Leipzig - https://www.geonames.org/2879139 - - - - Berlin - https://www.geonames.org/2950159 - - - - Memmingen - https://www.geonames.org/6557109 - - - - Magdeburg - https://www.geonames.org/2874545 - - - - Stendal - https://www.geonames.org/6550942 - - - - Danzig - https://www.geonames.org/3099434 - - - - Halle - https://www.geonames.org/2911522 - - - - Erlangen - https://www.geonames.org/6556830 - - - - Breslau - https://www.geonames.org/3081368 - - - - Bremen - https://www.geonames.org/2944388 - - - - Helmstedt - https://www.geonames.org/2906676 - - - - Amsterdam - https://www.geonames.org/2759794 - - - - Hamburg - https://www.geonames.org/2911298 - - - - Paris - https://www.geonames.org/2968815 - - - - Ulm - https://www.geonames.org/2820256 - - - - Genf - https://www.geonames.org/7285902 - - - - Mannheim - https://www.geonames.org/2873891 - - - - Lübeck - https://www.geonames.org/7602559 - - - - Riga - https://www.geonames.org/456173 - - - - Altona - https://www.geonames.org/11669484 - - - - Strassburg - https://www.geonames.org/6441375 - - - - Tübingen - https://www.geonames.org/2820860/ - - - - Jena - https://www.geonames.org/6549748 - - - - Brandenburg an der Havel - https://www.geonames.org/6547540 - - - - Lyon - https://www.geonames.org/6454573 - - - - Den Haag - https://www.geonames.org/2747373 - - - - Kleve - https://www.geonames.org/6557494 - - - - Rostock - https://www.geonames.org/2844588 - - - - Kopenhagen - https://www.geonames.org/2618425 - - - - Stralsund - https://www.geonames.org/6551183 - - - - Stettin - https://www.geonames.org/3083829 - - - - Karlsruhe - https://www.geonames.org/6555606 - - - - Quedlinburg - https://www.geonames.org/6551148 - - - - Nürnberg - https://www.geonames.org/2861650 - - - - Hildburghausen - https://www.geonames.org/6551153 - - - - Eisleben - https://www.geonames.org/6549067 - - - - Wittenberg - https://www.geonames.org/6548975 - - - - Sorau - https://www.geonames.org/3080644 - - - - Züllichau - https://www.geonames.org/3084241 - - - - Hannover - https://www.geonames.org/6559065 - - - - Erfurt - https://www.geonames.org/6549746 - - - - Altenburg - https://www.geonames.org/6551051 - - - - Rinteln - https://www.geonames.org/6558455 - - - - Zittau - https://www.geonames.org/6551130 - - - - Dresden - https://www.geonames.org/2935020 - - - - Bützow - https://www.geonames.org/6550684 - - - - Wismar - https://www.geonames.org/7602561 - - - - Zürich - https://www.geonames.org/6458798 - - - - Celle - https://www.geonames.org/6557432 - - - - Braunschweig - https://www.geonames.org/6552297 - - - - Wolfenbüttel - https://www.geonames.org/6557395 - - - - Lemgo - https://www.geonames.org/6557639 - - - - Mitau - https://www.geonames.org/459279 - - - - Hanau - https://www.geonames.org/6557738/ - - - - Wien - https://www.geonames.org/2761367 - - - - Augsburg - https://www.geonames.org/6557107 - - - - Heilbronn - https://www.geonames.org/6555511 - - - - Bern - https://www.geonames.org/2661552 - - - - Eisenach - https://www.geonames.org/6547386 - - - - Prag - https://www.geonames.org/3067696 - - - - München - https://www.geonames.org/3220837 - - - - Liegnitz - https://www.geonames.org/7530968 - - - - Weimar - https://www.geonames.org/6549750 - - - - Bayreuth - https://www.geonames.org/6556726 - - - - Gießen - https://www.geonames.org/6559130 - - - - Göttingen - https://www.geonames.org/6557373 - - - - Görlitz - https://www.geonames.org/6548602 - - - - Bamberg - https://www.geonames.org/2952984 - - - - Zelle - https://www.geonames.org/2783286 - - - - Altdorf bei Nürnberg - https://www.geonames.org/6558981 - - - - Schwerin - https://www.geonames.org/2834281 - - - - Hof - https://www.geonames.org/6556728 - - - - Münster - https://www.geonames.org/6553087 - - - - Hamm - https://www.geonames.org/6553135 - - - - Meiningen - https://www.geonames.org/655115 - - - - Langensalza - https://www.geonames.org/6550971 - - - - Odense - https://www.geonames.org/2615872 - - - - Glogau - https://www.geonames.org/3099213 - - - - Schwabach - https://www.geonames.org/2835536 - - - - Ansbach - https://www.geonames.org/6556829 - - - - Stockholm - https://www.geonames.org/2673730 - - - - Potsdam - https://www.geonames.org/7602560 - - - - Hasenpoth - https://www.geonames.org/461602 - - - - Zerbst - https://www.geonames.org/6550879 - - - - Halberstadt - https://www.geonames.org/6550926 - - - - Pressburg - https://www.geonames.org/3343955 - - - - Warschau - https://www.geonames.org/7531926 - - - - Öhringen - https://www.geonames.org/6557998 - - - - Graz - https://www.geonames.org/7871499 - - - - Budissin / Bautzen - https://www.geonames.org/6550794 - - - - Greifswald - https://www.geonames.org/6551180 - - - - Kiel - https://www.geonames.org/2891122 - - - - Basel - https://www.geonames.org/7285161 - - - - Lausanne - https://www.geonames.org/7286283 - - - - Bernburg - https://www.geonames.org/2950073 - - - - Minden - https://www.geonames.org/6557646 - + + Königsberg + https://www.geonames.org/554234 + + + + London + https://www.geonames.org/11591955 + + + + Kassel + https://www.geonames.org/6547484 + + + + Flensburg + https://www.geonames.org/6551295 + + + + Regensburg + https://www.geonames.org/6556611 + + + + Coburg + https://www.geonames.org/2939951 + + + + Neuenburg + https://www.geonames.org/2659496 + + + + Chemnitz + https://www.geonames.org/6548487 + + + + Altorf + https://www.geonames.org/6452473 + + + + Gotha + https://www.geonames.org/2918752 + + + + Köln + https://www.geonames.org/2886242 + + + + Preussisch Holland + https://www.geonames.org/7533014 + + + + St. Petersburg + https://www.geonames.org/536203 + + + + Lindau + https://www.geonames.org/2877550 + + + + Schleswig + https://www.geonames.org/2838632 + + + + Stuttgart + https://www.geonames.org/2825297 + + + + Haarlem + https://www.geonames.org/2755002 + + + + Aurich + https://www.geonames.org/6557459 + + + + Frankfurt am Main + https://www.geonames.org/6553153 + + + + Frankfurt an der Oder + https://www.geonames.org/2925535 + + + + Leipzig + https://www.geonames.org/2879139 + + + + Berlin + https://www.geonames.org/2950159 + + + + Memmingen + https://www.geonames.org/6557109 + + + + Magdeburg + https://www.geonames.org/2874545 + + + + Stendal + https://www.geonames.org/6550942 + + + + Danzig + https://www.geonames.org/3099434 + + + + Halle + https://www.geonames.org/2911522 + + + + Erlangen + https://www.geonames.org/6556830 + + + + Breslau + https://www.geonames.org/3081368 + + + + Bremen + https://www.geonames.org/2944388 + + + + Helmstedt + https://www.geonames.org/2906676 + + + + Amsterdam + https://www.geonames.org/2759794 + + + + Hamburg + https://www.geonames.org/2911298 + + + + Paris + https://www.geonames.org/2968815 + + + + Ulm + https://www.geonames.org/2820256 + + + + Genf + https://www.geonames.org/7285902 + + + + Mannheim + https://www.geonames.org/2873891 + + + + Lübeck + https://www.geonames.org/7602559 + + + + Riga + https://www.geonames.org/456173 + + + + Altona + https://www.geonames.org/11669484 + + + + Strassburg + https://www.geonames.org/6441375 + + + + Tübingen + https://www.geonames.org/2820860/ + + + + Jena + https://www.geonames.org/6549748 + + + + Brandenburg an der Havel + https://www.geonames.org/6547540 + + + + Lyon + https://www.geonames.org/6454573 + + + + Den Haag + https://www.geonames.org/2747373 + + + + Kleve + https://www.geonames.org/6557494 + + + + Rostock + https://www.geonames.org/2844588 + + + + Kopenhagen + https://www.geonames.org/2618425 + + + + Stralsund + https://www.geonames.org/6551183 + + + + Stettin + https://www.geonames.org/3083829 + + + + Karlsruhe + https://www.geonames.org/6555606 + + + + Quedlinburg + https://www.geonames.org/6551148 + + + + Nürnberg + https://www.geonames.org/2861650 + + + + Hildburghausen + https://www.geonames.org/6551153 + + + + Eisleben + https://www.geonames.org/6549067 + + + + Wittenberg + https://www.geonames.org/6548975 + + + + Sorau + https://www.geonames.org/3080644 + + + + Züllichau + https://www.geonames.org/3084241 + + + + Hannover + https://www.geonames.org/6559065 + + + + Erfurt + https://www.geonames.org/6549746 + + + + Altenburg + https://www.geonames.org/6551051 + + + + Rinteln + https://www.geonames.org/6558455 + + + + Zittau + https://www.geonames.org/6551130 + + + + Dresden + https://www.geonames.org/2935020 + + + + Bützow + https://www.geonames.org/6550684 + + + + Wismar + https://www.geonames.org/7602561 + + + + Zürich + https://www.geonames.org/6458798 + + + + Celle + https://www.geonames.org/6557432 + + + + Braunschweig + https://www.geonames.org/6552297 + + + + Wolfenbüttel + https://www.geonames.org/6557395 + + + + Lemgo + https://www.geonames.org/6557639 + + + + Mitau + https://www.geonames.org/459279 + + + + Hanau + https://www.geonames.org/6557738/ + + + + Wien + https://www.geonames.org/2761367 + + + + Augsburg + https://www.geonames.org/6557107 + + + + Heilbronn + https://www.geonames.org/6555511 + + + + Bern + https://www.geonames.org/2661552 + + + + Eisenach + https://www.geonames.org/6547386 + + + + Prag + https://www.geonames.org/3067696 + + + + München + https://www.geonames.org/3220837 + + + + Liegnitz + https://www.geonames.org/3093692 + + + + Weimar + https://www.geonames.org/6549750 + + + + Bayreuth + https://www.geonames.org/6556726 + + + + Gießen + https://www.geonames.org/6559130 + + + + Göttingen + https://www.geonames.org/6557373 + + + + Görlitz + https://www.geonames.org/6548602 + + + + Bamberg + https://www.geonames.org/2952984 + + + + Zelle + https://www.geonames.org/2783286 + + + + Altdorf bei Nürnberg + https://www.geonames.org/6558981 + + + + Schwerin + https://www.geonames.org/2834281 + + + + Hof + https://www.geonames.org/6556728 + + + + Münster + https://www.geonames.org/6553087 + + + + Hamm + https://www.geonames.org/6553135 + + + + Meiningen + https://www.geonames.org/655115 + + + + Langensalza + https://www.geonames.org/6550971 + + + + Odense + https://www.geonames.org/2615872 + + + + Glogau + https://www.geonames.org/3099213 + + + + Schwabach + https://www.geonames.org/2835536 + + + + Ansbach + https://www.geonames.org/6556829 + + + + Stockholm + https://www.geonames.org/2673730 + + + + Potsdam + https://www.geonames.org/7602560 + + + + Hasenpoth + https://www.geonames.org/461602 + + + + Zerbst + https://www.geonames.org/6550879 + + + + Halberstadt + https://www.geonames.org/6550926 + + + + Pressburg + https://www.geonames.org/3343955 + + + + Warschau + https://www.geonames.org/7531926 + + + + Öhringen + https://www.geonames.org/6557998 + + + + Graz + https://www.geonames.org/7871499 + + + + Budissin / Bautzen + https://www.geonames.org/6550794 + + + + Greifswald + https://www.geonames.org/6551180 + + + + Kiel + https://www.geonames.org/2891122 + + + + Basel + https://www.geonames.org/7285161 + + + + Lausanne + https://www.geonames.org/7286283 + + + + Bernburg + https://www.geonames.org/2950073 + + + + Minden + https://www.geonames.org/6557646 + From bcda616461566a4b0f69bb8a867b5712ee406cf8 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Sun, 28 Sep 2025 18:03:05 +0200 Subject: [PATCH 2/5] Merge conflict liegnizs solved --- XML/orte.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/XML/orte.xml b/XML/orte.xml index 40485d8..c715f28 100644 --- a/XML/orte.xml +++ b/XML/orte.xml @@ -420,17 +420,7 @@ Liegnitz - < - < - < - < - < - < - < HEAD https://www.geonames.org/3093692 - ======= - https://www.geonames.org/7530968 - >>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223 From a3d0af4b0bda7e30638336b2f6ba75c2a2e37c3f Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Sun, 28 Sep 2025 18:03:38 +0200 Subject: [PATCH 3/5] Merge conflict pressburg solved --- XML/orte.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/XML/orte.xml b/XML/orte.xml index c715f28..f3b079c 100644 --- a/XML/orte.xml +++ b/XML/orte.xml @@ -540,17 +540,7 @@ Pressburg - < - < - < - < - < - < - < HEAD - https://www.geonames.org/3343955 - ======= https://www.geonames.org/3060972 - >>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223 From 5da8da85a6b0e2ca4c574a3d949903df1c2c399c Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Sun, 28 Sep 2025 18:48:27 +0200 Subject: [PATCH 4/5] hanau +commit test --- XML/orte.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XML/orte.xml b/XML/orte.xml index f3b079c..f6ae07c 100644 --- a/XML/orte.xml +++ b/XML/orte.xml @@ -380,7 +380,7 @@ Hanau - https://www.geonames.org/6557738/ + https://www.geonames.org/2911007 From df446a2e6b6f88098e9a74620d3e99779fd2d735 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Sun, 28 Sep 2025 18:53:28 +0200 Subject: [PATCH 5/5] =?UTF-8?q?T=C3=BCbingen=20&=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XML/orte.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XML/orte.xml b/XML/orte.xml index f6ae07c..75974ca 100644 --- a/XML/orte.xml +++ b/XML/orte.xml @@ -220,7 +220,7 @@ Tübingen - https://www.geonames.org/2820860/ + https://www.geonames.org/2820860