From 138911a173d9dc8c023e8ef8902ef95fed5c2e74 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 23 Jul 2014 17:13:38 +0300 Subject: [PATCH] =?UTF-8?q?[generator]=20Treat=20house=20numbers=20like=20?= =?UTF-8?q?=E2=80=9C=D0=BA403=E2=80=9D=20as=20house=20names.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator/osm2type.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 1f2489ae66..0850206491 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -172,13 +172,17 @@ namespace ftype // get house number if (k == "addr:housenumber") - m_params.AddHouseNumber(v); - if (k == "addr:housename") + { + // Treat "numbers" like names if it's not an actual number. + if (!m_params.AddHouseNumber(v)) m_params.AddHouseName(v); + } + if (k == "addr:housename") + m_params.AddHouseName(v); if (k == "addr:street") - m_params.AddStreetAddress(v); + m_params.AddStreetAddress(v); if (k == "addr:flats") - m_params.flats = v; + m_params.flats = v; // get population rank if (k == "population")