Changeset 16134 in osm for applications/editors/josm/plugins/openstreetbugs/src

Timestamp:

2009-06-26T15:30:38+02:00 (16 years ago)

Author:

hampelratte

Message:

modified api communication, to be compatible with appspot.com and schokokeks.org

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api

Files:

• CloseAction.java (modified) (1 diff)
• DownloadAction.java (modified) (1 diff)
• EditAction.java (modified) (1 diff)
• NewAction.java (modified) (2 diffs)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java

@@ -57 +57 @@
         }
 
-        if("ok".equalsIgnoreCase(result)) {
+        if("ok".equalsIgnoreCase(result.trim())) {
             n.put("state", "1");
             Main.map.mapView.repaint();

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -76 +76 @@
         String idPattern = "\\d+";
         String floatPattern = "-?\\d+\\.\\d+";
-        String pattern = "putAJAXMarker\\(("+idPattern+"),("+floatPattern+"),("+floatPattern+"),\"(.*)\",([01])\\)";
+        String pattern = "putAJAXMarker\\s*\\(\\s*("+idPattern+")\\s*,\\s*("+floatPattern+")\\s*,\\s*("+floatPattern+")\\s*,\\s*(?:\"|\')(.*)(?:\"|\')\\s*,\\s*([01])\\s*\\)";
         Pattern p = Pattern.compile(pattern);
         Matcher m = p.matcher(content);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java

@@ -60 +60 @@
         }
 
-        if("ok".equalsIgnoreCase(result)) {
+        if("ok".equalsIgnoreCase(result) || "comment added\n".equalsIgnoreCase(result)) {
             String desc = n.get("note");
             desc = desc.concat("<hr />").concat(comment);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java

@@ -68 +68 @@
         }
 
-        Pattern resultPattern = Pattern.compile("ok\\s+(\\d+)");
+        Pattern resultPattern = Pattern.compile("ok\\s+(\\d+)\\s*");
         Matcher m = resultPattern.matcher(result);
         String id = "-1";
@@ -74 +74 @@
             id = m.group(1);
         } else {
-            throw new RuntimeException(tr("Couldn't create new bug. Result: {0}" + result));
+            throw new RuntimeException(tr("Couldn't create new bug. Result: {0}", result));
         }