Changeset 32892 in osm for applications/editors

Timestamp:

2016-08-30T13:27:07+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: refactoring (move label to WikidataEntry)

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (1 diff)
• src/org/wikipedia/data/WikidataEntry.java (modified) (2 diffs)
• src/org/wikipedia/data/WikipediaEntry.java (modified) (4 diffs)
• src/org/wikipedia/gui/WikipediaToggleDialog.java (modified) (2 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (1 diff)

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

@@ -83 +83 @@
                                 return new WikidataEntry(name, null, latLon, null);
                             } else {
-                                return new WikipediaEntry(wikipediaLang, name, name, latLon);
+                                return new WikipediaEntry(wikipediaLang, name, latLon);
                             }
                         }).collect(Collectors.toList());

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

@@ -4 +4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp;
 
+import java.util.Comparator;
+import java.util.Optional;
+
 public class WikidataEntry extends WikipediaEntry {
 
+    public final String label;
     public final String description;
 
     public WikidataEntry(String id, String label, LatLon coordinate, String description) {
-        super("wikidata", id, label, coordinate);
+        super("wikidata", id, coordinate);
+        this.label = label;
         this.description = description;
         ensureValidWikidataId(id);
@@ -33 +39 @@
     }
 
+    @Override
+    public String getSearchText() {
+        return Optional.ofNullable(label).orElse(article);
+    }
+
     private static void ensureValidWikidataId(String id) {
         CheckParameterUtil.ensureThat(WikipediaApp.WIKIDATA_PATTERN.matcher(id).matches(), "Invalid Wikidata ID given: " + id);
     }
+
+    @Override
+    public int compareTo(WikipediaEntry o) {
+        if (o instanceof WikidataEntry) {
+            return Comparator
+                    .<WikidataEntry, String>comparing(x -> x.label, AlphanumComparator.getInstance())
+                    .thenComparing(x -> x.article, AlphanumComparator.getInstance())
+                    .compare(this, ((WikidataEntry) o));
+        } else {
+            return super.compareTo(o);
+        }
+    }
 }

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

@@ -8 +8 @@
 import org.wikipedia.WikipediaApp;
 
-import java.util.Comparator;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -17 +16 @@
     public final String lang;
     public final String article;
-    public final String label;
     public final LatLon coordinate;
     private Boolean wiwosmStatus;
 
     public WikipediaEntry(String lang, String article) {
-        this(lang, article, null, null);
+        this(lang, article, null);
     }
 
-    public WikipediaEntry(String lang, String article, String label, LatLon coordinate) {
+    public WikipediaEntry(String lang, String article, LatLon coordinate) {
         this.lang = lang;
         this.article = article;
-        this.label = label;
         this.coordinate = coordinate;
     }
@@ -90 +87 @@
     }
 
+    public String getSearchText() {
+        return article;
+    }
+
     @Override
     public String toString() {
@@ -97 +98 @@
     @Override
     public int compareTo(WikipediaEntry o) {
-        return Comparator
-                .<WikipediaEntry, String>comparing(x -> x.label, AlphanumComparator.getInstance())
-                .thenComparing(x -> x.article, AlphanumComparator.getInstance())
-                .compare(this, o);
+        return AlphanumComparator.getInstance().compare(article, o.article);
     }
 

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

@@ -11 +11 @@
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
@@ -79 +78 @@
                             Main.map.mapView.zoomTo(bbox);
                         }
-                        final String search = Optional.ofNullable(entry.label).orElse(entry.article).replaceAll("\\(.*\\)", "");
+                        final String search = entry.getSearchText().replaceAll("\\(.*\\)", "");
                         SearchAction.search(search, SearchAction.SearchMode.replace);
                     }

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

@@ -97 +97 @@
                 new LatLon(47.20, 11.30), new LatLon(47.22, 11.32));
         final long c = entries.stream()
+                .map(WikidataEntry.class::cast)
                 .filter(entry -> "Q865406".equals(entry.article) && "wikidata".equals(entry.lang) && "Birgitzer Alm".equals(entry.label))
                 .count();