Add yours walking strategy as a fallback/alternative for Google walki… …

…NecronomiconCoding#429 Merge branch 'jjskuld-feature/add_multiple_walking_strategies'

PoGo.NecroBot.CLI/Config/Translations/translation.ca.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Viatjant cap a la Pokeparada: {0} ({1}m)({2}segons)"
+      "Value": "Viatjant cap a la Pokeparada: {0} ({1}m) ({2}segons) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.cs.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Chůze k Pokestopu: {0} ({1}m) ({2} sekund)"
+      "Value": "Chůze k Pokestopu: {0} ({1}m) ({2} sekund) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.da.json

@@ -78,7 +78,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} om ({1}m) ({2}sekunder)"
+      "Value": "{0} om ({1}m) ({2}sekunder) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.de.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} in ({1}m) ({2} Sekunden)"
+      "Value": "{0} in ({1}m) ({2} Sekunden) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.el.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} σε απόσταση {1} μέτρων"
+      "Value": "{0} σε απόσταση {1} μέτρων ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.es.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Llegando a Poképarada: {0} en ({1}m) ({2} segundos)"
+      "Value": "Llegando a Poképarada: {0} en ({1}m) ({2} segundos) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.et.json

@@ -78,7 +78,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} ({1} m pärast)"
+      "Value": "{0} ({1} m pärast) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.fr.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} à {1}m | {2}s"
+      "Value": "{0} à {1}m | {2}s (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.hu.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Erkezes pokestopphoz: {0} ({1}m)"
+      "Value": "Erkezes pokestopphoz: {0} ({1}m) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.id.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Jalan ke PokeStop {0}, {1} meter, {2} detik"
+      "Value": "Jalan ke PokeStop {0}, {1} meter, {2} detik (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.it.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Camminando verso il Pokestop: {0} ({1}m) ({2} secondi)"
+      "Value": "Camminando verso il Pokestop: {0} ({1}m) ({2} secondi) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "次のポケストップへ移動中です: {0} ({1}m) ({2} 秒)"
+      "Value": "次のポケストップへ移動中です: {0} ({1}m) ({2} 秒) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.kh.json

@@ -56,7 +56,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "ធ្វើដំណើរទៅ PokeStop: {0} ({1}វិនារទី)"
+      "Value": "ធ្វើដំណើរទៅ PokeStop: {0} ({1}វិនារទី) ({2} seconds) (route {3})"
 
     },
     {

PoGo.NecroBot.CLI/Config/Translations/translation.lt.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Atvykstama į Pokestotelę: {0} už ({1}m)"
+      "Value": "Atvykstama į Pokestotelę: {0} už ({1}m) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.nl-NL.json

@@ -47,7 +47,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} over {1} meter ({2} seconden)"
+      "Value": "{0} over {1} meter ({2} seconden) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.nn-NO.json

@@ -42,7 +42,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{0} in ({1}m)"
+      "Value": "{0} in ({1}m) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.pl.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Dotarcie do PokeStopu: {0} za ({1}m) ({2}s)"
+      "Value": "Dotarcie do PokeStopu: {0} za ({1}m) ({2}s) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Chegando ao Pokestop: {0} ({1}m) ({2} segundos)"
+      "Value": "Chegando ao Pokestop: {0} ({1}m) ({2} segundos) (rota {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.pt-pt.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "A chegar ao Pokestop: {0} em ({1}m)"
+      "Value": "A chegar ao Pokestop: {0} em ({1}m) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.ro.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Călătoresc la pokestopul \"{0}\" ({1}m) ({2} secunde)"
+      "Value": "Călătoresc la pokestopul \"{0}\" ({1}m) ({2} secunde) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Направляемся к <{0}>, дистанция ({1}м) ({2} сек.)"
+      "Value": "Направляемся к <{0}>, дистанция ({1}м) ({2} сек.) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.sv.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Anländer till Pokestop: {0} om ({1}m)"
+      "Value": "Anländer till Pokestop: {0} om ({1}m) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.th.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "กำลังเดินทางไปสู่ PokeStops : {0} ( {1} เมตร ) ( {2} วินาที )"
+      "Value": "กำลังเดินทางไปสู่ PokeStops : {0} ( {1} เมตร ) ( {2} วินาที ) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.tr.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "{2} saniye sonra {1}m mesafedeki \"{0}\" adlı PokéStop'a varılacak."
+      "Value": "(route {3}) {2} saniye sonra {1}m mesafedeki \"{0}\" adlı PokéStop'a varılacak."
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.uk-UA.json

@@ -46,7 +46,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Прямуємо до <{0}>, дистанція ({1} м)"
+      "Value": "Прямуємо до <{0}>, дистанція ({1} м) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.vi.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Đi đến Pokestop: {0} (xa {1}m) (trong {2} giây)"
+      "Value": "Đi đến Pokestop: {0} (xa {1}m) (trong {2} giây) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "正在前往补给站:{0} 距离{1}米,需要{2}秒\t\t\t"
+      "Value": "正在前往补给站:{0} 距离{1}米,需要{2}秒 (route {3})\t\t\t"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "正在前往补给站:{0} 距离{1}米,需要{2}秒\t\t\t"
+      "Value": "正在前往补给站:{0} 距离{1}米,需要{2}秒 (route {3})\t\t\t"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "前往補給站：{0} (距離{1}公尺)"
+      "Value": "前往補給站：{0} (距離{1}公尺) ({2} seconds) (route {3})"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json

@@ -50,7 +50,7 @@
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "前往補給站：{0} (距離{1}公尺，需要{2}秒)\t\t\t\t"
+      "Value": "前往補給站：{0} (距離{1}公尺，需要{2}秒) (route {3})\t\t\t\t"
     },
     {
       "Key": "eventProfileLogin",

PoGo.NecroBot.CLI/ConsoleEventListener.cs

@@ -129,7 +129,7 @@ private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession sessio
 
             Logger.Write(
                 session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name,
-                     Math.Round(fortTargetEvent.Distance), intTimeForArrival),
+                     Math.Round(fortTargetEvent.Distance), intTimeForArrival, fortTargetEvent.Route),
                 LogLevel.Info, ConsoleColor.Gray);
         }
 

PoGo.NecroBot.Logic/Common/Translations.cs

@@ -237,7 +237,7 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(TranslationString.EventFortFailed,
                 "Name: {0} INFO: Looting failed, possible softban. Unban in: {1}/{2}"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventFortTargeted,
-                "Traveling to Pokestop: {0} ({1}m) ({2} seconds)"),
+                "Traveling to Pokestop: {0} ({1}m) ({2} seconds) (route {3})"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventProfileLogin, "Playing as {0}"),
             new KeyValuePair<TranslationString, string>(TranslationString.EventUsedIncense,
                 "Used Incense, remaining: {0}"),

PoGo.NecroBot.Logic/Event/FortTargetEvent.cs

@@ -2,6 +2,7 @@
 {
     public class FortTargetEvent : IEvent
     {
+        public string Route;
         public double Distance;
         public string Name;
     }

PoGo.NecroBot.Logic/Interfaces/Configuration/ILogicSettings.cs

@@ -154,6 +154,11 @@ public interface ILogicSettings
         bool UseGoogleWalkCache { get; }
         string GoogleApiKey { get; }
         string GoogleHeuristic { get; }
+
+        bool UseYoursWalk { get; }
+        string YoursWalkHeuristic { get; }
+        string YoursServerUrl { get; }
+
         int ResumeTrack { get; }
         int ResumeTrackSeg { get; }
         int ResumeTrackPt { get; }

PoGo.NecroBot.Logic/Model/Google/Teste.cs

@@ -9,7 +9,7 @@ public static class Teste
     {
         public static void Testar(ISession session)
         {
-            var googleDirectionsService = new DirectionsService(session);
+            var googleDirectionsService = new GoogleDirectionsService(session);
 
             var googleResult = googleDirectionsService.GetDirections(new GeoCoordinate(40.780599, -73.968862), new List<GeoCoordinate>(), new GeoCoordinate(40.781939, -73.965123));
             var googleWalk = GoogleWalk.Get(googleResult);

PoGo.NecroBot.Logic/Model/Settings/GlobalSettings.cs

@@ -41,6 +41,7 @@ public class GlobalSettings
         public PlayerConfig PlayerConfig = new PlayerConfig();
         public SoftBanConfig SoftBanConfig = new SoftBanConfig();
         public GoogleWalkConfig GoogleWalkConfig = new GoogleWalkConfig();
+        public YoursWalkConfig YoursWalkConfig = new YoursWalkConfig();
 
         public List<KeyValuePair<ItemId, int>> ItemRecycleFilter = new List<KeyValuePair<ItemId, int>>
         {

PoGo.NecroBot.Logic/Model/Settings/LogicSettings.cs

@@ -126,6 +126,11 @@ public LogicSettings(GlobalSettings settings)
         public bool UseGoogleWalkCache => _settings.GoogleWalkConfig.Cache;
         public string GoogleApiKey => _settings.GoogleWalkConfig.GoogleAPIKey;
         public string GoogleHeuristic => _settings.GoogleWalkConfig.GoogleHeuristic;
+
+        public bool UseYoursWalk => _settings.YoursWalkConfig.UseYoursWalk;
+        public string YoursWalkHeuristic => _settings.YoursWalkConfig.YoursWalkHeuristic;
+        public string YoursServerUrl => _settings.YoursWalkConfig.YoursServerUrl;
+
         public bool SnipeAtPokestops => _settings.SnipeConfig.SnipeAtPokestops;
 
         public bool UseTelegramAPI => _settings.TelegramConfig.UseTelegramAPI;

PoGo.NecroBot.Logic/Model/Settings/YoursWalkConfig.cs

@@ -0,0 +1,11 @@
+namespace PoGo.NecroBot.Logic.Model.Settings
+{
+    /// <summary>
+    ///  </summary>
+    public class YoursWalkConfig
+    {
+        public bool UseYoursWalk = false;
+        public string YoursWalkHeuristic = "bicycle";
+        public string YoursServerUrl = "http://www.yournavigation.org/api/dev/route.php";
+    }
+}