Changeset 19416 in josm

Timestamp:

2025-06-24T14:05:53+02:00 (4 days ago)

Author:

stoecker

Message:

fix #24298 - add JOSM API indication to remote control

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• RemoteControl.java (modified) (1 diff)
• RequestProcessor.java (modified) (2 diffs)
• handler/VersionHandler.java (modified) (1 diff)

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

@@ -32 +32 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 12;
+    static final int protocolMinorVersion = 13;
 
     /**

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

@@ -29 +29 @@
 
 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;
@@ -72 +74 @@
      * 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 */

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

@@ -20 +20 @@
     protected void handleRequest() throws RequestHandlerErrorException,
             RequestHandlerBadRequestException {
-        content = RequestProcessor.PROTOCOLVERSION;
+        content = RequestProcessor.getProtocolVersion();
         contentType = "application/json";
         if (args.containsKey("jsonp")) {