Sécurity MAJ
This commit is contained in:
+273
-9
@@ -29,15 +29,20 @@ from qgis.PyQt.QtWidgets import (
|
||||
QMessageBox,
|
||||
QVBoxLayout,
|
||||
)
|
||||
from .tools.PythonSQL import *
|
||||
from .tools.SQLRequet import *
|
||||
from .tools.resources import (
|
||||
load_ui,
|
||||
resources_path,
|
||||
login_base,
|
||||
send_issues,
|
||||
)
|
||||
try:
|
||||
from .tools.PythonSQL import login_base
|
||||
except:
|
||||
print('Pas de fichier PythonSQL')
|
||||
|
||||
from .issues import CenRa_Issues
|
||||
|
||||
from ast import literal_eval
|
||||
from qgis.utils import iface
|
||||
import os.path
|
||||
import webbrowser, os
|
||||
@@ -46,16 +51,130 @@ import psycopg2.extras
|
||||
import base64
|
||||
|
||||
try:
|
||||
first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
|
||||
first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
|
||||
first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
|
||||
res_ident = first_cur.fetchone()
|
||||
mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
|
||||
user = res_ident[1]
|
||||
first_conn.close()
|
||||
account = login_base('account')
|
||||
user = account[0]
|
||||
mdp = account[1]
|
||||
host = account[2]
|
||||
port = account[3]
|
||||
dbname = account[4]
|
||||
sigdb = account[5]
|
||||
refdb = account[6]
|
||||
|
||||
except:
|
||||
print('')
|
||||
EDITOR_CLASS = load_ui('CenRa_Flux_base.ui')
|
||||
html = '''<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
|
||||
integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
|
||||
crossorigin=""/>
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
|
||||
integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
|
||||
crossorigin=""></script>
|
||||
<style>
|
||||
body { padding: 0; margin: 0; }
|
||||
html, body, #map { height: 100%; }
|
||||
.leaflet-control-layers-toggle {
|
||||
background-image: url(https://intranet.cenra-outils.org/Intranet/css/images/layers.png);
|
||||
}
|
||||
.legend_parc {
|
||||
border-radius: 15px;
|
||||
box-shadow: 2px 2px 3px 0 #6a6a6a;
|
||||
background-color: #fefafab3;
|
||||
opacity:0;
|
||||
}
|
||||
.legend_parc:hover{
|
||||
opacity:1;
|
||||
}
|
||||
.popup-with-no-events {
|
||||
pointer-events: none;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map"></div>
|
||||
<script src="map.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
<script>'''
|
||||
font = '''var OrthoIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
|
||||
'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
|
||||
'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
|
||||
'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
|
||||
{
|
||||
ignLayer: 'ORTHOIMAGERY.ORTHOPHOTOS',
|
||||
style: 'normal',
|
||||
service: 'WMTS',
|
||||
format: 'image/jpeg',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
attribution: '© IGN'
|
||||
}).addTo(map);
|
||||
// Plan IGN avec une transparence de 50%
|
||||
var PlanIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
|
||||
'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
|
||||
'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
|
||||
'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
|
||||
{
|
||||
ignLayer: 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2',
|
||||
style: 'normal',
|
||||
service: 'WMTS',
|
||||
format: 'image/png',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
attribution: '© IGN'
|
||||
});
|
||||
var baseMaps = {
|
||||
// "BDORTHO2" : bdortho,
|
||||
// "Openstreetmap": openStreetMap,
|
||||
// "Opentopomap": openTopoMap,
|
||||
"BDORTHO" : OrthoIGN,
|
||||
"PlanIGN": PlanIGN
|
||||
};
|
||||
var overlayMaps = {
|
||||
"Sites": Sites,
|
||||
//"Parcelle":JSON
|
||||
};
|
||||
L.control.layers(baseMaps,overlayMaps).addTo(map);
|
||||
var scale = L.control.scale({position: 'bottomleft', metric:true, imperial:false});
|
||||
scale.addTo(map);
|
||||
var legend = L.control({position: 'bottomleft'});
|
||||
|
||||
legend.onAdd = function (map) {
|
||||
var div = L.DomUtil.create('div', 'info legend_parc'),
|
||||
labels = [];
|
||||
labels.push('<i style="background:#73004c;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition')
|
||||
|
||||
labels.push('<i style="background:#ff00c5;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquis en partie BND')
|
||||
|
||||
labels.push('<i style="background:#f0ade1ab;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition pour partie')
|
||||
|
||||
labels.push('<i style="background:#73462e;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition / Convention')
|
||||
|
||||
labels.push('<i style="background:#e69800;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention')
|
||||
|
||||
labels.push('<i style="background:#ffd37f;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention en partie BND')
|
||||
|
||||
labels.push('<i style="background:#ffebaf;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention pour partie')
|
||||
|
||||
labels.push('<i style="background:#c8c8c8;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Autre')
|
||||
|
||||
labels.push('<i style="background:#f9ff08;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Projet en cours')
|
||||
|
||||
labels.push('<i style="background:#fe0000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Problème de mise à jour')
|
||||
|
||||
labels.push('<i style="background:#000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Pas de maitrise')
|
||||
|
||||
div.innerHTML = labels.join('<br>');
|
||||
return div;
|
||||
};
|
||||
|
||||
legend.addTo(map);
|
||||
</script>'''
|
||||
targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')
|
||||
layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')
|
||||
TranformCRS = QgsCoordinateTransform(layerCrs, targetCrs,QgsProject.instance())
|
||||
|
||||
class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
|
||||
@@ -84,10 +203,14 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
self.commandLinkButton_2.clicked.connect(self.suppression_flux)
|
||||
self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)
|
||||
self.comboBox_2.currentIndexChanged.connect(self.bd_source)
|
||||
self.checkBox.hide()
|
||||
self.checkBox.stateChanged.connect(self.modeCarte)
|
||||
self.toolButton.clicked.connect(self.getCanevas)
|
||||
layout = QVBoxLayout()
|
||||
self.lineEdit.textChanged.connect(self.filtre_dynamique)
|
||||
self.viewer.titleChanged.connect(self.NewTitle)
|
||||
layout.addWidget(self.lineEdit)
|
||||
self.viewer.hide()
|
||||
#self.lineEdit.mousePressEvent = self._mousePressEvent
|
||||
|
||||
#metadonnees_plugin = open(self.plugin_path + '/metadata.txt')
|
||||
@@ -97,6 +220,128 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
"""Run method that performs all the real work"""
|
||||
self.bd_source()
|
||||
|
||||
def NewTitle(self):
|
||||
if self.viewer.title() != '':
|
||||
Tsplit = ((self.viewer.title()).split('.'))
|
||||
print(Tsplit[0],Tsplit[1])
|
||||
self.openPostGIS(Tsplit[0],Tsplit[1])
|
||||
|
||||
def modeCarte(self):
|
||||
if self.checkBox.isChecked():
|
||||
self.viewer.show()
|
||||
|
||||
cur.execute("SELECT ST_AsGeoJSON(st_centroid(ST_Transform(geom,4326))) FROM _agregation_ra._agreg_contour")
|
||||
varcenter = literal_eval(cur.fetchall()[0][0])
|
||||
varcenter = [varcenter['coordinates'][1],varcenter['coordinates'][0]]
|
||||
|
||||
cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_contour WHERE geom IS NOT NULL GROUP BY tschema,tname;" )
|
||||
varSite = cur.fetchall()
|
||||
cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_travaux_prevus_poly WHERE geom IS NOT NULL GROUP BY tschema,tname;")
|
||||
varTravaux = cur.fetchall()
|
||||
cur.execute("SELECT ST_AsGeoJSON(ST_Transform(geom,4326)),milieu_libelle ,lb_eu_01,tschema,tname FROM _agregation_ra._agreg_eu_habitat WHERE geom IS NOT NULL;")
|
||||
varHabitat = cur.fetchall()
|
||||
|
||||
vargeomS = literal_eval(varSite[0][0])
|
||||
vargeomT = literal_eval(varTravaux[0][0])
|
||||
vargeomH = literal_eval(varHabitat[0][0])
|
||||
#new_objectS = self.SwitchGeom(vargeomS)
|
||||
#new_objectT = self.SwitchGeom(vargeomT)
|
||||
#new_objectH = self.SwitchGeom(vargeomH)
|
||||
|
||||
script = 'var map = L.map("map").setView('+str(varcenter)+', 13);'
|
||||
|
||||
id = 0
|
||||
varSiteJSON = '''var ParcelleJSON = {
|
||||
"type": "FeatureCollection",
|
||||
"features":['''
|
||||
for varP in varSite:
|
||||
id = id+1
|
||||
varSiteJSON = varSiteJSON+'{"properties": {"code": "'+str(varP[1])+'.'+str(varP[2])+'" },'+str(varP[0][1:])+','
|
||||
varSiteJSON = varSiteJSON[:-1]+''']};
|
||||
var Sites = L.geoJSON(ParcelleJSON,{
|
||||
style: function(feature) {
|
||||
switch (feature.geometry.properties.code) {
|
||||
case 'Ensemble de sites': return {fillColor: "#9a7863",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
case 'Sous-site conservatoire': return {fillColor: "#e69800",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
case 'Site non géré': return {fillColor: "#73004c",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
case 'Animation territoriale': return {fillColor: "#ffebaf",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
case 'Site conservatoire': return {fillColor: "#f9ff08",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
default: return {fillColor: "#c8c8c8",color:"white",weight: 1,fillOpacity: 0.7};
|
||||
}
|
||||
},
|
||||
onEachFeature: function (feature,layer) {
|
||||
layer.on('click', function(e) {
|
||||
map.fitBounds(layer.getBounds());
|
||||
document.title = feature.properties.code.toString();
|
||||
});
|
||||
layer.on('mouseover', function(e) {
|
||||
layer.setStyle({
|
||||
weight: 5,
|
||||
color: '#fe0000',
|
||||
dashArray: '',
|
||||
});
|
||||
});
|
||||
//layer.on('mousemove', function(e) {
|
||||
//layer.openPopup(e.latlng);
|
||||
//});
|
||||
layer.on('mouseout', function(e) {
|
||||
layer.setStyle({
|
||||
color:"white",
|
||||
weight: 1,
|
||||
});
|
||||
});
|
||||
layer.bindTooltip(feature.properties.code.toString(), {
|
||||
sticky: true,
|
||||
permanent: false,
|
||||
direction: 'right',
|
||||
className: 'label_parc'
|
||||
});
|
||||
}
|
||||
}).addTo(map);'''
|
||||
id = 0
|
||||
varTravauxJSON = '''var TravauxJSON = {
|
||||
"type": "FeatureCollection",
|
||||
"features":['''
|
||||
for varT in varTravaux:
|
||||
id = id+1
|
||||
varTravauxJSON = varTravauxJSON+'{"properties": {"code": "'+str(varT[1])+'.'+str(varT[2])+'" },'+str(varT[0][1:])+','
|
||||
varTravauxJSON = varTravauxJSON[:-1]+''']};
|
||||
var Travaux = L.geoJSON(TravauxJSON,{
|
||||
onEachFeature: function (feature,layer) {
|
||||
layer.on('click', function(e) {
|
||||
map.fitBounds(layer.getBounds());
|
||||
document.title = feature.properties.code.toString();
|
||||
});
|
||||
layer.on('mouseover', function(e) {
|
||||
layer.setStyle({
|
||||
weight: 5,
|
||||
color: '#fe0000',
|
||||
dashArray: '',
|
||||
});
|
||||
});
|
||||
//layer.on('mousemove', function(e) {
|
||||
//layer.openPopup(e.latlng);
|
||||
//});
|
||||
layer.on('mouseout', function(e) {
|
||||
layer.setStyle({
|
||||
color:"white",
|
||||
weight: 1,
|
||||
});
|
||||
});
|
||||
layer.bindTooltip(feature.properties.code.toString(), {
|
||||
sticky: true,
|
||||
permanent: false,
|
||||
direction: 'right',
|
||||
className: 'label_parc'
|
||||
});
|
||||
}
|
||||
}).addTo(map);'''
|
||||
script = script+varSiteJSON+varTravauxJSON
|
||||
self.viewer.setHtml(html+script+font)
|
||||
|
||||
else:
|
||||
self.viewer.hide()
|
||||
|
||||
def bd_source(self):
|
||||
self.activateWindow()
|
||||
bd_origine=self.comboBox_2.currentText()
|
||||
@@ -223,6 +468,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
self.tableWidget.setColumnWidth(1, 300)
|
||||
self.tableWidget.setColumnWidth(2, 300)
|
||||
self.tableWidget.setHorizontalHeaderLabels(["Code","Schema","Table"])
|
||||
|
||||
def selection_flux(self):
|
||||
selected_row = 0
|
||||
selected_items = self.tableWidget.selectedItems()
|
||||
@@ -268,6 +514,15 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
|
||||
if self.tableWidget_2.rowCount() <= 5:
|
||||
self.chargement_flux()
|
||||
def openPostGIS(self,schema,table):
|
||||
uri = QgsDataSourceUri()
|
||||
uri.setConnection(host ,port ,sigdb ,user ,mdp)
|
||||
uri.setDataSource(schema, table, "geom")
|
||||
uri.setKeyColumn('gid')
|
||||
uri.setSrid('2154')
|
||||
layer = QgsVectorLayer(uri.uri(), table, "postgres")
|
||||
# Ajout de la couche au canevas QGIS
|
||||
QgsProject.instance().addMapLayer(layer)
|
||||
|
||||
def chargement_flux(self):
|
||||
|
||||
@@ -285,6 +540,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
return switcher.get(type, "nothing")
|
||||
|
||||
|
||||
|
||||
def displayOnWindows(type, uri, name):
|
||||
p = []
|
||||
|
||||
@@ -427,6 +683,14 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
|
||||
if self.lineEdit.text() != 'Recherche par mots-clés':
|
||||
self.filtre_dynamique(self.lineEdit.text())
|
||||
|
||||
def SwitchGeom(self,vargeom):
|
||||
new_object = '['
|
||||
obj = vargeom['coordinates'][0][0]
|
||||
for obj_X in obj:
|
||||
new_object = new_object+'['+str(obj_X[1])+','+str(obj_X[0])+'],'
|
||||
new_object = new_object[:-1]+']'
|
||||
return(new_object)
|
||||
|
||||
def popup(self):
|
||||
|
||||
self.dialog = Popup() # +++ - self
|
||||
|
||||
Reference in New Issue
Block a user