Changeset 520

Timestamp:

03/17/08 22:54:13 (8 months ago)

Author:

asc

Message:

json/javascript output love; not sure what to do about error messages/codes; let's see if it's even an issue...

Files:

• trunk/py/wscompose/__init__.py (modified) (4 diffs)

trunk/py/wscompose/__init__.py

@@ -262 +262 @@
-        img.save(fh, "PNG")
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if self.ctx.has_key('json_callback') :
@@ -507 +527 @@
-        if params.has_key('output') :
-
-
-
-
-
+
+
+
+
+
+
-                if not params.has_key('callback') :
-                    self.error(142, 'Missing JSON callback')
@@ -520 +542 @@
-                    self.error(143, e)
-                    return False
+
+                valid['output'] = 'json'
+
+            elif out == 'png' :
+                #  set above
+                pass
+            
-            else :
-
-
-
-
-
+
+
-                
-        #
@@ -591 +617 @@
-        self.help_option('bbox', 'A bounding box comprised of comma-separated decimal coordinates in the following order : SW latitude, SW longitude, NE latitude, NE longitude', True, 2)
-        self.help_option('accuracy', 'The zoom level / accuracy (as defined by ModestMaps rather than any individual tile provider) of the final image.', True, 2)
+
+        self.help_option('output', 'Although the default output format for maps is \'png\' (you know, like a PNG image file) you may also specify the following alternatives: ', False)
+        self.help_option('json', 'Return a Base64 encoded version of a PNG image, as well as any extra X-wscompose headers, as JSON data structure.', False, 1)        
+        self.help_option('javascript', 'Return a Base64 encoded version of a PNG image, as well as any extra X-wscompose headers, as JSON data structure wrapped in a function whose name is defined by the \'callback\' parameter.', False, 1)        
+        self.help_option('callback', 'Required if the output format is \'javascript\'; this is the name of the callback function that your JSON data structure will be wrapped in.', False)        
-
-        self.help_option('plot', 'Plot -- but do not render -- the x and y coordinates for a given point. Coordinate data will be returned HTTP header(s) named \'X-wscompose-plot-\' followed by the label you choose when passing latitude and longitude information. You may pass multiple plot arguments, each of which should contain the following comma separated values :', False)