fix #24298 - add JOSM API indication to remote control

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19416 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: stoecker

src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -31,7 +31,7 @@ public class RemoteControl {
      * changes.
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 12;
+    static final int protocolMinorVersion = 13;
 
     /**
      * Starts the remote control server

src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -28,7 +28,9 @@
 import jakarta.json.Json;
 
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.AddWayHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.AuthorizationHandler;
@@ -71,13 +73,18 @@ public class RequestProcessor extends Thread {
      * interface extensions. Change major number in case of incompatible
      * changes.
      */
-    public static final String PROTOCOLVERSION = Json.createObjectBuilder()
-            .add("protocolversion", Json.createObjectBuilder()
-                    .add("major", RemoteControl.protocolMajorVersion)
-                    .add("minor", RemoteControl.protocolMinorVersion))
-            .add("application", JOSM_REMOTE_CONTROL)
-            .add("version", Version.getInstance().getVersion())
-            .build().toString();
+    public static String getProtocolVersion() {
+        String OsmServerUrl = OsmApi.getOsmApi().getServerUrl();
+        String defaultOsmApiUrl = JosmUrls.getInstance().getDefaultOsmApiUrl();
+        return Json.createObjectBuilder()
+                .add("protocolversion", Json.createObjectBuilder()
+                        .add("major", RemoteControl.protocolMajorVersion)
+                        .add("minor", RemoteControl.protocolMinorVersion))
+                .add("application", JOSM_REMOTE_CONTROL)
+                .add("version", Version.getInstance().getVersion())
+                .add("osm_server", OsmServerUrl.equals(defaultOsmApiUrl) ? "default" : "custom")
+                .build().toString();
+    }
 
     /** The socket this processor listens on */
     private final Socket request;

src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java

@@ -19,7 +19,7 @@ public class VersionHandler extends RequestHandler {
     @Override
     protected void handleRequest() throws RequestHandlerErrorException,
             RequestHandlerBadRequestException {
-        content = RequestProcessor.PROTOCOLVERSION;
+        content = RequestProcessor.getProtocolVersion();
         contentType = "application/json";
         if (args.containsKey("jsonp")) {
             content = args.get("jsonp") + " && " + args.get("jsonp") + '(' + content + ')';