Specify UTF encoding in JSON tiles

TileStache · Jul 6, 2012 · 845b7d9 · 845b7d9
1 parent 571401c
commit 845b7d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/TileStache/Goodies/Providers/MapnikGrid.py b/TileStache/Goodies/Providers/MapnikGrid.py
@@ -109,7 +109,7 @@ def getTypeByExtension(self, extension):
         if extension.lower() != 'json':
             raise KnownUnknown('MapnikGrid only makes .json tiles, not "%s"' % extension)
 
-        return 'application/json', 'JSON'
+        return 'application/json; charset=utf-8', 'JSON'
 
 class SaveableResponse:
     """ Wrapper class for JSON response that makes it behave like a PIL.Image object.

diff --git a/TileStache/Mapnik.py b/TileStache/Mapnik.py
@@ -252,7 +252,7 @@ def getTypeByExtension(self, extension):
         if extension.lower() != 'json':
             raise KnownUnknown('MapnikGrid only makes .json tiles, not "%s"' % extension)
 
-        return 'application/json', 'JSON'
+        return 'application/json; charset=utf-8', 'JSON'
 
 class SaveableResponse:
     """ Wrapper class for JSON response that makes it behave like a PIL.Image object.

diff --git a/TileStache/__init__.py b/TileStache/__init__.py
@@ -287,7 +287,7 @@ def requestHandler(config_hint, path_info, query_string):
             mimetype, content = getTile(layer, coord, extension)
 
         if callback and 'json' in mimetype:
-            mimetype, content = 'application/javascript', '%s(%s)' % (callback, content)
+            mimetype, content = 'application/javascript; charset=utf-8', '%s(%s)' % (callback, content)
 
     except Core.KnownUnknown, e:
         out = StringIO()