Skip to content

Commit

Permalink
Merge remote-tracking branch 'pnorman/citywall_zoom'
Browse files Browse the repository at this point in the history
Conflicts:
	project.mml
  • Loading branch information
matthijsmelissen committed May 27, 2015
2 parents 497ba76 + fe498b9 commit d86afd4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@
"srs-name": "900913",
"geometry": "linestring",
"class": "",
"id": "citywalls",
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
Expand All @@ -555,7 +556,9 @@
180,
85.05112877980659
],
"id": "citywalls",
"properties": {
"minzoom": 14
},
"advanced": {}
},
{
Expand Down
2 changes: 2 additions & 0 deletions project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,8 @@ Layer:
WHERE historic = 'citywalls')
AS citywalls
advanced: {}
properties:
minzoom: 14
- id: "castlewalls"
name: "castlewalls"
class: "castlewalls"
Expand Down

0 comments on commit d86afd4

Please sign in to comment.