RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Add code for 'area' styles program generation.

Browse source
This commit is contained in:
vng 2011-08-23 14:05:54 +03:00 • committed by Alex Zolotarev
parent 419efca5bd
commit d91251169d
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
generator/classif_routine.cpp
View file

@ -3,6 +3,12 @@
#include "../indexer/classificator.hpp"
#include "../indexer/drawing_rules.hpp"
#include "../indexer/file_reader_stream.hpp"
#include "../indexer/scales.hpp"
#include "../platform/platform.hpp"
#include "../base/logging.hpp"
#include "../base/start_mem_debug.hpp"
@ -23,21 +29,26 @@ namespace classificator
void GenerateAndWrite(string const & path)
{
// Experimental - add drawing rules in programm.
//string const fullName = path + "drawing_rules.bin";
//drule::ReadRules(fullName.c_str());
// Experimental - add drawing rules in program.
//int const color = 0;
//double const pixWidth = 1.5;
//for (int i = 0; i <= scales::GetUpperScale(); ++i)
//{
// size_t const ind = drule::rules().AddLineRule(i, color, pixWidth);
// LOG_SHORT(LINFO, ("Scale = ", i, "; Index = ", ind));
//}
// // 1. Read rules.
// string const name = "drawing_rules.bin";
// ReaderPtrStream rulesS(GetPlatform().GetReader(name));
// drule::ReadRules(rulesS);
//drule::WriteRules(fullName.c_str());
// // 2. Append rules.
// //int const color = 0;
// int const color = 0xD3D3D3;
// //double const pixWidth = 1.5;
// for (int i = 0; i <= scales::GetUpperScale(); ++i)
// {
// //size_t const ind = drule::rules().AddLineRule(i, color, pixWidth);
// size_t const ind = drule::rules().AddAreaRule(i, color);
// LOG_SHORT(LINFO, ("Scale = ", i, "; Index = ", ind));
// }
//return;
// drule::WriteRules((path + name).c_str());
// return;
// 1. generic types
parse_osm_types(0, 11, path + "styles/caption-z");

7
indexer/drawing_rules.cpp
View file

@ -994,6 +994,13 @@ size_t RulesHolder::AddLineRule(int32_t scale, int color, double pixWidth)
return AddRule(scale, line, p);
}
size_t RulesHolder::AddAreaRule(int32_t scale, int color)
{
AreaRule * p = new AreaRule();
p->m_params.get<0>() = color_t(color);
return AddRule(scale, area, p);
}
BaseRule const * RulesHolder::Find(Key const & k) const
{
rules_map_t::const_iterator i = m_rules.find(k.m_scale);

1
indexer/drawing_rules.hpp
View file

@ -130,6 +130,7 @@ namespace drule
size_t AddRule(int32_t scale, rule_type_t type, BaseRule * p);
size_t AddLineRule(int32_t scale, int color, double pixWidth);
size_t AddAreaRule(int32_t scale, int color);
void Clean();