Minor code improvements

MarcusWolschon · Jan 20, 2025 · 5417b69 · 5417b69
1 parent c23c60b
commit 5417b69
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/src/main/java/de/blau/android/resources/DataStyle.java b/src/main/java/de/blau/android/resources/DataStyle.java
@@ -187,26 +187,26 @@ public final class DataStyle extends DefaultHandler {
 
     public class FeatureStyle {
 
-        final Map<String, String> tags;
-        private int               minVisibleZoom = DEFAULT_MIN_VISIBLE_ZOOM;
-        private boolean           area           = false;
-        boolean                   dontrender     = false;
-        boolean                   updateWidth    = true;
-        final Paint               paint;
-        float                     widthFactor;
-        float                     offset         = 0f;
-        DashPath                  dashPath       = null;
-        private FontMetrics       fontMetrics    = null;
-        private PathPattern       pathPattern    = null;
-        private boolean           pathPatternSupported;
-        private FeatureStyle      arrowStyle     = null;
-        private FeatureStyle      casingStyle    = null;
-        private boolean           oneway         = false;
-        private Boolean           closed         = null;
-        private String            labelKey       = null;
-        private String            iconPath       = null;
-        private int               labelZoomLimit = Integer.MAX_VALUE;
-        private int               textColor;
+        private final Map<String, String> tags;
+        private int                       minVisibleZoom = DEFAULT_MIN_VISIBLE_ZOOM;
+        private boolean                   area           = false;
+        boolean                           dontrender     = false;
+        boolean                           updateWidth    = true;
+        final Paint                       paint;
+        float                             widthFactor;
+        float                             offset         = 0f;
+        DashPath                          dashPath       = null;
+        private FontMetrics               fontMetrics    = null;
+        private PathPattern               pathPattern    = null;
+        private boolean                   pathPatternSupported;
+        private FeatureStyle              arrowStyle     = null;
+        private FeatureStyle              casingStyle    = null;
+        private boolean                   oneway         = false;
+        private Boolean                   closed         = null;
+        private String                    labelKey       = null;
+        private String                    iconPath       = null;
+        private int                       labelZoomLimit = Integer.MAX_VALUE;
+        private int                       textColor;
 
         List<FeatureStyle> cascadedStyles = null;
 
@@ -673,6 +673,13 @@ public int getTextColor() {
             return textColor;
         }
 
+        /**
+         * @return the tags
+         */
+        public Map<String, String> getTags() {
+            return tags;
+        }
+
         /**
          * Dump this Style in XML format, not very abstracted and closely tied to the implementation
          * 
@@ -865,6 +872,8 @@ private void init() {
 
         FeatureStyle baseWayStyle = new FeatureStyle(WAY, standardPath);
         baseWayStyle.setColor(Color.BLACK);
+        baseWayStyle.getPaint().setStrokeCap(Cap.ROUND);
+        baseWayStyle.getPaint().setStrokeJoin(Join.ROUND);
 
         FeatureStyle fp = new FeatureStyle(PROBLEM_WAY, standardPath);
         int problemColor = ContextCompat.getColor(ctx, R.color.problem);
@@ -936,15 +945,11 @@ private void init() {
 
         fp = new FeatureStyle(GPS_TRACK, baseWayStyle);
         fp.setColor(Color.BLUE);
-        fp.getPaint().setStrokeCap(Cap.ROUND);
-        fp.getPaint().setStrokeJoin(Join.ROUND);
         internalStyles.put(GPS_TRACK, fp);
 
         fp = new FeatureStyle(MVT_DEFAULT, baseWayStyle);
         fp.setColor(Color.BLUE);
         fp.getPaint().setAlpha(0x7F);
-        fp.getPaint().setStrokeCap(Cap.ROUND);
-        fp.getPaint().setStrokeJoin(Join.ROUND);
         internalStyles.put(MVT_DEFAULT, fp);
 
         fp = new FeatureStyle(WAY_TOLERANCE, baseWayStyle);
@@ -1031,16 +1036,12 @@ private void init() {
         fp = new FeatureStyle(SELECTED_WAY, baseWayStyle);
         fp.setColor(cccBeige);
         fp.setWidthFactor(2f);
-        fp.getPaint().setStrokeCap(Cap.ROUND);
-        fp.getPaint().setStrokeJoin(Join.ROUND);
         internalStyles.put(SELECTED_WAY, fp);
 
         fp = new FeatureStyle(HIDDEN_WAY, baseWayStyle);
         fp.setColor(ContextCompat.getColor(ctx, R.color.light_grey));
         fp.getPaint().setAlpha(TOLERANCE_ALPHA);
         fp.setWidthFactor(0.5f);
-        fp.getPaint().setStrokeCap(Cap.ROUND);
-        fp.getPaint().setStrokeJoin(Join.ROUND);
         internalStyles.put(HIDDEN_WAY, fp);
 
         fp = new FeatureStyle(SELECTED_RELATION_WAY, internalStyles.get(SELECTED_WAY));

diff --git a/src/test/java/de/blau/android/resources/DataStyleTaginfoDump.java b/src/test/java/de/blau/android/resources/DataStyleTaginfoDump.java
@@ -13,6 +13,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.LargeTest;
 import de.blau.android.App;
+import de.blau.android.prefs.Preferences;
 
 /**
  * This is just a convenient way of generating the default preset dump
@@ -41,7 +42,7 @@ public void dump() { // NOSONAR
         File target = manual ? new File(TARGET_FILE) : new File(ctx.getFilesDir(), TARGET_FILE);
         DataStyle styles = App.getDataStyle(ApplicationProvider.getApplicationContext());
         styles.getStylesFromFiles(ApplicationProvider.getApplicationContext());
-        styles.switchTo("Color Round Nodes");
+        styles.switchTo(Preferences.DEFAULT_MAP_STYLE);
         assertTrue(styles.generateTaginfoJson(target));
     }
 }