Changeset 478

Timestamp:

02/04/08 22:42:59 (10 months ago)

Author:

asc

Message:

dots and plots

Files:

• trunk/py/wscompose/pinwin.py (modified) (9 diffs)
• trunk/py/wscompose/plotting.py (modified) (1 diff)
• trunk/py/wscompose/validate.py (modified) (3 diffs)
• trunk/py/wscompose/__init__.py (modified) (6 diffs)

trunk/py/wscompose/pinwin.py

@@ -2 +2 @@
-
-__package__    = "wscompose/pinwin.py"
-0
+1
-__author__     = "Aaron Straup Cope"
-__url__        = "http://www.aaronland.info/python/wscompose"
@@ -34 +34 @@
-        if self.ctx.has_key('filter') and self.ctx['filter'] == 'atkinson' :
-            img = self.atkinson_dithering(img)
-
+
+
+
+
+
+
+
+
-        if self.ctx.has_key('markers') :
-
@@ -44 +51 @@
-                img = self.draw_markers(img)            
-
+        #
+        
-        return img
-
@@ -71 +80 @@
-                
-                self.send_header(header, sep.join(details))
+
+        #
+        
+        if self.ctx.has_key('dots') :
+            for data in self.ctx['dots'] :
+
+                pt = self.latlon_to_point(data['latitude'], data['longitude'])
+
+                header = "X-wscompose-Dot-%s" % data['label']
+                coords = "%s,%s,%s" % (int(pt.x), int(pt.y), int(data['radius']))
+                
+                self.send_header(header, coords)
-        
-    # ##########################################################
@@ -235 +256 @@
-    
-    # ##########################################################
+
+    # share me with marker.py or add shapes.py (or something) ?
+    
+    def draw_dots (self, img) :
+
+        dr = ImageDraw.Draw(img)
+        pink = (255, 0, 132)
+        grey = (42, 42, 42)
+        
+        for data in self.ctx['dots'] :
+
+            pt = self.latlon_to_point(data['latitude'], data['longitude'])
+            offset = float(data['radius']) / 2
+
+            x1 = pt.x - offset
+            y1 = pt.y - offset
+            x2 = pt.x + offset
+            y2 = pt.y + offset
+
+            dr.ellipse((x1 + 1 , y1 + 2, x2 + 1, y2 + 2), fill=grey)
+            dr.ellipse((x1, y1, x2, y2), fill=pink)            
+
+        return img
+    
+    # ##########################################################
-    
-    def fetch_marker_fill (self, mrk_data) :
@@ -334 +380 @@
-            
-        #
+        # dots
+        #
+
+        if params.has_key('dot') :
+
+            try :
+                valid['dots'] = validator.dots(params['dot'])
+            except Exception, e :
+                self.error(141, e)
+                return False
-        
-        return valid
@@ -358 +414 @@
-        self.help_option('point', 'A comma-separated string containing the latitude and longitude indicating the point where the marker should be placed', True, 1)
-        self.help_option('dimensions', 'A comma-separated string containing the height and width of the marker canvas - the default is 75 x 75', False, 1)   
+
+        self.help_option('dot', 'Draw a pinwin-style dot (but not the marker) at a given point. You may pass multiple dot arguments, each of which should contain the following comma separated values :', False)
+        self.help_option('label', 'A unique string to identify the dot by', True, 1)
+        self.help_option('point', 'A comma-separated string containing the latitude and longitude indicating the point where the dot should be placed', True, 1)
+        self.help_option('radius', 'The radius, in pixels, of the dot - the default is 18', False, 1)    
+
+        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)
+        self.help_option('label', 'A unique string to identify the plotting by', True, 1)
+        self.help_option('point', 'A comma-separated string containing the latitude and longitude indicating the point to be plotted', True, 1)
-
-        self.help_option('fill', 'A helper argument which if present will cause each marker specified to be filled with the contents of map for the marker\'s coordinates at zoom level 15. The value should be a valid ModestMaps map tile provider.', False)
@@ -394 +459 @@
-        X-wscompose-Marker-cherrier: 679,312,641,192,75,75""")
-
-
-
-M
+, dots and plotting coordinates
+
+d
-
-        self.help_para("The first two numbers are the x/y coordinates for the lat/lon.")
@@ -402 +467 @@
-        self.help_para("The last pair  are the dimensions of the pinwin content which is sort of redundant unless you are opting for defaults and don't know what to expect.")
-
-
+
+
+
+

trunk/py/wscompose/plotting.py

@@ -75 +75 @@
-            
-            mrk = self.load_marker(w, h, a)
-
-
-
+
+
+
+
+
-            
-            # argh...fix me!

trunk/py/wscompose/validate.py

@@ -2 +2 @@
-
-__package__    = "wscompose/validate.py"
-0
+1
-__author__     = "Aaron Straup Cope"
-__url__        = "http://www.aaronland.info/python/wscompose"
@@ -91 +91 @@
-    # ##########################################################
-
+    def radius (self, input) :
+        return self.__num(input)
+
+    # ##########################################################
+
-    def provider (self, input) :
-
@@ -209 +214 @@
-
-        return valid
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # ##########################################################
-    

trunk/py/wscompose/__init__.py

@@ -2 +2 @@
-
-__package__    = "wscompose/__init__.py"
-0
+1
-__author__     = "Aaron Straup Cope"
-__url__        = "http://www.aaronland.info/python/wscompose"
@@ -34 +34 @@
-    def __init__ (self, request, client_address, server) :
-        self.ctx = {}
+        self.points = {}
-        BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, request, client_address, server)
-        
@@ -239 +240 @@
-        self.send_header("X-wscompose-Image-Width", img.size[0])        
-        self.send_header("X-wscompose-Map-Zoom", self.ctx['zoom'])
+
+        if self.ctx.has_key('plot') :
+            for data in self.ctx['plot'] :
+
+                pt = self.latlon_to_point(data['latitude'], data['longitude'])
+
+                header = "X-wscompose-Plot-%s" % data['label']
+                coords = "%s,%s" % (int(pt.x), int(pt.y))
+
+                self.send_header(header, coords)
-                
+    # ##########################################################
+
+    def latlon_to_point (self, lat, lon) :
+
+        key = "%s-%s" % (lat, lon)
+
+        if not self.points.has_key(key) :
+            loc = ModestMaps.Geo.Location(lat, lon)
+            pt = self.ctx['map'].locationPoint(loc)
+            self.points[key] = pt
+
+        return self.points[key]
+    
-    # ##########################################################
-    
@@ -410 +434 @@
-                    return False
-            
+
+        #
+        # plotting or "headless" markers
+        #
+
+        if params.has_key('plot') :
+
+            try :
+                valid['plot'] = validator.plots(params['plot'])
+            except Exception, e :
+                self.error(141, e)
+                return False
+        
-        #
-        # whoooosh
@@ -474 +511 @@
-        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('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)
+        self.help_option('label', 'A unique string to identify the plotting by', True, 1)
+        self.help_option('point', 'A comma-separated string containing the latitude and longitude indicating the point to be plotted', True, 1)
-        
-    # ##########################################################
@@ -490 +531 @@
-        X-wscompose-Image-Height: 1024
-        X-wscompose-Image-Width: 1024
-
+
+
+
+
+
+
-        
-    # ##########################################################