Changeset 501

Timestamp:

02/26/08 21:33:54 (9 months ago)

Author:

asc

Message:

plots, dots, lines and hulls

Files:

• trunk/py/wscompose/convexhull.py (added)
• trunk/py/wscompose/markers.py (modified) (3 diffs)
• trunk/py/wscompose/pinwin.py (modified) (6 diffs)
• trunk/py/wscompose/validate.py (modified) (2 diffs)
• trunk/py/wscompose/__init__.py (modified) (5 diffs)

trunk/py/wscompose/markers.py

@@ -442 +442 @@
-    # ##########################################################
-    
-
+, img, corners
-
-        #
@@ -455 +455 @@
-        # im.transform(size, PERSPECTIVE, data)
-        #
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # ##########################################################
-
@@ -566 +593 @@
-    
-    pw = pinwin(w, h, 15)
-draw
-    
-
+mk_pinwin
+im = pw.mk_perspective_shadow(im, ((10,100), (10,10), (500,500), (500,200)))
+# 
-    im.show()

trunk/py/wscompose/pinwin.py

@@ -9 +9 @@
-
-import wscompose
+import convexhull
-
-import wscompose.plotting
@@ -36 +37 @@
-
-        #
+
+        if self.ctx.has_key('polylines') :
+            img = self.draw_polylines(img)
+
+        #
+
+        if self.ctx.has_key('hulls') :
+            img = self.draw_convex_hulls(img)
+            
+        #
-        
-        if self.ctx.has_key('dots') :
@@ -95 +106 @@
-    # ##########################################################
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # To do : move this code in to methods that can be run
-    # easily from unit tests and/or CLI tools...
@@ -390 +476 @@
-                self.error(141, e)
-                return False
+
+        #
+        # polylines
+        #
+
+        if params.has_key('polyline') :
+
+            try :
+                valid['polylines'] = validator.polylines(params['polyline'])
+            except Exception, e :
+                self.error(142, e)
+                return False
+
+        #
+        #
+        #
+
+        if params.has_key('convex') :
+
+            try :
+                valid['hulls'] = validator.convex(params['convex'])
+            except Exception, e :
+                self.error(143, e)
+                return False
+            
+        #
+        # Happy happy
+        #
-        
-        return valid
@@ -410 +524 @@
-        wscompose.handler.help_parameters(self)
-
+        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('marker', 'Draw a pinwin-style marker at a given point. You may pass multiple marker arguments, each of which should contain the following comma separated values :', False)
-        self.help_option('label', 'A unique string to identify the marker by', True, 1)
@@ -415 +534 @@
-        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('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)
-        

trunk/py/wscompose/validate.py

@@ -21 +21 @@
-            'num' : re.compile(r"^\d+$"),
-            'provider' : re.compile(r"^([A-Z_]+)$"),
-
+
+
-            }
-
@@ -312 +313 @@
-            
-    # ##########################################################
+
+    def polylines (self, lines) :
+
+        valid = []
+        
+        for poly in lines :
+
+            points = []
+            
+            for pt in poly.split(" ") :
+            
+                coord = pt.split(",")
+
+                if len(coord) != 2 :
+                    raise Exception, "Polyline coordinate missing data"
+                
+                (lat, lon) = map(string.strip, coord) 
+                
+                lat = self.latlon(lat)
+                lon = self.latlon(lon)
+
+                points.append({'latitude':lat, 'longitude':lon})
+
+            valid.append(points)
+            
+        return valid
+    
+    # ##########################################################    
+
+    def convex (self, hulls) :
+        
+        valid = []
+
+        for label in hulls :
+
+            if not self.regexp('hull', label)  :
+                raise Exception, "Unknown marker type for convex hulls"
+
+            valid.append(label)
+
+        return valid
+    
+    # ##########################################################
-    
-    def __num (self, input) :

trunk/py/wscompose/__init__.py

@@ -241 +241 @@
-        self.send_header("X-wscompose-Map-Zoom", self.ctx['zoom'])
-
-
-
+s
+s
-
-                pt = self.latlon_to_point(data['latitude'], data['longitude'])
@@ -380 +380 @@
-                    return False
-
+            # you can blame migurski for this
+            
+            if params.has_key('zoom') :
+                self.error(125, "'zoom' is not a valid argument when method is 'extent'")
+                return False
+                
-        elif params['method'][0] == 'bbox' :
-
@@ -406 +412 @@
-                except Exception, e :
-                    self.error(124, e)
+                    return False
+
+            # you can blame migurski for this
+            
+            for p in ('height', 'width') :
+                if params.has_key(p) :
+                    self.error(125, "'%s' is not a valid argument when method is 'bbox'" % p)
-                    return False
-                
@@ -448 +461 @@
-
-            try :
-
+s
-            except Exception, e :
-                self.error(141, e)
@@ -540 +553 @@
-        X-wscompose-plot-roy: 667,285""")
-
-Markers, dots and plotting
-
--
+Plotted
+
+
-        
-    # ##########################################################