v0.2.54..v0.2.55 changeset BuildingMergerTest.cpp
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMergerTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMergerTest.cpp
index 8e33549..a6d2dc4 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMergerTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMergerTest.cpp
@@ -25,22 +25,6 @@
* @copyright Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
// Hoot
#include <hoot/core/elements/OsmMap.h>
#include <hoot/core/TestUtils.h>
@@ -57,7 +41,6 @@
#include <hoot/core/visitors/ElementIdsVisitor.h>
#include <hoot/core/io/OsmJsonReader.h>
#include <hoot/core/io/OsmMapReaderFactory.h>
-#include <hoot/core/io/OsmMapWriterFactory.h>
// CPP Unit
#include <cppunit/extensions/HelperMacros.h>
@@ -238,7 +221,7 @@ public:
OsmMapPtr map(new OsmMap());
OsmXmlReader reader;
const QString inputPath =
- "test-files/cases/attribute/unifying/building-3136-many-to-many-auto-merge-1";
+ "test-files/cases/attribute/unifying/building/building-3136-many-to-many-auto-merge-1";
reader.setDefaultStatus(Status::Unknown1);
reader.read(inputPath + "/Input1.osm", map);
reader.setDefaultStatus(Status::Unknown2);