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

cleanup

Browse Source
This commit is contained in:
Konstantin Käfer
2014-06-26 15:16:28 +02:00
parent aff667d742
commit 99d939b9a6
4 changed files with 3 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/llmr/style/bucket_description.hpp
View File

@@ -12,23 +12,6 @@
namespace llmr {
// Deprecated
class BucketDescription {
public:
BucketType feature_type = BucketType::None;
BucketType type = BucketType::None;
// Specify what data to pull into this bucket
std::string source_name;
std::string source_layer;
FilterExpression filter;
// Specifies how the geometry for this bucket should be created
StyleBucketRender render;
};
std::ostream& operator<<(std::ostream&, const BucketDescription& bucket);
std::ostream& operator<<(std::ostream&, BucketType type);
}

72
include/llmr/style/style.hpp
View File

@@ -87,81 +87,13 @@ private:
private:
std::set<std::shared_ptr<Source>> activeSources;
// This is static information parsed from the stylesheet.
// // This is unused!!!
// std::map<std::string, BucketDescription> buckets;
//
//
// std::vector<LayerDescription> layers;
//
// // These are unused!!!
// std::map<std::string, ClassDescription> classes;
//
// // Currently applied settings.
// struct {
// BackgroundProperties background;
// std::unordered_map<std::string, FillProperties> fills;
// std::unordered_map<std::string, LineProperties> lines;
// std::unordered_map<std::string, IconProperties> icons;
// std::unordered_map<std::string, TextProperties> texts;
// std::unordered_map<std::string, RasterProperties> rasters;
// std::unordered_map<std::string, CompositeProperties> composites;
// std::unordered_map<std::string, std::unordered_map<TransitionablePropertyKey, std::string>> effective_classes;
// } computed;
private:
// bool transitionInProgress(const std::string &layer_name, TransitionablePropertyKey key, time start);
// bool transitionExists(const std::string &layer_name, TransitionablePropertyKey key) const;
// bool inNeedOfTransition(const std::string &layer_name, TransitionablePropertyKey key) const;
// uint64_t transitionDuration(const std::string &layer_name, TransitionablePropertyKey key) const;
// uint64_t transitionDelay(const std::string &layer_name, TransitionablePropertyKey key) const;
//
// void cascadeProperties(GenericProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(FillProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(LineProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(IconProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(TextProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(RasterProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(CompositeProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
// void cascadeProperties(BackgroundProperties &properties, const ClassProperties& klass, const std::string& layer_name, const std::string& class_name, float z);
private:
// Last applied settings.
// struct {
// BackgroundProperties background;
// std::unordered_map<std::string, FillProperties> fills;
// std::unordered_map<std::string, LineProperties> lines;
// std::unordered_map<std::string, IconProperties> icons;
// std::unordered_map<std::string, TextProperties> texts;
// std::unordered_map<std::string, RasterProperties> rasters;
// std::unordered_map<std::string, CompositeProperties> composites;
// std::unordered_map<std::string, std::unordered_map<TransitionablePropertyKey, std::string>> effective_classes;
// } previous;
// // Settings values currently being transitioned.
// struct {
// BackgroundProperties background;
// std::unordered_map<std::string, FillProperties> fills;
// std::unordered_map<std::string, LineProperties> lines;
// std::unordered_map<std::string, IconProperties> icons;
// std::unordered_map<std::string, TextProperties> texts;
// std::unordered_map<std::string, RasterProperties> rasters;
// std::unordered_map<std::string, CompositeProperties> composites;
// } transitioning;
// std::unordered_map<std::string, std::unordered_map<TransitionablePropertyKey, ClassPropertyTransition>> properties_to_transition;
// std::unordered_map<std::string, std::unordered_map<TransitionablePropertyKey, std::shared_ptr<util::transition>>> transitions;
uint64_t default_transition_duration = 0;
bool initial_render_complete = false;
mutable uv::rwlock mtx;
};
}
#endif
#endif
¯

9
src/style/bucket_description.cpp
View File

@@ -2,15 +2,6 @@
#include <iostream>
std::ostream& llmr::operator<<(std::ostream& os, const BucketDescription& bucket) {
os << "Bucket:" << std::endl;
os << " - type: " << (uint32_t)bucket.type << std::endl;
os << " - source_name: " << bucket.source_name << std::endl;
os << " - source_layer: " << bucket.source_layer << std::endl;
return os;
}
std::ostream& llmr::operator<<(std::ostream& os, BucketType type) {
switch (type) {
case BucketType::None: os << "None"; return os;

1019
src/style/style.cpp
View File

File diff suppressed because it is too large Load Diff