From 551d973f4a37090e192a201a6d733e7dcfa9b1d8 Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Tue, 28 Jun 2016 17:30:07 +0200 Subject: [PATCH] Pass is_capital in place view up the chain --- src/import-sql/layers/place_label.sql | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/import-sql/layers/place_label.sql b/src/import-sql/layers/place_label.sql index 703ce2f..d09051a 100644 --- a/src/import-sql/layers/place_label.sql +++ b/src/import-sql/layers/place_label.sql @@ -1,6 +1,6 @@ CREATE OR REPLACE VIEW place_label_z3 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND scalerank IS NOT NULL @@ -10,7 +10,7 @@ CREATE OR REPLACE VIEW place_label_z3 AS ( CREATE OR REPLACE VIEW place_label_z4 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND scalerank IS NOT NULL @@ -20,7 +20,7 @@ CREATE OR REPLACE VIEW place_label_z4 AS ( CREATE OR REPLACE VIEW place_label_z5 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND scalerank IS NOT NULL @@ -30,7 +30,7 @@ CREATE OR REPLACE VIEW place_label_z5 AS ( CREATE OR REPLACE VIEW place_label_z6toz7 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('city', 'town') @@ -38,7 +38,7 @@ CREATE OR REPLACE VIEW place_label_z6toz7 AS ( CREATE OR REPLACE VIEW place_label_z8 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('city', 'town') @@ -46,7 +46,7 @@ CREATE OR REPLACE VIEW place_label_z8 AS ( CREATE OR REPLACE VIEW place_label_z9 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('island', 'aboriginal_lands', 'city', 'town', 'village') @@ -54,7 +54,7 @@ CREATE OR REPLACE VIEW place_label_z9 AS ( CREATE OR REPLACE VIEW place_label_z10 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('island', 'aboriginal_lands', 'city', 'town', 'village', 'suburb') @@ -62,7 +62,7 @@ CREATE OR REPLACE VIEW place_label_z10 AS ( CREATE OR REPLACE VIEW place_label_z11toz12 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('island', 'aboriginal_lands', 'city', 'town', 'village', 'suburb') @@ -70,7 +70,7 @@ CREATE OR REPLACE VIEW place_label_z11toz12 AS ( CREATE OR REPLACE VIEW place_label_z13 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' AND type IN ('island', 'islet', 'aboriginal_lands', 'city', 'town', 'village', 'suburb', 'hamlet') @@ -78,7 +78,7 @@ CREATE OR REPLACE VIEW place_label_z13 AS ( CREATE OR REPLACE VIEW place_label_z14 AS ( SELECT id AS osm_id, name, name_fr, name_en, name_de, name_es, name_ru, name_zh, - type, population, capital, admin_level, scalerank, geometry + type, population, is_capital, capital, admin_level, scalerank, geometry FROM osm_place_point WHERE name <> '' );