Merge pull request #118 from plepe/standalone-process-id

 Mode Standalone: process specified ID

Author: plepe

CHANGELOG.creole

@@ -1,3 +1,6 @@
+0.11 release upcoming
+* Mode standalone: specify ID or list of IDs instead of a bounding box
+
 0.10.4 release 2015-03-11
 * DB/Overpass: set max allowed memory by config option {{{db.overpass-memory}}}
 * DB/Overpass: load full response at once; this greatly improves performance, but needs more memory.

doc/API.md

@@ -52,6 +52,9 @@ optional arguments:
                         Process the map from the specified bounding box as
                         min_lon,min_lat,max_lon,max_lat in WGS-84. (default:
                         whole database)
+  -o ID [ID ...], --id ID [ID ...]
+                        Instead of processing all objects in the specified
+                        bounding box, process only the given object(s).
   -s SCALE, --scale SCALE
                         Process map at a specified scale denominator. If
                         z<zoom> syntax (e.g. "z15") is used, the zoom levels
@@ -73,6 +76,7 @@ scale         | Process map at a specified scale denominator.
 zoom          | zoom level of standard tile based map (projection 900913)
 x, y          | x/y tiles as with images (jpg/png), requires parameter z or zoom
 z             | zoom level in combination with x/y tiles. If a different tilesize (e.g. 512 or 1024) is used, the zoom level will be adapted automatically. With tilesize 256, zoom and z are equal.
+id            | Instead of processing all objects in the specified bounding box, process only the given object(s). For multiple objects, pass the parameter multiple times.
 tilesize      | the tilesize when using x/y tiles (default: 256)
 lang          | Use the given language code (e.g. "en" or "de") for language dependend instructions. Default: the first value of the HTTP Accept-Language header.
 srs           | ID of projection of output coordinates (default: 4326).

pgmapcss/compiler/compile_function_match.py

@@ -96,6 +96,8 @@ def compile_function_match(stat):
     plan = plpy.prepare('select ST_SetSRID(ST_MakeBox2D(ST_Point($1, $2), ST_Point($3, $4)), $5) as bounds', ['float', 'float', 'float', 'float', 'int'])
     res = plpy.execute(plan, [float(b) for b in bbox] + [ parameters['in.srs'] if 'in.srs' in parameters else parameters['srs'] ])
     _bbox = res[0]['bounds']
+elif type(bbox) == set:
+    _bbox = None
 else:
     _bbox = bbox
 
@@ -127,14 +129,16 @@ def compile_function_match(stat):
 
 '''.format(**replacement)
 
-    func = "objects_bbox(render_context.get('bbox'), db_selects, {})"
+    ret += "if type(bbox) == set:\n"
+    ret += "    src = objects_by_id(bbox, {})\n"
+    ret += "else:\n"
+    ret += "    src = objects_bbox(render_context.get('bbox'), db_selects, {})\n"
+
     if stat['config'].get('debug.profiler', False):
         ret += "time_qry_start = datetime.datetime.now() # profiling\n"
-        ret += "src = list(" + func + ")\n"
+        ret += "src = list(src)\n"
         ret += "time_qry_stop = datetime.datetime.now() # profiling\n"
         ret += "plpy.warning('querying db objects took %.2fs' % (time_qry_stop - time_qry_start).total_seconds())\n"
-    else:
-        ret += "src = " + func + "\n"
 
     ret += '''\
 

pgmapcss/mode/standalone/footer.inc

@@ -60,6 +60,9 @@ if __name__ == '__main__':
             ]
             parameters['in.srs'] = 4326
 
+        if params.getvalue("id"):
+            bounds = set(params.getlist("id"))
+
         if params.getvalue("scale"):
             scale_denom = float(params.getvalue("scale"))
 
@@ -104,6 +107,9 @@ if __name__ == '__main__':
             help='Process the map from the specified bounding box as min_lon,min_lat,max_lon,max_lat in WGS-84. (default: whole database)'
         )
 
+        parser.add_argument('-o', '--id', dest='id', nargs='+',
+            help='Instead of processing all objects in the specified bounding box, process only the given object(s).')
+
         parser.add_argument('-s', '--scale', dest='scale',
             default='2000',
             help='Process map at a specified scale denominator. If z<zoom> syntax (e.g. "z15") is used, the zoom levels of projection 900913 are used.'
@@ -129,6 +135,10 @@ if __name__ == '__main__':
             if len(bounds) != 4:
                 print("Error parsing bounds, expecting four numbers.")
                 sys.exit(1)
+
+        elif args.id:
+            bounds = set(args.id)
+
         else:
             bounds = None