From 226a9f1af23c52ff3f37c0cfc8d45199ca6db3ba Mon Sep 17 00:00:00 2001 From: nebulon42 Date: Tue, 30 Aug 2016 21:39:56 +0200 Subject: [PATCH] bigger text size, no capitals at z3, fewer capitals on z4, be more strict with capitals, no dots at z8, only N and S placement --- project.mml | 2 +- project.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.mml b/project.mml index 52f7b9a5f0..94363e65ea 100644 --- a/project.mml +++ b/project.mml @@ -1291,7 +1291,7 @@ "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", "Datasource": { "extent": "-20037508,-20037508,20037508,20037508", - "table": "(SELECT\n way,\n name,\n CASE\n WHEN population ~ '^-?\\d+(\\.\\d+)?$' THEN population::NUMERIC ELSE 0\n END as population\n FROM planet_osm_point\n WHERE capital = 'yes'\n AND (admin_level = '2' OR admin_level IS NULL)\n ORDER BY population DESC\n) AS capital_names", + "table": "(SELECT\n way,\n name,\n CASE\n WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER ELSE 0\n END as population\n FROM planet_osm_point\n WHERE capital = 'yes'\n AND admin_level = '2'\n ORDER BY population DESC\n) AS capital_names", "geometry_field": "way", "type": "postgis", "key_field": "", diff --git a/project.yaml b/project.yaml index 144d24e02c..40917c339e 100644 --- a/project.yaml +++ b/project.yaml @@ -1523,11 +1523,11 @@ Layer: way, name, CASE - WHEN population ~ '^-?\d+(\.\d+)?$' THEN population::NUMERIC ELSE 0 + WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER ELSE 0 END as population FROM planet_osm_point WHERE capital = 'yes' - AND (admin_level = '2' OR admin_level IS NULL) + AND admin_level = '2' ORDER BY population DESC ) AS capital_names properties: