Changeset 18886 in josm

Timestamp:

2023-10-30T20:42:22+01:00 (6 months ago)

Author:

taylor.smock

Message:

Fix #18866: Remove Potlatch2 from the built-in styles. It has been replaced with wiki:Styles/Potlatch2.

Users who have the built-in Potlatch2 style enabled when they upgrade to this
revision or later will automatically have wiki:Styles/Potlatch2 added to their
style list and enabled.

Location:

trunk

Files:

• README (modified) (1 diff)
• nodist/styles/potlatch2 (deleted)
• resources/images/icons (deleted)
• resources/styles/standard/potlatch2.mapcss (deleted)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java (modified) (1 diff)

trunk/README

@@ -103 +103 @@
                             resolution and vector versions)
   - styles/                 files needed for map style maintenance
-    - potlatch2/README      infos on how to update the Potlatch 2 style from upstream sources
 - README                    this file
 - resources/                resource files that will be included in the JOSM jar file

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -901 +901 @@
             putInt("draw.rawgps.lines", -1);
         }
+        updateMapPaintKnownDefaults();
         if (modifiedDefault) {
             try {
@@ -913 +914 @@
 
     /**
+     * Update the known defaults for the map paintstyles.
+     * This should be removed sometime after 2024-06-01.
+     */
+    private void updateMapPaintKnownDefaults() {
+        final String url = "url";
+        final String active = "active";
+        final String potlatch2 = "resource://styles/standard/potlatch2.mapcss";
+        final String remotePotlatch2 = "https://josm.openstreetmap.de/josmfile?page=Styles/Potlatch2&zip=1";
+
+        // Remove potlatch2 from the known defaults
+        final List<String> knownDefaults = new ArrayList<>(getList("mappaint.style.known-defaults"));
+        // See #18866: Potlatch 2 internal theme removed in favor of remote theme by Stereo
+        knownDefaults.removeIf(potlatch2::equals);
+
+        // Moved from MapPaintPrefHelper for consistency
+        // XML style is not bundled anymore
+        knownDefaults.removeIf("resource://styles/standard/elemstyles.xml"::equals);
+        putList("mappaint.style.known-defaults", knownDefaults);
+
+        // Replace potlatch2 in the current style entries, but only if it is enabled. Otherwise, remove it.
+        final List<Map<String, String>> styleEntries = new ArrayList<>(getListOfMaps("mappaint.style.entries"));
+        final boolean potlatchEnabled = styleEntries.stream().filter(map -> potlatch2.equals(map.get(url)))
+                .anyMatch(map -> Boolean.parseBoolean(map.get(active)));
+        final boolean remotePotlatch2Present = styleEntries.stream().anyMatch(map -> remotePotlatch2.equals(map.get(url)));
+        // Remove potlatch2 if it is not enabled _or_ the remote potlatch2 version is present
+        styleEntries.removeIf(map -> (!potlatchEnabled || remotePotlatch2Present) && potlatch2.equals(map.get(url)));
+        styleEntries.replaceAll(HashMap::new); // The maps are initially immutable.
+        for (Map<String, String> map : styleEntries) {
+            if (potlatch2.equals(map.get(url))) {
+                map.put(url, remotePotlatch2);
+            }
+        }
+        putListOfMaps("mappaint.style.entries", styleEntries);
+    }
+
+    /**
      * Enables or not the preferences file auto-save mechanism (save each time a setting is changed).
      * This behaviour is enabled by default.

trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -73 +73 @@
         Config.getPref().putList("mappaint.style.known-defaults", new ArrayList<>(knownDefaults));
 
-        // XML style is not bundled anymore
-        list.removeIf(se -> "resource://styles/standard/elemstyles.xml".equals(se.url));
-
         return changed;
     }
@@ -87 +84 @@
         defJosmMapcss.title = tr("JOSM default (MapCSS)");
         defJosmMapcss.description = tr("Internal style to be used as base for runtime switchable overlay styles");
-        ExtendedSourceEntry defPL2 = new ExtendedSourceEntry(type, "potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");
-        defPL2.active = false;
-        defPL2.name = "standard";
-        defPL2.icon = new ImageProvider("dialogs/mappaint", "pl2_small").getResource();
-        defPL2.title = tr("Potlatch 2");
-        defPL2.description = tr("the main Potlatch 2 style");
-
-        return Arrays.asList(defJosmMapcss, defPL2);
+        return Collections.singletonList(defJosmMapcss);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java

@@ -88 +88 @@
 
     @ParameterizedTest
-    @ValueSource(strings = {"resources/styles/standard/elemstyles.mapcss", "resources/styles/standard/potlatch2.mapcss"})
+    @ValueSource(strings = "resources/styles/standard/elemstyles.mapcss")
     void testInternalMapcss(final String resourceLocation) {
         validatorCLI.processArguments(new String[]{"--input", resourceLocation});