Merge pull request #1453 from Framstag/fix_import_including_osmscout_…

…private Fixing import library importing Config.h from osmscout library.
Framstag · Jun 18, 2023 · 42194dc · 42194dc
2 parents 9b2e302 + 91b624c
commit 42194dc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Tests/src/HeaderCheck.cpp b/Tests/src/HeaderCheck.cpp
@@ -113,7 +113,6 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutgpx => osmscout.io",
     "osmscoutgpx => osmscout", // Fix this
 
-    "osmscoutimport => osmscout.private", // Fix this
     "osmscoutimport => osmscout.system",
     "osmscoutimport => osmscout.util",
     "osmscoutimport => osmscout.projection",
@@ -122,19 +121,20 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutimport => osmscout.feature",
     "osmscoutimport => osmscout.routing",
     "osmscoutimport => osmscout", // Fix it
+    "osmscoutimport => osmscoutimport.private",
     "osmscoutimport => osmscoutimport.pbf",
 
     "osmscoutmap.oss => osmscout.system",
     "osmscoutmap.oss => osmscout.util",
     "osmscoutmap.oss => osmscout.io",
-    "osmscoutmap.oss => osmscout", // Fix this
-    "osmscoutmap.oss => osmscoutmap", // Fix this
+    "osmscoutmap.oss => osmscout", // Fix this -> Helper and TypeService
+    "osmscoutmap.oss => osmscoutmap", // Fix this -> use of StyleConfig
     "osmscoutmap => osmscout.system",
     "osmscoutmap => osmscout.util",
     "osmscoutmap => osmscout.projection",
     "osmscoutmap => osmscout.feature",
-    "osmscoutmap => osmscout.io", // Fix this?
-    "osmscoutmap => osmscout.db", // Fix this?
+    "osmscoutmap => osmscout.io",
+    "osmscoutmap => osmscout.db", // Fix this? -> MapService makes heavy use of Database
     "osmscoutmap => osmscoutmap.oss",
     "osmscoutmap => osmscout",
 
@@ -158,17 +158,17 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutmapopengl => osmscout.system",
     "osmscoutmapopengl => osmscout.util",
     "osmscoutmapopengl => osmscout.projection",
-    "osmscoutmapopengl => osmscout.io", // Fix it?
+    "osmscoutmapopengl => osmscout.io",
     "osmscoutmapopengl => osmscoutmap",
 
     "osmscoutmapqt => osmscout.system",
     "osmscoutmapqt => osmscout.util",
-    "osmscoutmapqt => osmscout.io", // Fix it?
+    "osmscoutmapqt => osmscout.io",
     "osmscoutmapqt => osmscoutmap",
 
     "osmscoutmapsvg => osmscout.system",
     "osmscoutmapsvg => osmscout.util",
-    "osmscoutmapsvg => osmscout.io", // Fix it?
+    "osmscoutmapsvg => osmscout.io",
     "osmscoutmapsvg => osmscoutmap",
 
     "osmscout-test.olt => osmscout.util",

diff --git a/libosmscout-import/src/osmscoutimport/GenCoordDat.cpp b/libosmscout-import/src/osmscoutimport/GenCoordDat.cpp
@@ -19,7 +19,7 @@
 
 #include <osmscoutimport/GenCoordDat.h>
 
-#include <osmscout/private/Config.h>
+#include <osmscoutimport/private/Config.h>
 
 #if defined(HAVE_STD_EXECUTION)
   #include <execution>

diff --git a/libosmscout-import/src/osmscoutimport/GenOptimizeAreaWayIds.cpp b/libosmscout-import/src/osmscoutimport/GenOptimizeAreaWayIds.cpp
@@ -19,7 +19,7 @@
 
 #include <osmscoutimport/GenOptimizeAreaWayIds.h>
 
-#include <osmscout/private/Config.h>
+#include <osmscoutimport/private/Config.h>
 
 #if defined(HAVE_STD_EXECUTION)
 #include <execution>

diff --git a/libosmscout-import/src/osmscoutimport/Import.cpp b/libosmscout-import/src/osmscoutimport/Import.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <osmscoutimport/Import.h>
-#include <osmscout/private/Config.h>
+#include <osmscoutimport/private/Config.h>
 
 #include <algorithm>
 

diff --git a/libosmscout-import/src/osmscoutimport/Preprocess.cpp b/libosmscout-import/src/osmscoutimport/Preprocess.cpp
@@ -34,7 +34,7 @@
 #include <osmscoutimport/RawNode.h>
 #include <osmscoutimport/RawWay.h>
 
-#include <osmscout/private/Config.h>
+#include <osmscoutimport/private/Config.h>
 
 #if defined(HAVE_LIB_XML) || defined(OSMSCOUT_IMPORT_HAVE_XML_SUPPORT)
   #include <osmscoutimport/PreprocessOSM.h>

diff --git a/libosmscout-import/src/osmscoutimport/PreprocessPBF.cpp b/libosmscout-import/src/osmscoutimport/PreprocessPBF.cpp
@@ -19,7 +19,7 @@
 
 #include <osmscoutimport/PreprocessPBF.h>
 
-#include <osmscout/private/Config.h>
+#include <osmscoutimport/private/Config.h>
 #include <osmscoutimport/ImportFeatures.h>
 
 #include <cstdio>