remove libcurl dependency

Conflicts:
	plugins/input/osm/dataset_deliverer.cpp
	plugins/input/osm/osm.cpp
	plugins/input/osm/osm_datasource.cpp
	plugins/input/osm/test.cpp
This commit is contained in:
Dane Springmeyer 2014-06-12 18:29:26 -07:00
parent 033a0e0ed7
commit d5ac946706
13 changed files with 2 additions and 86248 deletions

View file

@ -93,7 +93,6 @@ pretty_dep_names = {
'gdal-config':'gdal-config program | try setting GDAL_CONFIG SCons option',
'freetype-config':'freetype-config program | try setting FREETYPE_CONFIG SCons option',
'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)'
@ -112,7 +111,7 @@ PLUGINS = { # plugins with external dependencies
'rasterlite': {'default':False,'path':'RASTERLITE','inc':['sqlite3.h','rasterlite.h'],'lib':'rasterlite','lang':'C'},
# todo: osm plugin does also depend on libxml2 (but there is a separate check for that)
'osm': {'default':False,'path':None,'inc':'curl/curl.h','lib':'curl','lang':'C'},
'osm': {'default':False,'path':None,'inc':None,'lib':None,'lang':'C'},
# plugins without external dependencies requiring CheckLibWithHeader...
'shape': {'default':True,'path':None,'inc':None,'lib':None,'lang':'C++'},

View file

@ -34,24 +34,10 @@ plugin_sources = Split(
%(PLUGIN_NAME)s_featureset.cpp
osmparser.cpp
dataset_deliverer.cpp
basiccurl.cpp
""" % locals()
)
plugin_env['LIBS'] = []
if env['RUNTIME_LINK'] == 'static':
# pkg-config is more reliable than pg_config across platforms
cmd = 'pkg-config libcurl --libs --static'
try:
plugin_env.ParseConfig(cmd)
except OSError, e:
# if this fails likely only system curl is available
# on OS X at least the system curl lacks a pkg-config file
# so static linking is not viable anyway
plugin_env.Append(LIBS='curl')
else:
plugin_env.Append(LIBS='curl')
plugin_env.Append(LIBS='xml2')
# Link Library to Dependencies

View file

@ -29,7 +29,6 @@
#include <sstream>
#include "dataset_deliverer.h"
#include "basiccurl.h"
osm_dataset * dataset_deliverer::dataset = nullptr;
std::string dataset_deliverer::last_bbox = "";
@ -65,32 +64,3 @@ osm_dataset* dataset_deliverer::load_from_file(const string& file, const string&
}
return dataset;
}
osm_dataset* dataset_deliverer::load_from_url(const string& url, const string& bbox, const string& parser)
{
if (dataset == nullptr)
{
dataset = new osm_dataset;
if (dataset->load_from_url(url.c_str(), bbox, parser) == false)
{
return nullptr;
}
atexit(dataset_deliverer::release);
last_bbox = bbox;
}
else if (bbox != last_bbox)
{
MAPNIK_LOG_WARN(osm) << "osm_dataset_deliverer: BBoxes are different=" << last_bbox << "," << bbox;
// Reload the dataset
dataset->clear();
if (dataset->load_from_url(url.c_str(), bbox, parser) == false)
{
return nullptr;
}
last_bbox = bbox;
}
return dataset;
}

View file

@ -37,7 +37,6 @@ private:
public:
static osm_dataset *load_from_file(const string&, const string&);
static osm_dataset *load_from_url(const string&, const string&, const string&);
static void release()
{

View file

@ -22,7 +22,6 @@
#include "osm.h"
#include "osmparser.h"
#include "basiccurl.h"
#include <mapnik/debug.hpp>
@ -44,40 +43,6 @@ bool osm_dataset::load(const char* filename,std::string const& parser)
return false;
}
bool osm_dataset::load_from_url(std::string const& url,
std::string const& bbox,
std::string const& parser)
{
if (parser == "libxml2")
{
MAPNIK_LOG_DEBUG(osm) << "osm_dataset: load_from_url url=" << url << ",bbox=" << bbox;
std::ostringstream str;
// use curl to grab the data
// fetch all the data we want - probably from osmxpai
str << url << "?bbox=" << bbox;
MAPNIK_LOG_DEBUG(osm) << "osm_dataset: Full url=" << str.str();
CURL_LOAD_DATA* resp = grab_http_response(str.str().c_str());
if (resp != nullptr)
{
char *blx = new char[resp->nbytes + 1];
std::memcpy(blx, resp->data, resp->nbytes);
blx[resp->nbytes] = '\0';
MAPNIK_LOG_DEBUG(osm) << "osm_dataset: CURL Response=" << blx;
delete[] blx;
bool success = osmparser::parse(this, resp->data, resp->nbytes);
return success;
}
}
return false;
}
osm_dataset::~osm_dataset()
{
clear();

View file

@ -108,9 +108,6 @@ public:
~osm_dataset();
bool load(const char* name, std::string const& parser = "libxml2");
bool load_from_url(std::string const&,
std::string const&,
std::string const& parser = "libxml2");
void clear();
void add_node(osm_node* n) { nodes.push_back(n); }
void add_way(osm_way* w) { ways.push_back(w); }

View file

@ -63,13 +63,7 @@ osm_datasource::osm_datasource(const parameters& params)
// load the data
if (url != "" && bbox != "")
{
// if we supplied a url and a bounding box, load from the url
MAPNIK_LOG_DEBUG(osm) << "osm_datasource: loading_from_url url=" << url << ",bbox=" << bbox;
if ((osm_data_ = dataset_deliverer::load_from_url(url, bbox, parser)) == nullptr)
{
throw datasource_exception("Error loading from URL");
}
throw datasource_exception("Error loading from URL is no longer supported (removed in >= Mapnik 2.3.x");
}
else if (osm_filename != "")
{

View file

@ -1,25 +0,0 @@
#include "osm.h"
#include <iostream>
using std::cout;
using std::endl;
int main(int argc,char* argv[])
{
if(argc>=2)
{
osm_dataset dataset(argv[1]);
bounds b = dataset.get_bounds();
osm_item *item;
dataset.rewind();
while((item=dataset.next_item())!=nullptr)
{
std::cerr << item->to_string() << endl;
}
}
else
{
std::cerr<<"Usage: test OSMfile"<<std::endl;
exit(1);
}
return 0;
}

View file

@ -1,35 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.5' generator='JOSM'>
<bound box='0.0,0.0,0.0,0.0' origin='http://www.openstreetmap.org/api/0.5' />
<bound box='50.9,-1.45,51.0,-1.35' origin='http://www.openstreetmap.org/api/0.5' />
<node id='28418532' timestamp='2007-05-24T10:51:06+01:00' visible='true' lat='50.9664497' lon='-1.3641324'>
<tag k='created_by' v='JOSM' />
</node>
<node id='91109765' timestamp='2007-10-29T07:53:27+00:00' user='nickw' visible='true' lat='50.9300913' lon='-1.4308423'>
<tag k='created_by' v='JOSM' />
</node>
<way id='4698470' timestamp='2007-06-02T19:44:15+01:00' visible='true'>
<nd ref='29874141' />
<nd ref='29874142' />
<tag k='highway' v='residential' />
<tag k='maxspeed' v='48' />
<tag k='name' v='Arnold Road' />
<tag k='created_by' v='JOSM' />
</way>
<way id='3910609' timestamp='2006-10-28T01:56:05+01:00' user='Dean Earley' visible='true'>
<nd ref='20102965' />
<nd ref='20133094' />
<nd ref='20133102' />
<nd ref='20133106' />
<nd ref='20133109' />
<nd ref='20133112' />
<nd ref='20133120' />
<nd ref='20133121' />
<nd ref='20133126' />
<nd ref='20133127' />
<nd ref='20133128' />
<tag k='highway' v='residential' />
<tag k='name' v='Paulet Close' />
<tag k='created_by' v='JOSM' />
</way>
</osm>

View file

@ -1,503 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map bgcolor="#b5d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="coast-poly">
<Rule>
<PolygonSymbolizer>
<CssParameter name="fill">#f2efe9</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name="coast-line">
<Rule>
<LineSymbolizer>
<CssParameter name="stroke">skyblue</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="leisure">
<Rule>
<Filter>[landuse] = 'reservoir'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'cemetery'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">grey</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'wood' or [landuse] = 'forest'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[leisure] = 'park' or [leisure] = 'common' or
[leisure] = 'golf_course'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#d8e8d0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'wood'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'heath'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#ffe0c0</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name='lakes'>
<Rule>
<Filter>[natural] = 'water'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[place] = 'city'</Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="16" fill="#000" halo_radius="2" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'town'</Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="14" fill="#000" halo_radius="2" wrap_width="20"/>
</Rule>
<Rule>
<Filter>[place] = 'village' or [place] = 'suburb'</Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="13" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'hamlet'</Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="12" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'peak'</Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="11" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'wood' or [natural] = 'water' or [natural] = 'heath'
or [leisure] = 'golf_course' </Filter>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman"
size="10" fill="#000" halo_radius="2" wrap_width="0" />
</Rule>
</Style>
<Style name="river">
<Rule>
<Filter>[waterway] = 'river'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="stream">
<Rule>
<Filter>[waterway] = 'stream'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="Bitstream Vera Sans Roman" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="roads-casing">
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#506077</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#477147</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#8d4346</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#a37b48</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="motorway">
<Rule>
<Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#809bc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="trunk">
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#7fc97f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="primary">
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#e46d71</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="secondary">
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fdbf6f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="tertiary">
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#ffffc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="unclassified">
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="residential">
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service' or
[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="bridleway">
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = ''</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [foot] = 'yes' and [horse] = 'yes'
and [bicycle] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'narrow'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">1.0</CssParameter>
<CssParameter name="stroke-dasharray">1,5</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'path'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'gravel'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'track'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="footway">
<Rule>
<Filter>[highway] = 'footway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'footway' and [foot] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="cycleway">
<Rule>
<Filter>[highway] = 'cycleway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">blue</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">4,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="byway">
<Rule>
<Filter>[highway] = 'byway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="contours">
<Rule>
<Filter>[major] = 1</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fb9b67</CssParameter>
<CssParameter name="stroke-width">1.0</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
<LineSymbolizer>
<CssParameter name="stroke">#fb9b67</CssParameter>
<CssParameter name="stroke-width">0.5</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="contours-text">
<Rule>
<TextSymbolizer name="height" face_name="Bitstream Vera Sans Roman"
size="8" fill="#fb9b67" halo_radius="0" placement="line"/>
</Rule>
</Style>
<Layer name="roads" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>roads-casing</StyleName>
<StyleName>footway</StyleName>
<StyleName>cycleway</StyleName>
<StyleName>bridleway</StyleName>
<StyleName>byway</StyleName>
<StyleName>residential</StyleName>
<StyleName>unclassified</StyleName>
<StyleName>tertiary</StyleName>
<StyleName>secondary</StyleName>
<StyleName>primary</StyleName>
<StyleName>trunk</StyleName>
<StyleName>motorway</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="parser">libxml2</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
</Map>

File diff suppressed because it is too large Load diff

View file

@ -1,537 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map bgcolor="#d0d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="amenity">
<Rule>
<Filter>[amenity]='pub'</Filter>
<PointSymbolizer file="/home/nick/images/pub.png" type="png"
width="16" height="16" />
</Rule>
<Rule>
<Filter>[man_made]='mast'</Filter>
<PointSymbolizer file="/home/nick/images/mast.png" type="png"
width="16" height="16" />
</Rule>
<Rule>
<Filter>[amenity]='parking'</Filter>
<PointSymbolizer file="/home/nick/images/carpark.png" type="png"
width="16" height="16"/>
</Rule>
<Rule>
<Filter>[residence]='farm'</Filter>
<PointSymbolizer file="/home/nick/images/farm.png" type="png"
width="16" height="16"/>
</Rule>
</Style>
<Style name="leisure">
<Rule>
<Filter>[landuse] = 'reservoir'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'cemetery'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">grey</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'wood' or [landuse] = 'forest'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[leisure] = 'park' or [leisure] = 'common' or
[leisure] = 'golf_course'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#d8e8d0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'wood'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'heath'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#ffe0c0</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name='lakes'>
<Rule>
<Filter>[natural] = 'water'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[place] = 'city'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="16" fill="#000" halo_radius="2" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'town'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="14" fill="#000" halo_radius="2" wrap_width="20"/>
</Rule>
<Rule>
<Filter>[place] = 'village' or [place] = 'suburb'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="13" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'hamlet'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="12" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'peak'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="11" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'wood' or [natural] = 'water' or [natural] = 'heath'
or [leisure] = 'golf_course' </Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book"
size="10" fill="#000" halo_radius="2" wrap_width="0" />
</Rule>
</Style>
<Style name="river">
<Rule>
<Filter>[waterway] = 'river'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="stream">
<Rule>
<Filter>[waterway] = 'stream'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="roads-casing">
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#506077</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#477147</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#8d4346</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#a37b48</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="motorway">
<Rule>
<Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#809bc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="trunk">
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#7fc97f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="primary">
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#e46d71</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="secondary">
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fdbf6f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="tertiary">
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#ffffc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="unclassified">
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="residential">
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service' or
[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="bridleway">
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = ''</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [foot] = 'yes' and [horse] = 'yes'
and [bicycle] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'narrow'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">1.0</CssParameter>
<CssParameter name="stroke-dasharray">1,5</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'path'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'gravel'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'track'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="footway">
<Rule>
<Filter>[highway] = 'footway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'footway' and [foot] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="cycleway">
<Rule>
<Filter>[highway] = 'cycleway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">blue</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">4,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="byway">
<Rule>
<Filter>[highway] = 'byway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="roads-text">
<Rule>
<Filter>[highway] = 'footway' or [highway] = 'bridleway' or [highway] = 'byway' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'tertiary'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="8" fill="#000" halo_radius="1" placement="line"/>
</Rule>
</Style>
<Layer name="leisure" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>leisure</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="waterway" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>river</StyleName>
<StyleName>stream</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="lakes" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>lakes</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="roads" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>roads-casing</StyleName>
<StyleName>footway</StyleName>
<StyleName>cycleway</StyleName>
<StyleName>bridleway</StyleName>
<StyleName>byway</StyleName>
<StyleName>residential</StyleName>
<StyleName>unclassified</StyleName>
<StyleName>tertiary</StyleName>
<StyleName>secondary</StyleName>
<StyleName>primary</StyleName>
<StyleName>trunk</StyleName>
<StyleName>motorway</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="amenity" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>amenity</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="roadstext" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>roads-text</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
<Layer name="text" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">test2.osm</Parameter>
</Datasource>
</Layer>
</Map>

View file

@ -1,530 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map bgcolor="#d0d0d0" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="amenity">
<Rule>
<Filter>[amenity]='pub'</Filter>
<PointSymbolizer file="/home/nick/images/pub.png" type="png"
width="16" height="16" />
</Rule>
<Rule>
<Filter>[man_made]='mast'</Filter>
<PointSymbolizer file="/home/nick/images/mast.png" type="png"
width="16" height="16" />
</Rule>
<Rule>
<Filter>[amenity]='parking'</Filter>
<PointSymbolizer file="/home/nick/images/carpark.png" type="png"
width="16" height="16"/>
</Rule>
<Rule>
<Filter>[residence]='farm'</Filter>
<PointSymbolizer file="/home/nick/images/farm.png" type="png"
width="16" height="16"/>
</Rule>
</Style>
<Style name="leisure">
<Rule>
<Filter>[landuse] = 'reservoir'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'cemetery'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">grey</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[landuse] = 'wood' or [landuse] = 'forest'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[leisure] = 'park' or [leisure] = 'common' or
[leisure] = 'golf_course'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#d8e8d0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'wood'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#aed1a0</CssParameter>
</PolygonSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'heath'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#ffe0c0</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name='lakes'>
<Rule>
<Filter>[natural] = 'water'</Filter>
<PolygonSymbolizer>
<CssParameter name="fill">#89bac6</CssParameter>
</PolygonSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[place] = 'city'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="16" fill="#000" halo_radius="2" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'town'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="14" fill="#000" halo_radius="2" wrap_width="20"/>
</Rule>
<Rule>
<Filter>[place] = 'village' or [place] = 'suburb'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="13" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[place] = 'hamlet'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="12" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'peak'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="11" fill="#000" halo_radius="1" wrap_width="0"/>
</Rule>
<Rule>
<Filter>[natural] = 'wood' or [natural] = 'water' or [natural] = 'heath'
or [leisure] = 'golf_course' </Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book"
size="10" fill="#000" halo_radius="2" wrap_width="0" />
</Rule>
</Style>
<Style name="river">
<Rule>
<Filter>[waterway] = 'river'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="stream">
<Rule>
<Filter>[waterway] = 'stream'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#89bac6</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="9" fill="white" placement="line"/>
</Rule>
</Style>
<Style name="roads-casing">
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#506077</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#477147</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#8d4346</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#a37b48</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#999</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="motorway">
<Rule>
<Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#809bc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="trunk">
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#7fc97f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="primary">
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#e46d71</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="secondary">
<Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fdbf6f</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="tertiary">
<Rule>
<Filter>[highway] = 'tertiary' or [highway] = 'tertiary_link'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#ffffc0</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="unclassified">
<Rule>
<Filter>[highway] = 'minor' or [highway] = 'unclassified'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="residential">
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'service' or
[highway] = 'unsurfaced' or [highway] = 'track'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="bridleway">
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = ''</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [foot] = 'yes' and [horse] = 'yes'
and [bicycle] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'narrow'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">1.0</CssParameter>
<CssParameter name="stroke-dasharray">1,5</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'path'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">#00c000</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'gravel'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">6,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'bridleway' and [newforest_pathtype] = 'track'
</Filter>
<LineSymbolizer>
<CssParameter name="stroke">brown</CssParameter>
<CssParameter name="stroke-dasharray">2,4</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="footway">
<Rule>
<Filter>[highway] = 'footway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">magenta</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'footway' and [foot] = 'yes'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">1,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="cycleway">
<Rule>
<Filter>[highway] = 'cycleway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">blue</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-dasharray">4,4</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="byway">
<Rule>
<Filter>[highway] = 'byway'</Filter>
<LineSymbolizer>
<CssParameter name="stroke">#fff</CssParameter>
<CssParameter name="stroke-width">6</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
<CssParameter name="stroke-opacity">0.4</CssParameter>
</LineSymbolizer>
<LineSymbolizer>
<CssParameter name="stroke">red</CssParameter>
<CssParameter name="stroke-width">2.0</CssParameter>
<CssParameter name="stroke-linejoin">round</CssParameter>
<CssParameter name="stroke-linecap">round</CssParameter>
</LineSymbolizer>
</Rule>
</Style>
<Style name="roads-text">
<Rule>
<Filter>[highway] = 'footway' or [highway] = 'bridleway' or [highway] = 'byway' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'tertiary'</Filter>
<TextSymbolizer name="name" face_name="DejaVu Sans Book" size="8" fill="#000" halo_radius="1" placement="line"/>
</Rule>
</Style>
<Layer name="leisure" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>leisure</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="waterway" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>river</StyleName>
<StyleName>stream</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="lakes" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>lakes</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="roads" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>roads-casing</StyleName>
<StyleName>footway</StyleName>
<StyleName>cycleway</StyleName>
<StyleName>bridleway</StyleName>
<StyleName>byway</StyleName>
<StyleName>residential</StyleName>
<StyleName>unclassified</StyleName>
<StyleName>tertiary</StyleName>
<StyleName>secondary</StyleName>
<StyleName>primary</StyleName>
<StyleName>trunk</StyleName>
<StyleName>motorway</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="amenity" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>amenity</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="roadstext" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>roads-text</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
<Layer name="text" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
</Datasource>
</Layer>
</Map>