sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for issues generated from api cleanup commit

Browse Source
This commit is contained in:
Salvatore Larosa 2012-12-31 13:11:16 +01:00
parent 98e9c27ec8
commit 90ef5767bc
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/osm/OsmDatabaseManager.py
View File

@ -168,7 +168,7 @@ class OsmDatabaseManager:
key=dbFileName.toLatin1().data()
# remove map layers that belong to dbFileName database
if key in self.lineLayers.keys() and layer.id()==self.lineLayers[key].getLayerID():
if key in self.lineLayers.keys() and layer.id()==self.lineLayers[key].id():
del self.lineLayers[key]
elif key in self.pointLayers.keys() and layer.id()==self.pointLayers[key].id():
@ -176,14 +176,14 @@ class OsmDatabaseManager:
if key in self.lineLayers.keys():
if self.lineLayers[key]:
lineLayID=self.lineLayers[key].id()
self.mapReg.removeMapLayer(lineLayID,True)
self.mapReg.removeMapLayers([lineLayID],True)
elif key in self.polygonLayers.keys() and layer.id()==self.polygonLayers[key].id():
del self.polygonLayers[key]
if key in self.pointLayers.keys():
if self.pointLayers[key]:
pointLayID=self.pointLayers[key].id()
self.mapReg.removeMapLayer(pointLayID,True)
self.mapReg.removeMapLayers([pointLayID],True)
if key in self.dbConns.keys():
del self.dbConns[key]
@ -202,7 +202,7 @@ class OsmDatabaseManager:
continue
if layer.type()==QgsMapLayer.VectorLayer and layer.dataProvider().name()=="osm":
QgsMapLayerRegistry.instance().removeMapLayer(layer.id(),True)
QgsMapLayerRegistry.instance().removeMapLayers([layer.id()],True)
self.dbConns={} # map dbFileName->sqlite3ConnectionObject
self.pointLayers={}

2
python/plugins/osm/OsmDownloadDlg.py
View File

@ -90,7 +90,7 @@ class OsmDownloadDlg(QDialog, Ui_OsmDownloadDlg):
# check whether the extent needs to be projected back to WGS84
mapRenderer = plugin.canvas.mapRenderer()
if mapRenderer.hasCrsTransformEnabled():
crsMap=mapRenderer.destinationSrs()
crsMap=mapRenderer.destinationCrs()
crsWgs84=QgsCoordinateReferenceSystem(4326)
xform=QgsCoordinateTransform(crsMap, crsWgs84)
currentExtent=xform.transformBoundingBox(currentExtent)

2
python/plugins/osm/OsmFeatureDW.py
View File

@ -207,7 +207,7 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object):
renderer = self.plugin.canvas.mapRenderer()
if renderer.hasCrsTransformEnabled():
self.coordXform = QgsCoordinateTransform(renderer.destinationSrs(), QgsCoordinateReferenceSystem(4326))
self.coordXform = QgsCoordinateTransform(renderer.destinationCrs(), QgsCoordinateReferenceSystem(4326))
else:
self.coordXform = None

6
python/plugins/osm/OsmLoadDlg.py
View File

@ -192,7 +192,7 @@ class OsmLoadDlg(QDialog, Ui_OsmLoadDlg):
if self.chkCustomRenderer.isChecked():
self.setCustomRenderer(polygonLayer)
QgsMapLayerRegistry.instance().addMapLayer(polygonLayer)
QgsMapLayerRegistry.instance().addMapLayers([polygonLayer])
# add line layer
lineLayer = QgsVectorLayer(self.fname+"?type=line"+observer + tag + style, basename+" lines", "osm")
@ -206,7 +206,7 @@ class OsmLoadDlg(QDialog, Ui_OsmLoadDlg):
if self.chkCustomRenderer.isChecked():
self.setCustomRenderer(lineLayer)
QgsMapLayerRegistry.instance().addMapLayer(lineLayer)
QgsMapLayerRegistry.instance().addMapLayers([lineLayer])
# add point layer
pointLayer = QgsVectorLayer(self.fname+"?type=point"+observer + tag + style, basename+" points", "osm")
@ -220,7 +220,7 @@ class OsmLoadDlg(QDialog, Ui_OsmLoadDlg):
if self.chkCustomRenderer.isChecked():
self.setCustomRenderer(pointLayer)
QgsMapLayerRegistry.instance().addMapLayer(pointLayer)
QgsMapLayerRegistry.instance().addMapLayers([pointLayer])
# remember layers
self.polygonLayer=polygonLayer