Skip to content

Commit

Permalink
Switiching from PyQGIS2 to PyQGIS3 - create raster layer - isogeo.py …
Browse files Browse the repository at this point in the history 
…and modules/tools.py

closes #190 by replacing QgsMapLayerRegistry.instance().addMapLayer(layer) with QgsProject.instance().addMapLayer(layer)
  • Loading branch information
@SimonSAMPERE
SimonSAMPERE committed Jun 17, 2019
1 parent 9e21c55 commit 16fceb5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions isogeo.py
View file
Expand Up @@ -1396,7 +1396,7 @@ def add_layer(self, layer_info):
name = os.path.basename(path).split(".")[0]
layer = QgsVectorLayer(path, layer_info[2], 'ogr')
if layer.isValid():
lyr = QgsMapLayerRegistry.instance().addMapLayer(layer)
lyr = QgsProject.instance().addMapLayer(layer)
# fill QGIS metadata from Isogeo
lyr.setTitle(layer_info[2])
lyr.setAbstract(layer_info[3])
Expand Down Expand Up @@ -1427,7 +1427,7 @@ def add_layer(self, layer_info):
name = os.path.basename(path).split(".")[0]
layer = QgsRasterLayer(path, layer_info[2])
if layer.isValid():
lyr = QgsMapLayerRegistry.instance().addMapLayer(layer)
lyr = QgsProject.instance().addMapLayer(layer)
# fill QGIS metadata from Isogeo
lyr.setTitle(layer_info[2])
lyr.setAbstract(layer_info[3])
Expand Down Expand Up @@ -1460,7 +1460,7 @@ def add_layer(self, layer_info):
name,
'arcgisfeatureserver')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("EFS layer added: {0}".format(uri))
else:
error_msg = layer.error().message()
Expand All @@ -1476,7 +1476,7 @@ def add_layer(self, layer_info):
uri = layer_info[2]
layer = QgsRasterLayer(uri,name,"arcgismapserver")
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("EMS layer added: {0}".format(uri))
else:
error_msg = layer.error().message()
Expand All @@ -1492,7 +1492,7 @@ def add_layer(self, layer_info):
name = layer_info[1]
layer = QgsVectorLayer(url, name, 'WFS')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("WFS layer added: {0}".format(url))
else:
error_msg = layer.error().message()
Expand All @@ -1502,7 +1502,7 @@ def add_layer(self, layer_info):
if name_url[0] != 0:
layer = QgsVectorLayer(name_url[2], name_url[1], 'WFS')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("WFS layer added: {0}".format(url))
else:
error_msg = layer.error().message()
Expand All @@ -1520,7 +1520,7 @@ def add_layer(self, layer_info):
name = layer_info[1]
layer = QgsRasterLayer(url, name, 'wms')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("WMS layer added: {0}".format(url))
else:
error_msg = layer.error().message()
Expand All @@ -1530,7 +1530,7 @@ def add_layer(self, layer_info):
if name_url[0] != 0:
layer = QgsRasterLayer(name_url[2], name_url[1], 'wms')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("WMS layer added: {0}".format(url))
else:
error_msg = layer.error().message()
Expand All @@ -1548,7 +1548,7 @@ def add_layer(self, layer_info):
name = layer_info[1]
layer = QgsRasterLayer(url, name, 'wms')
if layer.isValid():
QgsMapLayerRegistry.instance().addMapLayer(layer)
QgsProject.instance().addMapLayer(layer)
logger.debug("WMTS service layer added: {0}".format(url))
else:
error_msg = layer.error().message()
Expand Down Expand Up @@ -1591,7 +1591,7 @@ def add_layer(self, layer_info):
# layer.setAbstract(layer_info.get("abstract", ""))
# layer.setKeywordList(",".join(layer_info.get("keywords", ())))
if layer.isValid():
lyr = QgsMapLayerRegistry.instance().addMapLayer(layer)
lyr = QgsProject.instance().addMapLayer(layer)
# fill QGIS metadata from Isogeo
lyr.setTitle(layer_info.get("title", "notitle"))
lyr.setAbstract(layer_info.get("abstract", ""))
Expand All @@ -1610,7 +1610,7 @@ def add_layer(self, layer_info):
uri.setKeyColumn(field)
layer = QgsVectorLayer(uri.uri(True), table, "postgres")
if layer.isValid():
lyr = QgsMapLayerRegistry.instance().addMapLayer(layer)
lyr = QgsProject.instance().addMapLayer(layer)
# fill QGIS metadata from Isogeo
lyr.setTitle(layer_info.get("title", "notitle"))
lyr.setAbstract(layer_info.get("abstract", ""))
Expand Down
6 changes: 3 additions & 3 deletions modules/tools.py
View file
Expand Up @@ -14,7 +14,7 @@
import webbrowser

# PyQGIS
from qgis.core import (QgsDataSourceUri, QgsProject, QgsVectorLayer, QgsProject, QgsRasterLayer)
from qgis.core import (QgsDataSourceUri, QgsProject, QgsVectorLayer, QgsRasterLayer)
from qgis.utils import iface

# PyQT
Expand Down Expand Up @@ -247,7 +247,7 @@ def special_search(self, easter_code="isogeo"):
wms_uri = unquote(urlencode(wms_params))
wms_lyr = QgsRasterLayer(wms_uri, u"Ici c'est Isogeo !", "wms")
if wms_lyr.isValid:
QgsMapLayerRegistry.instance().addMapLayer(wms_lyr)
QgsProject.instance().addMapLayer(wms_lyr)
logger.info("Isogeo easter egg used and WMS displayed!")
else:
logger.error("WMS layer failed: {}"
Expand All @@ -267,7 +267,7 @@ def special_search(self, easter_code="isogeo"):
wfs_style = path.join(path.dirname(path.realpath(__file__)),
"isogeo.qml")
wfs_lyr.loadNamedStyle(wfs_style)
QgsMapLayerRegistry.instance().addMapLayer(wfs_lyr)
QgsProject.instance().addMapLayer(wfs_lyr)
canvas.setExtent(wfs_lyr.extent())
logger.debug("Isogeo easter egg used")
else:
Expand Down

0 comments on commit 16fceb5

Please sign in to comment.