v0.2.50..v0.2.51 changeset Tags.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/elements/Tags.cpp b/hoot-core/src/main/cpp/hoot/core/elements/Tags.cpp
index 8c9addc..32fe790 100644
--- a/hoot-core/src/main/cpp/hoot/core/elements/Tags.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/elements/Tags.cpp
@@ -56,7 +56,7 @@ QHash<QString, QString>()
   set(key, value);
 }
 
-void Tags::addTags(const Tags& t)
+void Tags::add(const Tags& t)
 {
   for (Tags::const_iterator it = t.constBegin(); it != t.constEnd(); ++it)
   {
@@ -579,7 +579,48 @@ bool Tags::operator==(const Tags& other) const
   return true;
 }
 
-QStringList Tags::dataOnlyTags(const Tags& tags) const
+void Tags::removeMetadata()
+{
+  removeByTagKeyStartsWith(MetadataTags::HootTagPrefix());
+}
+
+void Tags::removeByTagKeyContains(const QString& tagKeySubstring)
+{
+  QStringList keysToRemove;
+  for (Tags::const_iterator it = begin(); it != end(); ++it)
+  {
+    const QString key = it.key();
+    if (key.contains(tagKeySubstring))
+    {
+      keysToRemove.append(key);
+    }
+  }
+
+  for (int i = 0; i < keysToRemove.size(); i++)
+  {
+    remove(keysToRemove.at(i));
+  }
+}
+
+void Tags::removeByTagKeyStartsWith(const QString& tagKeySubstring)
+{
+  QStringList keysToRemove;
+  for (Tags::const_iterator it = begin(); it != end(); ++it)
+  {
+    const QString key = it.key();
+    if (key.startsWith(tagKeySubstring))
+    {
+      keysToRemove.append(key);
+    }
+  }
+
+  for (int i = 0; i < keysToRemove.size(); i++)
+  {
+    remove(keysToRemove.at(i));
+  }
+}
+
+QStringList Tags::getDataOnlyValues(const Tags& tags) const
 {
   QStringList t;
   for (Tags::const_iterator it = tags.begin(); it != tags.end(); ++it)
@@ -592,8 +633,8 @@ QStringList Tags::dataOnlyTags(const Tags& tags) const
 
 bool Tags::dataOnlyEqual(const Tags& other) const
 {
-  QStringList l1 = dataOnlyTags(*this);
-  QStringList l2 = dataOnlyTags(other);
+  QStringList l1 = getDataOnlyValues(*this);
+  QStringList l2 = getDataOnlyValues(other);
 
   if (l1.size() != l2.size())
   {
@@ -649,7 +690,7 @@ void Tags::readValues(const QString &k, QStringList& list) const
   }
 }
 
-void Tags::removeEmptyTags()
+void Tags::removeEmpty()
 {
   // remove all the empty tags.
   for (Tags::const_iterator it = begin(); it != end(); ++it)
@@ -829,4 +870,29 @@ Tags Tags::schemaVerticesToTags(const std::vector<SchemaVertex>& schemaVertices)
   return tags;
 }
 
+QString Tags::getDiffString(const Tags& other) const
+{
+  if (this->operator ==(other))
+  {
+    return "";
+  }
+
+  QStringList keys = this->keys();
+  keys.append(other.keys());
+  keys.removeDuplicates();
+  keys.sort();
+
+  QString diffStr;
+  for (int i = 0; i < keys.size(); i++)
+  {
+    QString k = keys[i];
+    if (this->operator [](k) != other[k])
+    {
+      diffStr += "< " + k + " = " + this->operator [](k) + "\n";
+      diffStr += "> " + k + " = " + other[k] + "\n";
+    }
+  }
+  return diffStr.trimmed();
+}
+
 }