v0.2.54..v0.2.55 changeset AddressTagKeys.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/address/AddressTagKeys.h b/hoot-core/src/main/cpp/hoot/core/conflate/address/AddressTagKeys.h
index b09b76a..cd8c551 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/address/AddressTagKeys.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/address/AddressTagKeys.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef ADDRESS_TAG_KEYS_H
 #define ADDRESS_TAG_KEYS_H
@@ -48,7 +48,7 @@ class AddressTagKeys
 {
 public:
 
-  static const AddressTagKeysPtr& getInstance();
+  static AddressTagKeys& getInstance();
 
   /**
    * Returns the tag keys of all address tags on an element
@@ -83,21 +83,27 @@ public:
 
 private:
 
-  AddressTagKeys();
+  /*
+   * Reads tag keys used to identify tags as addresses
+   */
+  void _readAddressTagKeys(const QString& configFile);
 
-  friend class AddressScoreExtractorTest;
+  QString _getAddressTag(const Tags& tags, const QString& addressTagType, bool key) const;
 
-  static AddressTagKeysPtr _theInstance;
+  friend class AddressScoreExtractorTest;
 
   //extra tags to search for addresses in
   QSet<QString> _additionalTagKeys;
   //maps address tag types to valid address tag keys
   QMultiMap<QString, QString> _addressTypeToTagKeys;
 
-  /*
-   * Reads tag keys used to identify tags as addresses
-   */
-  void _readAddressTagKeys(const QString& configFile);
+  AddressTagKeys();
+  /**  Default destructor */
+  ~AddressTagKeys() = default;
+  /** Delete copy constructor and assignment operator */
+  AddressTagKeys(const AddressTagKeys&) = delete;
+  AddressTagKeys& operator=(const AddressTagKeys&) = delete;
+
 };
 
 }