Branch upstream+l10n

project.mml.d/admin-text

@@ -6,7 +6,7 @@
       table: |-
         (SELECT
             way,
-            name,
+            localized_name_first AS name,
             admin_level,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels
           FROM planet_osm_polygon

project.mml.d/amenity-low-priority

@@ -20,7 +20,7 @@
             FROM
               (SELECT
                   ST_PointOnSurface(way) AS way,
-                  name,
+                  localized_name_second AS name,
                   access,
                   amenity,
                   barrier,
@@ -36,7 +36,7 @@
               UNION ALL
               SELECT
                   way,
-                  name,
+                  localized_name_second AS name,
                   access,
                   amenity,
                   barrier,

project.mml.d/amenity-points

@@ -148,7 +148,7 @@
             FROM
               (SELECT
                   ST_PointOnSurface(way) AS way,
-                  name,
+                  localized_name AS name,
                   access,
                   aeroway,
                   amenity,
@@ -177,7 +177,7 @@
               UNION ALL
               SELECT
                   way,
-                  name,
+                  localized_name AS name,
                   access,
                   aeroway,
                   amenity,

project.mml.d/bridge-text

@@ -8,7 +8,7 @@
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
             man_made,
-            name
+            localized_streetname AS name
           FROM planet_osm_polygon
           WHERE ST_PointOnSurface(way) && !bbox!
             AND name IS NOT NULL

project.mml.d/building-text

@@ -5,7 +5,7 @@
       <<: *osm2pgsql
       table: |-
         (SELECT
-            name,
+            localized_name_second AS name,
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels
           FROM planet_osm_polygon

project.mml.d/capital-names

@@ -6,7 +6,7 @@
       table: |-
         (SELECT
             way,
-            name,
+            localized_name_first AS name,
             CASE
               WHEN (tags->'population' ~ '^[0-9]{1,8}$') THEN (tags->'population')::INTEGER ELSE 0
             END as population,

project.mml.d/country-names

@@ -7,7 +7,7 @@
         (SELECT
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
-            name
+            country_name AS name
           FROM planet_osm_polygon
           WHERE ST_PointOnSurface(way) && !bbox!
             AND name IS NOT NULL

project.mml.d/county-names

@@ -7,7 +7,7 @@
         (SELECT
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
-            name,
+            localized_name_first AS name,
             admin_level
           FROM planet_osm_polygon
           WHERE ST_PointOnSurface(way) && !bbox!

project.mml.d/ferry-routes-text

@@ -6,7 +6,7 @@
       table: |-
         (SELECT
             way,
-            name
+            localized_name_second AS name
           FROM planet_osm_line
           WHERE route = 'ferry'
             AND osm_id > 0

project.mml.d/head

@@ -26,7 +26,7 @@ _parts:
     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"
   osm2pgsql: &osm2pgsql
     type: "postgis"
-    dbname: "gis"
+    dbname: "osm"
     key_field: ""
     geometry_field: "way"
     extent: "-20037508,-20037508,20037508,20037508"

project.mml.d/junctions

@@ -9,7 +9,7 @@
             highway,
             junction,
             ref,
-            name,
+            localized_streetname AS name,
             NULL AS way_pixels
           FROM planet_osm_point
           WHERE way && !bbox!

project.mml.d/landcover

@@ -8,7 +8,7 @@
             way, name, religion, way_pixels, is_building,
             COALESCE(aeroway, golf, amenity, wetland, power, landuse, leisure, man_made, "natural", shop, tourism, highway, railway) AS feature
           FROM (SELECT
-              way, COALESCE(name, '') AS name,
+              way, localized_name_second AS name,
               ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway END)) AS aeroway,
               ('golf_' || (CASE WHEN (tags->'golf') IN ('rough', 'fairway', 'driving_range', 'water_hazard', 'green', 'bunker', 'tee') THEN tags->'golf' ELSE NULL END)) AS golf,
               ('amenity_' || (CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'taxi',

project.mml.d/paths-text-name

@@ -8,7 +8,7 @@
             way,
             highway,
             construction,
-            name,
+            localized_streetname AS name,
             CASE
               WHEN oneway IN ('yes', '-1') THEN oneway
               WHEN junction IN ('roundabout') AND (oneway IS NULL OR NOT oneway IN ('no', 'reversible')) THEN 'yes'

project.mml.d/placenames-medium

@@ -18,7 +18,7 @@
                 osm_id,
                 way,
                 place,
-                name,
+                localized_name_second AS name,
                 (
                   (CASE
                     WHEN (tags->'population' ~ '^[0-9]{1,8}$') THEN (tags->'population')::INTEGER

project.mml.d/placenames-small

@@ -7,7 +7,7 @@
         (SELECT
             way,
             place,
-            name
+            localized_name_second AS name
           FROM planet_osm_point
           WHERE place IN ('village', 'hamlet')
              AND name IS NOT NULL

project.mml.d/protected-areas-text

@@ -6,7 +6,7 @@
       table: |-
         (SELECT
             way,
-            name,
+            localized_name_second AS name,
             boundary,
             tags->'protect_class' AS protect_class,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels

project.mml.d/railways-text-name

@@ -13,7 +13,7 @@
             tags->'highspeed' as highspeed,
             tags->'usage' as usage,
             construction,
-            name
+            localized_name_second AS name
           FROM planet_osm_line l
           WHERE railway IN ('rail', 'subway', 'narrow_gauge', 'light_rail', 'preserved', 'funicular',
                             'monorail', 'miniature', 'tram', 'disused', 'construction')

project.mml.d/roads-area-text-name

@@ -8,7 +8,7 @@
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
             highway,
-            name
+            localized_streetname AS name
           FROM planet_osm_polygon
           WHERE ST_PointOnSurface(way) && !bbox!
             AND name IS NOT NULL

project.mml.d/roads-text-name

@@ -9,7 +9,7 @@
             CASE WHEN substr(highway, length(highway)-4, 5) = '_link' THEN substr(highway, 0, length(highway)-4) ELSE highway END,
             CASE WHEN (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes') THEN 'yes' ELSE 'no' END AS tunnel,
             construction,
-            name,
+            localized_streetname AS name,
             CASE
               WHEN oneway IN ('yes', '-1') THEN oneway
               WHEN junction IN ('roundabout') AND (oneway IS NULL OR NOT oneway IN ('no', 'reversible')) THEN 'yes'

project.mml.d/state-names

@@ -7,7 +7,7 @@
         (SELECT
             ST_PointOnSurface(way) AS way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
-            name,
+            localized_name_first AS name,
             admin_level,
             ref
           FROM planet_osm_polygon

project.mml.d/stations

@@ -14,7 +14,7 @@
           FROM
           (SELECT
               ST_PointOnSurface(way) AS way,
-              name,
+              localized_name_second AS name,
               ref,
               railway,
               aerialway,
@@ -26,7 +26,7 @@
           UNION ALL
           SELECT
               way,
-              name,
+              localized_name_second AS name,
               ref,
               railway,
               aerialway,

project.mml.d/text-line

@@ -9,7 +9,7 @@
             NULL as way_pixels,
             COALESCE('aerialway_' || aerialway, 'attraction_' || CASE WHEN tags @> 'attraction=>water_slide' THEN 'water_slide' END, 'leisure_' || leisure, 'man_made_' || man_made, 'waterway_' || waterway, 'natural_' || "natural", 'golf_' || (tags->'golf')) AS feature,
             access,
-            name,
+            localized_name AS name,
             tags->'operator' as operator,
             ref,
             NULL AS way_area,

project.mml.d/text-poly-low-zoom

@@ -18,7 +18,7 @@
                                        THEN boundary END,
               'leisure_' || CASE WHEN leisure IN ('nature_reserve') THEN leisure END
             ) AS feature,
-            name,
+            localized_name AS name,
             CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building -- always no with the where conditions
           FROM planet_osm_polygon
           WHERE ST_PointOnSurface(way) && !bbox!

project.mml.d/water-lines

@@ -7,7 +7,7 @@
         (SELECT
             way,
             waterway,
-            name,
+            localized_name_second AS name,
             CASE WHEN tags->'intermittent' IN ('yes')
               OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
               THEN 'yes' ELSE 'no' END AS int_intermittent,

project.mml.d/water-lines-text

@@ -8,7 +8,7 @@
             way,
             waterway,
             lock,
-            name,
+            localized_name_second AS name,
             "natural",
             tags->'lock_name' AS lock_name,
             CASE WHEN tags->'intermittent' IN ('yes')