Proper escaping for GeoJSON

Fixes #101, #93

notices/README.TXT

@@ -1,4 +1,4 @@
-Geographic Object Librarian (GOL) 0.1.7 EA
+Geographic Object Librarian (GOL) 0.1.8-SNAPSHOT EA
 ==========================================
 
 Copyright (c) Clarisma / GeoDesk contributors

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.geodesk</groupId>
   <artifactId>gol-tool</artifactId>
-  <version>0.1.7</version>
+  <version>0.1.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>GeoDesk GOL Tool</name>
@@ -21,14 +21,14 @@
   	<dependency>
 		<groupId>com.geodesk</groupId>
   		<artifactId>geodesk</artifactId>
-  		<version>0.1.7</version>
+  		<version>0.1.8-SNAPSHOT</version>
 	</dependency>
 
     <!-- Testing -->
     <dependency>
       	<groupId>junit</groupId>
       	<artifactId>junit</artifactId>
-      	<version>4.12</version>
+      	<version>4.13.2</version>
       	<scope>test</scope>
     </dependency>
 

src/main/java/com/geodesk/gol/GolTool.java

@@ -12,7 +12,7 @@
 
 public class GolTool extends Application
 {
-    public static final String VERSION = "0.1.7";
+    public static final String VERSION = "0.1.8-SNAPSHOT";
 
     @Override public String version()
     {

src/main/java/com/geodesk/gol/query/GeoJsonFeaturePrinter.java

@@ -143,6 +143,7 @@ else if (g instanceof GeometryCollection)
     }
 
     // TODO: should string escaping happen in baseclass?
+    //  No, different for each output type
 
     @Override protected void printProperty(String key, String value)
     {
@@ -151,21 +152,25 @@ else if (g instanceof GeometryCollection)
             out.print(propertyNumber > 0 ? ",\"" : "\"");
             out.print(key);
             out.print("\":\"");
-            out.print(escapeValue(value));
+            out.print(Strings.escapeForJson(value));
             out.print('\"');
             return;
         }
         if(propertyNumber > 0) out.print(",\n");
         out.print("\t\t\t\t\"");
         out.print(key);
         out.print("\": \"");
-        out.print(escapeValue(value));
+        out.print(Strings.escapeForJson(value));
         out.print('\"');
     }
 
     // We can do simplified escaping (only quote and backslash) as all OSM
     // strings have already been cleaned up during import, with unprintables
     // turned into spaces
+    // (No, only dictionary strings are treated that way; must assume that we
+    // need to escape every string)
+    // Replaced with Strings.escapeForJson() to fix gol-tool#101
+    /*
     private static String escapeValue(String s)
     {
         if(Strings.indexOfAny(s, "\"\\") < 0) return s;
@@ -188,6 +193,7 @@ private static String escapeValue(String s)
         }
         return buf.toString();
     }
+     */
 
     private void printId(Feature feature)
     {