Merge branch 'master' into rasterize

[skip ci]
This commit is contained in:
Konstantin Käfer
2014-08-12 15:15:05 +02:00
32 changed files with 2762 additions and 159 deletions

View File

@@ -46,7 +46,7 @@ void StyleParser::parseConstants(JSVal value) {
}
}
} else {
throw Style::exception("constants must be an object");
Log::Warning(Event::ParseStyle, "constants must be an object");
}
}
@@ -84,7 +84,7 @@ template<> bool StyleParser::parseRenderProperty(JSVal value, std::string &targe
target = { property.GetString(), property.GetStringLength() };
return true;
} else {
fprintf(stderr, "[WARNING] '%s' must be a string\n", name);
Log::Warning(Event::ParseStyle, "'%s' must be a string", name);
}
}
return false;
@@ -97,7 +97,7 @@ template<> bool StyleParser::parseRenderProperty(JSVal value, float &target, con
target = property.GetDouble();
return true;
} else {
fprintf(stderr, "[WARNING] '%s' must be a number\n", name);
Log::Warning(Event::ParseStyle, "'%s' must be a number", name);
}
}
return false;
@@ -109,14 +109,14 @@ template<> bool StyleParser::parseRenderProperty(JSVal value, uint16_t &target,
if (property.IsUint()) {
unsigned int value = property.GetUint();
if (value > std::numeric_limits<uint16_t>::max()) {
fprintf(stderr, "[WARNING] values for %s that are larger than %d are not supported\n", name, std::numeric_limits<uint16_t>::max());
Log::Warning(Event::ParseStyle, "values for %s that are larger than %d are not supported", name, std::numeric_limits<uint16_t>::max());
return false;
}
target = value;
return true;
} else {
fprintf(stderr, "[WARNING] %s must be an unsigned integer\n", name);
Log::Warning(Event::ParseStyle, "%s must be an unsigned integer", name);
}
}
return false;
@@ -129,7 +129,7 @@ template<> bool StyleParser::parseRenderProperty(JSVal value, int32_t &target, c
target = property.GetInt();
return true;
} else {
fprintf(stderr, "[WARNING] %s must be an integer\n", name);
Log::Warning(Event::ParseStyle, "%s must be an integer", name);
}
}
return false;
@@ -144,10 +144,10 @@ template<> bool StyleParser::parseRenderProperty(JSVal value, vec2<float> &targe
target.y = property[(rapidjson::SizeType)1].GetDouble();
return true;
} else {
fprintf(stderr, "[WARNING] %s must have at least two members\n", name);
Log::Warning(Event::ParseStyle, "%s must have at least two members", name);
}
} else {
fprintf(stderr, "[WARNING] %s must be a n array of numbers\n", name);
Log::Warning(Event::ParseStyle, "%s must be an array of numbers", name);
}
}
return false;
@@ -161,7 +161,7 @@ bool StyleParser::parseRenderProperty(JSVal value, T &target, const char *name)
target = Parser({ property.GetString(), property.GetStringLength() });
return true;
} else {
fprintf(stderr, "[WARNING] %s must have one of the enum values\n", name);
Log::Warning(Event::ParseStyle, "%s must have one of the enum values", name);
}
}
return false;
@@ -192,7 +192,7 @@ void StyleParser::parseSources(JSVal value) {
sources.emplace(std::move(name), std::make_shared<StyleSource>(SourceInfo { type, url, tile_size, min_zoom, max_zoom }));
}
} else {
throw Style::exception("sources must be an object");
Log::Warning(Event::ParseStyle, "sources must be an object");
}
}
@@ -200,7 +200,7 @@ void StyleParser::parseSources(JSVal value) {
Color parseColor(JSVal value) {
if (!value.IsString()) {
fprintf(stderr, "[WARNING] color value must be a string\n");
Log::Warning(Event::ParseStyle, "color value must be a string");
return Color{{ 0, 0, 0, 0 }};
}
@@ -223,7 +223,7 @@ bool StyleParser::parseFunctionArgument(JSVal value) {
} else if (rvalue.IsNumber()) {
return rvalue.GetDouble();
} else {
fprintf(stderr, "[WARNING] function argument must be a boolean or numeric value");
Log::Warning(Event::ParseStyle, "function argument must be a boolean or numeric value");
return false;
}
}
@@ -234,7 +234,7 @@ float StyleParser::parseFunctionArgument(JSVal value) {
if (rvalue.IsNumber()) {
return rvalue.GetDouble();
} else {
fprintf(stderr, "[WARNING] function argument must be a numeric value");
Log::Warning(Event::ParseStyle, "function argument must be a numeric value");
return 0.0f;
}
}
@@ -251,7 +251,7 @@ template <> inline float defaultBaseValue<Color>() { return 1.0; }
template <typename T>
std::tuple<bool, Function<T>> StyleParser::parseFunction(JSVal value) {
if (!value.HasMember("stops")) {
fprintf(stderr, "[WARNING] stops function must specify a stops array\n");
Log::Warning(Event::ParseStyle, "function must specify a function type");
return std::tuple<bool, Function<T>> { false, ConstantFunction<T>(T()) };
}
@@ -262,13 +262,13 @@ std::tuple<bool, Function<T>> StyleParser::parseFunction(JSVal value) {
if (value_base.IsNumber()) {
base = value_base.GetDouble();
} else {
fprintf(stderr, "[WARNING] base must be numeric\n");
Log::Warning(Event::ParseStyle, "base must be numeric");
}
}
JSVal value_stops = value["stops"];
if (!value_stops.IsArray()) {
fprintf(stderr, "[WARNING] stops function must specify a stops array\n");
Log::Warning(Event::ParseStyle, "stops function must specify a stops array");
return std::tuple<bool, Function<T>> { false, ConstantFunction<T>(T()) };
}
@@ -277,19 +277,19 @@ std::tuple<bool, Function<T>> StyleParser::parseFunction(JSVal value) {
JSVal stop = value_stops[i];
if (stop.IsArray()) {
if (stop.Size() != 2) {
fprintf(stderr, "[WARNING] stop must have zoom level and value specification\n");
Log::Warning(Event::ParseStyle, "stop must have zoom level and value specification");
return std::tuple<bool, Function<T>> { false, ConstantFunction<T>(T()) };
}
JSVal z = stop[rapidjson::SizeType(0)];
if (!z.IsNumber()) {
fprintf(stderr, "[WARNING] zoom level in stop must be a number\n");
Log::Warning(Event::ParseStyle, "zoom level in stop must be a number");
return std::tuple<bool, Function<T>> { false, ConstantFunction<T>(T()) };
}
stops.emplace_back(z.GetDouble(), parseFunctionArgument<T>(stop[rapidjson::SizeType(1)]));
} else {
fprintf(stderr, "[WARNING] function argument must be a numeric value\n");
Log::Warning(Event::ParseStyle, "function argument must be a numeric value");
return std::tuple<bool, Function<T>> { false, ConstantFunction<T>(T()) };
}
}
@@ -352,7 +352,7 @@ bool StyleParser::parseOptionalProperty(const char *property_name, T &target, JS
template<> std::tuple<bool, std::string> StyleParser::parseProperty(JSVal value, const char *property_name) {
if (!value.IsString()) {
fprintf(stderr, "[WARNING] value of '%s' must be a string\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be a string", property_name);
return std::tuple<bool, std::string> { false, std::string() };
}
@@ -361,7 +361,7 @@ template<> std::tuple<bool, std::string> StyleParser::parseProperty(JSVal value,
template<> std::tuple<bool, TranslateAnchorType> StyleParser::parseProperty(JSVal value, const char *property_name) {
if (!value.IsString()) {
fprintf(stderr, "[WARNING] value of '%s' must be a string\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be a string", property_name);
return std::tuple<bool, TranslateAnchorType> { false, TranslateAnchorType::Map };
}
@@ -370,7 +370,7 @@ template<> std::tuple<bool, TranslateAnchorType> StyleParser::parseProperty(JSVa
template<> std::tuple<bool, RotateAnchorType> StyleParser::parseProperty<RotateAnchorType>(JSVal value, const char *property_name) {
if (!value.IsString()) {
fprintf(stderr, "[WARNING] value of '%s' must be a string\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be a string", property_name);
return std::tuple<bool, RotateAnchorType> { false, RotateAnchorType::Map };
}
@@ -403,7 +403,7 @@ template<> std::tuple<bool, Function<bool>> StyleParser::parseProperty(JSVal val
} else if (value.IsBool()) {
return std::tuple<bool, Function<bool>> { true, ConstantFunction<bool>(value.GetBool()) };
} else {
fprintf(stderr, "[WARNING] value of '%s' must be convertible to boolean, or a boolean function\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be convertible to boolean, or a boolean function", property_name);
return std::tuple<bool, Function<bool>> { false, ConstantFunction<bool>(false) };
}
}
@@ -416,7 +416,7 @@ template<> std::tuple<bool, Function<float>> StyleParser::parseProperty(JSVal va
} else if (value.IsBool()) {
return std::tuple<bool, Function<float>> { true, ConstantFunction<float>(value.GetBool()) };
} else {
fprintf(stderr, "[WARNING] value of '%s' must be a number, or a number function\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be a number, or a number function", property_name);
return std::tuple<bool, Function<float>> { false, ConstantFunction<float>(0) };
}
}
@@ -427,7 +427,7 @@ template<> std::tuple<bool, Function<Color>> StyleParser::parseProperty(JSVal va
} else if (value.IsString()) {
return std::tuple<bool, Function<Color>> { true, ConstantFunction<Color>(parseColor(value)) };
} else {
fprintf(stderr, "[WARNING] value of '%s' must be a color, or a color function\n", property_name);
Log::Warning(Event::ParseStyle, "value of '%s' must be a color, or a color function", property_name);
return std::tuple<bool, Function<Color>> { false, ConstantFunction<Color>(Color {{ 0, 0, 0, 0 }}) };
}
}
@@ -437,11 +437,11 @@ bool StyleParser::parseOptionalProperty(const char *property_name, const std::ve
if (value.HasMember(property_name)) {
JSVal rvalue = replaceConstant(value[property_name]);
if (!rvalue.IsArray()) {
throw Style::exception("array value must be an array");
Log::Warning(Event::ParseStyle, "array value must be an array");
}
if (rvalue.Size() != keys.size()) {
throw Style::exception("array value has unexpected number of elements");
Log::Warning(Event::ParseStyle, "array value has unexpected number of elements");
}
for (uint16_t i = 0; i < keys.size(); i++) {
@@ -464,27 +464,27 @@ std::unique_ptr<StyleLayerGroup> StyleParser::createLayers(JSVal value) {
}
return group;
} else {
throw Style::exception("layers must be an array");
Log::Warning(Event::ParseStyle, "layers must be an array");
}
}
std::shared_ptr<StyleLayer> StyleParser::createLayer(JSVal value) {
if (value.IsObject()) {
if (!value.HasMember("id")) {
fprintf(stderr, "[WARNING] layer must have an id\n");
Log::Warning(Event::ParseStyle, "layer must have an id");
return nullptr;
}
JSVal id = value["id"];
if (!id.IsString()) {
fprintf(stderr, "[WARNING] layer id must be a string\n");
Log::Warning(Event::ParseStyle, "layer id must be a string");
return nullptr;
}
const std::string layer_id = { id.GetString(), id.GetStringLength() };
if (layers.find(layer_id) != layers.end()) {
fprintf(stderr, "[WARNING] duplicate layer id %s\n", layer_id.c_str());
Log::Warning(Event::ParseStyle, "duplicate layer id %s", layer_id.c_str());
return nullptr;
}
@@ -504,7 +504,7 @@ std::shared_ptr<StyleLayer> StyleParser::createLayer(JSVal value) {
return layer;
} else {
fprintf(stderr, "[WARNING] layer must be an object\n");
Log::Warning(Event::ParseStyle, "layer must be an object");
return nullptr;
}
}
@@ -522,7 +522,7 @@ void StyleParser::parseLayer(std::pair<JSVal, std::shared_ptr<StyleLayer>> &pair
if (value.HasMember("type")) {
JSVal type = value["type"];
if (!type.IsString()) {
fprintf(stderr, "[WARNING] layer type of '%s' must be a string\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "layer type of '%s' must be a string", layer->id.c_str());
} else {
layer->type = StyleLayerTypeClass(std::string { type.GetString(), type.GetStringLength() });
}
@@ -535,7 +535,7 @@ void StyleParser::parseLayer(std::pair<JSVal, std::shared_ptr<StyleLayer>> &pair
// Make sure we have not previously attempted to parse this layer.
if (std::find(stack.begin(), stack.end(), layer.get()) != stack.end()) {
fprintf(stderr, "[WARNING] layer reference of '%s' is circular\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "layer reference of '%s' is circular", layer->id.c_str());
return;
}
@@ -652,13 +652,13 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) {
void StyleParser::parseReference(JSVal value, std::shared_ptr<StyleLayer> &layer) {
if (!value.IsString()) {
fprintf(stderr, "[WARNING] layer ref of '%s' must be a string\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "layer ref of '%s' must be a string", layer->id.c_str());
return;
}
const std::string ref { value.GetString(), value.GetStringLength() };
auto it = layers.find(ref);
if (it == layers.end()) {
fprintf(stderr, "[WARNING] layer '%s' references unknown layer %s\n", layer->id.c_str(), ref.c_str());
Log::Warning(Event::ParseStyle, "layer '%s' references unknown layer %s", layer->id.c_str(), ref.c_str());
// We cannot parse this layer further.
return;
}
@@ -674,7 +674,7 @@ void StyleParser::parseReference(JSVal value, std::shared_ptr<StyleLayer> &layer
layer->type = reference->type;
if (reference->layers) {
fprintf(stderr, "[WARNING] layer '%s' references composite layer\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "layer '%s' references composite layer", layer->id.c_str());
// We cannot parse this layer further.
return;
} else {
@@ -698,11 +698,10 @@ void StyleParser::parseBucket(JSVal value, std::shared_ptr<StyleLayer> &layer) {
if (source_it != sources.end()) {
layer->bucket->style_source = source_it->second;
} else {
fprintf(stderr, "[WARNING] can't find source '%s' required for layer '%s'\n",
source_name.c_str(), layer->id.c_str());
Log::Warning(Event::ParseStyle, "can't find source '%s' required for layer '%s'", source_name.c_str(), layer->id.c_str());
}
} else {
fprintf(stderr, "[WARNING] source of layer '%s' must be a string\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "source of layer '%s' must be a string", layer->id.c_str());
}
}
@@ -711,7 +710,7 @@ void StyleParser::parseBucket(JSVal value, std::shared_ptr<StyleLayer> &layer) {
if (value_source_layer.IsString()) {
layer->bucket->source_layer = { value_source_layer.GetString(), value_source_layer.GetStringLength() };
} else {
fprintf(stderr, "[WARNING] source-layer of layer '%s' must be a string\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "source-layer of layer '%s' must be a string", layer->id.c_str());
}
}
@@ -791,7 +790,7 @@ FilterExpression StyleParser::parseFilter(JSVal value, FilterExpression::Operato
expression.add(parseFilter(replaceConstant(value[i])));
}
} else {
fprintf(stderr, "[WARNING] expression must be either an array or an object\n");
Log::Warning(Event::ParseStyle, "expression must be either an array or an object");
}
return expression;
@@ -833,7 +832,7 @@ std::vector<Value> StyleParser::parseValues(JSVal value) {
void StyleParser::parseRender(JSVal value, std::shared_ptr<StyleLayer> &layer) {
if (!value.IsObject()) {
fprintf(stderr, "[WARNING] render property of layer '%s' must be an object\n", layer->id.c_str());
Log::Warning(Event::ParseStyle, "render property of layer '%s' must be an object", layer->id.c_str());
return;
}