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

[core] Enable 'symbol-sort-key' layout property and generate style code

Browse Source
This commit is contained in:
Alexander Shalamov
2019-04-08 18:13:22 +03:00
parent e329492f0f
commit 905ca29866
4 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbgl/style/layers/symbol_layer.hpp
View File

@@ -38,6 +38,10 @@ public:
const PropertyValue<bool>& getSymbolAvoidEdges() const;
void setSymbolAvoidEdges(const PropertyValue<bool>&);
static PropertyValue<float> getDefaultSymbolSortKey();
const PropertyValue<float>& getSymbolSortKey() const;
void setSymbolSortKey(const PropertyValue<float>&);
static PropertyValue<SymbolZOrderType> getDefaultSymbolZOrder();
const PropertyValue<SymbolZOrderType>& getSymbolZOrder() const;
void setSymbolZOrder(const PropertyValue<SymbolZOrderType>&);

3
scripts/style-spec.js
View File

@@ -1,4 +1 @@
var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8');
// Make temporary modifications here when Native doesn't have all features that JS has.
delete spec.layout_symbol['symbol-sort-key'];

111
src/mbgl/style/layers/symbol_layer.cpp
View File

@@ -108,6 +108,22 @@ void SymbolLayer::setSymbolAvoidEdges(const PropertyValue<bool>& value) {
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
PropertyValue<float> SymbolLayer::getDefaultSymbolSortKey() {
return SymbolSortKey::defaultValue();
}
const PropertyValue<float>& SymbolLayer::getSymbolSortKey() const {
return impl().layout.get<SymbolSortKey>();
}
void SymbolLayer::setSymbolSortKey(const PropertyValue<float>& value) {
if (value == getSymbolSortKey())
return;
auto impl_ = mutableImpl();
impl_->layout.get<SymbolSortKey>() = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
PropertyValue<SymbolZOrderType> SymbolLayer::getDefaultSymbolZOrder() {
return SymbolZOrder::defaultValue();
}
@@ -1333,6 +1349,7 @@ optional<Error> SymbolLayer::setLayoutProperty(const std::string& name, const Co
SymbolPlacement,
SymbolSpacing,
SymbolAvoidEdges,
SymbolSortKey,
SymbolZOrder,
IconAllowOverlap,
IconIgnorePlacement,
@@ -1374,6 +1391,7 @@ optional<Error> SymbolLayer::setLayoutProperty(const std::string& name, const Co
{ "symbol-placement", static_cast<uint8_t>(Property::SymbolPlacement) },
{ "symbol-spacing", static_cast<uint8_t>(Property::SymbolSpacing) },
{ "symbol-avoid-edges", static_cast<uint8_t>(Property::SymbolAvoidEdges) },
{ "symbol-sort-key", static_cast<uint8_t>(Property::SymbolSortKey) },
{ "symbol-z-order", static_cast<uint8_t>(Property::SymbolZOrder) },
{ "icon-allow-overlap", static_cast<uint8_t>(Property::IconAllowOverlap) },
{ "icon-ignore-placement", static_cast<uint8_t>(Property::IconIgnorePlacement) },
@@ -1520,6 +1538,55 @@ optional<Error> SymbolLayer::setLayoutProperty(const std::string& name, const Co
}
if (property == Property::SymbolSortKey || property == Property::IconSize || property == Property::IconRotate || property == Property::TextSize || property == Property::TextMaxWidth || property == Property::TextLetterSpacing || property == Property::TextRadialOffset || property == Property::TextRotate) {
Error error;
optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, true, false);
if (!typedValue) {
return error;
}
if (property == Property::SymbolSortKey) {
setSymbolSortKey(*typedValue);
return nullopt;
}
if (property == Property::IconSize) {
setIconSize(*typedValue);
return nullopt;
}
if (property == Property::IconRotate) {
setIconRotate(*typedValue);
return nullopt;
}
if (property == Property::TextSize) {
setTextSize(*typedValue);
return nullopt;
}
if (property == Property::TextMaxWidth) {
setTextMaxWidth(*typedValue);
return nullopt;
}
if (property == Property::TextLetterSpacing) {
setTextLetterSpacing(*typedValue);
return nullopt;
}
if (property == Property::TextRadialOffset) {
setTextRadialOffset(*typedValue);
return nullopt;
}
if (property == Property::TextRotate) {
setTextRotate(*typedValue);
return nullopt;
}
}
if (property == Property::SymbolZOrder) {
Error error;
optional<PropertyValue<SymbolZOrderType>> typedValue = convert<PropertyValue<SymbolZOrderType>>(value, error, false, false);
@@ -1561,50 +1628,6 @@ optional<Error> SymbolLayer::setLayoutProperty(const std::string& name, const Co
}
if (property == Property::IconSize || property == Property::IconRotate || property == Property::TextSize || property == Property::TextMaxWidth || property == Property::TextLetterSpacing || property == Property::TextRadialOffset || property == Property::TextRotate) {
Error error;
optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, true, false);
if (!typedValue) {
return error;
}
if (property == Property::IconSize) {
setIconSize(*typedValue);
return nullopt;
}
if (property == Property::IconRotate) {
setIconRotate(*typedValue);
return nullopt;
}
if (property == Property::TextSize) {
setTextSize(*typedValue);
return nullopt;
}
if (property == Property::TextMaxWidth) {
setTextMaxWidth(*typedValue);
return nullopt;
}
if (property == Property::TextLetterSpacing) {
setTextLetterSpacing(*typedValue);
return nullopt;
}
if (property == Property::TextRadialOffset) {
setTextRadialOffset(*typedValue);
return nullopt;
}
if (property == Property::TextRotate) {
setTextRotate(*typedValue);
return nullopt;
}
}
if (property == Property::IconTextFit) {
Error error;
optional<PropertyValue<IconTextFitType>> typedValue = convert<PropertyValue<IconTextFitType>>(value, error, false, false);

6
src/mbgl/style/layers/symbol_layer_properties.hpp
View File

@@ -27,6 +27,11 @@ struct SymbolAvoidEdges : LayoutProperty<bool> {
static bool defaultValue() { return false; }
};
struct SymbolSortKey : DataDrivenLayoutProperty<float> {
static constexpr const char *name() { return "symbol-sort-key"; }
static float defaultValue() { return 0; }
};
struct SymbolZOrder : LayoutProperty<SymbolZOrderType> {
static constexpr const char *name() { return "symbol-z-order"; }
static SymbolZOrderType defaultValue() { return SymbolZOrderType::Auto; }
@@ -270,6 +275,7 @@ class SymbolLayoutProperties : public Properties<
SymbolPlacement,
SymbolSpacing,
SymbolAvoidEdges,
SymbolSortKey,
SymbolZOrder,
IconAllowOverlap,
IconIgnorePlacement,