diff --git a/konova/management/commands/kspMigrater/compensation_migrater.py b/konova/management/commands/kspMigrater/compensation_migrater.py index 0cb85add..0055ccc7 100644 --- a/konova/management/commands/kspMigrater/compensation_migrater.py +++ b/konova/management/commands/kspMigrater/compensation_migrater.py @@ -21,9 +21,9 @@ class CompensationMigrater(BaseMigrater): 'select ' 'om."KENNUNG", ' 'linf."OBJBEZ", ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomf.the_geom,4326)), 3))) as geomf, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geoml.the_geom,4326)), 2))) as geoml, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomp.the_geom,4326)), 1))) as geomp, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomf.the_geom), 3))) as geomf, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geoml.the_geom), 2))) as geoml, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomp.the_geom), 1))) as geomp, ' 'linf."Bemerkung" ' 'from "OBJ_MASTER" om ' 'left join "LINFOS" linf on om."GISPADID"=linf."GISPADID" ' diff --git a/konova/management/commands/kspMigrater/eco_account_migrater.py b/konova/management/commands/kspMigrater/eco_account_migrater.py index 4fcd4c6b..9a3b5e90 100644 --- a/konova/management/commands/kspMigrater/eco_account_migrater.py +++ b/konova/management/commands/kspMigrater/eco_account_migrater.py @@ -27,9 +27,9 @@ class EcoAccountMigrater(CompensationMigrater): 'select ' 'om."KENNUNG", ' 'linf."OBJBEZ", ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomf.the_geom,4326)), 3))) as geomf, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geoml.the_geom,4326)), 2))) as geoml, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomp.the_geom,4326)), 1))) as geomp, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomf.the_geom), 3))) as geomf, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geoml.the_geom), 2))) as geoml, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomp.the_geom), 1))) as geomp, ' 'linf."Bemerkung" ' 'from "OBJ_MASTER" om ' 'left join "LINFOS" linf on om."GISPADID"=linf."GISPADID" ' @@ -85,7 +85,7 @@ class EcoAccountMigrater(CompensationMigrater): tmp_cursor = self.db_connection.cursor() tmp_cursor.execute( 'select ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Union(ST_Transform(geom.the_geom,4326)))))) ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Union(geom.the_geom))))) ' 'from "OBJ_MASTER" om ' 'left join "Aufwertung" auf on om."GISPADID"=auf."GISPADID" ' 'left join "OBJ_MASTER" om_kom on auf."Infos"=om_kom."KENNUNG" ' @@ -108,7 +108,7 @@ class EcoAccountMigrater(CompensationMigrater): tmp_cursor.execute( 'select ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomf.the_geom,4326)), 3))) as geomf ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomf.the_geom), 3))) as geomf ' 'from "OBJ_MASTER" om ' 'left join geometry_f geomf on om."GISPADID"=geomf.gispadid ' 'where ' @@ -293,7 +293,7 @@ class EcoAccountMigrater(CompensationMigrater): tmp_cursor = self.db_connection.cursor() tmp_cursor.execute( 'select ' - f'st_area(st_transform(geom.the_geom,{DEFAULT_SRID_RLP})) ' + f'st_area(geom.the_geom) ' 'from "OBJ_MASTER" om ' 'join geometry_f geom on om."GISPADID"=geom.gispadid ' 'where ' diff --git a/konova/management/commands/kspMigrater/ema_migrater.py b/konova/management/commands/kspMigrater/ema_migrater.py index eda219b3..b91aaee5 100644 --- a/konova/management/commands/kspMigrater/ema_migrater.py +++ b/konova/management/commands/kspMigrater/ema_migrater.py @@ -20,9 +20,9 @@ class EmaMigrater(CompensationMigrater): 'select ' 'om."KENNUNG", ' 'linf."OBJBEZ", ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomf.the_geom,4326)), 3))) as geomf, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geoml.the_geom,4326)), 2))) as geoml, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomp.the_geom,4326)), 1))) as geomp, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomf.the_geom), 3))) as geomf, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geoml.the_geom), 2))) as geoml, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomp.the_geom), 1))) as geomp, ' 'linf."Bemerkung" ' 'from "OBJ_MASTER" om ' 'left join "LINFOS" linf on om."GISPADID"=linf."GISPADID" ' diff --git a/konova/management/commands/kspMigrater/intervention_migrater.py b/konova/management/commands/kspMigrater/intervention_migrater.py index 82911a86..c74013c8 100644 --- a/konova/management/commands/kspMigrater/intervention_migrater.py +++ b/konova/management/commands/kspMigrater/intervention_migrater.py @@ -150,9 +150,9 @@ class InterventionMigrater(BaseMigrater): 'select ' 'om."KENNUNG", ' 'linf."OBJBEZ", ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomf.the_geom,4326)), 3))) as geomf, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geoml.the_geom,4326)), 2))) as geoml, ' - 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(ST_Transform(geomp.the_geom,4326)), 1))) as geomp, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomf.the_geom), 3))) as geomf, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geoml.the_geom), 2))) as geoml, ' + 'ST_AsEWKT(ST_Multi(ST_CollectionExtract(ST_MakeValid(geomp.the_geom), 1))) as geomp, ' 'eiv.verfahrenstyp, ' 'vr.verfahrensrecht, ' 'adr.behoerde as zb, '