diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2014-05-31 11:32:42 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2014-05-31 11:32:42 -0700 |
commit | a81a336638000f1986f1bde56e909a07b2a6ae36 (patch) | |
tree | 19ca5424367a3c89e76009a77fe54413d8c3ea51 /bin | |
parent | 6fd1525335bb753bb0efdfc3cfb58e1b6c4c1539 (diff) | |
download | qtlocation-mapboxgl-a81a336638000f1986f1bde56e909a07b2a6ae36.tar.gz |
programmatic styling API
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/build-style.js | 36 | ||||
-rw-r--r-- | bin/style.js | 206 |
2 files changed, 194 insertions, 48 deletions
diff --git a/bin/build-style.js b/bin/build-style.js index 932287b899..c69fcb8b40 100755 --- a/bin/build-style.js +++ b/bin/build-style.js @@ -7,36 +7,6 @@ var mkdirp = require('./mkdirp'); var name = 'style'; var data = JSON.stringify(require(path.join(process.cwd(), process.argv[2]))); - -var length = data.length; - -var header = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n\n'; -header += '#ifndef LLMR_STYLE_RESOURCES\n'; -header += '#define LLMR_STYLE_RESOURCES\n'; -header += '\n'; -header += 'namespace llmr {\n'; -header += 'namespace resources {\n'; -header += '\n'; -header += 'extern const unsigned char ' + name + '[];\n'; -header += 'extern const unsigned long ' + name + '_size;\n'; -header += '\n'; -header += '}\n'; -header += '}\n'; -header += '\n'; -header += '#endif\n'; - -var header_path = path.join(process.argv[3], 'include/llmr/style/resources.hpp'); -mkdirp.sync(path.dirname(header_path)); -fs.writeFileSync(header_path, header); - -var code = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n'; -code += '#include <llmr/style/resources.hpp>\n'; -code += '\n'; -code += 'using namespace llmr;\n'; -code += '\n'; -code += 'const unsigned char resources::' + name + '[] = R"JSON(' + data + ')JSON";\n'; -code += 'const unsigned long resources::' + name + '_size = sizeof(resources::' + name + ');\n'; - -var file_path = path.join(process.argv[3], 'src/style/resources.cpp'); -mkdirp.sync(path.dirname(file_path)); -fs.writeFileSync(file_path, code); +var out_path = path.join(process.argv[3], 'bin/style.min.js'); +mkdirp.sync(path.dirname(out_path)); +fs.writeFileSync(out_path, data); diff --git a/bin/style.js b/bin/style.js index 0a389f6be1..ffa326525a 100644 --- a/bin/style.js +++ b/bin/style.js @@ -661,15 +661,61 @@ module.exports = { "layer": "country_label_line", "type": "line" }, - "marine_label_line": { + "marine_label_line_1": { "source": "outdoors", "layer": "marine_label", "feature_type": "line", "type": "text", + "field": "labelrank", + "value": 1, + "text_field": "{{name_en}}", + "path": "curve", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", + "fontSize": 30, + "letterSpacing": 0.4, + "maxAngleDelta": 0.5 + }, + "marine_label_line_2": { + "source": "outdoors", + "layer": "marine_label", + "feature_type": "line", + "field": "labelrank", + "value": 2, + "type": "text", + "text_field": "{{name_en}}", + "path": "curve", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", + "fontSize": 24, + "letterSpacing": 0.2, + "maxAngleDelta": 0.5 + }, + "marine_label_line_3": { + "source": "outdoors", + "layer": "marine_label", + "feature_type": "line", + "type": "text", + "field": "labelrank", + "value": 3, "text_field": "{{name_en}}", "path": "curve", "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", - "fontSize": 16 + "fontSize": 18, + "letterSpacing": 0.1, + "maxAngleDelta": 0.5 + }, + "marine_label_line_other": { + "source": "outdoors", + "layer": "marine_label", + "feature_type": "line", + "type": "text", + "field": "labelrank", + "value": [4, 5, 6], + "text_field": "{{name_en}}", + "path": "curve", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", + "fontSize": 16, + "letterSpacing": 0.1, + "maxAngleDelta": 0.5 }, "marine_label_point_1": { "source": "outdoors", @@ -698,9 +744,24 @@ module.exports = { "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 24, "maxWidth": 8, - "letterSpacing": 0.4, + "letterSpacing": 0.2, "lineHeight": 1.5, }, + "marine_label_point_3": { + "source": "outdoors", + "layer": "marine_label", + "feature_type": "point", + "type": "text", + "text_field": "{{name_en}}", + "path": "horizontal", + "field": "labelrank", + "value": 3, + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", + "fontSize": 18, + "maxWidth": 8, + "letterSpacing": 0.1, + "lineHeight": 1.3, + }, "marine_label_point_other": { "source": "outdoors", "layer": "marine_label", @@ -709,9 +770,12 @@ module.exports = { "text_field": "{{name_en}}", "path": "horizontal", "field": "labelrank", - "value": [3,4,5,6], + "value": [4,5,6], "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", - "fontSize": 18 + "fontSize": 16, + "maxWidth": 8, + "letterSpacing": 0.1, + "lineHeight": 1.2, }, "state_label": { "source": "outdoors", @@ -1363,8 +1427,20 @@ module.exports = { "bucket": "country_label" }, { - "name": "marine_label_line", - "bucket": "marine_label_line" + "name": "marine_label_line_1", + "bucket": "marine_label_line_1" + }, + { + "name": "marine_label_line_2", + "bucket": "marine_label_line_2" + }, + { + "name": "marine_label_line_3", + "bucket": "marine_label_line_3" + }, + { + "name": "marine_label_line_other", + "bucket": "marine_label_line_other" }, { "name": "marine_label_point_1", @@ -1375,6 +1451,10 @@ module.exports = { "bucket": "marine_label_point_2" }, { + "name": "marine_label_point_3", + "bucket": "marine_label_point_3" + }, + { "name": "marine_label_point_other", "bucket": "marine_label_point_other" }, @@ -2309,12 +2389,50 @@ module.exports = { "width": 0.5, "opacity": 0.5 }, - "marine_label_line": { + "marine_label_line_1": { + "color": "marine_text", + "size": ["stops", + {"z": 3, "val": 20}, + {"z": 4, "val": 25}, + {"z": 5, "val": 30}, + {"z": 22, "val": 30} + ], + "stroke": "water" + }, + "marine_label_line_2": { + "color": "marine_text", + "size": ["stops", + {"z": 3, "val": 13}, + {"z": 4, "val": 14}, + {"z": 5, "val": 20}, + {"z": 6, "val": 24}, + {"z": 22, "val": 24} + ], + "stroke": "water" + }, + "marine_label_line_3": { + "color": "marine_text", + "size": ["stops", + {"z": 3, "val": 12}, + {"z": 4, "val": 13}, + {"z": 5, "val": 15}, + {"z": 6, "val": 18}, + {"z": 22, "val": 18} + ], + "stroke": "water" + }, + "marine_label_line_other": { "color": "marine_text", + "size": ["stops", + {"z": 4, "val": 12}, + {"z": 5, "val": 14}, + {"z": 6, "val": 16}, + {"z": 22, "val": 16} + ], "stroke": "water" }, "marine_label_point_1": { - "color": "#a9c4c7", + "color": "marine_text", "size": ["stops", {"z": 3, "val": 20}, {"z": 4, "val": 25}, @@ -2324,7 +2442,7 @@ module.exports = { "stroke": "water" }, "marine_label_point_2": { - "color": "#a9c4c7", + "color": "marine_text", "size": ["stops", {"z": 3, "val": 13}, {"z": 4, "val": 14}, @@ -2334,8 +2452,8 @@ module.exports = { ], "stroke": "water" }, - "marine_label_point_other": { - "color": "#a9c4c7", + "marine_label_point_3": { + "color": "marine_text", "size": ["stops", {"z": 3, "val": 12}, {"z": 4, "val": 13}, @@ -2345,6 +2463,16 @@ module.exports = { ], "stroke": "water" }, + "marine_label_point_other": { + "color": "marine_text", + "size": ["stops", + {"z": 4, "val": 12}, + {"z": 5, "val": 14}, + {"z": 6, "val": 16}, + {"z": 22, "val": 16} + ], + "stroke": "water" + }, "state_label": { "color": "#333", "strokeWidth": 0.4, @@ -2500,7 +2628,7 @@ module.exports = { } }, { - "name": "satellite", + "name": "night", "layers": { "background": { "color": "land_night" @@ -3067,8 +3195,46 @@ module.exports = { "width": 0.5, "opacity": 0.5 }, - "marine_label_line": { + "marine_label_line_1": { "color": "water_dark_night", + "size": ["stops", + {"z": 3, "val": 20}, + {"z": 4, "val": 25}, + {"z": 5, "val": 30}, + {"z": 22, "val": 30} + ], + "stroke": "water_night" + }, + "marine_label_line_2": { + "color": "water_dark_night", + "size": ["stops", + {"z": 3, "val": 13}, + {"z": 4, "val": 14}, + {"z": 5, "val": 20}, + {"z": 6, "val": 24}, + {"z": 22, "val": 24} + ], + "stroke": "water_night" + }, + "marine_label_line_3": { + "color": "water_dark_night", + "size": ["stops", + {"z": 3, "val": 12}, + {"z": 4, "val": 13}, + {"z": 5, "val": 15}, + {"z": 6, "val": 18}, + {"z": 22, "val": 18} + ], + "stroke": "water_night" + }, + "marine_label_line_other": { + "color": "water_dark_night", + "size": ["stops", + {"z": 4, "val": 12}, + {"z": 5, "val": 14}, + {"z": 6, "val": 16}, + {"z": 22, "val": 16} + ], "stroke": "water_night" }, "marine_label_point_1": { @@ -3092,7 +3258,7 @@ module.exports = { ], "stroke": "water_night" }, - "marine_label_point_other": { + "marine_label_point_3": { "color": "water_dark_night", "size": ["stops", {"z": 3, "val": 12}, @@ -3103,6 +3269,16 @@ module.exports = { ], "stroke": "water_night" }, + "marine_label_point_other": { + "color": "water_dark_night", + "size": ["stops", + {"z": 4, "val": 12}, + {"z": 5, "val": 14}, + {"z": 6, "val": 16}, + {"z": 22, "val": 16} + ], + "stroke": "water_night" + }, "state_label": { "color": "#fff", "strokeWidth": 0.4, |