Can parse simple jq query like strings

Outdooractive · Sep 6, 2024 · 06b8d19 · 06b8d19
1 parent d884b82
commit 06b8d19
Show file tree

Hide file tree

Showing 5 changed files with 571 additions and 102 deletions.
diff --git a/Sources/MVTCLI/Query.swift b/Sources/MVTCLI/Query.swift
@@ -77,7 +77,7 @@ extension CLI {
         var path: String
 
         @Argument(help: "Search term, can be a string or a coordinate in the form 'latitude,longitude,tolerance(meters)'.")
-        var searchTerm: String
+        var searchTerms: [String]
 
         mutating func run() async throws {
             if let outputFile {
@@ -94,6 +94,8 @@ extension CLI {
                 }
             }
 
+            let searchTerm = searchTerms.joined(separator: " ")
+
             var coordinate: Coordinate3D?
             var tolerance: CLLocationDistance?
 

diff --git a/Sources/MVTTools/Extensions/StringExtensions.swift b/Sources/MVTTools/Extensions/StringExtensions.swift
@@ -2,7 +2,9 @@ import Foundation
 
 extension String {
 
-    public func matches(_ regex: String) -> Bool {
+    var isNotEmpty: Bool { !isEmpty }
+
+    func matches(_ regex: String) -> Bool {
         var options: String.CompareOptions = .regularExpression
 
         var regex = regex

diff --git a/Sources/MVTTools/Query.swift b/Sources/MVTTools/Query.swift
@@ -51,15 +51,24 @@ extension VectorTile {
             layerNames
         }
 
+        let queryParser = QueryParser(string: term)
+
         var result: [QueryResult] = []
 
         for layerName in queryLayerNames {
             guard let layerFeatureContainer = layers[layerName] else { continue }
 
             let resultFeatures: [Feature] = layerFeatureContainer.features.filter({ feature in
-                for value in feature.properties.values.compactMap({ $0 as? String }) {
-                    if value.contains(term) {
-                        return true
+                if let queryParser,
+                   let properties = feature.properties as? [String: AnyHashable]
+                {
+                    return queryParser.evaluate(on: properties)
+                }
+                else {
+                    for value in feature.properties.values.compactMap({ $0 as? String }) {
+                        if value.contains(term) {
+                            return true
+                        }
                     }
                 }