Code

Merge upstream 2.40.0 changes#5

Code

Closed

pnorman wants to merge 20 commits intogiggls:mastergiggls/openstreetmap-carto-de:masterfrom pnorman:de_2.40.0_updatepnorman/openstreetmap-carto:de_2.40.0_updateCopy head branch name to clipboard

+294-192

Commits

Commits on Feb 17, 2016

• Reformat road SQL

  pnorman

  committed
  3eaf7c4

  Copy full SHA for 3eaf7c4

Commits on Jun 17, 2016

• placenames-medium is not used on z3

  matkoniecz

  committed
  1710ea6

  Copy full SHA for 1710ea6

• Merge pull request gravitystorm#2168 from pnorman/road_reformat

  Show description for 7b0ea93
  matkoniecz

  authored
  7b0ea93

  Copy full SHA for 7b0ea93

Commits on Jun 18, 2016

• Revert "Merge remote-tracking branch 'pnorman/water_polygons'"

  Show description for 7b492e6
  matthijsmelissen

  committed
  7b492e6

  Copy full SHA for 7b492e6

• Merge pull request gravitystorm#2173 from matkoniecz/faster_z3

  Show description for 723b869
  matthijsmelissen

  authored
  723b869

  Copy full SHA for 723b869

Commits on Jun 19, 2016

• rewrite low priority layer to make it like main amenity layer

  Show description for 77b3010
  matkoniecz

  committed
  77b3010

  Copy full SHA for 77b3010

• stop displaying highway=mini_roundabout and highway=level_crossing mapped as areas

  matkoniecz

  committed
  2af08b0

  Copy full SHA for 2af08b0

Commits on Jun 20, 2016

• larger labels for placenames

  Show description for cb69b80
  matkoniecz

  committed
  cb69b80

  Copy full SHA for cb69b80

Commits on Jun 21, 2016

• Filter placenames-large based on way_area

  Show description for eb5f783
  pnorman

  committed
  eb5f783

  Copy full SHA for eb5f783

• Add name IS NOT NULL check to medium placenames

  pnorman

  committed
  c573c8d

  Copy full SHA for c573c8d

• Merge pull request gravitystorm#2181 from matkoniecz/placename_without_dots

  Show description for d34fe46
  pnorman

  authored
  d34fe46

  Copy full SHA for d34fe46

• Merge pull request gravitystorm#2186 from pnorman/placenames_medium_name

  Show description for 0975e13
  matkoniecz

  authored
  0975e13

  Copy full SHA for 0975e13

• synchronise description in Github repo and project file

  matkoniecz

  committed
  e2ab3a1

  Copy full SHA for e2ab3a1

• Merge pull request gravitystorm#2188 from matkoniecz/synch

  Show description for d789bda
  matthijsmelissen

  authored
  d789bda

  Copy full SHA for d789bda

• it is not necessary to query buildings for z12, as buildings are not displayed on z12

  matkoniecz

  committed
  dbb4d94

  Copy full SHA for dbb4d94

• Merge pull request gravitystorm#2190 from matkoniecz/buildingless_z12

  Show description for 7f5624d
  matthijsmelissen

  authored
  7f5624d

  Copy full SHA for 7f5624d

• Merge pull request gravitystorm#2185 from pnorman/placename_large_way_area

  Show description for e7dc874
  matthijsmelissen

  authored
  e7dc874

  Copy full SHA for e7dc874

• show bus_guideway tunnels

  Show description for 51da5e2
  matkoniecz

  committed
  51da5e2

  Copy full SHA for 51da5e2

• Merge pull request gravitystorm#2191 from matkoniecz/show_guideway_tunnel

  Show description for 2e3802c
  matthijsmelissen

  authored
  2e3802c

  Copy full SHA for 2e3802c

Commits on Jul 2, 2016

• Merge tag 'v2.40.0' into de_2.40.0_update

  Show description for f995a5e
  pnorman

  committed
  f995a5e

  Copy full SHA for f995a5e