From 7de8f38e90072f33b5e02e55b7ffa1c29902e84c Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Sat, 8 Oct 2016 21:21:53 +0200 Subject: [PATCH] Move encoding function up to start of file --- schema/layers/state.sql | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/schema/layers/state.sql b/schema/layers/state.sql index 6cad81a4..1a973f85 100644 --- a/schema/layers/state.sql +++ b/schema/layers/state.sql @@ -1,3 +1,11 @@ +CREATE OR REPLACE FUNCTION fix_win1252_shp_encoding(str TEXT) RETURNS TEXT +AS $$ +BEGIN + RETURN convert_from(convert_to(str, 'WIN1252'), 'UTF-8'); + EXCEPTION WHEN others THEN RETURN str; +END; +$$ LANGUAGE plpgsql IMMUTABLE; + CREATE TABLE IF NOT EXISTS state_label AS ( SELECT topoint(geom) AS geom, name_local, fix_win1252_shp_encoding(name) AS name_en, @@ -10,14 +18,6 @@ CREATE TABLE IF NOT EXISTS state_label AS ( ); CREATE INDEX IF NOT EXISTS state_label_geom_idx ON state_label USING gist(geom); -CREATE OR REPLACE FUNCTION fix_win1252_shp_encoding(str TEXT) RETURNS TEXT -AS $$ -BEGIN - RETURN convert_from(convert_to(str, 'WIN1252'), 'UTF-8'); - EXCEPTION WHEN others THEN RETURN str; -END; -$$ LANGUAGE plpgsql IMMUTABLE; - CREATE OR REPLACE VIEW state_z3 AS ( SELECT * FROM state_label WHERE (scalerank <= 2 AND labelrank <= 1) OR type = 'Avtonomnyy Okrug'