Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 12816)
@@ -21,7 +21,7 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
+import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
@@ -1090,5 +1090,5 @@
      * visitor function.
      * @param visitor The visitor from which the visit() function must be called.
-     * @deprecated will be removed along with {@link Visitor}
+     * @deprecated will be removed along with {@link org.openstreetmap.josm.data.osm.visitor.Visitor}
      */
     @Deprecated
Index: /trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java	(revision 12816)
@@ -35,5 +35,4 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.download.DownloadSourceSizingPolicy.AdjustableDownloadSizePolicy;
-import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -63,5 +62,5 @@
         task.setZoomAfterDownload(settings.zoomToData());
         Future<?> future = task.download(
-                new OverpassDownloadReader(area, OverpassServerPreference.getOverpassServer(), data.getQuery()),
+                new OverpassDownloadReader(area, OverpassDownloadReader.OVERPASS_SERVER.get(), data.getQuery()),
                 settings.asNewLayer(), area, null);
         MainApplication.worker.submit(new PostDownloadHandler(task, future, data.getErrorReporter()));
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreference.java	(revision 12816)
@@ -5,5 +5,4 @@
 
 import java.awt.GridBagLayout;
-import java.util.Arrays;
 
 import javax.swing.BorderFactory;
@@ -13,7 +12,4 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
-import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -22,4 +18,5 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
+import org.openstreetmap.josm.io.OverpassDownloadReader;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -30,10 +27,4 @@
  */
 public class OverpassServerPreference implements SubPreferenceSetting {
-
-    private static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server",
-            "https://overpass-api.de/api/");
-    private static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
-            Arrays.asList("https://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));
-    private static final BooleanProperty FOR_MULTI_FETCH = new BooleanProperty("download.overpass.for-multi-fetch", false);
 
     private final HistoryComboBox overpassServer = new HistoryComboBox();
@@ -62,9 +53,9 @@
         panel.add(new JLabel(tr("Overpass server: ")), GBC.std().insets(5, 5, 5, 5));
         panel.add(overpassServer, GBC.eop().fill(GBC.HORIZONTAL));
-        overpassServer.setPossibleItems(OVERPASS_SERVER_HISTORY.get());
-        overpassServer.setText(OVERPASS_SERVER.get());
+        overpassServer.setPossibleItems(OverpassDownloadReader.OVERPASS_SERVER_HISTORY.get());
+        overpassServer.setText(OverpassDownloadReader.OVERPASS_SERVER.get());
 
         panel.add(forMultiFetch, GBC.eop());
-        forMultiFetch.setSelected(useForMultiFetch());
+        forMultiFetch.setSelected(OverpassDownloadReader.FOR_MULTI_FETCH.get());
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill());
@@ -75,7 +66,7 @@
     @Override
     public boolean ok() {
-        OVERPASS_SERVER.put(overpassServer.getText());
-        OVERPASS_SERVER_HISTORY.put(overpassServer.getHistory());
-        FOR_MULTI_FETCH.put(forMultiFetch.isSelected());
+        OverpassDownloadReader.OVERPASS_SERVER.put(overpassServer.getText());
+        OverpassDownloadReader.OVERPASS_SERVER_HISTORY.put(overpassServer.getHistory());
+        OverpassDownloadReader.FOR_MULTI_FETCH.put(forMultiFetch.isSelected());
         return false;
     }
@@ -89,7 +80,9 @@
      * Returns the URL of the currently selected Overpass server.
      * @return the URL of the currently selected Overpass server.
+     * @deprecated To be removed end of 2017. Use {@code OverpassDownloadReader.OVERPASS_SERVER.get()} instead
      */
+    @Deprecated
     public static String getOverpassServer() {
-        return OVERPASS_SERVER.get();
+        return OverpassDownloadReader.OVERPASS_SERVER.get();
     }
 
@@ -97,7 +90,9 @@
      * Returns true if objects should be fetched from an Overpass server instead of the OSM API.
      * @return true if objects should be fetched from an Overpass server instead of the OSM API.
+     * @deprecated To be removed end of 2017. Use {@code OverpassDownloadReader.FOR_MULTI_FETCH.get()} instead
      */
+    @Deprecated
     public static boolean useForMultiFetch() {
-        return FOR_MULTI_FETCH.get();
+        return OverpassDownloadReader.FOR_MULTI_FETCH.get();
     }
 }
Index: /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 12816)
@@ -30,7 +30,7 @@
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
@@ -65,5 +65,5 @@
     public GeoJSONWriter(DataSet ds) {
         this.data = ds;
-        this.projection = ProjectionPreference.wgs84.getProjection();
+        this.projection = Projections.getProjectionByCode("EPSG:4326"); // WGS 84
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java	(revision 12816)
@@ -6,5 +6,4 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -25,5 +24,5 @@
     @Override
     protected String getBaseUrl() {
-        return OverpassServerPreference.getOverpassServer();
+        return OverpassDownloadReader.OVERPASS_SERVER.get();
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 12816)
@@ -35,5 +35,4 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -87,5 +86,5 @@
     /**
      * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
-     * depending on the {@link OverpassServerPreference#useForMultiFetch preference}.
+     * depending on the {@link OverpassDownloadReader#FOR_MULTI_FETCH preference}.
      *
      * @return a new instance
@@ -93,5 +92,5 @@
      */
     public static MultiFetchServerObjectReader create() {
-        return create(OverpassServerPreference.useForMultiFetch());
+        return create(OverpassDownloadReader.FOR_MULTI_FETCH.get());
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 12815)
+++ /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 12816)
@@ -11,4 +11,5 @@
 import java.time.Period;
 import java.time.ZoneOffset;
+import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.Locale;
@@ -31,4 +32,7 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.NameFinder.SearchResult;
@@ -44,4 +48,22 @@
  */
 public class OverpassDownloadReader extends BoundingBoxDownloader {
+
+    /**
+     * Property for current Overpass server.
+     * @since 12816
+     */
+    public static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server",
+            "https://overpass-api.de/api/");
+    /**
+     * Property for list of known Overpass servers.
+     * @since 12816
+     */
+    public static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
+            Arrays.asList("https://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));
+    /**
+     * Property to determine if Overpass API should be used for multi-fetch download.
+     * @since 12816
+     */
+    public static final BooleanProperty FOR_MULTI_FETCH = new BooleanProperty("download.overpass.for-multi-fetch", false);
 
     private static final String DATA_PREFIX = "?data=";