@@ -362,6 +362,7 @@ def list_tools(self, keywords=[]):
362362
363363
364364
365+
365366 ##############
366367 # Data Tools #
367368 ##############
@@ -422,7 +423,7 @@ def export_table_to_csv(self, i, output, headers=True, callback=None):
422423 if headers : args .append ("--headers" )
423424 return self .run_tool ('export_table_to_csv' , args , callback ) # returns 1 if error
424425
425- def join_tables (self , input1 , pkey , input2 , fkey , import , callback = None ):
426+ def join_tables (self , input1 , pkey , input2 , fkey , import_field , callback = None ):
426427 """Merge a vector's attribute table with another table based on a common field.
427428
428429 Keyword arguments:
@@ -431,15 +432,15 @@ def join_tables(self, input1, pkey, input2, fkey, import, callback=None):
431432 pkey -- Primary key field.
432433 input2 -- Input foreign vector file (i.e. source of data to be imported).
433434 fkey -- Foreign key field.
434- import -- Imported field (all fields will be imported if not specified).
435+ import_field -- Imported field (all fields will be imported if not specified).
435436 callback -- Custom function for handling tool text outputs.
436437 """
437438 args = []
438439 args .append ("--input1='{}'" .format (input1 ))
439440 args .append ("--pkey='{}'" .format (pkey ))
440441 args .append ("--input2='{}'" .format (input2 ))
441442 args .append ("--fkey='{}'" .format (fkey ))
442- args .append ("--import ='{}'" .format (import ))
443+ args .append ("--import_field ='{}'" .format (import_field ))
443444 return self .run_tool ('join_tables' , args , callback ) # returns 1 if error
444445
445446 def lines_to_polygons (self , i , output , callback = None ):
@@ -456,7 +457,7 @@ def lines_to_polygons(self, i, output, callback=None):
456457 args .append ("--output='{}'" .format (output ))
457458 return self .run_tool ('lines_to_polygons' , args , callback ) # returns 1 if error
458459
459- def merge_table_with_csv (self , i , pkey , csv , fkey , import = None , callback = None ):
460+ def merge_table_with_csv (self , i , pkey , csv , fkey , import_field = None , callback = None ):
460461 """Merge a vector's attribute table with a table contained within a CSV text file.
461462
462463 Keyword arguments:
@@ -465,15 +466,15 @@ def merge_table_with_csv(self, i, pkey, csv, fkey, import=None, callback=None):
465466 pkey -- Primary key field.
466467 csv -- Input CSV file (i.e. source of data to be imported).
467468 fkey -- Foreign key field.
468- import -- Imported field (all fields will be imported if not specified).
469+ import_field -- Imported field (all fields will be imported if not specified).
469470 callback -- Custom function for handling tool text outputs.
470471 """
471472 args = []
472473 args .append ("--input='{}'" .format (i ))
473474 args .append ("--pkey='{}'" .format (pkey ))
474475 args .append ("--csv='{}'" .format (csv ))
475476 args .append ("--fkey='{}'" .format (fkey ))
476- if import is not None : args .append ("--import ='{}'" .format (import ))
477+ if import_field is not None : args .append ("--import_field ='{}'" .format (import_field ))
477478 return self .run_tool ('merge_table_with_csv' , args , callback ) # returns 1 if error
478479
479480 def merge_vectors (self , inputs , output , callback = None ):
@@ -1560,20 +1561,22 @@ def highest_position(self, inputs, output, callback=None):
15601561 args .append ("--output='{}'" .format (output ))
15611562 return self .run_tool ('highest_position' , args , callback ) # returns 1 if error
15621563
1563- def intersect (self , i , overlay , output , callback = None ):
1564+ def intersect (self , i , overlay , output , snap = 0.0 , callback = None ):
15641565 """Identifies the parts of features in common between two input vector layers.
15651566
15661567 Keyword arguments:
15671568
15681569 i -- Input vector file.
15691570 overlay -- Input overlay vector file.
15701571 output -- Output vector file.
1572+ snap -- Snap tolerance.
15711573 callback -- Custom function for handling tool text outputs.
15721574 """
15731575 args = []
15741576 args .append ("--input='{}'" .format (i ))
15751577 args .append ("--overlay='{}'" .format (overlay ))
15761578 args .append ("--output='{}'" .format (output ))
1579+ args .append ("--snap={}" .format (snap ))
15771580 return self .run_tool ('intersect' , args , callback ) # returns 1 if error
15781581
15791582 def line_intersections (self , input1 , input2 , output , callback = None ):
@@ -1770,20 +1773,22 @@ def sum_overlay(self, inputs, output, callback=None):
17701773 args .append ("--output='{}'" .format (output ))
17711774 return self .run_tool ('sum_overlay' , args , callback ) # returns 1 if error
17721775
1773- def symmetrical_difference (self , i , overlay , output , callback = None ):
1776+ def symmetrical_difference (self , i , overlay , output , snap = 0.0 , callback = None ):
17741777 """Outputs the features that occur in one of the two vector inputs but not both, i.e. no overlapping features.
17751778
17761779 Keyword arguments:
17771780
17781781 i -- Input vector file.
17791782 overlay -- Input overlay vector file.
17801783 output -- Output vector file.
1784+ snap -- Snap tolerance.
17811785 callback -- Custom function for handling tool text outputs.
17821786 """
17831787 args = []
17841788 args .append ("--input='{}'" .format (i ))
17851789 args .append ("--overlay='{}'" .format (overlay ))
17861790 args .append ("--output='{}'" .format (output ))
1791+ args .append ("--snap={}" .format (snap ))
17871792 return self .run_tool ('symmetrical_difference' , args , callback ) # returns 1 if error
17881793
17891794 def union (self , i , overlay , output , snap = 0.0 , callback = None ):
0 commit comments