Apply constructor method pattern to TileSource creation

google · Sep 9, 2023 · 9e82aad · 9e82aad
1 parent f10dc51
commit 9e82aad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ground/src/main/java/com/google/android/ground/model/imagery/TileSource.kt b/ground/src/main/java/com/google/android/ground/model/imagery/TileSource.kt
@@ -24,7 +24,7 @@ data class TileSource(val url: String, val type: Type) {
   }
 
   companion object {
-    fun fromFileExtension(url: String) =
-      if (url.endsWith(".png")) Type.TILED_WEB_MAP else Type.MOG_COLLECTION
+    fun fromUrl(url: String) =
+      TileSource(url, if (url.endsWith(".png")) Type.TILED_WEB_MAP else Type.MOG_COLLECTION)
   }
 }
diff --git a/...main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt b/...main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt
@@ -56,8 +56,6 @@ internal object SurveyConverter {
   }
 
   private fun convertTileSources(pd: SurveyDocument, builder: MutableList<TileSource>) {
-    pd.tileSources
-      ?.mapNotNull { it.url }
-      ?.forEach { url -> builder.add(TileSource(url, TileSource.fromFileExtension(url))) }
+    pd.tileSources?.mapNotNull { it.url }?.forEach { url -> builder.add(TileSource.fromUrl(url)) }
   }
 }