From 445b06c3bf78d8f0cdbc25fc94fc730481f9477f Mon Sep 17 00:00:00 2001 From: Manuel Roth Date: Thu, 28 Apr 2016 19:19:38 +0200 Subject: [PATCH] Move all as to uppercase AS --- osm2vectortiles.tm2source/data.yml | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/osm2vectortiles.tm2source/data.yml b/osm2vectortiles.tm2source/data.yml index 0e1fb8a..75da6ae 100644 --- a/osm2vectortiles.tm2source/data.yml +++ b/osm2vectortiles.tm2source/data.yml @@ -34,7 +34,7 @@ Layer: AND geometry && !bbox! GROUP BY type UNION ALL - SELECT osm_ids2mbid(osm_id, true) as osm_id, geometry, landuse_class(type) as class, type + SELECT osm_ids2mbid(osm_id, true) AS osm_id, geometry, landuse_class(type) AS class, type FROM ( SELECT osm_id, geometry, type FROM landuse_z9 @@ -82,7 +82,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, false) as osm_id, geometry, type, type as class + SELECT osm_ids2mbid(osm_id, false) AS osm_id, geometry, type, type AS class FROM ( SELECT * FROM waterway_z7toz9 @@ -184,7 +184,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, is_polygon(geometry)) as osm_id, geometry, type + SELECT osm_ids2mbid(osm_id, is_polygon(geometry)) AS osm_id, geometry, type FROM ( SELECT * FROM aeroway_z9 @@ -219,7 +219,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, is_polygon(geometry)) as osm_id, geometry, barrier_line_class(type) AS class + SELECT osm_ids2mbid(osm_id, is_polygon(geometry)) AS osm_id, geometry, barrier_line_class(type) AS class FROM barrier_line_z14 WHERE geometry && !bbox! AND z(!scale_denominator!) = 14 @@ -459,7 +459,7 @@ Layer: table: |- ( SELECT osm_ids2mbid(osm_id, true) AS osm_id, wkb_geometry, - iso3166_1_alpha_2 as code, + iso3166_1_alpha_2 AS code, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -467,7 +467,7 @@ Layer: coalesce(NULLIF(name_de, ''), name) AS name_de, coalesce(NULLIF(name_ru, ''), name) AS name_ru, coalesce(NULLIF(name_zh, ''), name) AS name_zh, - rank as scalerank + rank AS scalerank FROM custom_countries WHERE ( ( @@ -532,7 +532,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, true) as osm_id, wkb_geometry, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, wkb_geometry, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -541,7 +541,7 @@ Layer: coalesce(NULLIF(name_ru, ''), name) AS name_ru, coalesce(NULLIF(name_zh, ''), name) AS name_zh, case when ST_GeometryType(wkb_geometry) = 'ST_LineString' then 'line' - else 'point' end as placement, + else 'point' end AS placement, rank AS labelrank FROM custom_seas WHERE wkb_geometry && !bbox! AND ( @@ -596,8 +596,8 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, true) as osm_id, wkb_geometry, abbr, - area_sqkm as area, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, wkb_geometry, abbr, + area_sqkm AS area, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -646,7 +646,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, true) as osm_id, topoint(geometry) AS geometry, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, topoint(geometry) AS geometry, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -853,9 +853,9 @@ Layer: coalesce(NULLIF(name_zh, ''), name) AS name_zh, nullif(ref, '') AS ref, nullif(char_length(ref), 0) AS reflen, - round(MercLength(geometry)) as len, + round(MercLength(geometry)) AS len, road_class(type, service, access) AS class, - 'default' as shield, + 'default' AS shield, rank() OVER ( PARTITION BY LabelGrid(geometry, (CASE WHEN z(!scale_denominator!) >= 11 THEN 300 @@ -925,7 +925,7 @@ Layer: coalesce(NULLIF(name_de, ''), name) AS name_de, coalesce(NULLIF(name_ru, ''), name) AS name_ru, coalesce(NULLIF(name_zh, ''), name) AS name_zh, - type, type as class + type, type AS class FROM ( SELECT * FROM waterway_label_z13 WHERE z(!scale_denominator!) = 13 @@ -967,7 +967,7 @@ Layer: srid: '' table: |- ( - SELECT topoint(geometry) AS geometry, osm_ids2mbid(osm_id, true) as osm_id, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, topoint(geometry) AS geometry, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -1014,7 +1014,7 @@ Layer: srid: '' table: |- ( - SELECT geometry, osm_ids2mbid(osm_id, true) as osm_id, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, geometry, name, coalesce(NULLIF(name_en, ''), name) AS name_en, coalesce(NULLIF(name_es, ''), name) AS name_es, @@ -1064,7 +1064,7 @@ Layer: srid: '' table: |- ( - SELECT osm_ids2mbid(osm_id, true) as osm_id, geometry, + SELECT osm_ids2mbid(osm_id, true) AS osm_id, geometry, meter_to_feet(elevation_m) AS elevation_ft, elevation_m, mountain_peak_type(type) AS maki,