From 1dd98896458797776304829d8f9b759e9ab9164a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20Hansl=C3=ADk?= <kukulich@kukulich.cz>
Date: Tue, 10 Oct 2023 12:51:56 +0200
Subject: [PATCH] Revert "Convert semi-colon separated house numbers to a range
 (#1562)"

This reverts commit a7a50d84bc7e5117453d6e1c179a8a36f105d73b.
---
 layers/housenumber/housenumber.sql         |  2 +-
 layers/housenumber/housenumber.yaml        |  4 +---
 layers/housenumber/housenumber_display.sql | 20 --------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 layers/housenumber/housenumber_display.sql

diff --git a/layers/housenumber/housenumber.sql b/layers/housenumber/housenumber.sql
index 22dc43853..54cccef5b 100644
--- a/layers/housenumber/housenumber.sql
+++ b/layers/housenumber/housenumber.sql
@@ -14,7 +14,7 @@ SELECT
     -- etldoc: osm_housenumber_point -> layer_housenumber:z14_
     osm_id,
     geometry,
-    display_housenumber(housenumber)
+    housenumber
 FROM (
     SELECT
         osm_id,
diff --git a/layers/housenumber/housenumber.yaml b/layers/housenumber/housenumber.yaml
index 99a8a7cba..7fa1e6e01 100644
--- a/layers/housenumber/housenumber.yaml
+++ b/layers/housenumber/housenumber.yaml
@@ -7,14 +7,12 @@ layer:
   buffer_size: 8
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    housenumber: Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag. 
-      If there are multiple values separated by semi-colons, the first and last value separated by a dash.
+    housenumber: Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag.
   datasource:
     geometry_field: geometry
     srid: 900913
     query: (SELECT geometry, housenumber FROM layer_housenumber(!bbox!, z(!scale_denominator!))) AS t
 schema:
-  - ./housenumber_display.sql
   - ./housenumber_centroid.sql
   - ./housenumber.sql
 datasources:
diff --git a/layers/housenumber/housenumber_display.sql b/layers/housenumber/housenumber_display.sql
deleted file mode 100644
index 7b4a46b09..000000000
--- a/layers/housenumber/housenumber_display.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE OR REPLACE FUNCTION display_housenumber_nonnumeric(raw_housenumber text)
-RETURNS text AS $$
-  -- Find the position of the semicolon in the input string
-  -- and extract the first and last value
-  SELECT substring(raw_housenumber from 1 for position(';' in raw_housenumber) - 1)
-         || '–'
-         || substring(raw_housenumber from position(';' in raw_housenumber) + 1);
-$$ LANGUAGE SQL IMMUTABLE;
-
-
-CREATE OR REPLACE FUNCTION display_housenumber(raw_housenumber text)
-RETURNS text AS $$
-  SELECT CASE
-    WHEN raw_housenumber !~ ';' THEN raw_housenumber
-    WHEN raw_housenumber ~ '[^0-9;]' THEN display_housenumber_nonnumeric(raw_housenumber)
-    ELSE
-      (SELECT min(value)::text || '–' || max(value)::text
-       FROM unnest(string_to_array(raw_housenumber, ';')::int[]) AS value)
-  END
-$$ LANGUAGE SQL IMMUTABLE;