Changeset 33626 in osm for applications/editors/josm/plugins/wikipedia

Timestamp:

2017-09-18T06:27:29+02:00 (7 years ago)

Author:

nyuriks

Message:

Fixed Wikosm template parameter expansion

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/gui/WikosmDownloadSource.java (modified) (1 diff)
• src/org/wikipedia/io/WikosmDownloadReader.java (modified) (2 diffs)
• test/unit/org/wikipedia/io/WikosmDownloadReaderTest.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikosmDownloadSource.java

@@ -221 +221 @@
              * is not restricted to bbox.
              */
-            if (!settings.getDownloadBounds().isPresent() && query.contains("{{bbox}}")) {
+            if (!settings.getDownloadBounds().isPresent() && (
+                    query.contains("{{boxParams}}") ||
+                    query.contains("{{center}}")
+            )) {
                 JOptionPane.showMessageDialog(
                         this.getParent(),

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/io/WikosmDownloadReader.java

@@ -88 +88 @@
     protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
         final String query = this.wikosmQuery
-                .replace("{{boxParams}}", bbox(lon1, lat1, lon2, lat2))
+                .replace("{{boxParams}}", boxParams(lon1, lat1, lon2, lat2))
                 .replace("{{center}}", center(lon1, lat1, lon2, lat2));
         return DATA_PREFIX + Utils.encodeUrl(query);
     }
 
-    private static String bbox(double lon1, double lat1, double lon2, double lat2) {
-        return "\nbd:serviceParam wikibase:cornerWest " + point(lon1, lat1) + "." +
+    public static String boxParams(double lon1, double lat1, double lon2, double lat2) {
+        return "\nbd:serviceParam wikibase:cornerWest " + point(lon1, lat1) + ".\n" +
                 "bd:serviceParam wikibase:cornerEast " + point(lon2, lat2) + ".\n";
     }
 
-    private static String center(double lon1, double lat1, double lon2, double lat2) {
+    public static String center(double lon1, double lat1, double lon2, double lat2) {
         LatLon c = new BBox(lon1, lat1, lon2, lat2).getCenter();
         return point(c.lon(), c.lat());
     }
 
-    private static String point(double lon, double lat) {
-        return "Point(\"" + lon + " " + lat + "\")^^geo:wktLiteral";
+    public static String point(double lon, double lat) {
+        return "\"Point(" + lon + " " + lat + ")\"^^geo:wktLiteral";
     }
 
@@ -266 +266 @@
 
         // add bounds if necessary (note that Wikosm API does not return bounds in the response XML)
-        if (ds != null && ds.getDataSources().isEmpty() && wikosmQuery.contains("{{bbox}}")) {
+        if (ds != null && ds.getDataSources().isEmpty() && wikosmQuery.contains("{{boxParams}}")) {
             if (crosses180th) {
                 Bounds bounds = new Bounds(lat1, lon1, lat2, 180.0);

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/WikosmDownloadReaderTest.java

@@ -17 +17 @@
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -33 +34 @@
 
     /**
-     * Tests evaluating the extended query feature {@code date}.
+     * Tests point generation
+     */
+    @Test
+    public void testPoint() throws UnsupportedEncodingException {
+        assertThat(WikosmDownloadReader.point(9.5, 47.16),
+                is("\"Point(9.5 47.16)\"^^geo:wktLiteral"));
+        assertThat(WikosmDownloadReader.boxParams(1, 2, 3, 4),
+                is("\nbd:serviceParam wikibase:cornerWest \"Point(1 2)\"^^geo:wktLiteral." +
+                        "\nbd:serviceParam wikibase:cornerEast \"Point(3 4)\"^^geo:wktLiteral.\n"));
+    }
+
+    /**
+     * Tests server response parsing
      */
     @Test