Merge branch 'master' into quickstart_v2

docker-compose.yml

@@ -3,7 +3,7 @@ volumes:
   pgdata:
 services:
   postgres:
-    image: "openmaptiles/postgis:2.2"
+    image: "openmaptiles/postgis:2.3"
     volumes:
     - pgdata:/var/lib/postgresql/data
     ports:
@@ -25,7 +25,11 @@ services:
     links:
     - postgres
   import-osm:
+<<<<<<< HEAD
     image: "openmaptiles/import-osm:add_tools"
+=======
+    image: "openmaptiles/import-osm:0.1"
+>>>>>>> master
     env_file: .env
     environment:
       DIFF_MODE: "false"
@@ -35,7 +39,7 @@ services:
      - ./data:/import
      - ./build:/mapping
   import-sql:
-    image: "openmaptiles/import-sql"
+    image: "openmaptiles/import-sql:0.1"
     env_file: .env
     links:
     - postgres
@@ -50,7 +54,7 @@ services:
     ports:
      - "3000:3000"
   generate-vectortiles:
-    image: "openmaptiles/generate-vectortiles"
+    image: "openmaptiles/generate-vectortiles:0.1"
     volumes:
     - ./data:/export
     - ./build/openmaptiles.tm2source:/tm2source

layers/place/capital.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE FUNCTION normalize_capital_level(capital TEXT)
+RETURNS INT AS $$
+    SELECT CASE
+        WHEN capital IN ('yes', '2') THEN 2
+        WHEN capital = '4' THEN 4
+        ELSE NULL
+    END;
+$$ LANGUAGE SQL IMMUTABLE STRICT;

layers/place/class.sql

@@ -1,18 +0,0 @@
-CREATE OR REPLACE FUNCTION place_class(place TEXT)
-RETURNS TEXT AS $$
-    SELECT CASE
-        WHEN place IN ('city', 'town', 'village', 'hamlet', 'isolated_dwelling') THEN 'settlement'
-        WHEN place IN ('suburb', 'neighbourhood') THEN 'subregion'
-        WHEN place IN ('locality', 'farm') THEN 'other'
-        ELSE NULL
-    END;
-$$ LANGUAGE SQL IMMUTABLE STRICT;
-
-CREATE OR REPLACE FUNCTION normalize_capital_level(capital TEXT)
-RETURNS INT AS $$
-    SELECT CASE
-        WHEN capital IN ('yes', '2') THEN 2
-        WHEN capital = '4' THEN 4
-        ELSE NULL
-    END;
-$$ LANGUAGE SQL IMMUTABLE STRICT;

layers/place/island_polygon_update.sql

@@ -0,0 +1,5 @@
+-- etldoc:  osm_island_polygon ->  osm_island_polygon
+UPDATE osm_island_polygon  SET geometry=topoint(geometry)
+WHERE ST_GeometryType(geometry) <> 'ST_Point';
+
+ANALYZE osm_island_polygon;

layers/place/island_rank.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE FUNCTION island_rank(area REAL) RETURNS INT AS $$
+    SELECT CASE
+        WHEN area < 10000000 THEN 6
+        WHEN area BETWEEN  1000000 AND 15000000 THEN 5
+        WHEN area BETWEEN 15000000 AND 40000000 THEN 4
+        WHEN area > 40000000 THEN 3
+        ELSE 7
+    END;
+$$ LANGUAGE SQL IMMUTABLE STRICT;

layers/place/layer.sql

@@ -5,25 +5,27 @@
 -- etldoc: osm_continent_point -> layer_place
 -- etldoc: osm_country_point   -> layer_place
 -- etldoc: osm_state_point     -> layer_place
+-- etldoc: osm_island_point    -> layer_place
+-- etldoc: osm_island_polygon  -> layer_place
 -- etldoc: layer_city          -> layer_place
 
 CREATE OR REPLACE FUNCTION layer_place(bbox geometry, zoom_level int, pixel_width numeric)
-RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, subclass text, "rank" int, capital INT) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, "rank" int, capital INT) AS $$
     SELECT
         osm_id, geometry, name, name_en,
-        'continent' AS class, 'continent' AS subclass, 1 AS "rank", NULL::int AS capital
+        'continent' AS class, 1 AS "rank", NULL::int AS capital
     FROM osm_continent_point
     WHERE geometry && bbox AND zoom_level < 4
     UNION ALL
     SELECT
         osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
-        'country' AS class, 'country' AS subclass,"rank", NULL::int AS capital
+        'country' AS class, "rank", NULL::int AS capital
     FROM osm_country_point
     WHERE geometry && bbox AND "rank" <= zoom_level AND name <> ''
     UNION ALL
     SELECT
         osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
-        'state' AS class, 'state' AS subclass, "rank", NULL::int AS capital
+        'state' AS class, "rank", NULL::int AS capital
     FROM osm_state_point
     WHERE geometry && bbox AND
           name <> '' AND
@@ -32,9 +34,25 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t
               is_in_country IN ('United Kingdom', 'USA', 'Россия', 'Brasil', 'China', 'India') OR
               is_in_country_code IN ('AU', 'CN', 'IN', 'BR', 'US'))
     UNION ALL
+    SELECT
+        osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
+        'island' AS class, 7 AS "rank", NULL::int AS capital
+    FROM osm_island_point
+    WHERE zoom_level BETWEEN 12 AND 14
+        AND geometry && bbox
+    UNION ALL
+    SELECT
+        osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
+        'island' AS class, island_rank(area) AS "rank", NULL::int AS capital
+    FROM osm_island_polygon
+    WHERE geometry && bbox AND
+        ((zoom_level = 8 AND island_rank(area) <= 3)
+        OR (zoom_level = 9 AND island_rank(area) <= 4)
+        OR (zoom_level >= 10))
+    UNION ALL
     SELECT
         osm_id, geometry, name, name_en,
-        place_class(place::text) AS class, place::text AS subclass, "rank", capital
+        place::text AS class, "rank", capital
     FROM layer_city(bbox, zoom_level, pixel_width)
     ORDER BY "rank" ASC
 $$ LANGUAGE SQL IMMUTABLE;

layers/place/mapping.yaml

@@ -88,6 +88,34 @@ tables:
       place:
       - country
 
+  # etldoc: imposm3 -> osm_island_polygon
+  island_polygon:
+    type: polygon
+    fields:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: area
+      type: pseudoarea
+    - *name
+    - *name_en
+    - *name_de
+    - *name_fr
+    - *name_es
+    - *name_pt
+    - *name_ru
+    - *name_zh
+    - *name_ar
+    - *name_ja
+    - *rank
+    filters:
+      exclude_tags:
+      - [ "name", "__nil__" ]
+    mapping:
+      place:
+      - island
+
   # etldoc: imposm3 -> osm_island_point
   island_point:
     type: point

layers/place/place.yaml

@@ -16,23 +16,12 @@ layer:
       values: [2, 4]
     class: |
       description: |
-          Distinguish between continents, countries, states and
-          places like settlements or smaller entities.
-          Use this to separately style the different places and build
-          a text hierarchy according to their importance.
-          than cities).
-      values:
-      - continent
-      - country
-      - state
-      - settlement
-      - subregion
-      - other
-    subclass:
-      description: |
-          Use **subclass** to do more precise styling.
           Original value of the
           [`place`](http://wiki.openstreetmap.org/wiki/Key:place) tag.
+          Distinguish between continents, countries, states and
+          places like settlements or smaller entities.
+          Use **class** to separately style the different places and build
+          a text hierarchy according to their importance.
       values:
       - continent
       - country
@@ -63,11 +52,13 @@ layer:
   buffer_size: 128
   datasource:
     geometry_field: geometry
-    query: (SELECT geometry, name, name_en, class, subclass, rank, capital FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
+    query: (SELECT geometry, name, name_en, class, rank, capital FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
 schema:
   - ./types.sql
-  - ./class.sql
+  - ./capital.sql
   - ./city.sql
+  - ./island_polygon_update.sql
+  - ./island_rank.sql
   - ./merge_country_rank.sql
   - ./merge_city_rank.sql
   - ./merge_state_rank.sql

layers/transportation/layer.sql

@@ -6,14 +6,13 @@ $$ LANGUAGE SQL IMMUTABLE STRICT;
 -- etldoc: layer_transportation[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="<sql> layer_transportation |<z4z6> z4-z6 |<z7z8> z7-z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 CREATE OR REPLACE FUNCTION layer_transportation(bbox geometry, zoom_level int)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text, ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
     SELECT
         osm_id, geometry,
         CASE
             WHEN highway IS NOT NULL THEN highway_class(highway)
             WHEN railway IS NOT NULL THEN railway_class(railway)
         END AS class,
-        COALESCE(NULLIF(highway,''), NULLIF(railway, '')) AS subclass,
         -- All links are considered as ramps as well
         CASE WHEN highway_is_link(highway) OR highway = 'steps'
              THEN 1 ELSE is_ramp::int END AS ramp,

layers/transportation/transportation.yaml

@@ -1,23 +1,23 @@
 layer:
   id: "transportation"
   description: |
-      **transportation** containsrRoads and railways.
+      **transportation** contains roads and railways.
-      This layer is directly derived from the OSM road hierarchy which is why it is called `highway`. Only
+      This layer is directly derived from the OSM road hierarchy.
-      at zoom level 4 to 7 some major highways from Natural Earth are used otherwise it is only OSM data.
+      Only at zoom level 4 to 6 some major highways from Natural Earth
-      It contains all roads from motorways to primary, secondary and tertiary roads to residential roads and
+      are used.
-      foot paths. Styling the roads is the most essential part of the map. If you can put enough effort into it
+      It contains all roads from motorways to primary, secondary and
-      makes sense to carefully style each `subclass`. For more comfortable styling you can also just style the roads
+      tertiary roads to residential roads and
-      by `class`. Roads can have different properties, a road can have `oneway=yes` and `bridge=yes` at the same time.
+      foot paths. Styling the roads is the most essential part of the map.
-      These properties are reflected in the field `properties`.
-      This layer is not meant for labelling the roads (the purpose of the layer `highway_name`).
-
       The `highway` layer also contains polygons for things like plazas.
   buffer_size: 4
   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:
     class:
       description: |
-          Distinguish between more and less important roads.
+          Distinguish between more and less important roads or railways.
+          Class is derived from the value of the
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
       values:
       - motorway
       - trunk
@@ -25,49 +25,12 @@ layer:
       - secondary
       - tertiary
       - minor
-      - track
       - service
+      - track
       - path
-    subclass:
-      description: |
-          Use **subclass** to do more precise styling.
-          Original value of the
-          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
-          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
-      values:
-      - motorway
-      - motorway_link
-      - trunk
-      - trunk_link
-      - primary
-      - primary_link
-      - secondary
-      - secondary_link
-      - tertiary
-      - tertiary_link
-      - unclassified
-      - residential
-      - road
-      - living_street
       - raceway
-      - construction
-      - track
-      - service
-      - path
-      - cycleway
-      - bridleway
-      - footway
-      - corridor
-      - crossing
-      - pedestrian
       - rail
-      - narrow_gauge
+      - transit
-      - preserved
-      - funicular
-      - subway
-      - light_rail
-      - monorail
-      - tram
     brunnel:
       description: |
           Mark whether way is a tunnel or bridge.
@@ -99,7 +62,7 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, class, subclass, oneway, ramp, brunnel, service FROM layer_transportation(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class, oneway, ramp, brunnel, service FROM layer_transportation(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./class.sql
   - ./layer.sql

layers/transportation_name/layer.sql

@@ -3,12 +3,12 @@
 -- etldoc:     label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
 
 CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer)
-RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text, subclass text) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text) AS $$
     SELECT osm_id, geometry, name,
       NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length,
       --TODO: The road network of the road is not yet implemented
       NULL::text AS network,
-      highway_class(highway) AS class, highway AS subclass
+      highway_class(highway) AS class
     FROM (
 
         -- etldoc: osm_transportation_name_linestring_gen3 ->  layer_transportation_name:z8

layers/transportation_name/transportation_name.yaml

@@ -22,53 +22,16 @@ layer:
       - secondary
       - tertiary
       - minor
-      - track
       - service
+      - track
       - path
-    subclass:
-      description: |
-          Use **subclass** to do more precise styling.
-          Original value of the
-          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
-          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
-      values:
-      - motorway
-      - motorway_link
-      - trunk
-      - trunk_link
-      - primary
-      - primary_link
-      - secondary
-      - secondary_link
-      - tertiary
-      - tertiary_link
-      - unclassified
-      - residential
-      - road
-      - living_street
       - raceway
-      - construction
-      - track
-      - service
-      - path
-      - cycleway
-      - bridleway
-      - footway
-      - corridor
-      - crossing
-      - pedestrian
       - rail
-      - narrow_gauge
+      - transit
-      - preserved
-      - funicular
-      - subway
-      - light_rail
-      - monorail
-      - tram
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, name, ref, ref_length, class::text, subclass FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, name, ref, ref_length, class::text FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./merge_highways.sql
   - ./layer.sql