cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test fixes due to other formatting

Browse Source
This commit is contained in:
Konstantin Käfer 2011-02-02 16:17:43 -05:00
parent 4dcf61fead
commit 03417147e3
17 changed files with 189 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mess/tree/definition.js
View File

@ -95,7 +95,7 @@ tree.Definition.prototype.symbolizersToXML = function(env, symbolizers, zoom) {
xml += ' <' + name + ' ';
for (var key in attributes) {
xml += attributes[key].eval().toXML(env) + ' ';
xml += attributes[key].eval(env).toXML(env) + ' ';
}
xml += '/>\n';
}

28
lib/mess/tree/filterset.js
View File

@ -85,8 +85,14 @@ Object.defineProperty(tree.Filterset.prototype, 'addable', {
return true;
case '!=':
if (key + '=' in this) return (this[key + '='].val == value) ? false : null
if (key + '=' in this) return (this[key + '='].val == value) ? false : null;
if (key + '!=' + value in this) return null;
if (key + '>' in this && this[key + '>'].val >= value) return null;
if (key + '<' in this && this[key + '<'].val <= value) return null;
if (key + '>=' in this && this[key + '>='].val > value) return null;
if (key + '<=' in this && this[key + '<='].val < value) return null;
return true;
case '>':
@ -114,7 +120,7 @@ Object.defineProperty(tree.Filterset.prototype, 'addable', {
return true;
case '<=':
if (key + '=' in this) return (this[key + '='].val < value) ? false : null;
if (key + '=' in this) return (this[key + '='].val > value) ? false : null;
if (key + '>' in this && this[key + '>'].val >= value) return false;
if (key + '>=' in this && this[key + '>='].val > value) return false;
if (key + '<' in this && this[key + '<'].val <= value) return null;
@ -155,7 +161,14 @@ Object.defineProperty(tree.Filterset.prototype, 'add', {
for (var id in this)
if (this[id].key == key && this[id].val < filter.val)
delete this[id];
this[key + '>='] = filter;
if (key + '!=' + filter.val in this) {
delete this[key + '!=' + filter.val];
filter.op = '>';
this[key + '>'] = filter;
}
else {
this[key + '>='] = filter;
}
break;
case '<':
@ -169,7 +182,14 @@ Object.defineProperty(tree.Filterset.prototype, 'add', {
for (var id in this)
if (this[id].key == key && this[id].val > filter.val)
delete this[id];
this[key + '<='] = filter;
if (key + '!=' + filter.val in this) {
delete this[key + '!=' + filter.val];
filter.op = '<';
this[key + '<'] = filter;
}
else {
this[key + '<='] = filter;
}
break;
}
}

2
test/benchmark/opened.result
View File

@ -3,7 +3,7 @@
<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">
<Style name="data-polygon">
<Style name="data-polygon" filter-mode="first">
<Rule>
<Filter>([Dist_ID] = 1704)</Filter>
<PolygonSymbolizer fill-opacity="0.6"

242
test/rendering/afghanistan_votes.result
View File

@ -3,167 +3,167 @@
<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">
<Style name="data-markers">
<Style name="data" filter-mode="first">
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 312547.80000000005) and ([votes_total] &lt;= 347275)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="29"
<MarkersSymbolizer allow_overlap="true"
width="29"
allow_overlap="true"/>
height="29"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 277820.60000000003) and ([votes_total] &lt; 312547.80000000005)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="26"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 277820.60000000003) and ([votes_total] &lt;= 312547.80000000005)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="26"
allow_overlap="true"/>
height="26"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 243093.40000000002) and ([votes_total] &lt; 277820.60000000003)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="23"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 243093.40000000002) and ([votes_total] &lt;= 277820.60000000003)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="23"
allow_overlap="true"/>
height="23"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 208366.2) and ([votes_total] &lt; 243093.40000000002)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="20"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 208366.2) and ([votes_total] &lt;= 243093.40000000002)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="20"
allow_overlap="true"/>
height="20"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 173639) and ([votes_total] &lt; 208366.2)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="17"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 173639) and ([votes_total] &lt;= 208366.2)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="17"
allow_overlap="true"/>
height="17"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt; 173639)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="14"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt;= 173639)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="14"
allow_overlap="true"/>
height="14"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt; 138911.8)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="11"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt;= 138911.8)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="11"
allow_overlap="true"/>
height="11"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt; 104184.59999999999)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="8"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt;= 104184.59999999999)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="8"
allow_overlap="true"/>
height="8"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt; 69457.4)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="5"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt;= 69457.4)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="5"
allow_overlap="true"/>
height="5"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 3) and ([votes_total] &lt; 34730.2)</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#222222"
stroke-width="0"
opacity="0.8"
fill="#222222"
height="2"
<Filter>([_votes_total_null] = '0') and ([votes_total] &gt;= 3) and ([votes_total] &lt;= 34730.2)</Filter>
<MarkersSymbolizer allow_overlap="true"
width="2"
allow_overlap="true"/>
height="2"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = '1')</Filter>
<MarkersSymbolizer meta-output="votes_name, votes_description"
meta-writer="meta1"
type="ellipse"
stroke-opacity="0.8"
stroke="#444444"
stroke-width="2"
opacity="0.8"
fill="#ffffff"
height="4"
<MarkersSymbolizer allow_overlap="true"
width="4"
allow_overlap="true"/>
height="4"
fill="#ffffff"
opacity="0.8"
stroke-width="2"
stroke="#444444"
stroke-opacity="0.8"
type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
</Style>
<Layer
id="data"
name="data"
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">
<StyleName>data-markers</StyleName>
<StyleName>data</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">ogr</Parameter>

5
test/rendering/color_variable.result
View File

@ -4,9 +4,8 @@ downloading with binary
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<PolygonSymbolizer fill="#008000"/>
</Rule>
</Style>
@ -14,7 +13,7 @@ downloading with binary
id="world"
name="world"
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">
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

8
test/rendering/complex_cascades.result
View File

@ -2,7 +2,7 @@
<!DOCTYPE Map[]>
<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">
<Style name="world-polygon">
<Style name="world-polygon" filter-mode="first">
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<Filter>([NAME] = 'United States')</Filter>
@ -22,7 +22,7 @@
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
<Style name="world-line">
<Style name="world-line" filter-mode="first">
<Rule>
<Filter>([NAME] = 'Canada')</Filter>
<LineSymbolizer stroke-width="1"
@ -46,7 +46,7 @@
</Datasource>
</Layer>
<Style name="countries-polygon">
<Style name="countries-polygon" filter-mode="first">
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<Filter>([NAME] = 'United States')</Filter>
@ -62,7 +62,7 @@
<PolygonSymbolizer fill="#cccccc"/>
</Rule>
</Style>
<Style name="countries-line">
<Style name="countries-line" filter-mode="first">
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<LineSymbolizer stroke="#cccccc"

18
test/rendering/complexfontset.result
View File

@ -6,38 +6,32 @@
<Font face_name="Georgia Regular"/>
<Font face_name="Arial Italic"/>
</FontSet>
<Style name="world-text">
<Style name="world" filter-mode="first">
<Rule>
<TextSymbolizer fontset_name="fontset-0"
size="11"
name="[NAME]"/>
<TextSymbolizer size="11" name="[NAME]" fontset_name="fontset-0" />
</Rule>
</Style>
<Layer
id="world"
name="world"
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">
<StyleName>world-text</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>
</Datasource>
</Layer>
<Style name="countries-text">
<Style name="countries" filter-mode="first">
<Rule>
<TextSymbolizer fontset_name="fontset-0"
size="11"
name="[NAME]"/>
<TextSymbolizer size="11" name="[NAME]" fontset_name="fontset-0" />
</Rule>
</Style>
<Layer
id="countries"
name="world"
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">
<StyleName>countries-text</StyleName>
<StyleName>countries</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

5
test/rendering/cross_stylesheet_variable.result
View File

@ -3,9 +3,8 @@
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<PolygonSymbolizer fill="#ff0000"/>
</Rule>
</Style>
@ -13,7 +12,7 @@
id="world"
name="world"
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">
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

5
test/rendering/external_image.result
View File

@ -3,9 +3,8 @@
<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">
<Style name="world-polygon-pattern">
<Style name="world" filter-mode="first">
<Rule>
<PolygonPatternSymbolizer file="[absolute path]"/>
</Rule>
</Style>
@ -13,7 +12,7 @@
id="world"
name="world"
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">
<StyleName>world-polygon-pattern</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

12
test/rendering/filters.result
View File

@ -3,25 +3,19 @@
<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">
<Style name="world-polygon">
<Rule>
<Filter>([POP2005] &gt; 100.1)</Filter>
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
<Style name="world-line">
<Style name="world" filter-mode="first">
<Rule>
<Filter>([POP2005] &gt; 100.1)</Filter>
<LineSymbolizer stroke-width="0.5"
stroke="#ff0000"/>
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
<Layer
id="world"
name="world"
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">
<StyleName>world-line</StyleName>
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

2
test/rendering/partial_overrides.result
View File

@ -3,7 +3,7 @@
<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">
<Style name="world-line">
<Style name="world-line" filter-mode="first">
<Rule>
<MaxScaleDenominator>1500000</MaxScaleDenominator>
<Filter>([NAME] = 'United States')</Filter>

9
test/rendering/simplefontset.result
View File

@ -6,19 +6,16 @@
<Font face_name="Georgia Regular"/>
<Font face_name="Arial Italic"/>
</FontSet>
<Style name="world-text">
<Style name="world" filter-mode="first">
<Rule>
<TextSymbolizer fontset_name="fontset-0"
size="11"
name="[NAME]"/>
<TextSymbolizer name="[NAME]" size="11" fontset_name="fontset-0" />
</Rule>
</Style>
<Layer
id="world"
name="world"
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">
<StyleName>world-text</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

5
test/rendering/simplevariabletest.result
View File

@ -3,9 +3,8 @@
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
@ -13,7 +12,7 @@
id="world"
name="world"
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">
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

13
test/rendering/symbolizer_order.result
View File

@ -3,24 +3,17 @@
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
<Style name="world-line">
<Rule>
<LineSymbolizer stroke-width="2"/>
<PolygonSymbolizer fill="#ffffff"/>
</Rule>
</Style>
<Layer
id="world"
name="world"
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">
<StyleName>world-line</StyleName>
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

26
test/rendering/text_property_overrides.result
View File

@ -1,46 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map[]>
<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">
<Style name="world-text">
<Style name="world" filter-mode="first">
<Rule>
<MaxScaleDenominator>6500000</MaxScaleDenominator>
<MinScaleDenominator>3000000</MinScaleDenominator>
<TextSymbolizer fill="#000000"
face_name="DejaVu Sans Book"
name="[COUNTRY]"
size="12"/>
<TextSymbolizer size="12" name="[COUNTRY]" face_name="DejaVu Sans Book" fill="#000000" />
</Rule>
<Rule>
<MaxScaleDenominator>12500000</MaxScaleDenominator>
<MinScaleDenominator>6500000</MinScaleDenominator>
<TextSymbolizer fill="#000000"
face_name="DejaVu Sans Book"
name="[COUNTRY]"
size="11"/>
<TextSymbolizer size="11" name="[COUNTRY]" face_name="DejaVu Sans Book" fill="#000000" />
</Rule>
<Rule>
<MaxScaleDenominator>25000000</MaxScaleDenominator>
<MinScaleDenominator>12500000</MinScaleDenominator>
<TextSymbolizer fill="#000000"
face_name="DejaVu Sans Book"
name="[COUNTRY]"
size="10"/>
<TextSymbolizer size="10" name="[COUNTRY]" face_name="DejaVu Sans Book" fill="#000000" />
</Rule>
<Rule>
<MaxScaleDenominator>50000000</MaxScaleDenominator>
<TextSymbolizer size="9"
fill="#000000"
face_name="DejaVu Sans Book"
name="[COUNTRY]"/>
<TextSymbolizer size="9" name="[COUNTRY]" face_name="DejaVu Sans Book" fill="#000000" />
</Rule>
</Style>
<Layer
id="world"
name="world"
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">
<StyleName>world-text</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

4
test/rendering/weird_comments.result
View File

@ -2,7 +2,7 @@
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<PolygonSymbolizer fill="#aa3333"/>
</Rule>
@ -11,7 +11,7 @@
id="world"
name="world"
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">
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>

10
test/rendering/zoomlevels.result
View File

@ -3,7 +3,7 @@
<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">
<Style name="world-polygon">
<Style name="world" filter-mode="first">
<Rule>
<MinScaleDenominator>50000000</MinScaleDenominator>
<PolygonSymbolizer fill="#ffff00"/>
@ -17,14 +17,14 @@
id="world"
name="world"
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">
<StyleName>world-polygon</StyleName>
<StyleName>world</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>
</Datasource>
</Layer>
<Style name="countries-line">
<Style name="countries" filter-mode="first">
<Rule>
<MaxScaleDenominator>100000</MaxScaleDenominator>
<LineSymbolizer stroke-width="0.25"/>
@ -66,7 +66,7 @@
<LineSymbolizer stroke-width="1.25"/>
</Rule>
<Rule>
<MaxScaleDenominator>100000000</MaxScaleDenominator><MinScaleDenominator>50000000</MinScaleDenominator>
<MaxScaleDenominator>100000000</MaxScaleDenominator><MinScaleDenominator>25000000</MinScaleDenominator>
<LineSymbolizer stroke-width="1.25"/>
</Rule>
<Rule>
@ -82,7 +82,7 @@
id="countries"
name="countries"
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">
<StyleName>countries-line</StyleName>
<StyleName>countries</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">shape</Parameter>