From b0c762cd2bf9a8083233588455d4792836da1a00 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Thu, 10 Nov 2016 03:23:52 +0100
Subject: [PATCH] simplified etldoc for layer_place

---
 layers/place/city.sql    | 17 +++--------------
 layers/place/country.sql |  3 +++
 layers/place/place.sql   |  3 +++
 layers/place/state.sql   |  3 +++
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/layers/place/city.sql b/layers/place/city.sql
index 6b3faec..af23866 100644
--- a/layers/place/city.sql
+++ b/layers/place/city.sql
@@ -1,15 +1,10 @@
 
 -- etldoc: layer_city[shape=record fillcolor=lightpink, style="rounded,filled",  
--- etldoc:     label="layer_city | <z2> z2 |<z3> z3 |<z4> z4 |<z5> z5|  <z6> z6 |<z7> z7 | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+-- etldoc:     label="layer_city | <z2_7> z2-z7 | <z8_14_> z8_z14_   " ] ;
 
 CREATE OR REPLACE FUNCTION layer_city(bbox geometry, zoom_level int, pixel_width numeric)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class city_class, "rank" int) AS $$
-    -- etldoc: osm_city_point -> layer_city:z2
-    -- etldoc: osm_city_point -> layer_city:z3
-    -- etldoc: osm_city_point -> layer_city:z4
-    -- etldoc: osm_city_point -> layer_city:z5
-    -- etldoc: osm_city_point -> layer_city:z6
-    -- etldoc: osm_city_point -> layer_city:z7                
+    -- etldoc: osm_city_point -> layer_city:z2_7              
     SELECT osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en, place AS class, "rank"
     FROM osm_city_point
     WHERE geometry && bbox
@@ -30,13 +25,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class c
         population DESC NULLS LAST,
         length(name) ASC
       )::int AS gridrank
-    -- etldoc: osm_city_point -> layer_city:z8
-    -- etldoc: osm_city_point -> layer_city:z9
-    -- etldoc: osm_city_point -> layer_city:z10
-    -- etldoc: osm_city_point -> layer_city:z11
-    -- etldoc: osm_city_point -> layer_city:z12
-    -- etldoc: osm_city_point -> layer_city:z13
-    -- etldoc: osm_city_point -> layer_city:z14_                              
+    -- etldoc: osm_city_point -> layer_city:z8_14_                          
         FROM osm_city_point
         WHERE geometry && bbox
           AND ((zoom_level = 8 AND place <= 'town'::city_class)
diff --git a/layers/place/country.sql b/layers/place/country.sql
index 092aed2..3f276fa 100644
--- a/layers/place/country.sql
+++ b/layers/place/country.sql
@@ -1,4 +1,7 @@
 
+-- etldoc: layer_country[shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc:     label="layer_country | <zall> z0-z14_ " ] ;
+
 -- etldoc: osm_country_point -> layer_country
 CREATE OR REPLACE FUNCTION layer_country(bbox geometry, zoom_level int)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, "rank" int) AS $$
diff --git a/layers/place/place.sql b/layers/place/place.sql
index 320dbfa..8e11d21 100644
--- a/layers/place/place.sql
+++ b/layers/place/place.sql
@@ -1,4 +1,7 @@
 
+-- etldoc: layer_place[shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc:     label="layer_place | <zall> z0-z14_ " ] ;
+
 -- etldoc: layer_country -> layer_place
 -- etldoc: layer_state   -> layer_place
 -- etldoc: layer_city    -> layer_place
diff --git a/layers/place/state.sql b/layers/place/state.sql
index 64037f9..de11478 100644
--- a/layers/place/state.sql
+++ b/layers/place/state.sql
@@ -1,4 +1,7 @@
 
+-- etldoc: layer_state[shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc:     label="layer_state | <zall> z0-z14_ " ] ;
+
 -- etldoc:  osm_state_point -> layer_state
 
 CREATE OR REPLACE FUNCTION layer_state(bbox geometry, zoom_level int)