sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/plugins/input/osm
History
artemp 4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
2013-08-30 09:46:09 +01:00
..
basiccurl.cpp suppress unused variable compiler warnings with gcc 2012-07-23 17:29:10 -07:00
basiccurl.h use c++ style includes 2011-11-09 16:45:18 -08:00
build.py start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
dataset_deliverer.cpp start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
dataset_deliverer.h remove unused iostream includes and unnecessary usage of ostringstream - refs #1055 2012-12-06 23:06:12 -08:00
libMakefile remove tabs 2011-04-02 03:45:50 +00:00
Makefile.example remove tabs 2011-04-02 03:45:50 +00:00
osm.cpp fix visual tests by restoring old hack to prevent rendering of all names 2012-11-27 18:15:56 -08:00
osm.h refactor expression and value type usage to speed up compile time 2013-01-08 14:17:31 -08:00
osm_datasource.cpp + use more consise c++11 syntax 2013-05-06 15:52:04 +01:00
osm_datasource.hpp remove as much mutable as possible 2012-12-17 12:59:15 -08:00
osm_featureset.cpp fixup includes and value type and params usage across plugins 2013-01-04 09:23:06 -08:00
osm_featureset.hpp osm input: remove string hack and set feature_id to osm node id 2012-10-16 17:46:24 -07:00
osmparser.cpp Stop the osm input plugin truncating ID values on 32 bit platforms 2013-07-11 00:39:52 +01:00
osmparser.h Stop the osm input plugin truncating ID values on 32 bit platforms 2013-07-11 00:39:52 +01:00
osmtagtypes.h - aligned coding style in osm plugin 2011-10-22 16:04:05 +02:00
render.cpp + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
test.cpp plugin code formatting based on emacs format in utils/format_source_files 2011-11-13 19:37:50 -08:00
test.osm mapnik osm plugin initial commit 2008-03-01 11:49:37 +00:00
test.xml remove tabs 2011-04-02 03:45:50 +00:00
test2.osm mapnik osm plugin initial commit 2008-03-01 11:49:37 +00:00
test2.xml remove tabs 2011-04-02 03:45:50 +00:00
test3.xml remove tabs 2011-04-02 03:45:50 +00:00