Tagging 0.1.5
This commit is contained in:
Tom MacWright
parent
0b4bd04a41
commit
0e005fe21d
9
Makefile
9
Makefile
@ -2,15 +2,18 @@
|
||||
# Run all tests
|
||||
#
|
||||
|
||||
expresso = ./node_modules/expresso/bin/expresso
|
||||
docco = ./node_modules/docco/bin/docco
|
||||
|
||||
ifndef only
|
||||
test:
|
||||
expresso -I lib test/*.test.js
|
||||
$(expresso) -I lib test/*.test.js
|
||||
else
|
||||
test:
|
||||
expresso -I lib test/${only}.test.js
|
||||
$(expresso) -I lib test/${only}.test.js
|
||||
endif
|
||||
|
||||
doc:
|
||||
docco lib/carto/*.js lib/carto/tree/*.js
|
||||
$(docco) lib/carto/*.js lib/carto/tree/*.js
|
||||
|
||||
.PHONY: test
|
||||
|
||||
@ -250,6 +250,12 @@ Only for running tests:
|
||||
|
||||
## Changelog
|
||||
|
||||
### 0.1.5
|
||||
|
||||
* Using npm devDependencies in place of ndistro
|
||||
* Updated package.json format
|
||||
* Fixes tests
|
||||
|
||||
### 0.1.4
|
||||
|
||||
* Fix bug in which SRS autodetection broke error handling
|
||||
|
||||
54
package.json
54
package.json
@ -1,27 +1,49 @@
|
||||
{
|
||||
"name" : "carto",
|
||||
"description" : "Mapnik Stylesheet Compiler",
|
||||
"url" : "https://github.com/mapbox/carto",
|
||||
"keywords" : ["mapnik", "maps", "css"],
|
||||
"author" : "Tom MacWright <macwright@gmail.com>, Konstantin Käfer, Alexis Sellier <self@cloudhead.net>",
|
||||
"contributors" : [],
|
||||
"version" : "0.1.4",
|
||||
"bin" : {
|
||||
"name": "carto",
|
||||
"description": "Mapnik Stylesheet Compiler",
|
||||
"url": "https://github.com/mapbox/carto",
|
||||
"repositories": [{
|
||||
"type": "git",
|
||||
"url": "http://github.com/mapbox/carto.git"
|
||||
}],
|
||||
"keywords": [
|
||||
"mapnik",
|
||||
"maps",
|
||||
"css",
|
||||
"stylesheets"
|
||||
],
|
||||
"contributors": [
|
||||
"Tom MacWright <macwright@gmail.com>",
|
||||
"Konstantin Käfer",
|
||||
"Alexis Sellier <self@cloudhead.net>"
|
||||
],
|
||||
"version": "0.1.5",
|
||||
"licenses": [{
|
||||
"type": "Apache"
|
||||
}],
|
||||
"bin": {
|
||||
"carto": "./bin/carto",
|
||||
"cartox": "./bin/cartox",
|
||||
"mml2json.js": "./bin/mml2json.js"
|
||||
},
|
||||
"main" : "./lib/carto/index",
|
||||
"directories" : { "test": "./test" },
|
||||
"engines" : { "node": ">=0.2.4" },
|
||||
"dependencies" : {
|
||||
"main": "./lib/carto/index",
|
||||
"directories": {
|
||||
"test": "./test"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.2.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"underscore": ">= 1.0.3",
|
||||
"step": ">= 0.0.3",
|
||||
"zipfile": ">= 0.1.0",
|
||||
"xml2js": ">= 0.1.0",
|
||||
"srs" : ">= 0.1.0",
|
||||
"get" : ">= 0.1.0",
|
||||
"step" : ">= 0.0.3",
|
||||
"expresso" : ">= 0.0.0"
|
||||
"srs": ">= 0.1.0",
|
||||
"get": ">= 0.1.0",
|
||||
"step": ">= 0.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"expresso" : ">= 0.7.6",
|
||||
"docco" : ">= 0.2.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +1,21 @@
|
||||
<?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">
|
||||
<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" filter-mode="first">
|
||||
<Rule>
|
||||
<MinScaleDenominator>50000000</MinScaleDenominator>
|
||||
<PolygonSymbolizer fill="#ffff00"/>
|
||||
<PolygonSymbolizer fill="#ffff00" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>1500000</MaxScaleDenominator><MinScaleDenominator>750000</MinScaleDenominator>
|
||||
<PolygonSymbolizer fill="#000000"/>
|
||||
<MaxScaleDenominator>1500000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>750000</MinScaleDenominator>
|
||||
<PolygonSymbolizer fill="#000000" />
|
||||
</Rule>
|
||||
</Style>
|
||||
<Layer
|
||||
name="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</StyleName>
|
||||
<Datasource>
|
||||
@ -26,59 +27,71 @@
|
||||
<Style name="countries" filter-mode="first">
|
||||
<Rule>
|
||||
<MaxScaleDenominator>100000</MaxScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.25"/>
|
||||
<LineSymbolizer stroke-width="0.25" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>200000</MaxScaleDenominator><MinScaleDenominator>100000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.3"/>
|
||||
<MaxScaleDenominator>200000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>100000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.3" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>400000</MaxScaleDenominator><MinScaleDenominator>200000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.4"/>
|
||||
<MaxScaleDenominator>400000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>200000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.4" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>750000</MaxScaleDenominator><MinScaleDenominator>400000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.5"/>
|
||||
<MaxScaleDenominator>750000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>400000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.5" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>1500000</MaxScaleDenominator><MinScaleDenominator>750000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.6"/>
|
||||
<MaxScaleDenominator>1500000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>750000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.6" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>3000000</MaxScaleDenominator><MinScaleDenominator>1500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.7"/>
|
||||
<MaxScaleDenominator>3000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>1500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.7" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>6500000</MaxScaleDenominator><MinScaleDenominator>3000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.8"/>
|
||||
<MaxScaleDenominator>6500000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>3000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.8" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>12500000</MaxScaleDenominator><MinScaleDenominator>6500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.9"/>
|
||||
<MaxScaleDenominator>12500000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>6500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="0.9" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>25000000</MaxScaleDenominator><MinScaleDenominator>12500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1"/>
|
||||
<MaxScaleDenominator>25000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>12500000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>100000000</MaxScaleDenominator><MinScaleDenominator>50000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.25"/>
|
||||
<MaxScaleDenominator>50000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>25000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.25" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>50000000</MaxScaleDenominator><MinScaleDenominator>25000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.25"/>
|
||||
<MaxScaleDenominator>100000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>50000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.25" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>200000000</MaxScaleDenominator><MinScaleDenominator>100000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.5"/>
|
||||
<MaxScaleDenominator>200000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>100000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="1.5" />
|
||||
</Rule>
|
||||
<Rule>
|
||||
<MaxScaleDenominator>500000000</MaxScaleDenominator><MinScaleDenominator>200000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="2"/>
|
||||
<MaxScaleDenominator>500000000</MaxScaleDenominator>
|
||||
<MinScaleDenominator>200000000</MinScaleDenominator>
|
||||
<LineSymbolizer stroke-width="2" />
|
||||
</Rule>
|
||||
</Style>
|
||||
<Layer
|
||||
name="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</StyleName>
|
||||
<Datasource>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user