Merge pull request #3125 from vng/dev

Minor fixes.

generator/osm2type.cpp

@@ -512,11 +512,6 @@ namespace ftype
     // Stage3: Process base feature tags.
     TagProcessor(p).ApplyRules<void(string &, string &)>
     ({
-      { "atm", "yes", [](string & k, string & v) { k.swap(v); k = "amenity"; }},
-      { "restaurant", "yes", [](string & k, string & v) { k.swap(v); k = "amenity"; }},
-      { "hotel", "yes", [](string & k, string & v) { k.swap(v); k = "tourism"; }},
-      { "building", "entrance", [](string & k, string & v) { k.swap(v); v = "yes"; }},
-
       { "addr:city", "*", [&params](string & k, string & v) { params.AddPlace(v); k.clear(); v.clear(); }},
       { "addr:place", "*", [&params](string & k, string & v) { params.AddPlace(v); k.clear(); v.clear(); }},
       { "addr:housenumber", "*", [&params](string & k, string & v) { params.AddHouseName(v); k.clear(); v.clear(); }},

indexer/feature.cpp

@@ -372,9 +372,6 @@ void FeatureType::ParseMetadata() const
 
   m_pLoader->ParseMetadata();
 
-  if (HasInternet())
-    m_metadata.Set(Metadata::FMD_INTERNET, "wlan");
-
   m_bMetadataParsed = true;
 }
 
@@ -617,26 +614,6 @@ string FeatureType::GetRoadNumber() const
   return m_params.ref;
 }
 
-bool FeatureType::HasInternet() const
-{
-  ParseTypes();
-
-  bool res = false;
-
-  ForEachType([&res](uint32_t type)
-  {
-    if (!res)
-    {
-      static const uint32_t t1 = classif().GetTypeByPath({"internet_access"});
-
-      ftype::TruncValue(type, 1);
-      res = (type == t1);
-    }
-  });
-
-  return res;
-}
-
 void FeatureType::SwapGeometry(FeatureType & r)
 {
   ASSERT_EQUAL(m_bPointsParsed, r.m_bPointsParsed, ());

indexer/feature.hpp

@@ -293,7 +293,6 @@ public:
   uint8_t GetRank() const;
   uint32_t GetPopulation() const;
   string GetRoadNumber() const;
-  bool HasInternet() const;
 
   inline feature::Metadata const & GetMetadata() const
   {