From d850ee8b76ff44a5dd70fc545e04726c7487d1de Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 16 Aug 2012 12:27:58 -0700 Subject: [PATCH] correct various old trac links to point to github - closes #1396 --- CHANGELOG.md | 4 +-- INSTALL.md | 35 ++++++------------- SConstruct | 22 ++++++------ bindings/python/build.py | 4 +-- plugins/input/occi/occi_featureset.cpp | 2 -- src/box2d.cpp | 2 +- src/image_scaling.cpp | 2 +- tests/data/good_maps/datasource.xml | 2 +- tests/data/good_maps/filesource.xml | 2 +- .../point_symbolizer_on_polygon_map.xml | 4 +-- tests/data/good_maps/polygon_symbolizer.xml | 2 +- tests/data/good_maps/sqlite_attachdb.xml | 2 +- utils/upgrade_map_xml/upgrade_map_xml.py | 2 +- 13 files changed, 34 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a61da5f6..63bcea19b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,7 +135,7 @@ Released September 26, 2011 - Add support for png quantization using fixed palettes (#843) -- Add AlsoFilter functionality - http://trac.mapnik.org/wiki/AlsoFilter +- Add AlsoFilter functionality - https://github.com/mapnik/mapnik/wiki/AlsoFilter - SQLite Plugin: optimize i/o using shared cache and no mutexes (#797) @@ -224,7 +224,7 @@ Released Oct 18, 2011 (Packaged from bc5cabeb6a) -- Added forward compatibility for Mapnik 2.0 XML syntax (https://trac.mapnik.org/wiki/Mapnik2/Changes) +- Added forward compatibility for Mapnik 2.0 XML syntax (https://github.com/mapnik/mapnik/wiki/Mapnik2/Changes) - Build fixes to ensure boost_threads are not used unless THREADING=multi build option is used diff --git a/INSTALL.md b/INSTALL.md index d525be56a..c9e46de45 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -15,9 +15,9 @@ If you need to uninstall do: For more details see the 'Building' Section below. -Platform specific install guides at http://trac.mapnik.org/wiki/MapnikInstallation +Platform specific install guides at https://github.com/mapnik/mapnik/wiki/Mapnik-Installation -For troubleshooting help see http://trac.mapnik.org/wiki/InstallationTroubleshooting +For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationTroubleshooting ## Depends @@ -26,7 +26,7 @@ Mapnik is cross platform and runs on Linux, Mac OSX, Solaris, *BSD, and Windows. The build system should work for all posix/unix systems but for windows see: - http://trac.mapnik.org/wiki/BuildingOnWindows + https://github.com/mapnik/mapnik/wiki/BuildingOnWindows Build dependencies are: @@ -74,7 +74,7 @@ Optional dependencies: Instructions for installing many of these dependencies on various platforms can be found at the Mapnik Community Wiki -(http://trac.mapnik.org/wiki/MapnikInstallation). +(https://github.com/mapnik/mapnik/wiki/Mapnik-Installation). @@ -124,7 +124,7 @@ If you want to see configure options do: For more details on all the options see: - http://trac.mapnik.org/wiki/UsingScons + https://github.com/mapnik/mapnik/wiki/UsingScons ## Testing Installation @@ -155,11 +155,11 @@ For further tests see the `tests` folder within the Mapnik source code. ### Users -Visit http://trac.mapnik.org/wiki/LearningMapnik for basic tutorials on making maps with Mapnik using the Python bindings. +Visit https://github.com/mapnik/mapnik/wiki/LearningMapnik for basic tutorials on making maps with Mapnik using the Python bindings. ### Developers -Visit http://trac.mapnik.org/#DevelopersCorner for resources for getting involved with Mapnik development. +Read docs/contributing.markdown for resources for getting involved with Mapnik development. ## Mapnik Community @@ -168,22 +168,7 @@ Visit http://trac.mapnik.org/#DevelopersCorner for resources for getting involve Mapnik has an active community of talented users and developers making amazing maps. -If you are looking for further help on installation or usage and you can't -find what you are looking for from searching the users list archives -(http://lists.berlios.de/pipermail/mapnik-users/) or the trac wiki -(http://trac.mapnik.org/), feel free to join the Mapnik community and -introduce yourself. +Please feel free to subscribe to the community list and post on both +usage and development topics: http://mapnik.org/contact/ -You can get involved by: - - * Subscribing to the mapnik-users list: - - http://lists.berlios.de/mailman/listinfo/mapnik-users - - * Subscribing to the mapnik-developers list: - - http://lists.berlios.de/mailman/listinfo/mapnik-devel - - * Joining the #mapnik channel on irc://irc.freenode.net/mapnik - - * Signing up as a user or contributor at http://www.ohloh.net/p/mapnik/ +You can also get involved by joining the #mapnik channel on irc://irc.freenode.net/mapnik diff --git a/SConstruct b/SConstruct index e5db708b4..177354f8a 100644 --- a/SConstruct +++ b/SConstruct @@ -54,17 +54,17 @@ DEFAULT_LINK_PRIORITY = ['internal','other','frameworks','user','system'] pretty_dep_names = { - 'ociei':'Oracle database library | configure with OCCI_LIBS & OCCI_INCLUDES | more info: http://trac.mapnik.org/wiki/OCCI', - 'gdal':'GDAL C++ library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: http://trac.mapnik.org/wiki/GDAL', - 'ogr':'OGR-enabled GDAL C++ Library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: http://trac.mapnik.org/wiki/OGR', - 'geos_c':'GEOS Simple Geometry Specification C Library | configured with GEOS_LIB & GEOS_INCLUDE | more info: http://trac.mapnik.org/wiki/GEOS', + 'ociei':'Oracle database library | configure with OCCI_LIBS & OCCI_INCLUDES | more info: https://github.com/mapnik/mapnik/wiki//OCCI', + 'gdal':'GDAL C++ library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: https://github.com/mapnik/mapnik/wiki/GDAL', + 'ogr':'OGR-enabled GDAL C++ Library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: https://github.com/mapnik/mapnik/wiki//OGR', + 'geos_c':'GEOS Simple Geometry Specification C Library | configured with GEOS_LIB & GEOS_INCLUDE | more info: https://github.com/mapnik/mapnik/wiki//GEOS', 'cairo':'Cairo C library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', 'cairomm':'Cairomm C++ bindings to Cairo library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', 'cairomm-version':'Cairomm version is too old (so cairo renderer will not be built), you need at least %s' % CAIROMM_MIN_VERSION, 'pycairo':'Python bindings to Cairo library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', 'proj':'Proj.4 C Projections library | configure with PROJ_LIBS & PROJ_INCLUDES | more info: http://trac.osgeo.org/proj/', - 'pg':'Postgres C Library requiered for PostGIS plugin | configure with pg_config program | more info: http://trac.mapnik.org/wiki/PostGIS', - 'sqlite3':'SQLite3 C Library | configure with SQLITE_LIBS & SQLITE_INCLUDES | more info: http://trac.mapnik.org/wiki/SQLite', + 'pg':'Postgres C Library requiered for PostGIS plugin | configure with pg_config program | more info: https://github.com/mapnik/mapnik/wiki//PostGIS', + 'sqlite3':'SQLite3 C Library | configure with SQLITE_LIBS & SQLITE_INCLUDES | more info: https://github.com/mapnik/mapnik/wiki//SQLite', 'jpeg':'JPEG C library | configure with JPEG_LIBS & JPEG_INCLUDES', 'tiff':'TIFF C library | configure with TIFF_LIBS & TIFF_INCLUDES', 'png':'PNG C library | configure with PNG_LIBS & PNG_INCLUDES', @@ -78,8 +78,8 @@ pretty_dep_names = { 'gdal-config':'gdal-config program | try setting GDAL_CONFIG SCons option', 'geos-config':'geos-config program | try setting GEOS_CONFIG SCons option', 'freetype-config':'freetype-config program | try setting FREETYPE_CONFIG SCons option', - 'osm':'more info: http://trac.mapnik.org/wiki/OsmPlugin', - 'curl':'libcurl is required for the "osm" plugin - more info: http://trac.mapnik.org/wiki/OsmPlugin', + 'osm':'more info: https://github.com/mapnik/mapnik/wiki//OsmPlugin', + 'curl':'libcurl is required for the "osm" plugin - more info: https://github.com/mapnik/mapnik/wiki//OsmPlugin', 'boost_regex_icu':'libboost_regex built with optional ICU unicode support is needed for unicode regex support in mapnik.', 'sqlite_rtree':'The SQLite plugin requires libsqlite3 built with RTREE support (-DSQLITE_ENABLE_RTREE=1)', 'pgsql2sqlite_rtree':'The pgsql2sqlite program requires libsqlite3 built with RTREE support (-DSQLITE_ENABLE_RTREE=1)' @@ -138,7 +138,7 @@ def call(cmd, silent=False): if not stderr: return stdin.strip() elif not silent: - color_print(1,'Problem encounted with SCons scripts, please post bug report to: http://trac.mapnik.org\nError was: %s' % stderr) + color_print(1,'Problem encounted with SCons scripts, please post bug report to: https://github.com/mapnik/mapnik/issues \nError was: %s' % stderr) def strip_first(string,find,replace=''): if string.startswith(find): @@ -244,7 +244,7 @@ def pretty_dep(dep): if pretty: return '%s (%s)' % (dep,pretty) elif 'boost' in dep: - return '%s (%s)' % (dep,'more info see: http://trac.mapnik.org/wiki/MapnikInstallation & http://www.boost.org') + return '%s (%s)' % (dep,'more info see: https://github.com/mapnik/mapnik/wiki//MapnikInstallation & http://www.boost.org') return dep @@ -1416,7 +1416,7 @@ if not preconfigured: color_print(4," $ sudo python scons/scons.py install") color_print(4,"\nTo view available path variables:\n $ python scons/scons.py --help or -h") color_print(4,'\nTo view overall SCons help options:\n $ python scons/scons.py --help-options or -H\n') - color_print(4,'More info: http://trac.mapnik.org/wiki/MapnikInstallation') + color_print(4,'More info: https://github.com/mapnik/mapnik/wiki//MapnikInstallation') if not HELP_REQUESTED: Exit(1) else: diff --git a/bindings/python/build.py b/bindings/python/build.py index 646b2eeaf..75b546cb8 100644 --- a/bindings/python/build.py +++ b/bindings/python/build.py @@ -65,7 +65,7 @@ if env['PLATFORM'] == 'Darwin': # 3) the below will directly link _mapnik.so to a python version # 4) _mapnik.so must link to the same python lib as boost_python.dylib otherwise # python will Abort with a Version Mismatch error. - # See http://trac.mapnik.org/ticket/453 for the seeds of a better approach + # See https://github.com/mapnik/mapnik/issues/453 for the seeds of a better approach # for now we offer control over method of direct linking... # The default below is to link against the python dylib in the form of #/path/to/Python.framework/Python instead of -lpython @@ -86,7 +86,7 @@ if env['PLATFORM'] == 'Darwin': # /System/Library/Frameworks/Python.framework/Python/Versions/ # or # /Library/Frameworks/Python.framework/Python/Versions/ - # See: http://trac.mapnik.org/ticket/380 + # See: https://github.com/mapnik/mapnik/issues/380 link_prefix = env['PYTHON_SYS_PREFIX'] if '.framework' in link_prefix: python_link_flag = '-F%s -framework Python -Z' % os.path.dirname(link_prefix.split('.')[0]) diff --git a/plugins/input/occi/occi_featureset.cpp b/plugins/input/occi/occi_featureset.cpp index 8717f6e73..b8dcb7c4d 100644 --- a/plugins/input/occi/occi_featureset.cpp +++ b/plugins/input/occi/occi_featureset.cpp @@ -287,8 +287,6 @@ void occi_featureset::convert_geometry(SDOGeometry* geom, feature_ptr feature) { const bool is_single_geom = false; const bool is_point_type = true; - - // FIXME :http://trac.mapnik.org/ticket/458 convert_ordinates(feature, mapnik::Point, elem_info, diff --git a/src/box2d.cpp b/src/box2d.cpp index faa2ef4c9..170c2aa51 100644 --- a/src/box2d.cpp +++ b/src/box2d.cpp @@ -59,7 +59,7 @@ box2d::box2d(const box2d &rhs) maxx_(rhs.maxx_), maxy_(rhs.maxy_) {} // copy rather than init so dfl ctor (0,0,-1,-1) is not modified -// http://trac.mapnik.org/ticket/749 +// https://github.com/mapnik/mapnik/issues/749 /*{ init(rhs.minx_,rhs.miny_,rhs.maxx_,rhs.maxy_); }*/ diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp index 2e5961751..32b2d6e5c 100644 --- a/src/image_scaling.cpp +++ b/src/image_scaling.cpp @@ -89,7 +89,7 @@ boost::optional scaling_method_to_string(scaling_method_e scaling_m return mode; } -// this has been replaced by agg impl - see https://trac.mapnik.org/ticket/656 +// this has been replaced by agg impl - see https://github.com/mapnik/mapnik/issues/656 template void scale_image_bilinear_old (Image & target,Image const& source, double x_off_f, double y_off_f) { diff --git a/tests/data/good_maps/datasource.xml b/tests/data/good_maps/datasource.xml index 64a90bbb3..87c705734 100644 --- a/tests/data/good_maps/datasource.xml +++ b/tests/data/good_maps/datasource.xml @@ -1,4 +1,4 @@ - +