sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename nik2img to mapnik-render

Browse source
This commit is contained in:
Dane Springmeyer 2015-10-12 10:38:58 -07:00
parent 03cc55f4f0
commit 67718ed8e1
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -34,7 +34,7 @@ utils/mapnik-index/mapnik-index
utils/ogrindex/ogrindex utils/ogrindex/ogrindex
utils/pgsql2sqlite/pgsql2sqlite utils/pgsql2sqlite/pgsql2sqlite
utils/svg2png/svg2png utils/svg2png/svg2png
utils/nik2img/nik2img utils/mapnik-render/mapnik-render
demo/python/demo* demo/python/demo*
demo/python/map.xml demo/python/map.xml
tests/data/sqlite/*index tests/data/sqlite/*index

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@ Released: TBD
#### Summary #### Summary
- Renamed `nik2img` command to `mapnik-render`
- PostGIS: Fixed handling of all attributes when `key_field_as_attribute=false` (https://github.com/mapnik/mapnik/issues/3120) - PostGIS: Fixed handling of all attributes when `key_field_as_attribute=false` (https://github.com/mapnik/mapnik/issues/3120)
- PostGIS: Fixed parsing of `key_field_as_attribute` as boolean: now `true/false` can be used in addition to `0/1` - PostGIS: Fixed parsing of `key_field_as_attribute` as boolean: now `true/false` can be used in addition to `0/1`

6
SConstruct
View file

@ -402,7 +402,7 @@ opts.AddVariables(
BoolVariable('SHAPEINDEX', 'Compile and install a utility to generate shapefile indexes in the custom format (.index) Mapnik supports', 'True'), BoolVariable('SHAPEINDEX', 'Compile and install a utility to generate shapefile indexes in the custom format (.index) Mapnik supports', 'True'),
BoolVariable('MAPNIK_INDEX', 'Compile and install a utility to generate file indexes for CSV and GeoJSON in the custom format (.index) Mapnik supports', 'True'), BoolVariable('MAPNIK_INDEX', 'Compile and install a utility to generate file indexes for CSV and GeoJSON in the custom format (.index) Mapnik supports', 'True'),
BoolVariable('SVG2PNG', 'Compile and install a utility to generate render an svg file to a png on the command line', 'False'), BoolVariable('SVG2PNG', 'Compile and install a utility to generate render an svg file to a png on the command line', 'False'),
BoolVariable('NIK2IMG', 'Compile and install a utility to generate render a map to an image', 'True'), BoolVariable('MAPNIK_RENDER', 'Compile and install a utility to render a map to an image', 'True'),
BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'), BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'),
BoolVariable('BIGINT', 'Compile support for 64-bit integers in mapnik::value', 'True'), BoolVariable('BIGINT', 'Compile support for 64-bit integers in mapnik::value', 'True'),
) )
@ -1971,8 +1971,8 @@ if not HELP_REQUESTED:
SConscript('utils/pgsql2sqlite/build.py') SConscript('utils/pgsql2sqlite/build.py')
if env['SVG2PNG']: if env['SVG2PNG']:
SConscript('utils/svg2png/build.py') SConscript('utils/svg2png/build.py')
if env['NIK2IMG']: if env['MAPNIK_RENDER']:
SConscript('utils/nik2img/build.py') SConscript('utils/mapnik-render/build.py')
# devtools not ready for public # devtools not ready for public
#SConscript('utils/ogrindex/build.py') #SConscript('utils/ogrindex/build.py')
env['LIBS'].remove('boost_program_options%s' % env['BOOST_APPEND']) env['LIBS'].remove('boost_program_options%s' % env['BOOST_APPEND'])

10
utils/nik2img/build.py → utils/mapnik-render/build.py
View file

@ -7,7 +7,7 @@ program_env = env.Clone()
source = Split( source = Split(
""" """
nik2img.cpp mapnik-render.cpp
""" """
) )
@ -24,11 +24,11 @@ libraries.extend(copy(env['LIBMAPNIK_LIBS']))
if env['RUNTIME_LINK'] == 'static' and env['PLATFORM'] == 'Linux': if env['RUNTIME_LINK'] == 'static' and env['PLATFORM'] == 'Linux':
libraries.append('dl') libraries.append('dl')
nik2img = program_env.Program('nik2img', source, LIBS=libraries) mapnik_render = program_env.Program('mapnik-render', source, LIBS=libraries)
Depends(nik2img, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) Depends(mapnik-render, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
if 'uninstall' not in COMMAND_LINE_TARGETS: if 'uninstall' not in COMMAND_LINE_TARGETS:
env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), nik2img) env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), mapnik_render)
env.Alias('install', os.path.join(env['INSTALL_PREFIX'],'bin')) env.Alias('install', os.path.join(env['INSTALL_PREFIX'],'bin'))
env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','nik2img')) env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','mapnik-render'))

0
utils/nik2img/nik2img.cpp → utils/mapnik-render/mapnik-render.cpp
View file