Fixes for Southern Region Map, added Egypt and SRM

Koenvh1 · Jan 4, 2017 · 63c442c · 63c442c
1 parent 7e1066f
commit 63c442c
Show file tree

Hide file tree

Showing 121 changed files with 11,018 additions and 5 deletions.
diff --git a/ETS2 Log to Coordinates/Program.cs b/ETS2 Log to Coordinates/Program.cs
@@ -51,12 +51,12 @@ static void Main(string[] args)
                     while ((line = readCity.ReadLine()) != null)
                     {
                         //Check ingame city name
-                        if (line.Trim().StartsWith("city_data: city."))
+                        if (line.Trim().StartsWith("city_data: city.") || line.Trim().StartsWith("city_data:city."))
                         {
                             //int nameIndex = line.IndexOf("\"");
                             //string cityName = line.Substring(nameIndex + 1,
                             //    line.IndexOf("\"", nameIndex + 1) - nameIndex - 1);
-                            cityName = line.Replace("city_data: city.", "");
+                            cityName = line.Replace("city_data: city.", "").Replace("city_data:city.", "");
                             if (cityName.Contains("{"))
                             {
                                 cityName = cityName.Remove(cityName.IndexOf("{"));
@@ -73,7 +73,7 @@ static void Main(string[] args)
                         //Check country
                         if (line.TrimStart().StartsWith("country:"))
                         {
-                            country = line.Trim().Replace("country: ", "");
+                            country = line.Trim().Replace("country: ", "").Replace("country:", "").Trim();
                         }
                     }
                     //Add them to the dictionaries

diff --git a/cities_egypt.json b/cities_egypt.json
@@ -0,0 +1,36 @@
+{
+  "citiesList": [
+    {
+      "gameName": "alwasta",
+      "realName": "Al Wasta",
+      "country": "egypt",
+      "x": "78780",
+      "y": "52.4297",
+      "z": "110100"
+    },
+    {
+      "gameName": "cairo",
+      "realName": "Cairo",
+      "country": "egypt",
+      "x": "78490.1",
+      "y": "53.3594",
+      "z": "104211"
+    },
+    {
+      "gameName": "fayyum",
+      "realName": "Al Fayyum",
+      "country": "egypt",
+      "x": "76362.4",
+      "y": "14.3242",
+      "z": "107667"
+    },
+    {
+      "gameName": "samalut",
+      "realName": "Samalut",
+      "country": "egypt",
+      "x": "77796.2",
+      "y": "45.2266",
+      "z": "116925"
+    }
+  ]
+}
diff --git a/cities_egypt.txt b/cities_egypt.txt
@@ -0,0 +1,8 @@
+ alwasta ; [04/12/2016  21:48] (sec+0019+0027);78780;52.4297;110100
+ cairo ; [04/12/2016  21:48] (sec+0019+0026);78490.1;53.3594;104211
+ dahszur ; [04/12/2016  21:48] (sec+0019+0026);78490.1;53.3594;104211
+ fayyum ; [04/12/2016  21:48] (sec+0019+0026);76362.4;14.3242;107667
+ memanbau ; [04/12/2016  21:48] (sec+0019+0026);76362.4;14.3242;107667
+ sakkara ; [04/12/2016  21:48] (sec+0019+0026);76362.4;14.3242;107667
+ samalut ; [04/12/2016  21:48] (sec+0019+0029);77796.2;45.2266;116925
+ vissl ; [04/12/2016  21:48] (sec+0019+0029);77796.2;45.2266;116925