Skip to content

Commit 82b9173

Browse files
artempartemp
committed
[WIP] refactor/enumerations mapnik/mapnik#4372 
1 parent 6c0e9b5 commit 82b9173

File tree

6 files changed

+61
-62
lines changed

6 files changed

+61
-62
lines changed

‎src/mapnik_datasource.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
#include <mapnik/datasource.hpp>
3939
#include <mapnik/datasource_cache.hpp>
4040
#include <mapnik/feature_layer_desc.hpp>
41-
#include <mapnik/memory_datasource.hpp>
41+
//#include <mapnik/memory_datasource.hpp>
4242

4343

4444
using mapnik::datasource;
45-
using mapnik::memory_datasource;
45+
//using mapnik::memory_datasource;
4646
using mapnik::layer_descriptor;
4747
using mapnik::attribute_descriptor;
4848
using mapnik::parameters;
@@ -197,7 +197,7 @@ void export_datasource()
197197
;
198198

199199
def("CreateDatasource",&create_datasource);
200-
200+
/*
201201
class_<memory_datasource,
202202
bases<datasource>, std::shared_ptr<memory_datasource>,
203203
boost::noncopyable>("MemoryDatasourceBase", init<parameters>())
@@ -210,4 +210,5 @@ void export_datasource()
210210
;
211211
212212
implicitly_convertible<std::shared_ptr<memory_datasource>,std::shared_ptr<datasource> >();
213+
*/
213214
}

‎src/mapnik_enumeration.hpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,17 @@ class enumeration_ :
6868
using namespace boost::python::converter;
6969
return base_type::base::to_python(
7070
registered<native_type>::converters.m_class_object
71-
, static_cast<long>( v ));
71+
, static_cast<long>(native_type(v)));
7272

7373
}
7474
};
7575

7676
void init() {
7777
boost::python::implicitly_convertible<native_type, EnumWrapper>();
7878
boost::python::to_python_converter<EnumWrapper, converter >();
79-
80-
for (unsigned i = 0; i < EnumWrapper::MAX; ++i)
79+
for (auto const& kv : EnumWrapper::lookupMap())
8180
{
82-
// Register the strings already defined for this enum.
83-
base_type::value( EnumWrapper::get_string( i ), native_type( i ) );
81+
base_type::value(kv.second.c_str(), kv.first);
8482
}
8583
}
8684

‎src/mapnik_gamma_method.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ void export_gamma_method()
3636
using namespace boost::python;
3737

3838
mapnik::enumeration_<mapnik::gamma_method_e>("gamma_method")
39-
.value("POWER", mapnik::GAMMA_POWER)
40-
.value("LINEAR",mapnik::GAMMA_LINEAR)
41-
.value("NONE", mapnik::GAMMA_NONE)
42-
.value("THRESHOLD", mapnik::GAMMA_THRESHOLD)
43-
.value("MULTIPLY", mapnik::GAMMA_MULTIPLY)
39+
.value("POWER", mapnik::gamma_method_enum::GAMMA_POWER)
40+
.value("LINEAR",mapnik::gamma_method_enum::GAMMA_LINEAR)
41+
.value("NONE", mapnik::gamma_method_enum::GAMMA_NONE)
42+
.value("THRESHOLD", mapnik::gamma_method_enum::GAMMA_THRESHOLD)
43+
.value("MULTIPLY", mapnik::gamma_method_enum::GAMMA_MULTIPLY)
4444
;
4545

4646
}

‎src/mapnik_raster_colorizer.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ using mapnik::colorizer_stop;
4040
using mapnik::colorizer_stops;
4141
using mapnik::colorizer_mode_enum;
4242
using mapnik::color;
43-
using mapnik::COLORIZER_INHERIT;
44-
using mapnik::COLORIZER_LINEAR;
45-
using mapnik::COLORIZER_DISCRETE;
46-
using mapnik::COLORIZER_EXACT;
43+
using mapnik::colorizer_mode_enum::COLORIZER_INHERIT;
44+
using mapnik::colorizer_mode_enum::COLORIZER_LINEAR;
45+
using mapnik::colorizer_mode_enum::COLORIZER_DISCRETE;
46+
using mapnik::colorizer_mode_enum::COLORIZER_EXACT;
4747

4848

4949
namespace {

‎src/mapnik_style.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ void export_style()
6969
using namespace boost::python;
7070

7171
mapnik::enumeration_<mapnik::filter_mode_e>("filter_mode")
72-
.value("ALL",mapnik::FILTER_ALL)
73-
.value("FIRST",mapnik::FILTER_FIRST)
72+
.value("ALL",mapnik::filter_mode_enum::FILTER_ALL)
73+
.value("FIRST",mapnik::filter_mode_enum::FILTER_FIRST)
7474
;
7575

7676
class_<rules>("Rules",init<>("default ctor"))

‎src/mapnik_symbolizer.cpp‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -277,38 +277,38 @@ void export_text_symbolizer()
277277
{
278278
using namespace boost::python;
279279
mapnik::enumeration_<mapnik::label_placement_e>("label_placement")
280-
.value("LINE_PLACEMENT", mapnik::LINE_PLACEMENT)
281-
.value("POINT_PLACEMENT", mapnik::POINT_PLACEMENT)
282-
.value("VERTEX_PLACEMENT", mapnik::VERTEX_PLACEMENT)
283-
.value("INTERIOR_PLACEMENT", mapnik::INTERIOR_PLACEMENT);
280+
.value("LINE_PLACEMENT", mapnik::label_placement_enum::LINE_PLACEMENT)
281+
.value("POINT_PLACEMENT", mapnik::label_placement_enum::POINT_PLACEMENT)
282+
.value("VERTEX_PLACEMENT", mapnik::label_placement_enum::VERTEX_PLACEMENT)
283+
.value("INTERIOR_PLACEMENT", mapnik::label_placement_enum::INTERIOR_PLACEMENT);
284284

285285
mapnik::enumeration_<mapnik::vertical_alignment_e>("vertical_alignment")
286-
.value("TOP", mapnik::V_TOP)
287-
.value("MIDDLE", mapnik::V_MIDDLE)
288-
.value("BOTTOM", mapnik::V_BOTTOM)
289-
.value("AUTO", mapnik::V_AUTO);
286+
.value("TOP", mapnik::vertical_alignment_enum::V_TOP)
287+
.value("MIDDLE", mapnik::vertical_alignment_enum::V_MIDDLE)
288+
.value("BOTTOM", mapnik::vertical_alignment_enum::V_BOTTOM)
289+
.value("AUTO", mapnik::vertical_alignment_enum::V_AUTO);
290290

291291
mapnik::enumeration_<mapnik::horizontal_alignment_e>("horizontal_alignment")
292-
.value("LEFT", mapnik::H_LEFT)
293-
.value("MIDDLE", mapnik::H_MIDDLE)
294-
.value("RIGHT", mapnik::H_RIGHT)
295-
.value("AUTO", mapnik::H_AUTO);
292+
.value("LEFT", mapnik::horizontal_alignment_enum::H_LEFT)
293+
.value("MIDDLE", mapnik::horizontal_alignment_enum::H_MIDDLE)
294+
.value("RIGHT", mapnik::horizontal_alignment_enum::H_RIGHT)
295+
.value("AUTO", mapnik::horizontal_alignment_enum::H_AUTO);
296296

297297
mapnik::enumeration_<mapnik::justify_alignment_e>("justify_alignment")
298-
.value("LEFT", mapnik::J_LEFT)
299-
.value("MIDDLE", mapnik::J_MIDDLE)
300-
.value("RIGHT", mapnik::J_RIGHT)
301-
.value("AUTO", mapnik::J_AUTO);
298+
.value("LEFT", mapnik::justify_alignment_enum::J_LEFT)
299+
.value("MIDDLE", mapnik::justify_alignment_enum::J_MIDDLE)
300+
.value("RIGHT", mapnik::justify_alignment_enum::J_RIGHT)
301+
.value("AUTO", mapnik::justify_alignment_enum::J_AUTO);
302302

303303
mapnik::enumeration_<mapnik::text_transform_e>("text_transform")
304-
.value("NONE", mapnik::NONE)
305-
.value("UPPERCASE", mapnik::UPPERCASE)
306-
.value("LOWERCASE", mapnik::LOWERCASE)
307-
.value("CAPITALIZE", mapnik::CAPITALIZE);
304+
.value("NONE", mapnik::text_transform_enum::NONE)
305+
.value("UPPERCASE", mapnik::text_transform_enum::UPPERCASE)
306+
.value("LOWERCASE", mapnik::text_transform_enum::LOWERCASE)
307+
.value("CAPITALIZE", mapnik::text_transform_enum::CAPITALIZE);
308308

309309
mapnik::enumeration_<mapnik::halo_rasterizer_e>("halo_rasterizer")
310-
.value("FULL", mapnik::HALO_RASTERIZER_FULL)
311-
.value("FAST", mapnik::HALO_RASTERIZER_FAST);
310+
.value("FULL", mapnik::halo_rasterizer_enum::HALO_RASTERIZER_FULL)
311+
.value("FAST", mapnik::halo_rasterizer_enum::HALO_RASTERIZER_FAST);
312312

313313
class_< text_symbolizer, bases<symbolizer_base> >("TextSymbolizer",
314314
init<>("Default ctor"))
@@ -343,8 +343,8 @@ void export_polygon_pattern_symbolizer()
343343
using namespace boost::python;
344344

345345
mapnik::enumeration_<mapnik::pattern_alignment_e>("pattern_alignment")
346-
.value("LOCAL",mapnik::LOCAL_ALIGNMENT)
347-
.value("GLOBAL",mapnik::GLOBAL_ALIGNMENT)
346+
.value("LOCAL",mapnik::pattern_alignment_enum::LOCAL_ALIGNMENT)
347+
.value("GLOBAL",mapnik::pattern_alignment_enum::GLOBAL_ALIGNMENT)
348348
;
349349

350350
class_<polygon_pattern_symbolizer>("PolygonPatternSymbolizer",
@@ -367,8 +367,8 @@ void export_point_symbolizer()
367367
using namespace boost::python;
368368

369369
mapnik::enumeration_<mapnik::point_placement_e>("point_placement")
370-
.value("CENTROID",mapnik::CENTROID_POINT_PLACEMENT)
371-
.value("INTERIOR",mapnik::INTERIOR_POINT_PLACEMENT)
370+
.value("CENTROID",mapnik::point_placement_enum::CENTROID_POINT_PLACEMENT)
371+
.value("INTERIOR",mapnik::point_placement_enum::INTERIOR_POINT_PLACEMENT)
372372
;
373373

374374
class_<point_symbolizer, bases<symbolizer_base> >("PointSymbolizer",
@@ -382,15 +382,15 @@ void export_markers_symbolizer()
382382
using namespace boost::python;
383383

384384
mapnik::enumeration_<mapnik::marker_placement_e>("marker_placement")
385-
.value("POINT_PLACEMENT",mapnik::MARKER_POINT_PLACEMENT)
386-
.value("INTERIOR_PLACEMENT",mapnik::MARKER_INTERIOR_PLACEMENT)
387-
.value("LINE_PLACEMENT",mapnik::MARKER_LINE_PLACEMENT)
385+
.value("POINT_PLACEMENT",mapnik::marker_placement_enum::MARKER_POINT_PLACEMENT)
386+
.value("INTERIOR_PLACEMENT",mapnik::marker_placement_enum::MARKER_INTERIOR_PLACEMENT)
387+
.value("LINE_PLACEMENT",mapnik::marker_placement_enum::MARKER_LINE_PLACEMENT)
388388
;
389389

390390
mapnik::enumeration_<mapnik::marker_multi_policy_e>("marker_multi_policy")
391-
.value("EACH",mapnik::MARKER_EACH_MULTI)
392-
.value("WHOLE",mapnik::MARKER_WHOLE_MULTI)
393-
.value("LARGEST",mapnik::MARKER_LARGEST_MULTI)
391+
.value("EACH",mapnik::marker_multi_policy_enum::MARKER_EACH_MULTI)
392+
.value("WHOLE",mapnik::marker_multi_policy_enum::MARKER_WHOLE_MULTI)
393+
.value("LARGEST",mapnik::marker_multi_policy_enum::MARKER_LARGEST_MULTI)
394394
;
395395

396396
class_<markers_symbolizer, bases<symbolizer_base> >("MarkersSymbolizer",
@@ -405,25 +405,25 @@ void export_line_symbolizer()
405405
using namespace boost::python;
406406

407407
mapnik::enumeration_<mapnik::line_rasterizer_e>("line_rasterizer")
408-
.value("FULL",mapnik::RASTERIZER_FULL)
409-
.value("FAST",mapnik::RASTERIZER_FAST)
408+
.value("FULL",mapnik::line_rasterizer_enum::RASTERIZER_FULL)
409+
.value("FAST",mapnik::line_rasterizer_enum::RASTERIZER_FAST)
410410
;
411411

412412
mapnik::enumeration_<mapnik::line_cap_e>("stroke_linecap",
413413
"The possible values for a line cap used when drawing\n"
414414
"with a stroke.\n")
415-
.value("BUTT_CAP",mapnik::BUTT_CAP)
416-
.value("SQUARE_CAP",mapnik::SQUARE_CAP)
417-
.value("ROUND_CAP",mapnik::ROUND_CAP)
415+
.value("BUTT_CAP",mapnik::line_cap_enum::BUTT_CAP)
416+
.value("SQUARE_CAP",mapnik::line_cap_enum::SQUARE_CAP)
417+
.value("ROUND_CAP",mapnik::line_cap_enum::ROUND_CAP)
418418
;
419419

420420
mapnik::enumeration_<mapnik::line_join_e>("stroke_linejoin",
421421
"The possible values for the line joining mode\n"
422422
"when drawing with a stroke.\n")
423-
.value("MITER_JOIN",mapnik::MITER_JOIN)
424-
.value("MITER_REVERT_JOIN",mapnik::MITER_REVERT_JOIN)
425-
.value("ROUND_JOIN",mapnik::ROUND_JOIN)
426-
.value("BEVEL_JOIN",mapnik::BEVEL_JOIN)
423+
.value("MITER_JOIN",mapnik::line_join_enum::MITER_JOIN)
424+
.value("MITER_REVERT_JOIN",mapnik::line_join_enum::MITER_REVERT_JOIN)
425+
.value("ROUND_JOIN",mapnik::line_join_enum::ROUND_JOIN)
426+
.value("BEVEL_JOIN",mapnik::line_join_enum::BEVEL_JOIN)
427427
;
428428

429429

@@ -448,8 +448,8 @@ void export_debug_symbolizer()
448448
using namespace boost::python;
449449

450450
mapnik::enumeration_<mapnik::debug_symbolizer_mode_e>("debug_symbolizer_mode")
451-
.value("COLLISION",mapnik::DEBUG_SYM_MODE_COLLISION)
452-
.value("VERTEX",mapnik::DEBUG_SYM_MODE_VERTEX)
451+
.value("COLLISION",mapnik::debug_symbolizer_mode_enum::DEBUG_SYM_MODE_COLLISION)
452+
.value("VERTEX",mapnik::debug_symbolizer_mode_enum::DEBUG_SYM_MODE_VERTEX)
453453
;
454454

455455
class_<debug_symbolizer, bases<symbolizer_base> >("DebugSymbolizer",

0 commit comments

Comments
 (0)