Changeset 33075 in osm for applications/editors

Timestamp:

2016-11-18T20:00:49+01:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: Refactoring (wikipediaLang as field)

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (11 diffs)
• src/org/wikipedia/actions/FetchWikidataAction.java (modified) (1 diff)
• src/org/wikipedia/actions/WikipediaAddNamesAction.java (modified) (1 diff)
• src/org/wikipedia/data/WikipediaEntry.java (modified) (1 diff)
• src/org/wikipedia/gui/WikipediaCategorySearchDialog.java (modified) (1 diff)
• src/org/wikipedia/gui/WikipediaToggleDialog.java (modified) (6 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (8 diffs)

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

@@ -44 +44 @@
     public static final Pattern WIKIDATA_PATTERN = Pattern.compile("Q\\d+");
     private static final XPath X_PATH = XPath.getInstance();
-
-    private WikipediaApp() {
+    private final String wikipediaLang;
+
+    private WikipediaApp(final String wikipediaLang) {
+        this.wikipediaLang = wikipediaLang;
+    }
+
+    public static WikipediaApp forLanguage(final String wikipediaLang) {
+        return new WikipediaApp(wikipediaLang);
     }
 
@@ -56 +62 @@
     }
 
-    public static String getSiteUrl(String wikipediaLang) {
+    public String getSiteUrl() {
         if ("wikidata".equals(wikipediaLang)) {
             return "https://www.wikidata.org";
@@ -64 +70 @@
     }
 
-    public static List<WikipediaEntry> getEntriesFromCoordinates(String wikipediaLang, LatLon min, LatLon max) {
+    public List<WikipediaEntry> getEntriesFromCoordinates(LatLon min, LatLon max) {
         try {
             // construct url
-            final String url = getSiteUrl(wikipediaLang) + "/w/api.php"
+            final String url = getSiteUrl() + "/w/api.php"
                     + "?action=query"
                     + "&list=geosearch"
@@ -120 +126 @@
     }
 
-    public static List<WikipediaEntry> getEntriesFromCategory(String wikipediaLang, String category, int depth) {
+    public List<WikipediaEntry> getEntriesFromCategory(String category, int depth) {
         try {
             final String url = "https://tools.wmflabs.org/cats-php/"
@@ -145 +151 @@
     }
 
-    public static void updateWIWOSMStatus(String wikipediaLang, List<WikipediaEntry> entries) {
+    public void updateWIWOSMStatus(List<WikipediaEntry> entries) {
         if (entries.size() > 20) {
-            partitionList(entries, 20).forEach(chunk -> updateWIWOSMStatus(wikipediaLang, chunk));
+            partitionList(entries, 20).forEach(chunk -> updateWIWOSMStatus(chunk));
             return;
         }
@@ -179 +185 @@
     }
 
-    public static Stream<String> getWikipediaArticles(final String wikipediaLang, OsmPrimitive p) {
+    public Stream<String> getWikipediaArticles(final OsmPrimitive p) {
         if ("wikidata".equals(wikipediaLang)) {
             return Stream.of(p.get("wikidata")).filter(Objects::nonNull);
@@ -194 +200 @@
      * Returns a map mapping wikipedia articles to wikidata ids.
      */
-    public static Map<String, String> getWikidataForArticles(String wikipediaLang, List<String> articles) {
+    public Map<String, String> getWikidataForArticles(Collection<String> articles) {
         return articles.stream()
                 .distinct()
@@ -216 +222 @@
                 .values()
                 .stream()
-                .flatMap(chunk -> getWikidataForArticles0(wikipediaLang, chunk).entrySet().stream())
+                .flatMap(chunk -> getWikidataForArticles0(chunk).entrySet().stream())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
-    private static Map<String, String> getWikidataForArticles0(String wikipediaLang, List<String> articles) {
+    private Map<String, String> getWikidataForArticles0(List<String> articles) {
         if (articles.isEmpty()) {
             return Collections.emptyMap();
@@ -249 +255 @@
     }
 
-    public static List<String> getCategoriesForPrefix(final String wikipediaLang, final String prefix) {
-        try {
-            final String url = getSiteUrl(wikipediaLang) + "/w/api.php"
+    public List<String> getCategoriesForPrefix(final String prefix) {
+        try {
+            final String url = getSiteUrl() + "/w/api.php"
                     + "?action=query"
                     + "&list=prefixsearch"
@@ -334 +340 @@
     }
 
-    public static Collection<WikipediaEntry> getInterwikiArticles(String wikipediaLang, String article) {
-        try {
-            final String url = getSiteUrl(wikipediaLang) + "/w/api.php" +
+    public Collection<WikipediaEntry> getInterwikiArticles(String article) {
+        try {
+            final String url = getSiteUrl() + "/w/api.php" +
                     "?action=query" +
                     "&prop=langlinks" +
@@ -356 +362 @@
     }
 
-    public static LatLon getCoordinateForArticle(String wikipediaLang, String article) {
-        try {
-            final String url = getSiteUrl(wikipediaLang) + "/w/api.php" +
+    public LatLon getCoordinateForArticle(String article) {
+        try {
+            final String url = getSiteUrl() + "/w/api.php" +
                     "?action=query" +
                     "&prop=coordinates" +

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/FetchWikidataAction.java

@@ -129 +129 @@
                     "Fetching {0} Wikidata ID for language ''{1}''",
                     "Fetching {0} Wikidata IDs for language ''{1}''", size, size, lang));
-            final Map<String, String> wikidataByWikipedia = WikipediaApp.getWikidataForArticles(lang, new ArrayList<>(byArticle.keySet()));
+            final Map<String, String> wikidataByWikipedia = WikipediaApp.forLanguage(lang).getWikidataForArticles(byArticle.keySet());
             ConditionalOptionPaneUtil.startBulkOperation(GuiUtils.PREF_OVERWRITE);
             for (Map.Entry<String, Set<OsmPrimitive>> i : byArticle.entrySet()) {

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaAddNamesAction.java

@@ -31 +31 @@
         final WikipediaEntry wp = WikipediaEntry.parseTag("wikipedia", getWikipediaValue());
         List<String[]> tags = new ArrayList<>();
-        WikipediaApp.getInterwikiArticles(wp.lang, wp.article).stream()
+        WikipediaApp.forLanguage(wp.lang).getInterwikiArticles(wp.article).stream()
                 .filter(this::useWikipediaLangArticle)
                 .map(i -> new String[]{"name:" + i.lang, i.article})

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaEntry.java

@@ -80 +80 @@
 
     public String getBrowserUrl() {
-        return WikipediaApp.getSiteUrl(lang) + "/wiki/" + Utils.encodeUrl(article.replace(" ", "_"));
+        return WikipediaApp.forLanguage(lang).getSiteUrl() + "/wiki/" + Utils.encodeUrl(article.replace(" ", "_"));
     }
 

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaCategorySearchDialog.java

@@ -58 +58 @@
                 final List<String> entries = query == null || query.isEmpty()
                         ? Collections.emptyList()
-                        : WikipediaApp.getCategoriesForPrefix(WikipediaToggleDialog.wikipediaLang.get(), query);
+                        : WikipediaApp.forLanguage(WikipediaToggleDialog.wikipediaLang.get()).getCategoriesForPrefix(query);
                 GuiHelper.runInEDT(() -> lsResultModel.setItems(entries));
             }, 200, TimeUnit.MILLISECONDS);

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java

@@ -113 +113 @@
     private void updateTitle() {
         final String lang = getLanguageOfFirstItem();
-        final String host = WikipediaApp.getSiteUrl(lang).split("/+")[1];
+        final String host = WikipediaApp.forLanguage(lang).getSiteUrl().split("/+")[1];
         if (titleContext == null) {
             setTitle(host);
@@ -155 +155 @@
                     @Override
                     List<WikipediaEntry> getEntries() {
-                        return WikipediaApp.getEntriesFromCoordinates(
-                                wikidata ? "wikidata" : wikipediaLang.get(), min, max);
+                        return WikipediaApp.forLanguage(wikidata ? "wikidata" : wikipediaLang.get())
+                                .getEntriesFromCoordinates(min, max);
                     }
                 }.execute();
@@ -175 +175 @@
             publish(entries.toArray(new WikipediaEntry[entries.size()]));
             WikipediaApp.partitionList(entries, 20).forEach(chunk -> {
-                WikipediaApp.updateWIWOSMStatus(chunk.get(0).lang, chunk);
+                WikipediaApp.forLanguage(chunk.get(0).lang).updateWIWOSMStatus(chunk);
                 list.repaint();
             });
@@ -217 +217 @@
                 @Override
                 List<WikipediaEntry> getEntries() {
-                    return WikipediaApp.getEntriesFromCategory(
-                            wikipediaLang.get(), category, Main.pref.getInteger("wikipedia.depth", 3));
+                    return WikipediaApp.forLanguage(wikipediaLang.get())
+                            .getEntriesFromCategory(category, Main.pref.getInteger("wikipedia.depth", 3));
                 }
             }.execute();
@@ -341 +341 @@
             final LatLon latLon = entry.coordinate != null
                     ? entry.coordinate
-                    : WikipediaApp.getCoordinateForArticle(entry.lang, entry.article);
+                    : WikipediaApp.forLanguage(entry.lang).getCoordinateForArticle(entry.article);
             if (latLon == null) {
                 return;
@@ -354 +354 @@
         if (Main.main != null && Main.getLayerManager().getEditDataSet() != null) {
             Main.getLayerManager().getEditDataSet().allPrimitives().stream()
-                    .flatMap(p -> WikipediaApp.getWikipediaArticles(language, p))
+                    .flatMap(p -> WikipediaApp.forLanguage(language).getWikipediaArticles(p))
                     .forEach(articles::add);
         }

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

@@ -55 +55 @@
     @Test
     public void testGetInterwikiArticles1() {
-        final Collection<WikipediaEntry> iw = WikipediaApp.getInterwikiArticles("de", "Österreich");
+        final Collection<WikipediaEntry> iw = WikipediaApp.forLanguage("de").getInterwikiArticles("Österreich");
         assertThat(iw, hasItem(new WikipediaEntry("en", "Austria")));
         assertThat(iw, hasItem(new WikipediaEntry("no", "Østerrike")));
@@ -63 +63 @@
     @Test
     public void testGetInterwikiArticles2() {
-        final Collection<WikipediaEntry> iw = WikipediaApp.getInterwikiArticles("en", "Ampersand");
+        final Collection<WikipediaEntry> iw = WikipediaApp.forLanguage("en").getInterwikiArticles("Ampersand");
         assertThat(iw, hasItem(new WikipediaEntry("fi", "&")));
     }
@@ -69 +69 @@
     @Test
     public void testGetCoordinates() throws Exception {
-        assertThat(WikipediaApp.getCoordinateForArticle("de", "Marchreisenspitze"), is(new LatLon(47.1725, 11.30833333)));
-        assertThat(WikipediaApp.getCoordinateForArticle("en", "Austria"), is(new LatLon(47.33333333, 13.33333333)));
-        assertThat(WikipediaApp.getCoordinateForArticle("en", "Foobar2000"), nullValue());
+        assertThat(WikipediaApp.forLanguage("de").getCoordinateForArticle("Marchreisenspitze"), is(new LatLon(47.1725, 11.30833333)));
+        assertThat(WikipediaApp.forLanguage("en").getCoordinateForArticle("Austria"), is(new LatLon(47.33333333, 13.33333333)));
+        assertThat(WikipediaApp.forLanguage("en").getCoordinateForArticle("Foobar2000"), nullValue());
     }
 
     @Test
     public void testFromCoordinates() throws Exception {
-        final List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates("de",
-                new LatLon(52.5179786, 13.3753321), new LatLon(52.5192215, 13.3768705));
+        final List<WikipediaEntry> entries = WikipediaApp.forLanguage("de")
+                .getEntriesFromCoordinates(new LatLon(52.5179786, 13.3753321), new LatLon(52.5192215, 13.3768705));
         final long c = entries.stream()
                 .filter(entry -> "Reichstagsgebäude".equals(entry.article) && "de".equals(entry.lang))
@@ -98 +98 @@
     @Test
     public void testFromCoordinatesWikidata() throws Exception {
-        final List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates("wikidata",
-                new LatLon(47.20, 11.30), new LatLon(47.22, 11.32));
+        final List<WikipediaEntry> entries = WikipediaApp.forLanguage("wikidata")
+                .getEntriesFromCoordinates(new LatLon(47.20, 11.30), new LatLon(47.22, 11.32));
         final long c = entries.stream()
                 .map(WikidataEntry.class::cast)
@@ -109 +109 @@
     @Test
     public void testGetWikidataForArticles() throws Exception {
-        final Map<String, String> map = WikipediaApp.getWikidataForArticles("en",
-                Arrays.asList("London", "Vienna", "Völs, Tyrol", "a-non-existing-article"));
+        final Map<String, String> map = WikipediaApp.forLanguage("en")
+                .getWikidataForArticles(Arrays.asList("London", "Vienna", "Völs, Tyrol", "a-non-existing-article"));
         assertThat(map.get("London"), is("Q84"));
         assertThat(map.get("Vienna"), is("Q1741"));
@@ -120 +120 @@
     @Test
     public void testTicket13991() throws Exception {
-        final Map<String, String> map = WikipediaApp.getWikidataForArticles("en",
-                Stream.iterate("London", x -> x).limit(100).collect(Collectors.toList()));
+        final Map<String, String> map = WikipediaApp.forLanguage("en")
+                .getWikidataForArticles(Stream.iterate("London", x -> x).limit(100).collect(Collectors.toList()));
         assertThat(map, is(Collections.singletonMap("London", "Q84")));
         final List<String> articles = IntStream.range(0, 200)
                 .mapToObj(i -> "a-non-existing-article-" + i)
                 .collect(Collectors.toList());
-        assertTrue(WikipediaApp.getWikidataForArticles("en", articles).isEmpty());
+        assertTrue(WikipediaApp.forLanguage("en").getWikidataForArticles(articles).isEmpty());
     }
 
@@ -154 +154 @@
         final WikipediaEntry entry2 = new WikipediaEntry("en", "London");
         final WikipediaEntry entry3 = new WikipediaEntry("en", "a-non-existing-article");
-        WikipediaApp.updateWIWOSMStatus("en", Arrays.asList(entry1, entry2, entry3));
+        WikipediaApp.forLanguage("en").updateWIWOSMStatus(Arrays.asList(entry1, entry2, entry3));
         assertThat(entry1.getWiwosmStatus(), is(true));
         assertThat(entry2.getWiwosmStatus(), is(true));
@@ -162 +162 @@
     @Test
     public void testCategoriesForPrefix() throws Exception {
-        final List<String> categories = WikipediaApp.getCategoriesForPrefix("de", "Gemeinde in Öster");
+        final List<String> categories = WikipediaApp.forLanguage("de").getCategoriesForPrefix("Gemeinde in Öster");
         assertTrue(categories.contains("Gemeinde in Österreich"));
     }