diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 69c039ca65..edff891c10 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1147,3 +1147,7 @@ sponsored|banner|viator;1146; sponsored|banner|geerbest_de;1147; sponsored|banner|geerbest_fr;1148; sponsored|banner|raileurope;1149; +hwtag|yescar;1150; +hwtag|nocar;1151; +tourism|gallery;1152; +historic|fort;1153; diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 6aeccab3d0..5ed330cdcd 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -217,7 +217,7 @@ namespace ftype public: enum EType { ENTRANCE, HIGHWAY, ADDRESS, ONEWAY, PRIVATE, LIT, NOFOOT, YESFOOT, NOBICYCLE, YESBICYCLE, BICYCLE_BIDIR, SURFPGOOD, SURFPBAD, SURFUGOOD, SURFUBAD, - HASPARTS, + HASPARTS, NOCAR, YESCAR, RW_STATION, RW_STATION_SUBWAY, WHEELCHAIR_YES }; CachedTypes() @@ -234,7 +234,7 @@ namespace ftype {"hwtag", "nobicycle"}, {"hwtag", "yesbicycle"}, {"hwtag", "bidir_bicycle"}, {"psurface", "paved_good"}, {"psurface", "paved_bad"}, {"psurface", "unpaved_good"}, {"psurface", "unpaved_bad"}, - {"building", "has_parts"} + {"building", "has_parts"}, {"hwtag", "nocar"}, {"hwtag", "yescar"} }; for (auto const & e : arr) m_types.push_back(c.GetTypeByPath(e)); @@ -576,6 +576,7 @@ namespace ftype { "junction", "roundabout", [&addOneway] { addOneway = true; }}, { "access", "private", [¶ms] { params.AddType(types.Get(CachedTypes::PRIVATE)); }}, + { "access", "!", [¶ms] { params.AddType(types.Get(CachedTypes::PRIVATE)); }}, { "lit", "~", [¶ms] { params.AddType(types.Get(CachedTypes::LIT)); }}, @@ -590,6 +591,13 @@ namespace ftype { "cycleway:left", "~", [¶ms] { params.AddType(types.Get(CachedTypes::YESBICYCLE)); }}, { "oneway:bicycle", "!", [¶ms] { params.AddType(types.Get(CachedTypes::BICYCLE_BIDIR)); }}, { "cycleway", "opposite", [¶ms] { params.AddType(types.Get(CachedTypes::BICYCLE_BIDIR)); }}, + + { "motor_vehicle", "private", [¶ms] { params.AddType(types.Get(CachedTypes::NOCAR)); }}, + { "motor_vehicle", "!", [¶ms] { params.AddType(types.Get(CachedTypes::NOCAR)); }}, + { "motor_vehicle", "yes", [¶ms] { params.AddType(types.Get(CachedTypes::YESCAR)); }}, + { "motorcar", "private", [¶ms] { params.AddType(types.Get(CachedTypes::NOCAR)); }}, + { "motorcar", "!", [¶ms] { params.AddType(types.Get(CachedTypes::NOCAR)); }}, + { "motorcar", "yes", [¶ms] { params.AddType(types.Get(CachedTypes::YESCAR)); }}, }); if (addOneway && !noOneway)