Read tagGroups (cities)

CMakeLists.txt

@@ -1,6 +1,6 @@
 project(OsmAndCore)
 
-# Bump this number each time a new source file is committed to repository, source file removed from repository or renamed: 187
+# Bump this number each time a new source file is committed to repository, source file removed from repository or renamed: 188
 
 set(target_specific_sources "")
 set(target_specific_public_definitions "")

include/OsmAndCore/Data/Amenity.h

@@ -45,12 +45,12 @@ namespace OsmAnd
             QString value;
         };
 
-    private:
     protected:
     public:
         Amenity(const std::shared_ptr<const ObfPoiSectionInfo>& obfSection);
         virtual ~Amenity();
 
+        QHash<uint32_t, QList<QPair<QString, QString>>> tagGroups;
         const std::shared_ptr<const ObfPoiSectionInfo> obfSection;
 
         PointI position31;
@@ -72,6 +72,7 @@ namespace OsmAnd
             const QList< std::shared_ptr<const OsmAnd::Amenity> >& input);
 
         QString getName(const QString lang, bool transliterate) const;
+        QString getCityFromTagGroups(QString lang) const;
     };
 }
 

include/OsmAndCore/Data/ObfPoiSectionInfo.h

@@ -11,6 +11,7 @@
 #include <OsmAndCore/CommonTypes.h>
 #include <OsmAndCore/Data/DataCommonTypes.h>
 #include <OsmAndCore/Data/ObfSectionInfo.h>
+#include <OsmAndCore/QuadTree.h>
 
 namespace OsmAnd
 {
@@ -76,6 +77,8 @@ namespace OsmAnd
     friend class OsmAnd::ObfPoiSectionReader_P;
     };
 
+    typedef OsmAnd::QuadTree<int32_t, AreaI::CoordType> BBoxIndexTree;
+
     class ObfPoiSectionInfo_P;
     class OSMAND_CORE_API ObfPoiSectionInfo : public ObfSectionInfo
     {
@@ -93,9 +96,12 @@ namespace OsmAnd
         uint32_t nameIndexInnerOffset;
         uint32_t subtypesInnerOffset;
         uint32_t firstBoxInnerOffset;
+        mutable QHash<int, QList<QPair<QString, QString>>> tagGroups;
+        mutable BBoxIndexTree bboxIndexCache;
 
         std::shared_ptr<const ObfPoiSectionCategories> getCategories() const;
         std::shared_ptr<const ObfPoiSectionSubtypes> getSubtypes() const;
+        QList<QPair<QString, QString>> getTagValues(int id) const;
 
     friend class OsmAnd::ObfPoiSectionReader_P;
     };