@@ -107,7 +107,7 @@ def run(item, action, mainwindow):
107
107
# face
108
108
layer = db .toSqlLayer (u'SELECT face_id, topology.ST_GetFaceGeometry(%s, face_id) as geom ' \
109
109
'FROM %s.face WHERE face_id > 0' % (quoteStr (toponame ), quoteId (toponame )),
110
- 'geom' , 'face_id' , u'geom' )
110
+ 'geom' , 'face_id' , u'%s.face' % toponame )
111
111
layer .loadNamedStyle (os .path .join (template_dir , 'face.qml' ))
112
112
registry .addMapLayers ([layer ])
113
113
legend .setLayerVisible (layer , False )
@@ -117,7 +117,7 @@ def run(item, action, mainwindow):
117
117
# face_seed
118
118
layer = db .toSqlLayer (u'SELECT face_id, ST_PointOnSurface(topology.ST_GetFaceGeometry(%s, face_id)) as geom ' \
119
119
'FROM %s.face WHERE face_id > 0' % (quoteStr (toponame ), quoteId (toponame )),
120
- 'geom' , 'face_id' , u'seed' )
120
+ 'geom' , 'face_id' , u'%s.face_seed' % toponame )
121
121
layer .loadNamedStyle (os .path .join (template_dir , 'face_seed.qml' ))
122
122
registry .addMapLayers ([layer ])
123
123
legend .setLayerVisible (layer , False )
@@ -134,7 +134,7 @@ def run(item, action, mainwindow):
134
134
135
135
# node
136
136
uri .setDataSource (toponame , 'node' , 'geom' , '' , 'node_id' )
137
- layer = QgsVectorLayer (uri .uri (), u'geom' , provider )
137
+ layer = QgsVectorLayer (uri .uri (), u'%s.node' % toponame , provider )
138
138
layer .loadNamedStyle (os .path .join (template_dir , 'node.qml' ))
139
139
registry .addMapLayers ([layer ])
140
140
legend .setLayerVisible (layer , False )
@@ -143,7 +143,7 @@ def run(item, action, mainwindow):
143
143
144
144
# node labels
145
145
uri .setDataSource (toponame , 'node' , 'geom' , '' , 'node_id' )
146
- layer = QgsVectorLayer (uri .uri (), u'node_id' , provider )
146
+ layer = QgsVectorLayer (uri .uri (), u'%s. node_id' % toponame , provider )
147
147
layer .loadNamedStyle (os .path .join (template_dir , 'node_label.qml' ))
148
148
registry .addMapLayers ([layer ])
149
149
legend .setLayerVisible (layer , False )
@@ -157,15 +157,15 @@ def run(item, action, mainwindow):
157
157
158
158
# edge
159
159
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
160
- layer = QgsVectorLayer (uri .uri (), u'geom' , provider )
160
+ layer = QgsVectorLayer (uri .uri (), u'%s.edge' % toponame , provider )
161
161
registry .addMapLayers ([layer ])
162
162
legend .setLayerVisible (layer , False )
163
163
legend .setLayerExpanded (layer , False )
164
164
legend .moveLayer (layer , group )
165
165
166
166
# directed edge
167
167
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
168
- layer = QgsVectorLayer (uri .uri (), u'directed_geom' , provider )
168
+ layer = QgsVectorLayer (uri .uri (), u'%s.directed_edge' % toponame , provider )
169
169
layer .loadNamedStyle (os .path .join (template_dir , 'edge.qml' ))
170
170
registry .addMapLayers ([layer ])
171
171
legend .setLayerVisible (layer , False )
@@ -175,7 +175,7 @@ def run(item, action, mainwindow):
175
175
176
176
# edge labels
177
177
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
178
- layer = QgsVectorLayer (uri .uri (), u'edge_id' , provider )
178
+ layer = QgsVectorLayer (uri .uri (), u'%s. edge_id' % toponame , provider )
179
179
layer .loadNamedStyle (os .path .join (template_dir , 'edge_label.qml' ))
180
180
registry .addMapLayers ([layer ])
181
181
legend .setLayerVisible (layer , False )
@@ -184,7 +184,7 @@ def run(item, action, mainwindow):
184
184
185
185
# face_left
186
186
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
187
- layer = QgsVectorLayer (uri .uri (), u'face_left' , provider )
187
+ layer = QgsVectorLayer (uri .uri (), u'%s. face_left' % toponame , provider )
188
188
layer .loadNamedStyle (os .path .join (template_dir , 'face_left.qml' ))
189
189
registry .addMapLayers ([layer ])
190
190
legend .setLayerVisible (layer , False )
@@ -193,7 +193,7 @@ def run(item, action, mainwindow):
193
193
194
194
# face_right
195
195
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
196
- layer = QgsVectorLayer (uri .uri (), u'face_right' , provider )
196
+ layer = QgsVectorLayer (uri .uri (), u'%s. face_right' % toponame , provider )
197
197
layer .loadNamedStyle (os .path .join (template_dir , 'face_right.qml' ))
198
198
registry .addMapLayers ([layer ])
199
199
legend .setLayerVisible (layer , False )
@@ -202,7 +202,7 @@ def run(item, action, mainwindow):
202
202
203
203
# next_left
204
204
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
205
- layer = QgsVectorLayer (uri .uri (), u'next_left' , provider )
205
+ layer = QgsVectorLayer (uri .uri (), u'%s. next_left' % toponame , provider )
206
206
layer .loadNamedStyle (os .path .join (template_dir , 'next_left.qml' ))
207
207
registry .addMapLayers ([layer ])
208
208
legend .setLayerVisible (layer , False )
@@ -211,7 +211,7 @@ def run(item, action, mainwindow):
211
211
212
212
# next_right
213
213
uri .setDataSource (toponame , 'edge_data' , 'geom' , '' , 'edge_id' )
214
- layer = QgsVectorLayer (uri .uri (), u'next_right' , provider )
214
+ layer = QgsVectorLayer (uri .uri (), u'%s. next_right' % toponame , provider )
215
215
layer .loadNamedStyle (os .path .join (template_dir , 'next_right.qml' ))
216
216
registry .addMapLayers ([layer ])
217
217
legend .setLayerVisible (layer , False )
0 commit comments