Changeset 32003 in osm for applications/editors/josm/plugins

Timestamp:

2016-01-18T14:07:47+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: Wikidata label fallback - #josm12397

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (1 diff)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (1 diff)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -239 +239 @@
                     }
                 }
-                return null;
+                final String fallBackLabel = (String) X_PATH.compile("//label/@value").evaluate(xml, XPathConstants.STRING);
+                return fallBackLabel == null || fallBackLabel.isEmpty() ? null : fallBackLabel;
             }
         } catch (Exception ex) {

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -157 +157 @@
         assertThat(WikipediaApp.getLabelForWikidata("Q1741", Locale.GERMAN), is("Wien"));
         assertThat(WikipediaApp.getLabelForWikidata("Q1741", Locale.ENGLISH), is("Vienna"));
+        // fallback to any label
+        assertThat(WikipediaApp.getLabelForWikidata("Q21849466", new Locale("aa")), is("Leoben - Straßennamen mit Geschichte"));
+        // not found -> null
         assertThat(WikipediaApp.getLabelForWikidata("Q" + Long.MAX_VALUE, Locale.ENGLISH), nullValue());
     }