Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #371 from bstroebl/fix#6925
fix #6925 fTools eliminate now works if the polygon to merge with has an id of 0
  • Loading branch information
mach0 committed Jan 3, 2013
2 parents 93e0526 + aef3f34 commit 71580df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/plugins/fTools/tools/doEliminate.py
Expand Up @@ -167,7 +167,7 @@ def eliminate(self, inLayer, boundary, progressBar, outFileName = None):
try:
found = fidsToEliminate.index(selFid)
except ValueError: #selFid is not in fidsToEliminate
# check wether the geometry to eliminate and the other geometry intersect
# check whether the geometry to eliminate and the other geometry intersect
selFeat = QgsFeature()

if outLayer.featureAtId(selFid, selFeat, True, False):
Expand All @@ -190,7 +190,7 @@ def eliminate(self, inLayer, boundary, progressBar, outFileName = None):
mergeWithFid = selFid
mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry

if mergeWithFid: # a successful candidate
if mergeWithFid != None: # a successful candidate
try:
geomList = geomsToMerge[mergeWithFid]
except KeyError:
Expand Down

0 comments on commit 71580df

Please sign in to comment.