[base] Replacing osm::Id with GeoObjectId.

6 files changed, 17 insertions, 17 deletions

diff --git a/transit/transit_graph_data.cpp b/transit/transit_graph_data.cpp
index 79788bcbf1..ea474816be 100644
--- a/transit/transit_graph_data.cpp
+++ b/transit/transit_graph_data.cpp
@@ -168,7 +168,7 @@ void DeserializerFromJson::operator()(FeatureIdentifiers & id, char const * name
   uint64_t osmIdNum;
   CHECK(strings::to_uint64(osmIdStr, osmIdNum),
         ("Cann't convert osm id string:", osmIdStr, "to a number."));
-  osm::Id const osmId(osmIdNum);
+  base::GeoObjectId const osmId(osmIdNum);
   auto const it = m_osmIdToFeatureIds.find(osmId);
   if (it != m_osmIdToFeatureIds.cend())
   {
diff --git a/transit/transit_graph_data.hpp b/transit/transit_graph_data.hpp
index 46cbababe7..ed14e8f722 100644
--- a/transit/transit_graph_data.hpp
+++ b/transit/transit_graph_data.hpp
@@ -9,7 +9,7 @@
 #include "coding/writer.hpp"
 
 #include "base/exception.hpp"
-#include "base/osm_id.hpp"
+#include "base/geo_object_id.hpp"
 #include "base/visitor.hpp"
 
 #include "3party/jansson/myjansson.hpp"
@@ -25,7 +25,7 @@ namespace routing
 {
 namespace transit
 {
-using OsmIdToFeatureIdsMap = std::map<osm::Id, std::vector<FeatureId>>;
+using OsmIdToFeatureIdsMap = std::map<base::GeoObjectId, std::vector<FeatureId>>;
 
 class DeserializerFromJson
 {
diff --git a/transit/transit_tests/transit_graph_test.cpp b/transit/transit_tests/transit_graph_test.cpp
index dfbd89e3a5..e786c227c3 100644
--- a/transit/transit_tests/transit_graph_test.cpp
+++ b/transit/transit_tests/transit_graph_test.cpp
@@ -269,13 +269,13 @@ unique_ptr<GraphData> CreateGraphFromJson()
   auto graph = my::make_unique<GraphData>();
 
   OsmIdToFeatureIdsMap mapping;
-  mapping[osm::Id(100)] = vector<FeatureId>({10});
-  mapping[osm::Id(101)] = vector<FeatureId>({11});
-  mapping[osm::Id(102)] = vector<FeatureId>({12});
-  mapping[osm::Id(103)] = vector<FeatureId>({13});
-  mapping[osm::Id(104)] = vector<FeatureId>({14});
-  mapping[osm::Id(105)] = vector<FeatureId>({15});
-  mapping[osm::Id(106)] = vector<FeatureId>({16});
+  mapping[base::GeoObjectId(100)] = vector<FeatureId>({10});
+  mapping[base::GeoObjectId(101)] = vector<FeatureId>({11});
+  mapping[base::GeoObjectId(102)] = vector<FeatureId>({12});
+  mapping[base::GeoObjectId(103)] = vector<FeatureId>({13});
+  mapping[base::GeoObjectId(104)] = vector<FeatureId>({14});
+  mapping[base::GeoObjectId(105)] = vector<FeatureId>({15});
+  mapping[base::GeoObjectId(106)] = vector<FeatureId>({16});
 
   my::Json root(jsonBuffer.c_str());
   CHECK(root.get() != nullptr, ("Cannot parse the json."));
diff --git a/transit/transit_tests/transit_json_parsing_test.cpp b/transit/transit_tests/transit_json_parsing_test.cpp
index 8d5377b082..0d2f392e43 100644
--- a/transit/transit_tests/transit_json_parsing_test.cpp
+++ b/transit/transit_tests/transit_json_parsing_test.cpp
@@ -101,8 +101,8 @@ UNIT_TEST(DeserializerFromJson_Stops)
            {TitleAnchor(12 /* min zoom */, 0 /* anchor */), TitleAnchor(15, 9)})};
 
   OsmIdToFeatureIdsMap mapping;
-  mapping[osm::Id(1234)] = vector<FeatureId>({1});
-  mapping[osm::Id(2345)] = vector<FeatureId>({2});
+  mapping[base::GeoObjectId(1234)] = vector<FeatureId>({1});
+  mapping[base::GeoObjectId(2345)] = vector<FeatureId>({2});
   TestDeserializerFromJson(jsonBuffer, mapping, "stops", expected);
 }
 
@@ -144,9 +144,9 @@ UNIT_TEST(DeserializerFromJson_Gates)
            {43.9290544, 68.41120791512581} /* point */)};
 
   OsmIdToFeatureIdsMap mapping;
-  mapping[osm::Id(46116860)] = vector<FeatureId>({0});
+  mapping[base::GeoObjectId(46116860)] = vector<FeatureId>({0});
   // Note. std::numeric_limits<uint64_t>::max() == 18446744073709551615
-  mapping[osm::Id(18446744073709551615ULL)] = vector<FeatureId>({2});
+  mapping[base::GeoObjectId(18446744073709551615ULL)] = vector<FeatureId>({2});
   TestDeserializerFromJson(jsonBuffer, mapping, "gates", expected);
 }
 
diff --git a/transit/transit_types.cpp b/transit/transit_types.cpp
index 063ebe1d4a..db0c100e65 100644
--- a/transit/transit_types.cpp
+++ b/transit/transit_types.cpp
@@ -204,7 +204,7 @@ bool Gate::IsEqualForTesting(Gate const & gate) const
 
 bool Gate::IsValid() const
 {
-  return m_featureIdentifiers.GetOsmId() != kInvalidOsmId && m_weight != kInvalidWeight &&
+  return m_featureIdentifiers.GetSerialId() != kInvalidOsmId && m_weight != kInvalidWeight &&
          (m_entrance || m_exit) && !m_stopIds.empty();
 }
 
diff --git a/transit/transit_types.hpp b/transit/transit_types.hpp
index d872e949a9..0989e17cf7 100644
--- a/transit/transit_types.hpp
+++ b/transit/transit_types.hpp
@@ -93,7 +93,7 @@ public:
   void SetOsmId(OsmId osmId) { m_osmId = osmId; }
   void SetFeatureId(FeatureId featureId) { m_featureId = featureId; }
 
-  OsmId GetOsmId() const { return m_osmId; }
+  OsmId GetSerialId() const { return m_osmId; }
   FeatureId GetFeatureId() const { return m_featureId; }
   bool IsSerializeFeatureIdOnly() const { return m_serializeFeatureIdOnly; }
 
@@ -206,7 +206,7 @@ public:
   void SetBestPedestrianSegment(SingleMwmSegment const & s) { m_bestPedestrianSegment = s; };
 
   FeatureId GetFeatureId() const { return m_featureIdentifiers.GetFeatureId(); }
-  OsmId GetOsmId() const { return m_featureIdentifiers.GetOsmId(); }
+  OsmId GetSerialId() const { return m_featureIdentifiers.GetSerialId(); }
   SingleMwmSegment const & GetBestPedestrianSegment() const { return m_bestPedestrianSegment; }
   bool GetEntrance() const { return m_entrance; }
   bool GetExit() const { return m_exit; }