Skip to content

v0.2.48..v0.2.49 changeset BuildingOutlineUpdateOp.h

Garret Voltz edited this page Oct 2, 2019 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/ops/BuildingOutlineUpdateOp.h b/hoot-core/src/main/cpp/hoot/core/ops/BuildingOutlineUpdateOp.h
index ebf6dba..156cfa8 100644
--- a/hoot-core/src/main/cpp/hoot/core/ops/BuildingOutlineUpdateOp.h
+++ b/hoot-core/src/main/cpp/hoot/core/ops/BuildingOutlineUpdateOp.h
@@ -33,7 +33,6 @@
 #include <hoot/core/info/OperationStatusInfo.h>
 #include <hoot/core/io/Serializable.h>
 #include <hoot/core/ops/OsmMapOperation.h>
-#include <hoot/core/util/Configurable.h>
 
 // Standard
 #include <set>
@@ -45,12 +44,9 @@ class OsmMap;
 /**
  * Goes through all building relations and updates the outline of the building by taking the union
  * of all the building parts.
- *
- * This class has gone through a few iterations based on user feedback and its complexity may have
- * increased unnecessarily as a result...maybe needs some refactoring to simplify.
  */
 class BuildingOutlineUpdateOp : public OsmMapOperation, public Serializable,
-  public OperationStatusInfo, public Configurable
+  public OperationStatusInfo
 {
 public:
 
@@ -69,24 +65,18 @@ public:
   virtual void writeObject(QDataStream& /*os*/) const {}
 
   virtual QString getInitStatusMessage() const
-  { return "Updating building outlines that changed during conflation..."; }
+  { return "Updating building outlines..."; }
 
   virtual QString getCompletedStatusMessage() const
   { return "Updated " + QString::number(_numAffected) + " building outlines"; }
 
   virtual QString getDescription() const override
-  { return "Updates any multi-part building outlines that changed during conflation"; }
-
-  virtual void setConfiguration(const Settings& conf);
+  { return "Updates multi-part building outlines"; }
 
 private:
 
   std::shared_ptr<OsmMap> _map;
   ReviewMarker _reviewMarker;
-  // If enabled, this will remove all building relations that were used as a source for creating
-  // the outline multipoly relations by this class.
-  bool _removeBuildingRelations;
-  std::set<ElementId> _buildingRelationIds;
 
   void _createOutline(const RelationPtr& building);
   void _unionOutline(const RelationPtr& building, const ElementPtr& element,
@@ -98,10 +88,6 @@ private:
    */
   void _mergeNodes(const std::shared_ptr<Element>& changed,
                    const RelationPtr& reference);
-  void _updateMultipolyWayMembers(
-    WayPtr& pOutlineWay, QHash<RelationData::Entry,WayPtr>& buildingWayLookup);
-
-  void _deleteBuildingRelations();
 };
 
 }
Clone this wiki locally