[generator] Switch housename and housenumber if needed

1 files changed, 15 insertions, 0 deletions

diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 9f8ef28239..c40b42eb20 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -258,6 +258,21 @@ bool FeatureParams::AddHouseName(string const & s)
   if (house.IsEmpty() && AddHouseNumber(s))
     return true;
 
+  // If we got a clear number, replace the house number with it.
+  // Example: housename=16th Street, housenumber=34
+  if (strings::is_number(s))
+  {
+    string housename(house.Get());
+    if (AddHouseNumber(s))
+    {
+      // Duplicating code to avoid changing the method header.
+      string dummy;
+      if (!name.GetString(StringUtf8Multilang::kDefaultCode, dummy))
+        name.AddString(StringUtf8Multilang::kDefaultCode, housename);
+      return true;
+    }
+  }
+
   // Add as a default name if we don't have it yet.
   string dummy;
   if (!name.GetString(StringUtf8Multilang::kDefaultCode, dummy))