Merge pull request #1589 from CesiumGS/ada-url

Replace `uriparser` usage with `CesiumUtility::Uri`
CesiumGS · Feb 1, 2025 · f78cb02 · f78cb02
2 parents 1044f5c + 17820f0
commit f78cb02
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/Source/CesiumEditor/Private/CesiumIonSession.cpp b/Source/CesiumEditor/Private/CesiumIonSession.cpp
@@ -6,7 +6,9 @@
 #include "CesiumIonServer.h"
 #include "CesiumRuntimeSettings.h"
 #include "CesiumSourceControl.h"
+THIRD_PARTY_INCLUDES_START
 #include "CesiumUtility/Uri.h"
+THIRD_PARTY_INCLUDES_END
 #include "FileHelpers.h"
 #include "HAL/PlatformProcess.h"
 #include "Misc/App.h"

diff --git a/Source/CesiumEditor/Private/CesiumIonTokenTroubleshooting.cpp b/Source/CesiumEditor/Private/CesiumIonTokenTroubleshooting.cpp
@@ -8,7 +8,9 @@
 #include "CesiumIonRasterOverlay.h"
 #include "CesiumIonServerDisplay.h"
 #include "CesiumRuntimeSettings.h"
+THIRD_PARTY_INCLUDES_START
 #include "CesiumUtility/Uri.h"
+THIRD_PARTY_INCLUDES_END
 #include "EditorStyleSet.h"
 #include "LevelEditor.h"
 #include "ScopedTransaction.h"

diff --git a/Source/CesiumEditor/Private/CesiumPanel.cpp b/Source/CesiumEditor/Private/CesiumPanel.cpp
@@ -10,7 +10,9 @@
 #include "CesiumIonServerSelector.h"
 #include "CesiumRuntime.h"
 #include "CesiumRuntimeSettings.h"
+THIRD_PARTY_INCLUDES_START
 #include "CesiumUtility/Uri.h"
+THIRD_PARTY_INCLUDES_END
 #include "Editor.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 #include "Interfaces/IPluginManager.h"

diff --git a/Source/CesiumEditor/Private/IonQuickAddPanel.cpp b/Source/CesiumEditor/Private/IonQuickAddPanel.cpp
@@ -8,7 +8,9 @@
 #include "CesiumIonRasterOverlay.h"
 #include "CesiumIonServer.h"
 #include "CesiumRuntimeSettings.h"
+THIRD_PARTY_INCLUDES_START
 #include "CesiumUtility/Uri.h"
+THIRD_PARTY_INCLUDES_END
 #include "Editor.h"
 #include "PropertyCustomizationHelpers.h"
 #include "SelectCesiumIonToken.h"

diff --git a/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp b/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp
@@ -7,6 +7,9 @@
 #include "CesiumAsync/AsyncSystem.h"
 #include "CesiumAsync/IAssetRequest.h"
 #include "CesiumAsync/IAssetResponse.h"
+THIRD_PARTY_INCLUDES_START
+#include "CesiumUtility/Uri.h"
+THIRD_PARTY_INCLUDES_END
 #include "CesiumCommon.h"
 #include "CesiumRuntime.h"
 #include "HttpManager.h"
@@ -21,7 +24,6 @@
 #include <cstring>
 #include <optional>
 #include <set>
-#include <uriparser/Uri.h>
 
 namespace {
 
@@ -338,32 +340,9 @@ const std::string UnrealFileAssetRequestResponse::getMethod = "GET";
 const CesiumAsync::HttpHeaders UnrealFileAssetRequestResponse::emptyHeaders{};
 
 std::string convertFileUriToFilename(const std::string& url) {
-  // According to the uriparser docs, both uriUriStringToWindowsFilenameA and
-  // uriUriStringToUnixFilenameA require an output buffer with space for at most
-  // length(url)+1 characters.
-  // https://uriparser.github.io/doc/api/latest/Uri_8h.html#a4afbc8453c7013b9618259bc57d81a39
-  std::string result(url.size() + 1, '\0');
-
-#ifdef _WIN32
-  int errorCode = uriUriStringToWindowsFilenameA(url.c_str(), result.data());
-#else
-  int errorCode = uriUriStringToUnixFilenameA(url.c_str(), result.data());
-#endif
-
-  // Truncate the string if necessary by finding the first null character.
-  size_t end = result.find('\0');
-  if (end != std::string::npos) {
-    result.resize(end);
-  }
-
-  // Remove query parameters from the URL if present, as they are no longer
-  // ignored by Unreal.
-  size_t pos = result.find("?");
-  if (pos != std::string::npos) {
-    result.erase(pos);
-  }
-
-  return result;
+  CesiumUtility::Uri parsedUri(url);
+  return CesiumUtility::Uri::uriPathToNativePath(
+      std::string(parsedUri.getPath()));
 }
 
 class FCesiumReadFileWorker : public FNonAbandonableTask {

diff --git a/extern/cesium-native b/extern/cesium-native
+1 −0		CHANGES.md
+3 −3		CMakeLists.txt
+1 −0		Cesium3DTiles/test/TestTileset.cpp
+0 −1		Cesium3DTilesSelection/CMakeLists.txt
+13 −9		Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp
+2 −0		Cesium3DTilesSelection/src/LayerJsonTerrainLoader.h
+17 −8		Cesium3DTilesSelection/test/TestLayerJsonTerrainLoader.cpp
+1 −1		Cesium3DTilesSelection/test/data/AddTileset/tileset3/tileset3.json
+9 −12		CesiumIonClient/src/Connection.cpp
+1 −1		CesiumUtility/CMakeLists.txt
+208 −4		CesiumUtility/include/CesiumUtility/Uri.h
+208 −324		CesiumUtility/src/Uri.cpp
+93 −15		CesiumUtility/test/TestUri.cpp
+6 −6		ThirdParty.json
+1 −2		doc/diagrams/dependencies/Cesium3DTilesSelection.mmd
+2 −1		doc/diagrams/dependencies/CesiumIonClient.mmd
+2 −2		doc/diagrams/dependencies/CesiumUtility.mmd
+18 −18		doc/diagrams/dependencies/all.mmd
+1 −1		doc/img/dependency-graph.svg
+1 −1		doc/topics/dependencies.md