Changeset 18801 in josm for trunk/src/org/openstreetmap/josm/tools/Territories.java

Timestamp:

2023-08-09T15:30:01+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

File:

• trunk/src/org/openstreetmap/josm/tools/Territories.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Territories.java

@@ -200 +200 @@
                     for (JsonValue feature : json.getObject().getJsonArray("features")) {
                         ofNullable(feature.asJsonObject().getJsonObject("properties")).ifPresent(props ->
-                        ofNullable(props.getJsonObject("urls")).ifPresent(urls ->
-                        ofNullable(urls.getString(TAGINFO)).ifPresent(taginfo -> {
+                        ofNullable(props.getJsonObject("urls")).flatMap(urls ->
+                        ofNullable(urls.getString(TAGINFO))).ifPresent(taginfo -> {
                             JsonArray iso1 = props.getJsonArray(ISO3166_1_LC);
                             JsonArray iso2 = props.getJsonArray(ISO3166_2_LC);
@@ -209 +209 @@
                                 readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso2, source);
                             }
-                        })));
+                        }));
                     }
                 }