tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow functions to be referenced from constants

Browse Source 
fixes #224
This commit is contained in:
Konstantin Käfer
2014-05-21 10:29:36 +02:00
parent 7f00a63fd0
commit 752661ae6e
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/style.js
View File

@@ -1359,7 +1359,19 @@ module.exports = {
"motorway_night": "#eee",
"main_night": "#95ccdb",
"street_night": "#0291b5",
"contour_night": "#ffff80"
"contour_night": "#ffff80",
"road_main_width": [
"stops",
{"z": 5, "val": 1},
{"z": 12, "val": 1},
{"z": 13, "val": 1.5},
{"z": 14, "val": 2},
{"z": 15, "val": 3},
{"z": 16, "val": 6},
{"z": 17, "val": 10},
{"z": 18, "val": 12}
]
},
"classes": [
{
@@ -1915,17 +1927,7 @@ module.exports = {
"road_main": {
"transition-color": {"duration": 300},
"color": "main",
"width": [
"stops",
{"z": 5, "val": 1},
{"z": 12, "val": 1},
{"z": 13, "val": 1.5},
{"z": 14, "val": 2},
{"z": 15, "val": 3},
{"z": 16, "val": 6},
{"z": 17, "val": 10},
{"z": 18, "val": 12}
],
"width": "road_main_width",
"opacity": [
"stops",
{"z": 6.5, "val": 0},

16
src/style/style_parser.cpp
View File

@@ -391,16 +391,18 @@ FunctionProperty::fn StyleParser::parseFunctionType(JSVal type) {
}
FunctionProperty StyleParser::parseFunction(JSVal value) {
JSVal rvalue = replaceConstant(value);
FunctionProperty property;
if (value.IsArray()) {
if (value.Size() < 1) {
if (rvalue.IsArray()) {
if (rvalue.Size() < 1) {
throw Style::exception("value function does not have arguments");
}
property.function = parseFunctionType(value[(rapidjson::SizeType)0]);
for (rapidjson::SizeType i = 1; i < value.Size(); ++i) {
JSVal stop = value[i];
property.function = parseFunctionType(rvalue[(rapidjson::SizeType)0]);
for (rapidjson::SizeType i = 1; i < rvalue.Size(); ++i) {
JSVal stop = rvalue[i];
if (stop.IsObject()) {
if (!stop.HasMember("z")) {
throw Style::exception("stop must have zoom level specification");
@@ -427,9 +429,9 @@ FunctionProperty StyleParser::parseFunction(JSVal value) {
throw Style::exception("function argument must be a numeric value");
}
}
} else if (value.IsNumber()) {
} else if (rvalue.IsNumber()) {
property.function = &functions::constant;
property.values.push_back(value.GetDouble());
property.values.push_back(rvalue.GetDouble());
}
return property;