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

Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-28 14:03:53 -05:00
commit 5720c0d476
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/data/good_maps/wgs842merc_reprojection.xml
View file

@ -1,4 +1,4 @@
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" background-color="lightsteelblue"> <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="lightsteelblue">
<Style name="My Style"> <Style name="My Style">
<Rule> <Rule>
<PolygonSymbolizer fill="#f2eff9"/><LineSymbolizer stroke="rgb(50%,50%,50%)" stroke-width="0.1"/></Rule> <PolygonSymbolizer fill="#f2eff9"/><LineSymbolizer stroke="rgb(50%,50%,50%)" stroke-width="0.1"/></Rule>

2
tests/python_tests/render_test.py
View file

@ -130,7 +130,7 @@ def test_render_points():
projs = { projs = {
'latlon': '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs', 'latlon': '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',
'merc': '+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs', 'merc': '+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs',
'google': '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over', 'google': '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
'utm': '+proj=utm +zone=54 +datum=WGS84' 'utm': '+proj=utm +zone=54 +datum=WGS84'
} }
for projdescr in projs.iterkeys(): for projdescr in projs.iterkeys():