Merge pull request #219 from mmd-osm/patch/json_indent

JSON fixes
zerebubuth · Jan 5, 2020 · ee2d807 · ee2d807
2 parents 8b817b6 + 9c25212
commit ee2d807
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/include/cgimap/mime_types.hpp b/include/cgimap/mime_types.hpp
@@ -13,7 +13,7 @@ enum type {
   text_plain,
   text_xml,
 #ifdef HAVE_YAJL
-  text_json,
+  application_json,
 #endif
   any_type // the "*/*" type used to mean that anything is acceptable.
 };

diff --git a/src/choose_formatter.cpp b/src/choose_formatter.cpp
@@ -120,7 +120,7 @@ struct http_accept_grammar
       = lit("* / *")      [_val = mime::any_type]
       | lit("text/xml") [_val = mime::text_xml]
 #ifdef HAVE_YAJL
-      | lit("text/json")[_val = mime::text_json]
+      | lit("application/json")[_val = mime::application_json]
 #endif
       ;
 */
@@ -267,8 +267,8 @@ shared_ptr<output_formatter> create_formatter(request &req,
     o_formatter = shared_ptr<output_formatter>(new xml_formatter(xwriter));
 
 #ifdef HAVE_YAJL
-  } else if (best_type == mime::text_json) {
-    auto *jwriter = new json_writer(out, true);
+  } else if (best_type == mime::application_json) {
+    auto *jwriter = new json_writer(out, false);
     o_formatter = shared_ptr<output_formatter>(new json_formatter(jwriter));
 #endif
 

diff --git a/src/json_formatter.cpp b/src/json_formatter.cpp
@@ -33,7 +33,7 @@ json_formatter::json_formatter(json_writer *w) : writer(w),
 
 json_formatter::~json_formatter() = default;
 
-mime::type json_formatter::mime_type() const { return mime::text_json; }
+mime::type json_formatter::mime_type() const { return mime::application_json; }
 
 void json_formatter::write_tags(const tags_t &tags) {
 

diff --git a/src/mime_types.cpp b/src/mime_types.cpp
@@ -14,8 +14,8 @@ string to_string(type t) {
   } else if (text_xml == t) {
     return "text/xml";
 #ifdef HAVE_YAJL
-  } else if (text_json == t) {
-    return "text/json";
+  } else if (application_json == t) {
+    return "application/json";
 #endif
   } else {
     throw runtime_error("No string conversion for unspecified MIME type.");
@@ -36,8 +36,8 @@ type parse_from(const std::string &name) {
   } else if (name == "text/xml") {
     t = text_xml;
 #ifdef HAVE_YAJL
-  } else if (name == "text/json") {
-    t = text_json;
+  } else if (name == "application/json") {
+    t = application_json;
 #endif
   }
 

diff --git a/src/osm_responder.cpp b/src/osm_responder.cpp
@@ -13,7 +13,7 @@ list<mime::type> osm_responder::types_available() const {
   list<mime::type> types;
   types.push_back(mime::text_xml);
 #ifdef HAVE_YAJL
-  types.push_back(mime::text_json);
+  types.push_back(mime::application_json);
 #endif
   return types;
 }

diff --git a/src/routes.cpp b/src/routes.cpp
@@ -275,7 +275,7 @@ routes::~routes() = default;
 namespace {
 /**
  * figures out the mime type from the path specification, e.g: a resource ending
- * in .xml should be text/xml, .json should be text/json, etc...
+ * in .xml should be text/xml, .json should be application/json, etc...
  */
   pair<string, mime::type> resource_mime_type(const string &path) {
 
@@ -284,7 +284,7 @@ namespace {
       std::size_t json_found = path.rfind(".json");
 
       if (json_found != string::npos && json_found == path.length() - 5) {
-	  return make_pair(path.substr(0, json_found), mime::text_json);
+	  return make_pair(path.substr(0, json_found), mime::application_json);
       }
     }
 #endif

diff --git a/test/json.testcore/map_all.case b/test/json.testcore/map_all.case
@@ -1,8 +1,8 @@
 Request-Method: GET
 Request-URI: /api/0.6/map?bbox=1.1463021,0.9924642,1.1633345,1.0044411
-HTTP-Accept: text/json
+HTTP-Accept: application/json
 ---
-Content-Type: text/json; charset=utf-8
+Content-Type: application/json; charset=utf-8
 Status: 200 OK
 ---
 { "version": "0.6",

diff --git a/test/json.testcore/node_1.case b/test/json.testcore/node_1.case
@@ -1,8 +1,8 @@
 Request-Method: GET
 Request-URI: /api/0.6/node/1
-HTTP-Accept: text/json
+HTTP-Accept: application/json
 ---
-Content-Type: text/json; charset=utf-8
+Content-Type: application/json; charset=utf-8
 !Content-Disposition: 
 Status: 200 OK
 ---

diff --git a/test/json.testcore/node_2.case b/test/json.testcore/node_2.case
@@ -3,7 +3,7 @@ Request-Method: GET
 Request-URI: /api/0.6/node/1.json
 HTTP-Accept: */*
 ---
-Content-Type: text/json; charset=utf-8
+Content-Type: application/json; charset=utf-8
 !Content-Disposition: 
 Status: 200 OK
 ---

diff --git a/test/test_core.cpp b/test/test_core.cpp
@@ -454,7 +454,7 @@ void check_response(std::istream &expected, std::istream &actual) {
         content_type.substr(0, 9) == "text/html") {
       check_content_body_xml(expected, actual);
 
-    } else if (content_type.substr(0, 9) == "text/json") {
+    } else if (content_type.substr(0, 16) == "application/json") {
       check_content_body_json(expected, actual);
 
     } else if (content_type.substr(0, 10) == "text/plain") {