Changeset 33808 in osm for applications/editors/josm/plugins/wikipedia/src

Timestamp:

2017-11-13T06:31:02+01:00 (7 years ago)

Author:

nyuriks

Message:

renamed Wikosm to Sophox, updated URLs

Location:

applications/editors/josm/plugins/wikipedia/src/org/wikipedia

Files:

• WikipediaPlugin.java (modified) (2 diffs)
• gui/SophoxDownloadReader.java (moved) (moved from applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java ) (17 diffs)
• gui/SophoxServerPreference.java (moved) (moved from applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmServerPreference.java ) (3 diffs)
• io/SophoxDownloadReader.java (moved) (moved from applications/editors/josm/plugins/wikipedia/src/org/wikipedia/io/WikosmDownloadReader.java ) (5 diffs)

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

@@ -28 +28 @@
         MainMenu.add(dataMenu, new WikidataItemSearchDialog.Action());
 
-        DownloadDialog.addDownloadSource(new WikosmDownloadSource());
+        DownloadDialog.addDownloadSource(new SophoxDownloadReader());
     }
 
@@ -42 +42 @@
     public PreferenceSetting getPreferenceSetting() {
         if (preferences == null) {
-            preferences = (new WikosmServerPreference.Factory()).createPreferenceSetting();
+            preferences = (new SophoxServerPreference.Factory()).createPreferenceSetting();
         }
         return preferences;

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

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.wikipedia.io.WikosmDownloadReader;
 
 /**
- * Class defines the way data is fetched from Wikosm API.
+ * Class defines the way data is fetched from Sophox API.
  */
-public class WikosmDownloadSource implements DownloadSource<WikosmDownloadSource.WikosmDownloadData> {
+public class SophoxDownloadReader implements DownloadSource<SophoxDownloadReader.SophoxDownloadData> {
 
     @Override
-    public AbstractDownloadSourcePanel<WikosmDownloadData> createPanel(DownloadDialog dialog) {
-        return new WikosmDownloadSourcePanel(this);
+    public AbstractDownloadSourcePanel<SophoxDownloadData> createPanel(DownloadDialog dialog) {
+        return new SophoxDownloadSourcePanel(this);
     }
 
     @Override
-    public void doDownload(WikosmDownloadData data, DownloadSettings settings) {
+    public void doDownload(SophoxDownloadData data, DownloadSettings settings) {
         Bounds area = settings.getDownloadBounds().orElse(new Bounds(0, 0, 0, 0));
         DownloadOsmTask task = new DownloadOsmTask();
         task.setZoomAfterDownload(settings.zoomToData());
         Future<?> future = task.download(
-                new WikosmDownloadReader(area, WikosmDownloadReader.WIKOSM_SERVER.get(), data.getQuery(),
+                new org.wikipedia.io.SophoxDownloadReader(area, org.wikipedia.io.SophoxDownloadReader.SOPHOX_SERVER.get(), data.getQuery(),
                         settings.asNewLayer(), data.getDownloadReferrers(), data.getDownloadFull()),
 
@@ -64 +63 @@
     @Override
     public String getLabel() {
-        return tr("Download from Wikosm API");
+        return tr("Download from Sophox API");
     }
 
@@ -73 +72 @@
 
     /**
-     * The GUI representation of the Wikosm download source.
+     * The GUI representation of the Sophox download source.
      */
-    public static class WikosmDownloadSourcePanel extends AbstractDownloadSourcePanel<WikosmDownloadData> {
+    public static class SophoxDownloadSourcePanel extends AbstractDownloadSourcePanel<SophoxDownloadData> {
 
         private static final String HELP_PAGE = "https://wiki.openstreetmap.org/wiki/Wikidata%2BOSM_SPARQL_query_service";
-        private static final String SIMPLE_NAME = "wikosmdownloadpanel";
+        private static final String SIMPLE_NAME = "sophoxdownloadpanel";
         private static final AbstractProperty<Integer> PANEL_SIZE_PROPERTY =
                 new IntegerProperty(TAB_SPLIT_NAMESPACE + SIMPLE_NAME, 150).cached();
-        private static final BooleanProperty WIKOSM_QUERY_LIST_OPENED =
-                new BooleanProperty("download.wikosm.query-list.opened", false);
+        private static final BooleanProperty SOPHOX_QUERY_LIST_OPENED =
+                new BooleanProperty("download.sophox.query-list.opened", false);
         private static final String ACTION_IMG_SUBDIR = "dialogs";
 
-        private final JosmTextArea wikosmQuery;
-        private final UserQueryList wikosmQueryList;
+        private final JosmTextArea sophoxQuery;
+        private final UserQueryList sophoxQueryList;
         private final JCheckBox referrers;
         private final JCheckBox fullRel;
 
         /**
-         * Create a new {@code WikosmDownloadSourcePanel}
+         * Create a new {@code SophoxDownloadSourcePanel}
          * @param ds The download source to create the panel for
          */
-        public WikosmDownloadSourcePanel(WikosmDownloadSource ds) {
+        public SophoxDownloadSourcePanel(SophoxDownloadReader ds) {
             super(ds);
             setLayout(new BorderLayout());
@@ -109 +108 @@
                     "}";
 
-            this.wikosmQuery = new JosmTextArea(queryText, 8, 80);
-
-            this.wikosmQuery.setFont(GuiHelper.getMonospacedFont(wikosmQuery));
-            this.wikosmQuery.addFocusListener(new FocusListener() {
+            this.sophoxQuery = new JosmTextArea(queryText, 8, 80);
+
+            this.sophoxQuery.setFont(GuiHelper.getMonospacedFont(sophoxQuery));
+            this.sophoxQuery.addFocusListener(new FocusListener() {
                 @Override
                 public void focusGained(FocusEvent e) {
-                    wikosmQuery.selectAll();
+                    sophoxQuery.selectAll();
                 }
 
@@ -125 +124 @@
 
 
-            this.wikosmQueryList = new UserQueryList(this, this.wikosmQuery, "download.wikosm.query");
-            this.wikosmQueryList.setPreferredSize(new Dimension(350, 300));
+            this.sophoxQueryList = new UserQueryList(this, this.sophoxQuery, "download.sophox.query");
+            this.sophoxQueryList.setPreferredSize(new Dimension(350, 300));
 
             EditSnippetAction edit = new EditSnippetAction();
             RemoveSnippetAction remove = new RemoveSnippetAction();
-            this.wikosmQueryList.addSelectionListener(edit);
-            this.wikosmQueryList.addSelectionListener(remove);
+            this.sophoxQueryList.addSelectionListener(edit);
+            this.sophoxQueryList.addSelectionListener(remove);
 
             JPanel listPanel = new JPanel(new GridBagLayout());
             listPanel.add(new JLabel(tr("Your saved queries:")), GBC.eol().insets(2).anchor(GBC.CENTER));
-            listPanel.add(this.wikosmQueryList, GBC.eol().fill(GBC.BOTH));
+            listPanel.add(this.sophoxQueryList, GBC.eol().fill(GBC.BOTH));
             listPanel.add(new JButton(new AddSnippetAction()), GBC.std().fill(GBC.HORIZONTAL));
             listPanel.add(new JButton(edit), GBC.std().fill(GBC.HORIZONTAL));
             listPanel.add(new JButton(remove), GBC.std().fill(GBC.HORIZONTAL));
-            listPanel.setVisible(WIKOSM_QUERY_LIST_OPENED.get());
-
-            JScrollPane scrollPane = new JScrollPane(wikosmQuery);
+            listPanel.setVisible(SOPHOX_QUERY_LIST_OPENED.get());
+
+            JScrollPane scrollPane = new JScrollPane(sophoxQuery);
             BasicArrowButton arrowButton = new BasicArrowButton(listPanel.isVisible()
                     ? BasicArrowButton.EAST
                     : BasicArrowButton.WEST);
-            arrowButton.setToolTipText(tr("Show/hide Wikosm snippet list"));
+            arrowButton.setToolTipText(tr("Show/hide Sophox snippet list"));
             arrowButton.addActionListener(e -> {
                 if (listPanel.isVisible()) {
                     listPanel.setVisible(false);
                     arrowButton.setDirection(BasicArrowButton.WEST);
-                    WIKOSM_QUERY_LIST_OPENED.put(Boolean.FALSE);
+                    SOPHOX_QUERY_LIST_OPENED.put(Boolean.FALSE);
                 } else {
                     listPanel.setVisible(true);
                     arrowButton.setDirection(BasicArrowButton.EAST);
-                    WIKOSM_QUERY_LIST_OPENED.put(Boolean.TRUE);
+                    SOPHOX_QUERY_LIST_OPENED.put(Boolean.TRUE);
                 }
             });
@@ -165 +164 @@
             referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.,"
                     + "parent relations and for nodes, additionally, parent ways"));
-            referrers.setSelected(Main.pref.getBoolean("wikosm.downloadprimitive.referrers", true));
-            referrers.addActionListener(e -> Main.pref.putBoolean("wikosm.downloadprimitive.referrers", referrers.isSelected()));
+            referrers.setSelected(Main.pref.getBoolean("sophox.downloadprimitive.referrers", true));
+            referrers.addActionListener(e -> Main.pref.putBoolean("sophox.downloadprimitive.referrers", referrers.isSelected()));
 
             fullRel = new JCheckBox(tr("Download relation members"));
             fullRel.setToolTipText(tr("Select if the members of a relation should be downloaded as well"));
-            fullRel.setSelected(Main.pref.getBoolean("wikosm.downloadprimitive.full", true));
-            fullRel.addActionListener(e -> Main.pref.putBoolean("wikosm.downloadprimitive.full", fullRel.isSelected()));
+            fullRel.setSelected(Main.pref.getBoolean("sophox.downloadprimitive.full", true));
+            fullRel.addActionListener(e -> Main.pref.putBoolean("sophox.downloadprimitive.full", fullRel.isSelected()));
 
             // https://stackoverflow.com/questions/527719/how-to-add-hyperlink-in-jlabel
@@ -201 +200 @@
 
         @Override
-        public WikosmDownloadData getData() {
-            String query = wikosmQuery.getText();
+        public SophoxDownloadData getData() {
+            String query = sophoxQuery.getText();
             /*
              * A callback that is passed to PostDownloadReporter that is called once the download task
              * has finished. According to the number of errors happened, their type we decide whether we
-             * want to save the last query in WikosmQueryList.
+             * want to save the last query in SophoxQueryList.
              */
             Consumer<Collection<Object>> errorReporter = errors -> {
@@ -214 +213 @@
 
                 if (errors.isEmpty() || onlyNoDataError) {
-                    wikosmQueryList.saveHistoricItem(query);
+                    sophoxQueryList.saveHistoricItem(query);
                 }
             };
 
-            return new WikosmDownloadData(query, referrers.isSelected(), fullRel.isSelected(), errorReporter);
+            return new SophoxDownloadData(query, referrers.isSelected(), fullRel.isSelected(), errorReporter);
         }
 
@@ -236 +235 @@
 
             /*
-             * Absence of the selected area can be justified only if the Wikosm query
+             * Absence of the selected area can be justified only if the Sophox query
              * is not restricted to bbox.
              */
@@ -257 +256 @@
         @Override
         public Icon getIcon() {
-            return ImageProvider.get(ACTION_IMG_SUBDIR, "wikosm");
+            return ImageProvider.get(ACTION_IMG_SUBDIR, "sophox");
         }
 
@@ -286 +285 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                wikosmQueryList.createNewItem();
+                sophoxQueryList.createNewItem();
             }
         }
@@ -307 +306 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                wikosmQueryList.removeSelectedItem();
+                sophoxQueryList.removeSelectedItem();
             }
 
@@ -314 +313 @@
              */
             void checkEnabled() {
-                setEnabled(wikosmQueryList.getSelectedItem().isPresent());
+                setEnabled(sophoxQueryList.getSelectedItem().isPresent());
             }
 
@@ -340 +339 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                wikosmQueryList.editSelectedItem();
+                sophoxQueryList.editSelectedItem();
             }
 
@@ -347 +346 @@
              */
             void checkEnabled() {
-                setEnabled(wikosmQueryList.getSelectedItem().isPresent());
+                setEnabled(sophoxQueryList.getSelectedItem().isPresent());
             }
 
@@ -358 +357 @@
 
     /**
-     * Encapsulates data that is required to preform download from Wikosm API.
+     * Encapsulates data that is required to preform download from Sophox API.
      */
-    static class WikosmDownloadData {
+    static class SophoxDownloadData {
         private final String query;
         private final boolean downloadReferrers;
@@ -366 +365 @@
         private final Consumer<Collection<Object>> errorReporter;
 
-        WikosmDownloadData(String query, boolean downloadReferrers, boolean downloadFull, Consumer<Collection<Object>> errorReporter) {
+        SophoxDownloadData(String query, boolean downloadReferrers, boolean downloadFull, Consumer<Collection<Object>> errorReporter) {
             this.query = query;
             this.downloadReferrers = downloadReferrers;

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
-import org.wikipedia.io.WikosmDownloadReader;
+import org.wikipedia.io.SophoxDownloadReader;
 
 /**
- * Preferences related to Wikosm API servers.
+ * Preferences related to Sophox API servers.
  */
-public class WikosmServerPreference implements SubPreferenceSetting {
+public class SophoxServerPreference implements SubPreferenceSetting {
 
-    private final HistoryComboBox wikosmServer = new HistoryComboBox();
+    private final HistoryComboBox SophoxServer = new HistoryComboBox();
 
     /**
-     * Factory used to create a new {@link WikosmServerPreference}.
+     * Factory used to create a new {@link SophoxServerPreference}.
      */
     public static class Factory implements PreferenceSettingFactory {
         @Override
         public PreferenceSetting createPreferenceSetting() {
-            return new WikosmServerPreference();
+            return new SophoxServerPreference();
         }
     }
@@ -48 +48 @@
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         panel.add(new JLabel(tr("Server: ")), GBC.std().insets(5, 5, 5, 5));
-        panel.add(wikosmServer, GBC.eop().fill(GBC.HORIZONTAL));
-        wikosmServer.setPossibleItems(WikosmDownloadReader.WIKOSM_SERVER_HISTORY.get());
-        wikosmServer.setText(WikosmDownloadReader.WIKOSM_SERVER.get());
+        panel.add(SophoxServer, GBC.eop().fill(GBC.HORIZONTAL));
+        SophoxServer.setPossibleItems(SophoxDownloadReader.SOPHOX_SERVER_HISTORY.get());
+        SophoxServer.setText(SophoxDownloadReader.SOPHOX_SERVER.get());
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill());
@@ -59 +59 @@
     @Override
     public boolean ok() {
-        WikosmDownloadReader.WIKOSM_SERVER.put(wikosmServer.getText());
-        WikosmDownloadReader.WIKOSM_SERVER_HISTORY.put(wikosmServer.getHistory());
+        SophoxDownloadReader.SOPHOX_SERVER.put(SophoxServer.getText());
+        SophoxDownloadReader.SOPHOX_SERVER_HISTORY.put(SophoxServer.getHistory());
         return false;
     }

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/io/SophoxDownloadReader.java

@@ -36 +36 @@
 
 /**
- * Read content from an Wikosm server.
+ * Read content from an Sophox server.
  */
-public class WikosmDownloadReader extends BoundingBoxDownloader {
+public class SophoxDownloadReader extends BoundingBoxDownloader {
 
     /**
-     * Property for current Wikosm server.
+     * Property for current Sophox server.
      */
-    public static final StringProperty WIKOSM_SERVER = new StringProperty("download.wikosm.server",
-            "http://88.99.164.208/bigdata/namespace/wdq/sparql");
+    public static final StringProperty SOPHOX_SERVER = new StringProperty("download.sophox.server",
+            "https://sophox.org/bigdata/namespace/wdq/sparql");
     /**
-     * Property for list of known Wikosm servers.
+     * Property for list of known Sophox servers.
      */
 // TODO: Core dependency:
-//    public static final ListProperty WIKOSM_SERVER_HISTORY = new ListProperty("download.wikosm.servers",
-//            Arrays.asList("http://88.99.164.208/bigdata/namespace/wdq/sparql"));
-    public static final ListProperty WIKOSM_SERVER_HISTORY = new ListProperty("download.wikosm.servers",
-            Arrays.asList("http://88.99.164.208/bigdata/namespace/wdq/sparql"));
+//    public static final ListProperty SOPHOX_SERVER_HISTORY = new ListProperty("download.sophox.servers",
+//            Arrays.asList("https://sophox.org/bigdata/namespace/wdq/sparql"));
+    public static final ListProperty SOPHOX_SERVER_HISTORY = new ListProperty("download.sophox.servers",
+            Arrays.asList("https://sophox.org/bigdata/namespace/wdq/sparql"));
 
     private static final String DATA_PREFIX = "?query=";
 
-    private final String wikosmServer;
-    private final String wikosmQuery;
+    private final String sophoxServer;
+    private final String sophoxQuery;
     private final boolean asNewLayer;
     private final boolean downloadReferrers;
@@ -63 +63 @@
 
     /**
-     * Constructs a new {@code WikosmDownloadReader}.
+     * Constructs a new {@code SophoxDownloadReader}.
      *
      * @param downloadArea The area to download
-     * @param wikosmServer The Wikosm server to use
-     * @param wikosmQuery  The Wikosm query
+     * @param sophoxServer The Sophox server to use
+     * @param sophoxQuery  The Sophox query
      */
-    public WikosmDownloadReader(Bounds downloadArea, String wikosmServer, String wikosmQuery,
+    public SophoxDownloadReader(Bounds downloadArea, String sophoxServer, String sophoxQuery,
                                 boolean asNewLayer, boolean downloadReferrers, boolean downloadFull) {
         super(downloadArea);
         setDoAuthenticate(false);
-        this.wikosmServer = wikosmServer;
-        this.wikosmQuery = wikosmQuery.trim();
+        this.sophoxServer = sophoxServer;
+        this.sophoxQuery = sophoxQuery.trim();
         this.asNewLayer = asNewLayer;
         this.downloadReferrers = downloadReferrers;
@@ -82 +82 @@
     @Override
     protected String getBaseUrl() {
-        return wikosmServer;
+        return sophoxServer;
     }
 
     @Override
     protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
-        final String query = this.wikosmQuery
+        final String query = this.sophoxQuery
                 .replace("{{boxParams}}", boxParams(lon1, lat1, lon2, lat2))
                 .replace("{{center}}", center(lon1, lat1, lon2, lat2));
@@ -204 +204 @@
     protected void adaptRequest(HttpClient request) {
         // see https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#timeout
-        final Matcher timeoutMatcher = Pattern.compile("#timeout:(\\d+)").matcher(wikosmQuery);
+        final Matcher timeoutMatcher = Pattern.compile("#timeout:(\\d+)").matcher(sophoxQuery);
         final int timeout;
         if (timeoutMatcher.find()) {
@@ -265 +265 @@
         DataSet ds = super.parseOsm(progressMonitor);
 
-        // add bounds if necessary (note that Wikosm API does not return bounds in the response XML)
-        if (ds != null && ds.getDataSources().isEmpty() && wikosmQuery.contains("{{boxParams}}")) {
+        // add bounds if necessary (note that Sophox API does not return bounds in the response XML)
+        if (ds != null && ds.getDataSources().isEmpty() && sophoxQuery.contains("{{boxParams}}")) {
             if (crosses180th) {
                 Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);