Merge pull request #6203 from milchakov/chairs_accessabilitybeta-850

[indexer] Wheelchair type info added into MapObject class

3 files changed, 36 insertions, 0 deletions

diff --git a/indexer/indexer_tests/CMakeLists.txt b/indexer/indexer_tests/CMakeLists.txt
index 3fcf24f0d7..ffadc3d332 100644
--- a/indexer/indexer_tests/CMakeLists.txt
+++ b/indexer/indexer_tests/CMakeLists.txt
@@ -36,6 +36,7 @@ set(
   test_type.cpp
   trie_test.cpp
   visibility_test.cpp
+  wheelchair_tests.cpp
 )
 
 omim_add_test(${PROJECT_NAME} ${SRC})
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index e324f2a352..78d6fe1d5f 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -59,3 +59,4 @@ SOURCES += \
     test_type.cpp \
     trie_test.cpp \
     visibility_test.cpp \
+    wheelchair_tests.cpp \
diff --git a/indexer/indexer_tests/wheelchair_tests.cpp b/indexer/indexer_tests/wheelchair_tests.cpp
new file mode 100644
index 0000000000..642955596f
--- /dev/null
+++ b/indexer/indexer_tests/wheelchair_tests.cpp
@@ -0,0 +1,34 @@
+#include "testing/testing.hpp"
+
+#include "indexer/classificator.hpp"
+#include "indexer/classificator_loader.hpp"
+#include "indexer/wheelchair.hpp"
+
+UNIT_TEST(Wheelchair_GetType)
+{
+  classificator::Load();
+  Classificator const & c = classif();
+
+  feature::TypesHolder holder;
+  {
+    holder.Assign(c.GetTypeByPath({"wheelchair", "no"}));
+    TEST_EQUAL(wheelchair::Matcher::GetType(holder), wheelchair::Type::No, ());
+  }
+  {
+    holder.Assign(c.GetTypeByPath({"wheelchair", "yes"}));
+    TEST_EQUAL(wheelchair::Matcher::GetType(holder), wheelchair::Type::Yes, ());
+  }
+  {
+    holder.Assign(c.GetTypeByPath({"wheelchair", "limited"}));
+    TEST_EQUAL(wheelchair::Matcher::GetType(holder), wheelchair::Type::Limited, ());
+  }
+  {
+    holder.Assign(c.GetTypeByPath({"amenity", "dentist"}));
+    TEST_EQUAL(wheelchair::Matcher::GetType(holder), wheelchair::Type::No, ());
+  }
+  {
+    holder.Assign(c.GetTypeByPath({"amenity", "dentist"}));
+    holder.Add(c.GetTypeByPath({"wheelchair", "yes"}));
+    TEST_EQUAL(wheelchair::Matcher::GetType(holder), wheelchair::Type::Yes, ());
+  }
+}