--- a/pkg/imports/fm_bcnlat.go	Mon Feb 17 12:24:00 2020 +0100
+++ b/pkg/imports/fm_bcnlat.go	Mon Feb 17 14:47:54 2020 +0100
@@ -80,47 +80,6 @@
 }
 
 const (
-	insertBCNLATSQL = `
-with a as (
-  select users.current_user_area_utm() AS a
-)
-INSERT INTO waterway.fairway_marks_bcnlat (
-  geom,
-  datsta,
-  datend,
-  persta,
-  perend,
-  objnam,
-  nobjnm,
-  inform,
-  ninfom,
-  scamin,
-  picrep,
-  txtdsc,
-  sordat,
-  sorind,
-  colour,
-  colpat,
-  condtn,
-  bcnshp,
-  catlam
-)
-SELECT newfm, $3, $4, $5, $6, $7, $8, $9,
-    $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20
-  FROM ST_Transform(ST_GeomFromWKB($1, $2::integer), 4326) AS newfm (newfm)
-  WHERE pg_has_role('sys_admin', 'MEMBER')
-    OR ST_Intersects((select a from a),
-      ST_Transform(newfm, (select ST_SRID(a) from a)))
-ON CONFLICT (
-  CAST((geom,
-      datsta, datend, persta, perend, objnam, nobjnm, inform, ninfom,
-      scamin, picrep, txtdsc, sordat, sorind,
-      0, colour, colpat, condtn, bcnshp, catlam
-    ) AS waterway.fairway_marks_bcnlat)
-  )
-  DO NOTHING
-RETURNING id
-`
 	insertDirimpSQL = `
 INSERT INTO waterway.fairway_marks_bcnlat_dirimps (fm_bcnlat_id, dirimp)
   VALUES ($1, $2)
@@ -150,7 +109,11 @@
 
 			feedback.Info("Store fairway marks of type BCNLAT/bcnlat")
 
-			insertStmt, err := tx.PrepareContext(ctx, insertBCNLATSQL)
+			insertStmt, err := tx.PrepareContext(
+				ctx,
+				getFMInsertSQL("bcnlat", []string{
+					"colour", "colpat", "condtn", "bcnshp", "catlam"}),
+			)
 			if err != nil {
 				return
 			}