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

Remove reference.json in favor of adding a mapnik-reference

Browse Source 
dependency which will update easily from the other repository.
Also update tests for 2.1.0 compatibility
This commit is contained in:
Tom MacWright 2012-06-18 15:35:19 -04:00
parent bea9b43787
commit 40b032c9bb
7 changed files with 18 additions and 1340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/carto/tree/reference.js
View File

@ -1,8 +1,9 @@
(function(tree) {
var fs = require('fs');
var mapnik_reference = require('mapnik-reference');
tree.Reference = {
data: JSON.parse(fs.readFileSync(__dirname + '/reference.json'))
data: mapnik_reference.version['2.1.0']
};
tree.Reference.required_prop_list_cache = {};

1105
lib/carto/tree/reference.json
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -36,6 +36,7 @@
},
"dependencies": {
"underscore": "~1.3.3",
"mapnik-reference": "~0.0.0",
"xml2js": "~0.1.13"
},
"devDependencies": {

87
test/rendering/afghanistan_votes.mss
View File

@ -8,8 +8,6 @@
marker-line-color: #222;
marker-line-opacity: 0.8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 0][votes_total >= 34730.2][votes_total <= 69457.4] {
@ -22,8 +20,6 @@
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
@ -37,8 +33,6 @@
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
@ -52,8 +46,6 @@
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
@ -67,8 +59,6 @@
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
@ -82,81 +72,4 @@
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 0][votes_total >= 208366.2][votes_total <= 243093.40000000002] {
marker-allow-overlap: true;
marker-width: 20;
marker-height: 20;
marker-fill: #222;
marker-opacity: .8;
marker-line-width: 0;
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 0][votes_total >= 243093.40000000002][votes_total <= 277820.60000000003] {
marker-allow-overlap: true;
marker-width: 23;
marker-height: 23;
marker-fill: #222;
marker-opacity: .8;
marker-line-width: 0;
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 0][votes_total >= 277820.60000000003][votes_total <= 312547.80000000005] {
marker-allow-overlap: true;
marker-width: 26;
marker-height: 26;
marker-fill: #222;
marker-opacity: .8;
marker-line-width: 0;
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 0][votes_total >= 312547.80000000005][votes_total <= 347275] {
marker-allow-overlap: true;
marker-width: 29;
marker-height: 29;
marker-fill: #222;
marker-opacity: .8;
marker-line-width: 0;
marker-line-color: #222;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}
#data[_votes_total_null = 1] {
marker-allow-overlap: true;
marker-width: 4;
marker-height: 4;
marker-fill: #fff;
marker-opacity: .8;
marker-line-width: 2;
marker-line-color: #444;
marker-line-opacity: .8;
marker-type: ellipse;
marker-meta-writer: "meta1";
marker-meta-output: "votes_name, votes_description";
}

158
test/rendering/afghanistan_votes.result
View File

@ -1,173 +1,41 @@
<?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.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
<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" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
<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 allow-overlap="true"
width="29"
height="29"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-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 allow-overlap="true"
width="26"
height="26"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-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 allow-overlap="true"
width="23"
height="23"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-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 allow-overlap="true"
width="20"
height="20"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Style name="data" filter-mode="first" >
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 173639) and ([votes_total] &lt;= 208366.2)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="17"
height="17"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="17" height="17" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 138911.8) and ([votes_total] &lt;= 173639)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="14"
height="14"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="14" height="14" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 104184.59999999999) and ([votes_total] &lt;= 138911.8)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="11"
height="11"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="11" height="11" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 69457.4) and ([votes_total] &lt;= 104184.59999999999)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="8"
height="8"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="8" height="8" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 34730.2) and ([votes_total] &lt;= 69457.4)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="5"
height="5"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="5" height="5" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
<Rule>
<Filter>([_votes_total_null] = 0) and ([votes_total] &gt;= 3) and ([votes_total] &lt;= 34730.2)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="2"
height="2"
fill="#222222"
opacity="0.8"
stroke-width="0"
stroke="#222222"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
</Rule>
<Rule>
<Filter>([_votes_total_null] = 1)</Filter>
<MarkersSymbolizer allow-overlap="true"
width="4"
height="4"
fill="#ffffff"
opacity="0.8"
stroke-width="2"
stroke="#444444"
stroke-opacity="0.8"
marker-type="ellipse"
meta-writer="meta1"
meta-output="votes_name, votes_description"/>
<MarkersSymbolizer allow-overlap="true" width="2" height="2" fill="#222222" opacity="0.8" stroke-width="0" stroke="#222222" stroke-opacity="0.8" marker-type="ellipse" />
</Rule>
</Style>
<Layer
name="data"
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">
<Layer name="data"
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">
<StyleName>data</StyleName>
<Datasource>
<Parameter name="file">[absolute path]</Parameter>
<Parameter name="type">ogr</Parameter>
<Parameter name="layer">OGRGeoJSON</Parameter>
<Parameter name="file"><![CDATA[[absolute path]]]></Parameter>
<Parameter name="type"><![CDATA[ogr]]></Parameter>
<Parameter name="layer"><![CDATA[OGRGeoJSON]]></Parameter>
</Datasource>
</Layer>
</Map>

2
test/rendering/raster.mss
View File

@ -1,4 +1,4 @@
#data {
raster-opacity: 1;
raster-mode: hard_light;
raster-mode: hard-light;
}

2
test/rendering/raster.result
View File

@ -5,7 +5,7 @@
<Style name="data" filter-mode="first">
<Rule>
<RasterSymbolizer opacity="1" mode="hard_light" />
<RasterSymbolizer opacity="1" mode="hard-light" />
</Rule>
</Style>
<Layer