Merge pull request #4922 from VladiMihaylenko/removed-typesbeta-518

Removed types from taxi checker

2 files changed, 13 insertions, 8 deletions

diff --git a/map/reachable_by_taxi_checker.cpp b/map/reachable_by_taxi_checker.cpp
index 7efb944c9e..3ac9691578 100644
--- a/map/reachable_by_taxi_checker.cpp
+++ b/map/reachable_by_taxi_checker.cpp
@@ -13,12 +13,7 @@ IsReachableByTaxiChecker::IsReachableByTaxiChecker()
     {"aerialway", "chair_lift"},
     {"aerialway", "drag_lift"},
     {"aerialway", "gondola"},
-    {"aerialway", "j-bar"},
-    {"aerialway", "magic_carpet"},
     {"aerialway", "mixed_lift"},
-    {"aerialway", "platter"},
-    {"aerialway", "rope_tow"},
-    {"aerialway", "t-bar"},
     {"aeroway", "gate"},
     {"amenity", "bench"},
     {"amenity", "fountain"},
@@ -55,7 +50,6 @@ IsReachableByTaxiChecker::IsReachableByTaxiChecker()
     {"man_made", "chimney"},
     {"man_made", "lighthouse"},
     {"man_made", "pier"},
-    {"man_made", "survey_point"},
     {"man_made", "windmill"},
     {"natural", "bare_rock"},
     {"natural", "cape"},
@@ -67,7 +61,11 @@ IsReachableByTaxiChecker::IsReachableByTaxiChecker()
     {"natural", "volcano"},
     {"natural", "water"},
     {"natural", "wetland"},
-    {"place", "archipelago"},
+    {"piste:lift", "j-bar"},
+    {"piste:lift", "magic_carpet"},
+    {"piste:lift", "platter"},
+    {"piste:lift", "rope_tow"},
+    {"piste:lift", "t-bar"},
     {"place", "city"},
     {"place", "continent"},
     {"place", "country"},
@@ -85,7 +83,6 @@ IsReachableByTaxiChecker::IsReachableByTaxiChecker()
     {"place", "town"},
     {"place", "village"},
     {"waterway", "lock_gate"},
-    {"waterway", "wair"},
     {"waterway", "waterfall"}
   };
 
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index 9bc3ebf47b..bee4148a73 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -90,6 +90,8 @@
 		67F183821BD5049500AB1840 /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837E1BD5049500AB1840 /* liblodepng.a */; };
 		67F183831BD5049500AB1840 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837F1BD5049500AB1840 /* libminizip.a */; };
 		67F183841BD5049500AB1840 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183801BD5049500AB1840 /* libtess2.a */; };
+		F63421F81DF9BF9100A96868 /* reachable_by_taxi_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */; };
+		F63421F91DF9BF9100A96868 /* reachable_by_taxi_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */; };
 		F6B283031C1B03320081957A /* gps_track_collection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B282FB1C1B03320081957A /* gps_track_collection.cpp */; };
 		F6B283041C1B03320081957A /* gps_track_collection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B282FC1C1B03320081957A /* gps_track_collection.hpp */; };
 		F6B283051C1B03320081957A /* gps_track_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B282FD1C1B03320081957A /* gps_track_filter.cpp */; };
@@ -206,6 +208,8 @@
 		67F183801BD5049500AB1840 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = "<group>"; };
 		67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsystem_configuration.tbd; path = usr/lib/system/libsystem_configuration.tbd; sourceTree = SDKROOT; };
 		67F183871BD5050900AB1840 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reachable_by_taxi_checker.cpp; sourceTree = "<group>"; };
+		F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reachable_by_taxi_checker.hpp; sourceTree = "<group>"; };
 		F6B282FB1C1B03320081957A /* gps_track_collection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_collection.cpp; sourceTree = "<group>"; };
 		F6B282FC1C1B03320081957A /* gps_track_collection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_collection.hpp; sourceTree = "<group>"; };
 		F6B282FD1C1B03320081957A /* gps_track_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_filter.cpp; sourceTree = "<group>"; };
@@ -386,6 +390,8 @@
 		675345BD1A4054AD00A0A8C3 /* map */ = {
 			isa = PBXGroup;
 			children = (
+				F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */,
+				F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */,
 				347B60741DD9926D0050FA24 /* traffic_manager.cpp */,
 				347B60751DD9926D0050FA24 /* traffic_manager.hpp */,
 				348AB57A1D7EE0C6009F8301 /* chart_generator.cpp */,
@@ -451,6 +457,7 @@
 				675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */,
 				6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */,
 				348AB57D1D7EE0C6009F8301 /* chart_generator.hpp in Headers */,
+				F63421F91DF9BF9100A96868 /* reachable_by_taxi_checker.hpp in Headers */,
 				6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */,
 				675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */,
 				F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */,
@@ -573,6 +580,7 @@
 				6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */,
 				674C38621BFF3095000D603B /* user_mark.cpp in Sources */,
 				675346641A4054E800A0A8C3 /* framework.cpp in Sources */,
+				F63421F81DF9BF9100A96868 /* reachable_by_taxi_checker.cpp in Sources */,
 				6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */,
 				348AB57C1D7EE0C6009F8301 /* chart_generator.cpp in Sources */,
 				342D833A1D5233E8000D8AEA /* displacement_mode_manager.cpp in Sources */,