separating scalerank 4 pois by localrank

This commit is contained in:
Nicki Dlugash
2014-06-02 17:38:44 -04:00
parent 3c26f53e63
commit 370c2e1d45

View File

@@ -932,12 +932,28 @@ module.exports = {
"size": 12,
"type": "point"
},
"poi_4": {
"poi_4_4": {
"source": "outdoors",
"layer": "poi_label",
"icon": "maki",
"field": "scalerank",
"value": 4,
"filter": [
"and",
{ "field": "scalerank", "value": 4 },
{ "field": "localrank", "operator": "<=", "value": 4 }
],
"size": 12,
"type": "point"
},
"poi_4_16": {
"source": "outdoors",
"layer": "poi_label",
"icon": "maki",
"filter": [
"and",
{ "field": "scalerank", "value": 4 },
{ "field": "localrank", "operator": "<=", "value": 16 },
{ "field": "localrank", "operator": ">", "value": 4 }
],
"size": 12,
"type": "point"
},
@@ -977,7 +993,7 @@ module.exports = {
"text_field": "{{name_en}}",
"path": "horizontal",
"padding": 2,
"maxWidth": 10,
"maxWidth": 8,
"verticalAlignment": "top",
"translate": [0, -1],
"font": "Open Sans Semibold, Arial Unicode MS Bold",
@@ -985,15 +1001,38 @@ module.exports = {
"feature_type": "point",
"type": "text",
},
"poi_label_4": {
"poi_label_4_4": {
"source": "outdoors",
"layer": "poi_label",
"field": "scalerank",
"value": 4,
"filter": [
"and",
{ "field": "scalerank", "value": 4 },
{ "field": "localrank", "operator": "<=", "value": 4 }
],
"text_field": "{{name_en}}",
"path": "horizontal",
"padding": 2,
"maxWidth": 10,
"maxWidth": 8,
"verticalAlignment": "top",
"translate": [0, -1],
"font": "Open Sans Semibold, Arial Unicode MS Bold",
"fontSize": 10,
"feature_type": "point",
"type": "text",
},
"poi_label_4_16": {
"source": "outdoors",
"layer": "poi_label",
"filter": [
"and",
{ "field": "scalerank", "value": 4 },
{ "field": "localrank", "operator": "<=", "value": 16 },
{ "field": "localrank", "operator": ">", "value": 4 }
],
"text_field": "{{name_en}}",
"path": "horizontal",
"padding": 2,
"maxWidth": 8,
"verticalAlignment": "top",
"translate": [0, -1],
"font": "Open Sans Semibold, Arial Unicode MS Bold",
@@ -1483,10 +1522,34 @@ module.exports = {
"name": "place_label_other",
"bucket": "place_label_other"
},
{
"name": "water_label",
"bucket": "water_label"
},
{
"name": "poi_aerodrome",
"bucket": "poi_aerodrome"
},
{
"name": "poi",
"bucket": "poi"
},
{
"name": "poi_label_1-2",
"bucket": "poi_label_1-2"
},
{
"name": "road_label_1",
"bucket": "road_label_1"
},
{
"name": "poi_3",
"bucket": "poi_3"
},
{
"name": "poi_label_3",
"bucket": "poi_label_3"
},
{
"name": "road_label_2",
"bucket": "road_label_2"
@@ -1499,41 +1562,25 @@ module.exports = {
"name": "contour_label",
"bucket": "contour_label"
},
{
"name": "water_label",
"bucket": "water_label"
},
{
"name": "waterway_label",
"bucket": "waterway_label"
},
{
"name": "poi",
"bucket": "poi"
"name": "poi_4_4",
"bucket": "poi_4_4"
},
{
"name": "poi_label_1-2",
"bucket": "poi_label_1-2"
"name": "poi_label_4_4",
"bucket": "poi_label_4_4"
},
{
"name": "poi_3",
"bucket": "poi_3"
"name": "poi_4_16",
"bucket": "poi_4_16"
},
{
"name": "poi_label_3",
"bucket": "poi_label_3"
},
{
"name": "poi_4",
"bucket": "poi_4"
},
{
"name": "poi_label_4",
"bucket": "poi_label_4"
},
{
"name": "poi_aerodrome",
"bucket": "poi_aerodrome"
"name": "poi_label_4_16",
"bucket": "poi_label_4_16"
}
],
"constants": {
@@ -2595,7 +2642,15 @@ module.exports = {
{"z": 16.75, "val": 1}
]
},
"poi_4": {
"poi_4_4": {
"antialias": false,
"opacity": [
"stops",
{"z": 17.5, "val": 0},
{"z": 17.75, "val": 1}
]
},
"poi_4_16": {
"antialias": false,
"opacity": [
"stops",
@@ -2622,12 +2677,24 @@ module.exports = {
{"z": 16.75, "val": 1}
]
},
"poi_label_4": {
"poi_label_4_4": {
"color": "#444",
"size": 10,
"opacity": [
"stops",
{"z": 18.5, "val": 0},
{"z": 17.5, "val": 0},
{"z": 17.75, "val": 1}
],
"stroke": "land",
"strokeWidth": 0.3,
"strokeBlur": 1,
},
"poi_label_4_16": {
"color": "#444",
"size": 10,
"opacity": [
"stops",
{"z": 18.25, "val": 0},
{"z": 18.75, "val": 1}
],
"stroke": "land",
@@ -3402,7 +3469,15 @@ module.exports = {
{"z": 16.75, "val": 1}
]
},
"poi_4": {
"poi_4_4": {
"antialias": false,
"opacity": [
"stops",
{"z": 17.5, "val": 0},
{"z": 17.75, "val": 1}
]
},
"poi_4_16": {
"antialias": false,
"opacity": [
"stops",
@@ -3429,7 +3504,19 @@ module.exports = {
{"z": 16.75, "val": 1}
]
},
"poi_label_4": {
"poi_label_4_4": {
"color": "#fff",
"size": 10,
"opacity": [
"stops",
{"z": 17.5, "val": 0},
{"z": 17.75, "val": 1}
],
"stroke": "text2_stroke_night",
"strokeWidth": 0.3,
"strokeBlur": 1
},
"poi_label_4_16": {
"color": "#fff",
"size": 10,
"opacity": [