mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-16 00:03:12 -04:00
Uses spatial index to select intersecting features (used selections before). Tool should run faster and with fewer map canvas glitches.
git-svn-id: http://svn.osgeo.org/qgis/trunk@13036 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
cfarmer
parent
cd23b747a9
commit
63c36711a0
@ -1,3 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#-----------------------------------------------------------
|
||||
#
|
||||
# Spatial Join
|
||||
@ -50,11 +51,9 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
# populate layer list
|
||||
self.progressBar.setValue(0)
|
||||
mapCanvas = self.iface.mapCanvas()
|
||||
for i in range(mapCanvas.layerCount()):
|
||||
layer = mapCanvas.layer(i)
|
||||
if layer.type() == layer.VectorLayer:
|
||||
self.inShape.addItem(layer.name())
|
||||
self.joinShape.addItem(layer.name())
|
||||
layers = ftools_utils.getLayerNames([QGis.Point, QGis.Line, QGis.Polygon])
|
||||
self.inShape.addItems(layers)
|
||||
self.joinShape.addItems(layers)
|
||||
|
||||
def accept(self):
|
||||
if self.inShape.currentText() == "":
|
||||
@ -103,22 +102,22 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
self.outShape.setText( QString( self.shapefileName ) )
|
||||
|
||||
def compute(self, inName, joinName, outName, summary, sumList, keep, progressBar):
|
||||
layer1 = self.getVectorLayerByName(inName)
|
||||
layer1 = ftools_utils.getVectorLayerByName(inName)
|
||||
provider1 = layer1.dataProvider()
|
||||
allAttrs = provider1.attributeIndexes()
|
||||
provider1.select(allAttrs)
|
||||
fieldList1 = self.getFieldList(layer1).values()
|
||||
fieldList1 = ftools_utils.getFieldList(layer1).values()
|
||||
|
||||
layer2 = self.getVectorLayerByName(joinName)
|
||||
layer2 = ftools_utils.getVectorLayerByName(joinName)
|
||||
provider2 = layer2.dataProvider()
|
||||
allAttrs = provider2.attributeIndexes()
|
||||
provider2.select(allAttrs)
|
||||
fieldList2 = self.getFieldList(layer2)
|
||||
fieldList2 = ftools_utils.getFieldList(layer2)
|
||||
fieldList = []
|
||||
if provider1.crs() <> provider2.crs():
|
||||
QMessageBox.warning(self, self.tr("CRS warning!"), self.tr("Warning: Input layers have non-matching CRS.\nThis may cause unexpected results."))
|
||||
if not summary:
|
||||
fieldList2 = self.testForUniqueness(fieldList1, fieldList2.values())
|
||||
fieldList2 = ftools_utils.testForUniqueness(fieldList1, fieldList2.values())
|
||||
seq = range(0, len(fieldList1) + len(fieldList2))
|
||||
fieldList1.extend(fieldList2)
|
||||
fieldList1 = dict(zip(seq, fieldList1))
|
||||
@ -132,7 +131,7 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
fieldList.append(field)
|
||||
field = QgsField("COUNT", QVariant.Double, "real", 24, 16, self.tr("Summary field") )
|
||||
fieldList.append(field)
|
||||
fieldList2 = self.testForUniqueness(fieldList1, fieldList)
|
||||
fieldList2 = ftools_utils.testForUniqueness(fieldList1, fieldList)
|
||||
fieldList1.extend(fieldList)
|
||||
seq = range(0, len(fieldList1))
|
||||
fieldList1 = dict(zip(seq, fieldList1))
|
||||
@ -147,13 +146,13 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
#writer = QgsVectorFileWriter(outName, "UTF-8", fieldList1, provider1.geometryType(), sRs)
|
||||
inFeat = QgsFeature()
|
||||
outFeat = QgsFeature()
|
||||
joinFeat = QgsFeature()
|
||||
inFeatB = QgsFeature()
|
||||
inGeom = QgsGeometry()
|
||||
progressBar.setValue(15)
|
||||
start = 15.00
|
||||
add = 85.00 / provider1.featureCount()
|
||||
provider1.rewind()
|
||||
|
||||
index = ftools_utils.createIndex(provider2)
|
||||
while provider1.nextFeature(inFeat):
|
||||
inGeom = inFeat.geometry()
|
||||
atMap1 = inFeat.attributeMap()
|
||||
@ -162,24 +161,28 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
joinList = []
|
||||
if inGeom.type() == QGis.Point:
|
||||
#(check, joinList) = layer2.featuresInRectangle(inGeom.buffer(10,2).boundingBox(), True, True)
|
||||
layer2.select(inGeom.buffer(10,2).boundingBox(), False)
|
||||
joinList = layer2.selectedFeatures()
|
||||
#layer2.select(inGeom.buffer(10,2).boundingBox(), False)
|
||||
#joinList = layer2.selectedFeatures()
|
||||
joinList = index.intersects( inGeom.buffer(10,2).boundingBox() )
|
||||
if len(joinList) > 0: check = 0
|
||||
else: check = 1
|
||||
else:
|
||||
#(check, joinList) = layer2.featuresInRectangle(inGeom.boundingBox(), True, True)
|
||||
layer2.select(inGeom.boundingBox(), False)
|
||||
joinList = layer2.selectedFeatures()
|
||||
#layer2.select(inGeom.boundingBox(), False)
|
||||
#joinList = layer2.selectedFeatures()
|
||||
joinList = index.intersects( inGeom.boundingBox() )
|
||||
if len(joinList) > 0: check = 0
|
||||
else: check = 1
|
||||
if check == 0:
|
||||
count = 0
|
||||
for i in joinList:
|
||||
tempGeom = i.geometry()
|
||||
if inGeom.intersects(tempGeom):
|
||||
#tempGeom = i.geometry()
|
||||
provider2.featureAtId(int(i), inFeatB , True, allAttrs)
|
||||
tmpGeom = QgsGeometry( inFeatB.geometry() )
|
||||
if inGeom.intersects(tmpGeom):
|
||||
count = count + 1
|
||||
none = False
|
||||
atMap2 = i.attributeMap()
|
||||
atMap2 = inFeatB.attributeMap()
|
||||
if not summary:
|
||||
atMap = atMap1.values()
|
||||
atMap2 = atMap2.values()
|
||||
@ -212,50 +215,3 @@ class Dialog(QDialog, Ui_Dialog):
|
||||
start = start + add
|
||||
progressBar.setValue(start)
|
||||
del writer
|
||||
|
||||
def testForUniqueness(self, fieldList1, fieldList2):
|
||||
changed = True
|
||||
while changed:
|
||||
changed = False
|
||||
for i in fieldList1:
|
||||
for j in fieldList2:
|
||||
if j.name() == i.name():
|
||||
j = self.createUniqueFieldName(j)
|
||||
changed = True
|
||||
return fieldList2
|
||||
|
||||
def createUniqueFieldName(self, field):
|
||||
check = field.name().right(2)
|
||||
if check.startsWith("_"):
|
||||
(val,test) = check.right(1).toInt()
|
||||
if test:
|
||||
if val < 2:
|
||||
val = 2
|
||||
else:
|
||||
val = val + 1
|
||||
field.setName(field.name().left(len(field.name())-1) + unicode(val))
|
||||
else:
|
||||
field.setName(field.name() + "_2")
|
||||
else:
|
||||
field.setName(field.name() + "_2")
|
||||
return field
|
||||
|
||||
def getVectorLayerByName(self, myName):
|
||||
mc = self.iface.mapCanvas()
|
||||
nLayers = mc.layerCount()
|
||||
for l in range(nLayers):
|
||||
layer = mc.layer(l)
|
||||
if layer.name() == unicode(myName):
|
||||
vlayer = QgsVectorLayer(unicode(layer.source()), unicode(myName), unicode(layer.dataProvider().name()))
|
||||
if vlayer.isValid():
|
||||
return vlayer
|
||||
else:
|
||||
QMessageBox.information(self, self.tr("Spatial Join"), self.tr("Vector layer is not valid"))
|
||||
|
||||
def getFieldList(self, vlayer):
|
||||
fProvider = vlayer.dataProvider()
|
||||
feat = QgsFeature()
|
||||
allAttrs = fProvider.attributeIndexes()
|
||||
fProvider.select(allAttrs)
|
||||
myFields = fProvider.fields()
|
||||
return myFields
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user