From 1e95694c7b279fe3ed835a7895a0977641bb7a8b Mon Sep 17 00:00:00 2001 From: Jacob Powers Date: Tue, 22 Jul 2025 02:18:00 +0000 Subject: [PATCH] remove some print statements --- Meshtastic/Helpers/GeoJSONOverlayConfig.swift | 4 --- .../Helpers/GeoJSONOverlayManager.swift | 25 -------------- Meshtastic/Helpers/MapDataManager.swift | 33 ------------------- .../Map/MapContent/MeshMapContent.swift | 2 -- .../Nodes/Helpers/Map/MapSettingsForm.swift | 9 +---- Meshtastic/Views/Nodes/MeshMap.swift | 1 - 6 files changed, 1 insertion(+), 73 deletions(-) diff --git a/Meshtastic/Helpers/GeoJSONOverlayConfig.swift b/Meshtastic/Helpers/GeoJSONOverlayConfig.swift index 6a4860fd..ac06b6ed 100644 --- a/Meshtastic/Helpers/GeoJSONOverlayConfig.swift +++ b/Meshtastic/Helpers/GeoJSONOverlayConfig.swift @@ -188,11 +188,7 @@ struct GeoJSONStyledFeature: Identifiable { if let geometry = mkFeature.geometry.first as? MKOverlay { // Successfully created overlay return geometry - } else { - Logger.services.warning("πŸ—ΊοΈ GeoJSONStyledFeature: First geometry is not an MKOverlay: \(type(of: mkFeature.geometry.first))") } - } else { - Logger.services.warning("πŸ—ΊοΈ GeoJSONStyledFeature: First feature is not an MKGeoJSONFeature: \(type(of: mkFeatures.first))") } } catch { Logger.services.error("πŸ—ΊοΈ GeoJSONStyledFeature: Failed to convert feature to overlay: \(error.localizedDescription)") diff --git a/Meshtastic/Helpers/GeoJSONOverlayManager.swift b/Meshtastic/Helpers/GeoJSONOverlayManager.swift index e37956cd..85080d89 100644 --- a/Meshtastic/Helpers/GeoJSONOverlayManager.swift +++ b/Meshtastic/Helpers/GeoJSONOverlayManager.swift @@ -11,52 +11,38 @@ class GeoJSONOverlayManager { /// Load raw GeoJSON feature collection from user uploads func loadFeatureCollection() -> GeoJSONFeatureCollection? { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: loadFeatureCollection() called") - if let cached = featureCollection { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: Returning cached feature collection with \(cached.features.count) features") return cached } // Load user-uploaded feature collection - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: Loading feature collection from MapDataManager") if let userFeatures = MapDataManager.shared.loadFeatureCollection() { - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Loaded feature collection with \(userFeatures.features.count) features") featureCollection = userFeatures return userFeatures } - // No feature collection available - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: No feature collection available") return nil } /// Load styled features for specific enabled configs func loadStyledFeaturesForConfigs(_ enabledConfigs: Set) -> [GeoJSONStyledFeature] { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: loadStyledFeaturesForConfigs() called with \(enabledConfigs.count) configs") - // Get files that match the enabled configs let enabledFiles = MapDataManager.shared.getUploadedFiles().filter { enabledConfigs.contains($0.id) } guard !enabledFiles.isEmpty else { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: No enabled files found, returning empty array") return [] } // Load feature collection from enabled files only guard let collection = MapDataManager.shared.loadFeatureCollectionForFiles(enabledFiles) else { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: No feature collection available for enabled files, returning empty array") return [] } var styledFeatures: [GeoJSONStyledFeature] = [] - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Processing \(collection.features.count) features from \(enabledFiles.count) enabled files") - for feature in collection.features { // Skip invisible features guard feature.isVisible else { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: Skipping invisible feature") continue } @@ -68,27 +54,20 @@ class GeoJSONOverlayManager { styledFeatures.append(styledFeature) } - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Returning \(styledFeatures.count) styled features from enabled configs") return styledFeatures } /// Load styled features for direct rendering (legacy method) func loadStyledFeatures() -> [GeoJSONStyledFeature] { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: loadStyledFeatures() called") - guard let collection = loadFeatureCollection() else { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: No feature collection available, returning empty array") return [] } var styledFeatures: [GeoJSONStyledFeature] = [] - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Processing \(collection.features.count) features") - for feature in collection.features { // Skip invisible features guard feature.isVisible else { - Logger.services.debug("πŸ—ΊοΈ GeoJSONOverlayManager: Skipping invisible feature") continue } @@ -100,7 +79,6 @@ class GeoJSONOverlayManager { styledFeatures.append(styledFeature) } - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Returning \(styledFeatures.count) styled features") return styledFeatures } @@ -130,7 +108,6 @@ class GeoJSONOverlayManager { /// Clear cached data (useful for testing or memory management) func clearCache() { - Logger.services.info("πŸ—ΊοΈ GeoJSONOverlayManager: Clearing cache") featureCollection = nil } @@ -164,10 +141,8 @@ class GeoJSONOverlayManager { /// Toggle the active state of an uploaded file func toggleFileActive(_ fileId: UUID) { - Logger.services.error("🚨 GeoJSONOverlayManager: ENTRY - Toggling active state for file: \(fileId)") MapDataManager.shared.toggleFileActive(fileId) // Clear cache to force reload with new file states clearCache() - Logger.services.error("🚨 GeoJSONOverlayManager: EXIT - Completed toggle and cache clear for file: \(fileId)") } } \ No newline at end of file diff --git a/Meshtastic/Helpers/MapDataManager.swift b/Meshtastic/Helpers/MapDataManager.swift index 3bdab686..3f9f61e4 100644 --- a/Meshtastic/Helpers/MapDataManager.swift +++ b/Meshtastic/Helpers/MapDataManager.swift @@ -57,7 +57,6 @@ class MapDataManager { /// Process and store an uploaded file func processUploadedFile(from sourceURL: URL) async throws -> MapDataMetadata { - Logger.services.info("πŸ“ Processing uploaded file: \(sourceURL.lastPathComponent, privacy: .public)") // 1. Start accessing security-scoped resource let isAccessing = sourceURL.startAccessingSecurityScopedResource() @@ -98,7 +97,6 @@ class MapDataManager { // 7. Clear cached configuration to force reload activeFeatureCollection = nil - Logger.services.info("πŸ“ Successfully processed file: \(newFilename, privacy: .public)") return metadata } @@ -186,10 +184,7 @@ class MapDataManager { /// Load combined feature collection from specific files func loadFeatureCollectionForFiles(_ files: [MapDataMetadata]) -> GeoJSONFeatureCollection? { - Logger.services.debug("πŸ“ MapDataManager: Loading feature collection for \(files.count) specific files") - guard !files.isEmpty else { - Logger.services.debug("πŸ“ MapDataManager: No files provided, returning nil") return nil } @@ -199,7 +194,6 @@ class MapDataManager { do { if let featureCollection = try loadFeatureCollectionFromFile(file) { allFeatures.append(contentsOf: featureCollection.features) - Logger.services.info("πŸ“ MapDataManager: Successfully loaded \(featureCollection.features.count) features from \(file.filename, privacy: .public)") } } catch { Logger.services.error("πŸ“ MapDataManager: Failed to load feature collection from \(file.filename, privacy: .public): \(error.localizedDescription, privacy: .public)") @@ -208,27 +202,21 @@ class MapDataManager { } guard !allFeatures.isEmpty else { - Logger.services.debug("πŸ“ MapDataManager: No features loaded from any files") return nil } - - Logger.services.info("πŸ“ MapDataManager: Successfully combined \(allFeatures.count) total features from \(files.count) files") return GeoJSONFeatureCollection(type: "FeatureCollection", features: allFeatures) } /// Load and combine raw GeoJSON feature collections from all active files func loadFeatureCollection() -> GeoJSONFeatureCollection? { if let cached = activeFeatureCollection { - Logger.services.debug("πŸ“ MapDataManager: Returning cached feature collection") return cached } // Find active user files let activeFiles = uploadedFiles.filter { $0.isActive } - Logger.services.debug("πŸ“ MapDataManager: Found \(activeFiles.count) active files out of \(self.uploadedFiles.count) total files") guard !activeFiles.isEmpty else { - Logger.services.debug("πŸ“ MapDataManager: No active files found") return nil } @@ -236,7 +224,6 @@ class MapDataManager { // Load features from all active files for activeFile in activeFiles { - Logger.services.info("πŸ“ MapDataManager: Attempting to load active file: \(activeFile.filename, privacy: .public)") guard let fileURL = getUserUploadedDirectory()?.appendingPathComponent(activeFile.filename) else { Logger.services.error("πŸ“ MapDataManager: Could not construct file URL for: \(activeFile.filename, privacy: .public)") @@ -246,14 +233,12 @@ class MapDataManager { // Check if file exists before trying to load it if !FileManager.default.fileExists(atPath: fileURL.path) { Logger.services.error("πŸ“ MapDataManager: Active file does not exist at path: \(fileURL.path, privacy: .public)") - Logger.services.info("πŸ“ MapDataManager: Removing missing file from metadata") // Remove the missing file from our metadata if let index = uploadedFiles.firstIndex(where: { $0.filename == activeFile.filename }) { uploadedFiles.remove(at: index) do { try saveMetadata() - Logger.services.info("πŸ“ MapDataManager: Successfully cleaned up missing file from metadata") } catch { Logger.services.error("πŸ“ MapDataManager: Failed to save cleaned metadata: \(error.localizedDescription, privacy: .public)") } @@ -266,7 +251,6 @@ class MapDataManager { let processedData = try processData(data, filename: activeFile.filename) let featureCollection = try JSONDecoder().decode(GeoJSONFeatureCollection.self, from: processedData) - Logger.services.info("πŸ“ MapDataManager: Successfully loaded \(featureCollection.features.count) features from \(activeFile.filename, privacy: .public)") allFeatures.append(contentsOf: featureCollection.features) } catch { Logger.services.error("πŸ“ MapDataManager: Failed to load feature collection from \(activeFile.filename, privacy: .public): \(error.localizedDescription, privacy: .public)") @@ -279,7 +263,6 @@ class MapDataManager { features: allFeatures ) - Logger.services.info("πŸ“ MapDataManager: Successfully combined \(allFeatures.count) total features from \(activeFiles.count) active files") activeFeatureCollection = combinedCollection return combinedCollection } @@ -293,39 +276,28 @@ class MapDataManager { /// Toggle the active state of an uploaded file func toggleFileActive(_ fileId: UUID) { - Logger.services.error("🚨 MapDataManager: ENTRY - Toggling active state for file: \(fileId)") - if let index = uploadedFiles.firstIndex(where: { $0.id == fileId }) { - let oldState = uploadedFiles[index].isActive uploadedFiles[index].isActive.toggle() - let newState = uploadedFiles[index].isActive - Logger.services.error("🚨 MapDataManager: File '\(self.uploadedFiles[index].filename)' changed from \(oldState) to \(newState)") // Save metadata changes do { try saveMetadata() // Clear cached data to force reload activeFeatureCollection = nil - Logger.services.error("🚨 MapDataManager: Successfully saved metadata and cleared cache") } catch { Logger.services.error("🚨 MapDataManager: FAILED to save metadata after toggling file: \(error.localizedDescription)") } - } else { - Logger.services.error("🚨 MapDataManager: ERROR - Could not find file with ID: \(fileId)") } - Logger.services.error("🚨 MapDataManager: EXIT - Completed toggle operation for file: \(fileId)") } /// Delete uploaded file func deleteFile(_ metadata: MapDataMetadata) throws { - Logger.services.info("πŸ—‘οΈ MapDataManager: Attempting to delete file: \(metadata.filename, privacy: .public)") guard let fileURL = getUserUploadedDirectory()?.appendingPathComponent(metadata.filename) else { Logger.services.error("πŸ—‘οΈ MapDataManager: Could not construct file URL for: \(metadata.filename, privacy: .public)") throw MapDataError.fileNotFound } - Logger.services.debug("πŸ—‘οΈ MapDataManager: File URL: \(fileURL.path, privacy: .public)") // Check if file exists before trying to delete if !FileManager.default.fileExists(atPath: fileURL.path) { @@ -334,7 +306,6 @@ class MapDataManager { do { try FileManager.default.removeItem(at: fileURL) - Logger.services.info("πŸ—‘οΈ MapDataManager: Successfully removed file from filesystem") } catch { Logger.services.error("πŸ—‘οΈ MapDataManager: Failed to remove file: \(error.localizedDescription, privacy: .public)") throw error @@ -342,14 +313,12 @@ class MapDataManager { if let index = uploadedFiles.firstIndex(where: { $0.filename == metadata.filename }) { uploadedFiles.remove(at: index) - Logger.services.debug("πŸ—‘οΈ MapDataManager: Removed file from uploadedFiles array at index \(index)") } else { Logger.services.warning("πŸ—‘οΈ MapDataManager: File not found in uploadedFiles array") } do { try saveMetadata() - Logger.services.debug("πŸ—‘οΈ MapDataManager: Successfully saved updated metadata") } catch { Logger.services.error("πŸ—‘οΈ MapDataManager: Failed to save metadata: \(error.localizedDescription, privacy: .public)") throw error @@ -358,13 +327,11 @@ class MapDataManager { // Clear cache if this was the active file if activeFeatureCollection != nil { activeFeatureCollection = nil - Logger.services.debug("πŸ—‘οΈ MapDataManager: Cleared active configuration cache") } // Clear GeoJSON overlay manager cache GeoJSONOverlayManager.shared.clearCache() - Logger.services.info("πŸ—‘οΈ MapDataManager: Successfully deleted file: \(metadata.filename, privacy: .public)") } /// Toggle file active status diff --git a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift index 3bd32bab..cfaa1e89 100644 --- a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift +++ b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift @@ -248,8 +248,6 @@ struct MeshMapContent: MapContent { // Get all features but filter by enabled configs let allStyledFeatures = GeoJSONOverlayManager.shared.loadStyledFeaturesForConfigs(enabledOverlayConfigs) - // Log with error level to make it visible - print("🚨 MeshMapContent: overlayContent computed - \(enabledOverlayConfigs.count) enabled configs, \(allStyledFeatures.count) features") return Group { ForEach(0.. 0 {