Skip to content

Commit 77b9765

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents b4bf2d8 + 8872f17 commit 77b9765

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

packages/core/src/bag3d/core/assets/reconstruction/reconstruction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def create_roofer_config(
149149
toml_template = """
150150
polygon-source = "{footprint_file}"
151151
id-attribute = "identificatie"
152-
force-lod11-attribute = "kas_warenhuis"
152+
force-lod11-attribute = "b3_kas_warenhuis"
153153
lod11-fallback-area = 20000
154154
155155
split-cjseq = true

packages/core/src/bag3d/core/sqlfiles/reconstruction_excluded.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT fid
88
FROM (SELECT bag.fid
99
, bag.identificatie
1010
, bag.geometrie
11-
, bkw.kas_warenhuis
11+
, bkw.kas_warenhuis as b3_kas_warenhuis
1212
FROM ${bag_cleaned} bag
1313
LEFT JOIN ${bag_kas_warenhuis} bkw USING (fid)) sub
1414
-- At the moment do not exclude anything, because we don't have the AHN data yet.

packages/core/src/bag3d/core/sqlfiles/reconstruction_input.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS ${new_table} CASCADE;
22

33
CREATE TABLE ${new_table} AS
44
WITH extra_attributes AS (SELECT bag.*
5-
, bkw.kas_warenhuis
5+
, bkw.kas_warenhuis as b3_kas_warenhuis,
66
, bbo.b3_bag_bag_overlap
77
FROM ${bag_cleaned} bag
88
LEFT JOIN ${bag_kas_warenhuis} bkw USING (fid)
@@ -27,7 +27,7 @@ SELECT fid
2727
, tijdstipeindregistratielv
2828
, tijdstipinactieflv
2929
, tijdstipnietbaglv
30-
, kas_warenhuis
30+
, b3_kas_warenhuis
3131
, b3_bag_bag_overlap
3232
, geometrie
3333
FROM duplicates

0 commit comments

Comments
 (0)