Changeset 9617 in josm

Timestamp:

2016-01-24T19:08:31+01:00 (9 years ago)

Author:

stoecker

Message:

see #12437 - support new Map<String, List<String>> type in preferences

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (4 diffs)
• imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -44 +44 @@
 
 import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
@@ -1413 +1415 @@
             for (Object o: map.entrySet()) {
                 Entry e = (Entry) o;
-                object.add(e.getKey().toString(), e.getValue().toString());
+                Object evalue = e.getValue();
+                if (evalue instanceof Collection) {
+                    JsonArrayBuilder a = Json.createArrayBuilder();
+                    for (Object evo : (Collection)evalue) {
+                        a.add(evo.toString());
+                    }
+                    object.add(e.getKey().toString(), a.build());
+                } else {
+                    object.add(e.getKey().toString(), evalue.toString());
+                }
             }
             writer.writeObject(object.build());
@@ -1428 +1439 @@
             for (Entry<String, JsonValue> e: object.entrySet()) {
                 JsonValue value = e.getValue();
-                if (value instanceof JsonString) {
+                if (value instanceof JsonArray) {
+                    List <String> finalList = new ArrayList<String>();
+                    for(JsonString js: ((JsonArray)value).getValuesAs(JsonString.class)) {
+                        finalList.add(js.getString());
+                    }
+                    ret.put(e.getKey(), finalList);
+                } else if (value instanceof JsonString) {
                     // in some cases, when JsonValue.toString() is called, then additional quotation marks are left in value
                     ret.put(e.getKey(), ((JsonString) value).getString());
@@ -1497 +1514 @@
      *
      * The map value (a String) is converted to the field type. Supported
-     * types are: boolean, Boolean, int, Integer, double, Double, String and
-     * Map&lt;String, String&gt;.
+     * types are: boolean, Boolean, int, Integer, double, Double, String,
+     * Map&lt;String, String&gt; and Map&lt;String, List&lt;String&gt;&gt;.
      *
      * Only fields with annotation {@link pref} are taken into account.

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -80 +80 @@
         handleTemplate();
         initProjection();
-        // FIXME: remove in September 2015, when ImageryPreferenceEntry.tileSize will be initialized to -1 instead to 256
-        // need to leave it as it is to keep compatibility between tested and latest JOSM versions
-        tileSize = WMSLayer.PROP_IMAGE_SIZE.get();
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -625 +625 @@
     }
 
-    // FIXME: remove in September 2015, when ImageryPreferenceEntry.tileSize will be initialized to -1 instead to 256
-    // need to leave it as it is to keep compatiblity between tested and latest JOSM versions
-    @Override
-    public int getTileSize() {
-        TileMatrix matrix = getTileMatrix(1);
-        if (matrix == null) {
-            return 1;
-        }
-        return matrix.tileHeight;
-    }
-
     @Override
     public String getTileUrl(int zoom, int tilex, int tiley) {