Code

add island labels (#399, #646, #703)#737

Code

Merged

zerebubuth merged 36 commits intomastertilezen/vector-datasource:masterfrom nvkelso/399-add-island-labelstilezen/vector-datasource:nvkelso/399-add-island-labelsCopy head branch name to clipboardApr 28, 2016

+787-49

Commits

Commits on Apr 25, 2016

• [filter] remove continent place labels from places layer

  nvkelso

  committed
  77e5983

• [filter] init earth YAML filter, add continent place label to earth layer

  nvkelso

  committed
  3949c71

• [query] add earth queary JINJA

  nvkelso

  committed
  1306fb5

• [migration] add custom migration for new earth layer features, including islands, islets & etc

  nvkelso

  committed
  e287f5d

• [query] hook up schema prefunction for new earth layer

  nvkelso

  committed
  841fdaf

• [query] hook up create sql functions and sql.jinja to new earth layer

  nvkelso

  committed
  ed2f448

• [apply] hook up data/apply functions, set new fields for new earth layer

  nvkelso

  committed
  933c809

• [tests] add full set of island label tests

  nvkelso

  committed
  478d994

• [filter] adjust island, islet zoom ranges

  nvkelso

  committed
  a32f242

• improve legibility

  nvkelso

  committed
  a3bf4af

• improve legibility

  nvkelso

  committed
  b3efd26

• correct typo

  nvkelso

  committed
  a9f760c

• rename way_area to test, since it is a fakeout

  nvkelso

  committed
  34e47eb

• [docs] add new earth kinds (label placements)

  nvkelso

  committed
  0046ec4

• use else, drop unused label_placement & etc in selects

  nvkelso

  committed
  18b4ef1

• remove junk & add comments

  nvkelso

  committed
  17944dc

• calculate label placement for islands as a transform, drop the src

  nvkelso

  committed
  ffccbbe

• add island names to tests, reformatting, fix z17 tests to z16

  nvkelso

  committed
  3bd9499

• update migrations

  nvkelso

  committed
  0d3e119

• update data/apply

  nvkelso

  committed
  9a6fb43

• target shp table type

  nvkelso

  committed
  5f58f70

• fids (like gids) are ints

  nvkelso

  committed
  6a01957

• remove junk left over from rebase

  nvkelso

  committed
  dd1e417

• allow points in EARTH layer, and apply normal transforms

  nvkelso

  committed
  484e730

• null names, sum the way area when grouping, and allow OSM features to show as early as zoom 7

  nvkelso

  committed
  85b422a

• add label_placement: yes

  nvkelso

  committed
  f9179b1

• comment out failing tests

  nvkelso

  committed
  183516f

• restore failing tests

  nvkelso

  committed
  98cc13d

Commits on Apr 27, 2016

• Merge remote-tracking branch 'origin/master' into nvkelso/399-add-island-labels

  zerebubuth

  committed
  3225802

• Fix whitespace.

  zerebubuth

  committed
  dd27f86

• Clean up migrations, add new columns for earth.

  zerebubuth

  committed
  d2eca3d

• Revert some whitespace changes to make the diff readable.

  zerebubuth

  committed
  2e8055f

• Land tables should have earth column, not water.

  zerebubuth

  committed
  3782656

• Undoing more whitespace changes.

  zerebubuth

  committed
  0bf0a87

• Fix up zoom levels to match tests. Don't use way_area on tables that don't have it. Include all earth features at z16.

  zerebubuth

  committed
  26dbf47

• Remove unnecessary synthetic columns now that way_area has been removed.

  zerebubuth

  committed
  6403cb2