lolalset
diff --git a/‎src/overpass_api/frontend/map_ql_parser.cc‎
Lines changed: 2 additions & 1 deletion b/‎src/overpass_api/frontend/map_ql_parser.cc‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/overpass_api/statements/item.cc‎
Lines changed: 3 additions & 3 deletions b/‎src/overpass_api/statements/item.cc‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/overpass_api/statements/pivot.cc‎
Lines changed: 2 additions & 2 deletions b/‎src/overpass_api/statements/pivot.cc‎
Lines changed: 2 additions & 2 deletions
@@ -1303,7 +1303,8 @@ TStatement* parse_statement(typename TStatement::Factory& stmt_factory, Parsed_Q
     type = *token;
     if (type == "rel")
       type = "relation";
-    else if (type != "node" && type != "way" && type != "relation" && type != "area")
+    else if (type != "node" && type != "way" && type != "relation" && type != "nwr"
+        && type != "derived" && type != "area")
     {
       if (error_output)
 	error_output->add_parse_error("Unknown type \"" + type + "\"", token.line_col().first);
 
@@ -100,17 +100,17 @@ bool Item_Constraint::collect(Resource_Manager& rman, Set& into,
   const Set* input = rman.get_set(item->get_input_name());
   if (input)
   {
-    if (type == QUERY_WAY)
+    if (type & QUERY_WAY)
     {
       collect_elements(input->ways, into.ways, ids, invert_ids);
       collect_elements(input->attic_ways, into.attic_ways, ids, invert_ids);
     }
-    else if (type == QUERY_RELATION)
+    if (type & QUERY_RELATION)
     {
       collect_elements(input->relations, into.relations, ids, invert_ids);
       collect_elements(input->attic_relations, into.attic_relations, ids, invert_ids);
     }
-    else if (type == QUERY_AREA)
+    if (type & QUERY_AREA)
       collect_elements(input->areas, into.areas, ids, invert_ids);
   }
   else
 
@@ -203,7 +203,7 @@ bool Pivot_Constraint::get_data
 {
   const Set* input_set = rman.get_set(stmt->get_input());
 
-  if (type == QUERY_WAY)
+  if (type & QUERY_WAY)
   {
     std::vector< Way::Id_Type > pivot_ids;
     if (input_set)
@@ -223,7 +223,7 @@ bool Pivot_Constraint::get_data
           intersect_ids.begin()), intersect_ids.end());
     collect_elems(rman, *osm_base_settings().WAYS, intersect_ids, into.ways);
   }
-  else if (type == QUERY_RELATION)
+  if (type & QUERY_RELATION)
   {
     std::vector< Relation::Id_Type > pivot_ids;
     if (input_set)
Original file line number	Diff line number	Diff line change
`@@ -100,17 +100,17 @@ bool Item_Constraint::collect(Resource_Manager& rman, Set& into,`
`100`	`100`	`const Set* input = rman.get_set(item->get_input_name());`
`101`	`101`	`if (input)`
`102`	`102`	`{`
`103`		`- if (type == QUERY_WAY)`
	`103`	`+ if (type & QUERY_WAY)`
`104`	`104`	`{`
`105`	`105`	`collect_elements(input->ways, into.ways, ids, invert_ids);`
`106`	`106`	`collect_elements(input->attic_ways, into.attic_ways, ids, invert_ids);`
`107`	`107`	`}`
`108`		`- else if (type == QUERY_RELATION)`
	`108`	`+ if (type & QUERY_RELATION)`
`109`	`109`	`{`
`110`	`110`	`collect_elements(input->relations, into.relations, ids, invert_ids);`
`111`	`111`	`collect_elements(input->attic_relations, into.attic_relations, ids, invert_ids);`
`112`	`112`	`}`
`113`		`- else if (type == QUERY_AREA)`
	`113`	`+ if (type & QUERY_AREA)`
`114`	`114`	`collect_elements(input->areas, into.areas, ids, invert_ids);`
`115`	`115`	`}`
`116`	`116`	`else`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ bool Pivot_Constraint::get_data`
`203`	`203`	`{`
`204`	`204`	`const Set* input_set = rman.get_set(stmt->get_input());`
`205`	`205`
`206`		`- if (type == QUERY_WAY)`
	`206`	`+ if (type & QUERY_WAY)`
`207`	`207`	`{`
`208`	`208`	`std::vector< Way::Id_Type > pivot_ids;`
`209`	`209`	`if (input_set)`
`@@ -223,7 +223,7 @@ bool Pivot_Constraint::get_data`
`223`	`223`	`intersect_ids.begin()), intersect_ids.end());`
`224`	`224`	`collect_elems(rman, *osm_base_settings().WAYS, intersect_ids, into.ways);`
`225`	`225`	`}`
`226`		`- else if (type == QUERY_RELATION)`
	`226`	`+ if (type & QUERY_RELATION)`
`227`	`227`	`{`
`228`	`228`	`std::vector< Relation::Id_Type > pivot_ids;`
`229`	`229`	`if (input_set)`