Code

update from original#1

Code

Merged

polarbearing merged 119 commits intopolarbearing:masterpolarbearing/openstreetmap-carto:masterfrom gravitystorm:mastergravitystorm/openstreetmap-carto:masterCopy head branch name to clipboardSep 16, 2014

+4,669-2,444

Commits

Commits on Jul 2, 2014

• render beach from z9

  matkoniecz

  committed
  6a4ef6e

Commits on Jul 7, 2014

• Change POIs displayed at z15 and z16 as discussed on #689

  Show description for f04c2b6
  matkoniecz

  committed
  f04c2b6

• follow CartoCSS Style Guidelines

  Show description for c9ac7a0
  matkoniecz

  committed
  c9ac7a0

Commits on Jul 11, 2014

• render beach from z10

  mkoniecz

  committed
  aa02ce4

Commits on Jul 21, 2014

• Create new multi-line shields

  Show description for e98bb12
  pnorman

  committed
  e98bb12

• Split concurrent refs into a multi-line shield

  Show description for cd7da91
  pnorman

  committed
  cd7da91

Commits on Jul 23, 2014

• Merge branch 'master' into multiline_split_refs

  pnorman

  committed
  0f77fed

Commits on Jul 26, 2014

• Increase text-dy for default shop style

  vholten

  committed
  5ff7d09

Commits on Jul 27, 2014

• explain workflow in contribution guidelines

  polarbearing

  committed
  2340841

• metatile alignments

  polarbearing

  committed
  364c95b

Commits on Jul 28, 2014

• Delete allotments_3-1.png

  polarbearing

  committed
  4ea5cf0

• rebase allotments.png and remove comment from mss

  polarbearing

  committed
  9cfa690

• Merge branch 'allotment-metatile' of github.com:polarbearing/openstreetmap-carto into allotment-metatile

  polarbearing

  committed
  cba0471

• Drop landuse=grave_yard

  Show description for 930c0f5
  matthijsmelissen

  committed
  930c0f5

• Drop polygon-opacity from landcover

  Show description for e3ae617
  matthijsmelissen

  committed
  e3ae617

Commits on Jul 29, 2014

• Merge pull request #768 from polarbearing/workflow-contributions

  Show description for 14713da
  gravitystorm

  committed
  14713da

• Merge pull request #767 from vholten/shop_names

  Show description for 4c01284
  gravitystorm

  committed
  4c01284

• Merge pull request #793 from math1985/graveyard

  Show description for 5b411de
  gravitystorm

  committed
  5b411de

Commits on Aug 1, 2014

• Move control over road rendering order to SQL

  Show description for 1102359
  matthijsmelissen

  committed
  1102359

• Correct rendering lowzoom and names of links

  Show description for bc730dc
  matthijsmelissen

  committed
  bc730dc

• Remove no longer needed link references

  matthijsmelissen

  committed
  b9c02d0

• Make colors former transparent landuses darker

  Show description for fc3b3ed
  matthijsmelissen

  committed
  fc3b3ed

• Remove irrelevant subway bridge casing change from PR

  matthijsmelissen

  committed
  d89c6e2

Commits on Aug 2, 2014

• Make bridge values consistent

  Show description for 543e025
  matthijsmelissen

  committed
  543e025

• Clean up highway labels

  Show description for 4f33212
  matthijsmelissen

  committed
  4f33212

• Render names of large names at lower zoomlevels

  Show description for 68823cf
  matthijsmelissen

  committed
  68823cf

Commits on Aug 4, 2014

• Give service roads the same color as residential roads

  Show description for 81ce70a
  matthijsmelissen

  committed
  81ce70a

• Revert accidental change in dasharray of steps

  Show description for a8e8668
  matthijsmelissen

  committed
  a8e8668

Commits on Aug 6, 2014

• Merge branch 'math1985-step-style'

  gravitystorm

  committed
  0905f32

• Merge branch 'service-casing-color' of https://github.com/math1985/openstreetmap-carto into math1985-service-casing-color

  gravitystorm

  committed
  a1620f1

• Merge branch 'math1985-service-casing-color'

  gravitystorm

  committed
  3b7e99c

• Merge pull request #812 from math1985/road-labels

  Show description for 504cbec
  gravitystorm

  committed
  504cbec

• Merge branch 'bridge-references' of https://github.com/math1985/openstreetmap-carto into math1985-bridge-references

  gravitystorm

  committed
  4a007e5

• Merge branch 'math1985-bridge-references'

  gravitystorm

  committed
  907c27f

• Merge branch 'opacity' of https://github.com/math1985/openstreetmap-carto into math1985-opacity

  gravitystorm

  committed
  07d9ee5

• Merge branch 'math1985-opacity'

  gravitystorm

  committed
  1da1a37

• Merge branch 'lake-names' of https://github.com/math1985/openstreetmap-carto into math1985-lake-names

  gravitystorm

  committed
  c4fd47a

• Merge branch 'math1985-lake-names'

  gravitystorm

  committed
  f6218ce

• Merge branch 'roads-order-2' of https://github.com/math1985/openstreetmap-carto into math1985-roads-order-2

  Show description for 6e820cf
  gravitystorm

  committed
  6e820cf

• Merge branch 'math1985-roads-order-2'

  gravitystorm

  committed
  2b68006

• Refactor waterway bridges

  Show description for 8fa1e06
  matthijsmelissen

  committed
  8fa1e06

• Make minimum landuse zoom levels more consistent

  Show description for a1a34dc
  matthijsmelissen

  committed
  a1a34dc

• Render names on junctions

  Show description for d59278f
  matthijsmelissen

  committed
  d59278f

• Change junction rendering

  Show description for 9c6b161
  matthijsmelissen

  committed
  9c6b161

Commits on Aug 8, 2014

• Clean up highway area label

  Show description for 4460065
  matthijsmelissen

  committed
  4460065

• Correct order secondary vs tertiary highway

  Show description for 8bbed89
  matthijsmelissen

  committed
  8bbed89

Commits on Aug 12, 2014

• Remove polygon-gamma

  Show description for e282c38
  pnorman

  committed
  e282c38

• Clean up and reformat water area SQL

  Show description for dc108c3
  pnorman

  committed
  dc108c3

• Don't return way_area for water areas

  Show description for ad99638
  pnorman

  committed
  ad99638

• trac requests are migrated to github bugtracker

  mkoniecz

  committed
  3b3099a

Commits on Aug 14, 2014

• Filter out small areas and use polygon-gamma for large ones

  Show description for d8afe6f
  pnorman

  committed
  d8afe6f

• Turn down polygon-gamma even more for bigger areas

  Show description for 4306f12
  pnorman

  committed
  4306f12

Commits on Aug 15, 2014

• Re-add highway=platform

  Show description for 40a747d
  matthijsmelissen

  committed
  40a747d

Commits on Aug 18, 2014

• Render ways with both highway and railway tag

  Show description for fd1df07
  matthijsmelissen

  committed
  fd1df07

Commits on Aug 23, 2014

• Add a travis file

  Show description for 86ca76a
  pnorman

  committed
  86ca76a

• Check the stylesheet is valid carto

  Show description for 47bc535
  pnorman

  committed
  47bc535

• Move raceway fill to right layer

  Show description for 01e0c9b
  matthijsmelissen

  committed
  01e0c9b

Commits on Aug 27, 2014

• Merge pull request #904 from math1985/raceway-order

  Show description for 1a812ff
  gravitystorm

  committed
  1a812ff

• Merge pull request #903 from pnorman/travis

  Show description for 74dc238
  gravitystorm

  committed
  74dc238

• Merge branch 'highway-railway-overlap' of https://github.com/math1985/openstreetmap-carto into math1985-highway-railway-overlap

  gravitystorm

  committed
  8d41ab9

• Merge branch 'math1985-highway-railway-overlap'

  gravitystorm

  committed
  646c94e

• Merge branch 'trac' of https://github.com/mkoniecz/openstreetmap-carto into mkoniecz-trac

  Show description for f53841f
  gravitystorm

  committed
  f53841f

• Merge branch 'mkoniecz-trac'

  gravitystorm

  committed
  c967011

• Merge pull request #878 from pnorman/polygon-gamma

  Show description for 7646ba8
  gravitystorm

  committed
  7646ba8

• Merge pull request #865 from math1985/way-area-dependent-rendering

  Show description for 6c000e7
  gravitystorm

  committed
  6c000e7

Commits on Aug 28, 2014

• Restore rendering of construction link rendering

  Show description for aa10cfd
  matthijsmelissen

  committed
  aa10cfd

• Re-add special rendering of construction links

  Show description for 52db195
  matthijsmelissen

  committed
  52db195

• Order POI by way_area

  Show description for fe1d623
  matthijsmelissen

  committed
  fe1d623

• Prevent combinatorial explosion

  matthijsmelissen

  committed
  88ee671

• Various corrections to 'Order POI by way_area' PR

  matthijsmelissen

  committed
  b355768

• Solve combinatorial explosion caused by shop != ''

  matthijsmelissen

  committed
  ca80283

• Do a linecount on the output XML

  Show description for bf29d27
  pnorman

  committed
  bf29d27

• Merge pull request #910 from math1985/construction-links

  Show description for c3a1665
  gravitystorm

  committed
  c3a1665

• Merge branch 'poi-rendering-order' of https://github.com/math1985/openstreetmap-carto into math1985-poi-rendering-order

  gravitystorm

  committed
  bb1f102

• Merge branch 'math1985-poi-rendering-order'

  gravitystorm

  committed
  aa6bcd0

• Merge pull request #911 from pnorman/travis_linecount

  Show description for 89fae79
  gravitystorm

  committed
  89fae79

• Merge pull request #814 from math1985/waterway-bridges

  Show description for be4700c
  gravitystorm

  committed
  be4700c

• Merge pull request #687 from mkoniecz/beach

  Show description for b8d20b8
  gravitystorm

  committed
  b8d20b8

• Merge branch 'change_POIs_appearing_on_z15_and_z16' of https://github.com/mkoniecz/openstreetmap-carto into mkoniecz-change_POIs_appearing_on_z15_and_z16

  Show description for 47b13c4
  gravitystorm

  committed
  47b13c4

• Merge branch 'mkoniecz-change_POIs_appearing_on_z15_and_z16'

  gravitystorm

  committed
  f641677

• Merge pull request #770 from polarbearing/allotment-metatile

  Show description for ae63fab
  gravitystorm

  committed
  ae63fab

• Merge pull request #809 from math1985/landcover-minzoom

  Show description for 4d02591
  gravitystorm

  committed
  4d02591

Commits on Sep 4, 2014

• switch extract link from metro.teczno to mapzen

  Show description for c967068
  erictheise

  committed
  c967068

• fix path: "opentreetmap" -> "openstreetmap"

  erictheise

  committed
  033379c

Commits on Sep 5, 2014

• Merge pull request #924 from erictheise/patch-2

  Show description for bdde517
  gravitystorm

  committed
  bdde517

• Merge pull request #923 from erictheise/patch-1

  Show description for cc3352a
  gravitystorm

  committed
  cc3352a

• Add missing text-placement: interior attributes

  Show description for 882f63d
  gravitystorm

  committed
  882f63d

• Merge pull request #813 from math1985/crossroad-names

  Show description for 738a46b
  gravitystorm

  committed
  738a46b

• Merge branch 'multiline_split_refs' of https://github.com/pnorman/openstreetmap-carto into pnorman-multiline_split_refs

  Show description for 9d59496
  gravitystorm

  committed
  9d59496

• Merge branch 'pnorman-multiline_split_refs'

  gravitystorm

  committed
  1adb532

Commits on Sep 7, 2014

• Restore aeroway line rendering

  Show description for 3189f25
  matthijsmelissen

  committed
  3189f25

Commits on Sep 8, 2014

• Merge pull request #928 from math1985/aeroway-lines

  Show description for f3d4207
  gravitystorm

  committed
  f3d4207

• Use a specific version of carto for travis

  Show description for 8552de0
  pnorman

  committed
  8552de0

Commits on Sep 9, 2014

• Add a preview image.

  gravitystorm

  committed
  886adbb

• Update some of the text to reflect current status.

  gravitystorm

  committed
  f9737d7

• Add the maintainers.

  gravitystorm

  committed
  0a79f16

• Move installation instructions to a separate file, since the README has become unweildy.

  gravitystorm

  committed
  2e56c08

• Add a description of the versioning system.

  Show description for 6673e15
  gravitystorm

  committed
  6673e15

• I always like seeing alternatives when I view other projects.

  gravitystorm

  committed
  c2ef817

• Add missing periods

  pnorman

  committed
  9d9a06d

• More Markdownification

  pnorman

  committed
  2670a1b

• Explain about the shapefiles a bit more

  pnorman

  committed
  fdc32e1

• Add a script that takes a yaml file and converts it to a JSON file

  Show description for 1be5578
  pnorman

  committed
  1be5578

Commits on Sep 10, 2014

• Convert the MML file from JSON to YAML

  Show description for 9918536
  pnorman

  committed
  9918536

• Use alias to avoid duplicating SQL connection information

  Show description for 45dbf13
  pnorman

  committed
  45dbf13

• Conver SQL from in-line escaped scalars to block scalars

  Show description for ba95ac9
  pnorman

  committed
  ba95ac9

• Merge pull request #933 from pnorman/docs-grammar

  Show description for cfdc110
  gravitystorm

  committed
  cfdc110

• Merge pull request #932 from pnorman/travis_carto_mapnik

  Show description for 82a8a76
  gravitystorm

  committed
  82a8a76

Commits on Sep 13, 2014

• Clean up SQL in the YAML file

  Show description for 95a56f0
  pnorman

  committed
  95a56f0

• Add documentation on YAML and SQL to CONTRIBUTING.md

  pnorman

  committed
  d31bd93

Commits on Sep 14, 2014

• Add PyYAML to dependencies, but only if editing the MML file

  pnorman

  committed
  72d5baa

• Fix typo and missed caps/quotes

  pnorman

  committed
  08d3fb8

• Whitespace fixes

  pnorman

  committed
  dcbdae6

• More caps fixes

  pnorman

  committed
  56cd8e0

Commits on Sep 16, 2014

• Merge branch 'yaml' of https://github.com/pnorman/openstreetmap-carto into pnorman-yaml

  gravitystorm

  committed
  8317220

• Resync with yaml.

  gravitystorm

  committed
  53aa718

• Merge branch 'pnorman-yaml'

  gravitystorm

  committed
  d97b051

• Rephrase some yaml-related information.

  gravitystorm

  committed
  c3663f3

• Use single backticks for inline code unless the code itself contains backticks

  gravitystorm

  committed
  d778979