Skip to content

Commit 24f329f

Browse files
committed
fix read coord in village list
1 parent b804845 commit 24f329f

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

TbsCore/Parsers/RightBarParser.cs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,26 @@ public static List<VillageChecked> GetVillages(HtmlAgilityPack.HtmlDocument html
7070
if (node.HasClass("active"))
7171
active = true;
7272

73-
var href = System.Net.WebUtility.HtmlDecode(node.ChildNodes.First(x => x.Name == "a").GetAttributeValue("href", ""));
74-
73+
var href = System.Net.WebUtility.HtmlDecode(node.ChildNodes.FirstOrDefault(x => x.Name == "a").GetAttributeValue("href", ""));
7574
var villId = Convert.ToInt32(href.Split('=')[1].Split('&')[0]);
75+
var villName = node.Descendants("a").FirstOrDefault().InnerText.Replace(" ", "").Replace("\r\n", "");
7676

77-
var villName = node.Descendants().FirstOrDefault(x => x.HasClass("name")).InnerText;
77+
var x_node = node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateX"));
78+
int x_coord = 0;
79+
if (x_node != null)
80+
{
81+
x_coord = (int)Parser.ParseNum(x_node.InnerText.Replace("(", ""));
82+
}
83+
var y_node = node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateY"));
84+
int y_coord = 0;
85+
if (y_node != null)
86+
{
87+
y_coord = (int)Parser.ParseNum(y_node.InnerText.Replace(")", ""));
88+
}
7889
var coords = new Coordinates()
7990
{
80-
x = (int)Parser.ParseNum(node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateX")).InnerText.Replace("(", "")),
81-
y = (int)Parser.ParseNum(node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateY")).InnerText.Replace(")", ""))
91+
x = x_coord,
92+
y = y_coord,
8293
};
8394

8495
ret.Add(new VillageChecked()

0 commit comments

Comments
 (0)