Try hard to find tile coordinates from input files

Outdooractive · Aug 9, 2024 · 009066d · 009066d
1 parent dbe79f1
commit 009066d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/Sources/MVTCLI/CLI.swift b/Sources/MVTCLI/CLI.swift
@@ -51,13 +51,15 @@ struct XYZOptions: ParsableArguments {
     var z: Int?
 
     mutating func parseXYZ(
-        fromPath path: String)
+        fromPaths paths: [String])
         throws -> (Int, Int, Int)
     {
-        if x == nil
-            || y == nil
-            || z == nil
-        {
+        for path in paths {
+            guard x == nil
+                    || y == nil
+                    || z == nil
+            else { break }
+
             let urlParts = path.extractingGroupsUsingPattern("\\/(\\d+)\\/(\\d+)\\/(\\d+)(?:\\/|\\.)", caseInsensitive: false)
             if urlParts.count >= 3 {
                 if let partX = Int(urlParts[1]),

diff --git a/Sources/MVTCLI/Dump.swift b/Sources/MVTCLI/Dump.swift
@@ -23,7 +23,7 @@ extension CLI {
         var path: String
 
         mutating func run() async throws {
-            let (x, y, z) = try xyzOptions.parseXYZ(fromPath: path)
+            let (x, y, z) = try xyzOptions.parseXYZ(fromPaths: [path])
             let url = try options.parseUrl(fromPath: path)
 
             let layerAllowlist = layer.nonempty

diff --git a/Sources/MVTCLI/Export.swift b/Sources/MVTCLI/Export.swift
@@ -32,7 +32,7 @@ extension CLI {
         var path: String
 
         mutating func run() async throws {
-            let (x, y, z) = try xyzOptions.parseXYZ(fromPath: path)
+            let (x, y, z) = try xyzOptions.parseXYZ(fromPaths: [path])
             let url = try options.parseUrl(fromPath: path)
 
             let outputUrl = URL(fileURLWithPath: output)

diff --git a/Sources/MVTCLI/Import.swift b/Sources/MVTCLI/Import.swift
@@ -36,7 +36,7 @@ extension CLI {
         var other: [String] = []
 
         mutating func run() async throws {
-            let (x, y, z) = try xyzOptions.parseXYZ(fromPath: output)
+            let (x, y, z) = try xyzOptions.parseXYZ(fromPaths: [output] + other)
 
             let outputUrl = URL(fileURLWithPath: output)
             if (try? outputUrl.checkResourceIsReachable()) ?? false {

diff --git a/Sources/MVTCLI/Merge.swift b/Sources/MVTCLI/Merge.swift
@@ -32,7 +32,7 @@ extension CLI {
         var other: [String] = []
 
         mutating func run() async throws {
-            let (x, y, z) = try xyzOptions.parseXYZ(fromPath: output)
+            let (x, y, z) = try xyzOptions.parseXYZ(fromPaths: [output] + other)
 
             let outputUrl = URL(fileURLWithPath: output)
             if (try? outputUrl.checkResourceIsReachable()) ?? false {

diff --git a/Sources/MVTCLI/Query.swift b/Sources/MVTCLI/Query.swift
@@ -47,7 +47,7 @@ extension CLI {
                 }
             }
 
-            let (x, y, z) = try xyzOptions.parseXYZ(fromPath: path)
+            let (x, y, z) = try xyzOptions.parseXYZ(fromPaths: [path])
             let url = try options.parseUrl(fromPath: path)
 
             let layerAllowlist = layer.nonempty