fix visual tests by restoring old hack to prevent rendering of all names

plugins/input/osm/osm.cpp

@@ -251,15 +251,10 @@ bounds osm_way::get_bounds()
 
 bool osm_way::is_polygon()
 {
-    if (keyvals.find("building") != keyvals.end())
-    {
-        return true;
-    }
-
     for (unsigned int count = 0; count < ptypes.ptypes.size(); ++count)
     {
         if (keyvals.find(ptypes.ptypes[count].first) != keyvals.end() &&
-            keyvals[ptypes.ptypes[count].first] == ptypes.ptypes[count].second)
+            (ptypes.ptypes[count].second.empty() || keyvals[ptypes.ptypes[count].first] == ptypes.ptypes[count].second))
         {
             return true;
         }

plugins/input/osm/osm.h

@@ -49,6 +49,9 @@ public:
 
     polygon_types()
     {
+        ptypes.push_back(std::pair<std::string, std::string>("water", ""));
+        ptypes.push_back(std::pair<std::string, std::string>("aeroway", ""));
+        ptypes.push_back(std::pair<std::string, std::string>("building", ""));
         ptypes.push_back(std::pair<std::string, std::string>("natural", "wood"));
         ptypes.push_back(std::pair<std::string, std::string>("natural", "water"));
         ptypes.push_back(std::pair<std::string, std::string>("natural", "heath"));

plugins/input/osm/osmparser.cpp

@@ -66,6 +66,8 @@ void osmparser::startElement(xmlTextReaderPtr reader, const xmlChar *name)
         assert(xid);
         way->id = atol((char*)xid);
         cur_item  =  way;
+        // Prevent ways with no name being assigned a name of "true"
+        cur_item->keyvals["name"] = "";
         xmlFree(xid);
     }
     else if (xmlStrEqual(name,BAD_CAST "nd"))