springmeyer

diff --git a/lib/copytask.js b/lib/copytask.js
index 1873f2b..471f373 100644
--- a/lib/copytask.js
+++ b/lib/copytask.js
@@ -61,7 +61,8 @@ CopyTask.prototype.toJSON = function() {
 
 CopyTask.prototype.finished = function() {
     var task = this;
-    this.pause(function() {
+    this.pause(function(err) {

springmeyer

# from http://hot-export.geofabrik.de/jobs/36
# http://hot-export.geofabrik.de/download/000044/extract.shp.zip
1,"osm_id","osm_id"
2,"z_order","z_order"
3,"way_area","way_area"
4,"addr:housename","addr_house"
5,"addr:interpolation","addr_inter"
6,"motorcar","motorcar"
7,"boundary","boundary"
8,"name","name"

springmeyer

# build fancy osm2pgsql version
git clone https://github.com/schuyler/osm2pgsql.git
cd osm2pgsql
./autogen.sh
./configure
make

# for osx, fix bogus linking that likely happened to apple's libpq
install_name_tool -change /usr/lib/libpq.5.dylib /usr/local/lib/libpq.5.dylib osm2pgsql

springmeyer

[ 5/20] cxx: src/mapnik_feature.cpp -> build/Release/src/mapnik_feature_1.o
13:25:53 runner system command -> ['/Developer/usr/bin/clang++', '-g', '-O3', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE', '-fPIC', '-compatibility_version', '1', '-current_version', '1', '-I/usr/local/include', '-I/Users/dane/Downloads/oracle10g/include', '-I/opt/libpng-1.5.8/include', '-I/opt/freetype2.4.9/include/freetype2', '-I/opt/freetype2.4.9/include', '-I/opt/boost-49/include', '-I/usr/local/Cellar/postgresql/9.1.3/include', '-I/usr/local/Cellar/geos/3.3.2/include', '-I/usr/local/Cellar/gdal/1.9.0/include', '-I/usr/local/Cellar/icu4c/4.8.1.1/include', '-I/usr/local/include', '-I/usr/include', '-I/usr/include/libxml2', '-DHAVE_JPEG', '-DBOOST_REGEX_HAS_ICU', '-ansi', '-Wall', '-Wno-array-bounds', '-Wno-char-subscripts', '-Wno-parentheses-equality', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-ftemplate-depth-300', '-DDARWIN', '-DBOOST_SPIRIT_THREADSAFE', '-DMAPNIK_THREADSAFE', '-O3',

springmeyer

diff --git a/src/Makefile b/src/Makefile
index 16c3e97..b95a8b5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,12 +16,12 @@ libosmpbf.a: fileformat.pb.o osmformat.pb.o
        cp *.pb.h ../include/osmpbf/
 
 install:
-       install -m 755 -g root -o root -d $(DESTDIR)/usr/lib
-       install -m 644 -g root -o root libosmpbf.a $(DESTDIR)/usr/lib

springmeyer

diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
index 702e18a..c93a8a3 100644
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@@ -139,11 +139,8 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
         using qi::_a;
         using qi::_b;
         using qi::_r1;
-#if BOOST_VERSION > 104200
         using qi::no_skip;

springmeyer

var sqlite3 = require('sqlite3')

var db = new sqlite3.Database('test.db');

var make_wkb_point = function(x,y) {
    var byteorder = 1;
    var len = 1 + 4 + 8*2 ;
    var wkb = new Buffer(len);
    wkb.fill(0);
    wkb[0] = byteorder;

springmeyer

diff --git a/include/mapnik/timer.hpp b/include/mapnik/timer.hpp
index 803f4d0..7247de1 100644
--- a/include/mapnik/timer.hpp
+++ b/include/mapnik/timer.hpp
@@ -29,12 +29,48 @@
 #include <sstream>
 #include <iomanip>
 #include <ctime>
-#ifndef WIN32
-#include <sys/time.h> // for gettimeofday() on unix

springmeyer

# First, clear out any old mapnik or node.js installs that might conflict
sudo apt-get purge libmapnik libmapnik-dev mapnik-utils nodejs

# Also clear out any old ppa's that might conflict
sudo rm /etc/apt/sources.list.d/*mapnik*
sudo rm /etc/apt/sources.list.d/*developmentseed*
sudo rm /etc/apt/sources.list.d/*chris-lea*

# add new ppa's
echo 'yes' | sudo apt-add-repository ppa:chris-lea/node.js

springmeyer

$ /opt/llvm/bin/clang++ -o src/libmapnik.dylib -Wl,-S -Wl,-search_paths_first -arch x86_64 -mmacosx-version-min=10.6 -isysroot /Developer/SDKs/MacOSX10.6.sdk -Losx/sources/lib -Wl,-install_name,/usr/local/lib/libmapnik.dylib -current_version 2.1.0 -compatibility_version 2.1.0 -dynamiclib src/libxml2_loader.os src/feature_style_processor.os src/cairo_renderer.os src/color.os src/conversions.os src/image_compositing.os src/box2d.os src/building_symbolizer.os src/datasource_cache.os src/deepcopy.os src/expression_string.os src/expression.os src/feature_kv_iterator.os src/feature_type_style.os src/font_engine_freetype.os src/font_set.os src/gamma_method.os src/gradient.os src/graphics.os src/image_reader.os src/image_util.os src/layer.os src/line_symbolizer.os src/line_pattern_symbolizer.os src/map.os src/load_map.os src/memory.os src/parse_path.os src/palette.os src/placement_finder.os src/plugin.os src/png_reader.os src/point_symbolizer.os src/polygon_pattern_symbolizer.os src/polygon_symbolizer.os src/save_map