brand features can now be loaded lazily per-country

Author: westnordost

README.md

@@ -10,9 +10,9 @@ Requires Java 8.
 
 ## Installation
 
-Add [`de.westnordost:osmfeatures:3.0`](https://mvnrepository.com/artifact/de.westnordost/osmfeatures/3.0/) as a Maven dependency or download the jar from there.
+Add [`de.westnordost:osmfeatures:4.0`](https://mvnrepository.com/artifact/de.westnordost/osmfeatures/4.0/) as a Maven dependency or download the jar from there.
 
-For Android, use [`de.westnordost:osmfeatures-android:3.0`](https://mvnrepository.com/artifact/de.westnordost/osmfeatures-android/3.0/).
+For Android, use [`de.westnordost:osmfeatures-android:4.0`](https://mvnrepository.com/artifact/de.westnordost/osmfeatures-android/4.0/).
 
 ## Usage
 

library-android/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'signing'
 }
 
-version = "3.0"
+version = "4.0"
 group "de.westnordost"
 
 repositories {
@@ -15,18 +15,18 @@ repositories {
 
 dependencies {
     //api (project(':library')) {
-    api ('de.westnordost:osmfeatures:3.0') {
+    api ('de.westnordost:osmfeatures:4.0') {
         // it's already included in Android
         exclude group: 'org.json', module: 'json'
     }
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName project.version
     }

library-android/src/main/java/de/westnordost/osmfeatures/AndroidFeatureDictionary.java

@@ -2,8 +2,6 @@
 
 import android.content.res.AssetManager;
 
-import java.util.Arrays;
-
 public class AndroidFeatureDictionary
 {
 	private AndroidFeatureDictionary() {} // cannot be instantiated
@@ -16,13 +14,13 @@ public static FeatureDictionary create(AssetManager assetManager, String presets
 	/** Create a new FeatureDictionary which gets its data from the given directory in the app's
 	 *  asset folder. Optionally, the path to the brand presets can be specified. */
 	public static FeatureDictionary create(AssetManager assetManager, String presetsBasePath, String brandPresetsBasePath) {
-		FeatureCollection featureCollection =
-				new IDFeatureCollection(new AssetManagerAccess(assetManager, presetsBasePath));
+		LocalizedFeatureCollection featureCollection =
+				new IDLocalizedFeatureCollection(new AssetManagerAccess(assetManager, presetsBasePath));
 
-		FeatureCollection brandsFeatureCollection = brandPresetsBasePath != null
-				? new IDBaseFeatureCollection(new AssetManagerAccess(assetManager, brandPresetsBasePath))
+		PerCountryFeatureCollection brandsFeatureCollection = brandPresetsBasePath != null
+				? new IDBrandPresetsFeatureCollection(new AssetManagerAccess(assetManager, brandPresetsBasePath))
 				: null;
 
-		return new FeatureDictionary(Arrays.asList(featureCollection), Arrays.asList(brandsFeatureCollection));
+		return new FeatureDictionary(featureCollection, brandsFeatureCollection);
 	}
 }

library/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'signing'
 }
 
-version = "3.0"
+version = "4.0"
 group "de.westnordost"
 
 repositories {