Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (revision 16134)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (revision 16135)
@@ -28,4 +28,6 @@
package org.openstreetmap.josm.plugins.osb;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -87,25 +89,39 @@
}
+ // check, which api is used
+ String uriNew = Main.pref.get(ConfigKeys.OSB_API_URI_NEW);
+ boolean oldApi = uriNew != null && uriNew.contains("appspot");
+ boolean switchApi = true;
+ if(oldApi) {
+ int choice = JOptionPane.showConfirmDialog(Main.parent,
+ tr("The openstreetbus plugin is using the old server at appspot.com.
" +
+ "A new server is available at schokokeks.org.
" +
+ "Do you want to switch to the new server? (Strongly recommended)"),
+ tr("Switch to new openstreetbugs server?"),
+ JOptionPane.YES_NO_OPTION);
+ switchApi = choice == JOptionPane.YES_OPTION;
+ }
+
String uri = Main.pref.get(ConfigKeys.OSB_API_URI_EDIT);
- if(uri == null || uri.length() == 0) {
- uri = "http://openstreetbugs.appspot.com/editPOIexec";
+ if(uri == null || uri.length() == 0 || switchApi) {
+ uri = "http://openstreetbugs.schokokeks.org/api/0.1/editPOIexec";
Main.pref.put(ConfigKeys.OSB_API_URI_EDIT, uri);
}
uri = Main.pref.get(ConfigKeys.OSB_API_URI_CLOSE);
- if(uri == null || uri.length() == 0) {
- uri = "http://openstreetbugs.appspot.com/closePOIexec";
+ if(uri == null || uri.length() == 0 || switchApi) {
+ uri = "http://openstreetbugs.schokokeks.org/api/0.1/closePOIexec";
Main.pref.put(ConfigKeys.OSB_API_URI_CLOSE, uri);
}
uri = Main.pref.get(ConfigKeys.OSB_API_URI_DOWNLOAD);
- if(uri == null || uri.length() == 0) {
- uri = "http://openstreetbugs.appspot.com/getBugs";
+ if(uri == null || uri.length() == 0 || switchApi) {
+ uri = "http://openstreetbugs.schokokeks.org/api/0.1/getBugs";
Main.pref.put(ConfigKeys.OSB_API_URI_DOWNLOAD, uri);
}
uri = Main.pref.get(ConfigKeys.OSB_API_URI_NEW);
- if(uri == null || uri.length() == 0) {
- uri = "http://openstreetbugs.appspot.com/addPOIexec";
+ if(uri == null || uri.length() == 0 || switchApi) {
+ uri = "http://openstreetbugs.schokokeks.org/api/0.1/addPOIexec";
Main.pref.put(ConfigKeys.OSB_API_URI_NEW, uri);
}