Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions NGeo/GeoNames/GeoNamesClient.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Net;
using System.ServiceModel;
Expand Down Expand Up @@ -164,6 +165,15 @@ public ReadOnlyCollection<Toponym> Children(int geoNameId, string userName,
{
var response = ChannelChildren(geoNameId, userName, resultStyle, maxRows);
var results = response.Items;
if (response.Status != null)
{
switch (response.Status.Value)
{
case 15:
return new ReadOnlyCollection<Toponym>(new List<Toponym>());
//TODO: Add another statuses processing
}
}
return results != null ? new ReadOnlyCollection<Toponym>(results) : null;
}

Expand Down
7 changes: 5 additions & 2 deletions NGeo/GeoNames/Results.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ namespace NGeo.GeoNames
[DataContract]
public sealed class Results<T> : IEnumerable<T>
{
[DataMember(Name = "geonames")]
[DataMember(Name = "geonames", IsRequired = false)]
internal List<T> Items { get; set; }

[DataMember(Name = "totalResultsCount")]
[DataMember(Name = "totalResultsCount", IsRequired = false)]
public int? Size { get; internal set; }

[DataMember(Name="status", IsRequired = false)]
public Status Status { get; set; }

public IEnumerator<T> GetEnumerator()
{
return Items.GetEnumerator();
Expand Down
14 changes: 14 additions & 0 deletions NGeo/GeoNames/Status.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Runtime.Serialization;

namespace NGeo.GeoNames
{
[DataContract]
public sealed class Status
{
[DataMember(Name = "message")]
public string Message { get; set; }

[DataMember(Name = "value")]
public int Value { get; set; }
}
}
1 change: 1 addition & 0 deletions NGeo/NGeo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<Compile Include="GeoNames\ResultStyle.cs" />
<Compile Include="GeoNames\SearchOptions.cs" />
<Compile Include="GeoNames\SearchType.cs" />
<Compile Include="GeoNames\Status.cs" />
<Compile Include="GeoNames\TimeZone.cs" />
<Compile Include="GeoNames\Toponym.cs" />
<Compile Include="GlobalSuppressions.cs" />
Expand Down