Pull Tileoven back to Tilemill

.travis.yml

@@ -1,17 +1,24 @@
 language: node_js
 
+sudo: false
+
 node_js:
   - "0.10"
-  #- "0.11.13"
+  # tests failing for unknown reasons
+  #- "4"
 
 addons:
   postgresql: "9.3"
+  apt:
+    sources:
+     - ubuntu-toolchain-r-test
+    packages:
+     - libstdc++6 # upgrade libstdc++ on linux to support C++11
+     - libwebkit-dev
 
 before_install:
  - createdb template_postgis
  - psql -c "CREATE EXTENSION postgis" template_postgis
- # upgrade libstdc++ to support C++11
- - if [ $(uname -s) == "Linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -q && sudo apt-get install -y libstdc++6; fi
 
 install:
 - npm install --fallback-to-build=false

README.md

@@ -1,19 +1,57 @@
-TileMill is a modern map design studio powered by [Node.js](http://nodejs.org) and [Mapnik](http://mapnik.org).
+# General Info
 
-Installation instructions, development docs and other information are available on the [TileMill website](https://mapbox.com/tilemill).
+TileOven is a maintained fork of TileMill, tested on Linux with Node 8.11.3 LTS
+TileOven works only in server mode, no native packages are provided.
+Platforms other than Linux should theoretically work, but aren't tested.
+
+Changes from upstream are cherry-picked, last time on Apr 22, 2016.
+
+
+# Changelog since forking
+
+## Features
+
+- Forked millstone, tilelive, node-srs dependencies, Node 8 now supported
+- Support for Node 8, thanks to patches and updated dependencies of @paulovieira
+- Added layer selection to map panel for fast comparisons with OSM and to save render time for low zoom levels
+- Added search field to layer panel
+- Added search field to styles panel
+- Added cloning of layers to layer panel
+- Layer actions only shown on hover, ideal for long layer names and reduces visual noise
+- Increased size of layer panel
+- Updated carto and node-mapnik dependencies, new CartoCSS commands available
+- Remember last selected folder in new layer dialog
+- Better compatibility with kosmtik, TileOven mml project files should work out of the box with kosmtik (https://github.com/kosmtik)
+
+## Bugfixes
+
+- Removed topcube and other obsolete dependencies
+- Removed windowed mode, only server mode is supported
+- Fixed Tab indentation in editor window
+- Fixed "Close" button bugs in Google Chrome (https://github.com/mapbox/tilemill/issues/2534)
+- Fixed mbtiles preview map
+- Removed Mapbox integration
+- Fixed CartoCSS variable auto completion
+- Fixed creation of job file in export if it doesn't exist
+- Fixed multiple output of CartoCSS errors to update to latest version
+
+# Readme
+
+TileOven is a modern map design studio powered by [Node.js](http://nodejs.org) and [Mapnik](http://mapnik.org).
+
+Installation instructions, development docs and other information are available in the [Wiki](https://github.com/florianf/tileoven/wiki/Installation-Guide).
 
 # Build Status
 
-[![Build Status](https://secure.travis-ci.org/mapbox/tilemill.png)](https://travis-ci.org/mapbox/tilemill)
-[![Build status](https://ci.appveyor.com/api/projects/status/hw3rqpyd7bj0cb03?svg=true)](https://ci.appveyor.com/project/Mapbox/tilemill)
-[![Dependencies](https://david-dm.org/mapbox/tilemill.png)](https://david-dm.org/mapbox/tilemill)
+[![Build status](https://travis-ci.org/florianf/tileoven.svg)](https://travis-ci.org/florianf/tileoven)
+[![Dependencies](https://david-dm.org/florianf/tileoven.svg)](https://david-dm.org/florianf/tileoven)
 
 ### Key modules
 
 - mapnik - [![Build Status](https://secure.travis-ci.org/mapnik/mapnik.png?branch=2.3.x)](https://travis-ci.org/mapnik/mapnik)
 - node-mapnik - [![Build Status](https://secure.travis-ci.org/mapnik/node-mapnik.png)](https://travis-ci.org/mapnik/node-mapnik)
 - carto - [![Build Status](https://secure.travis-ci.org/mapbox/carto.png)](http://travis-ci.org/mapbox/carto)
-- tilelive.js - [![Build Status](https://secure.travis-ci.org/mapbox/tilelive.js.png)](https://travis-ci.org/mapbox/tilelive.js)
+- tilelive - [![Build Status](https://secure.travis-ci.org/mapbox/tilelive.png)](https://travis-ci.org/mapbox/tilelive)
 - tilelive-mapnik - [![Build Status](https://secure.travis-ci.org/mapbox/tilelive-mapnik.png)](https://travis-ci.org/mapbox/tilelive-mapnik)
 - millstone - [![Build Status](https://secure.travis-ci.org/mapbox/millstone.png)](http://travis-ci.org/mapbox/millstone)
 - node-mbtiles - [![Build Status](https://secure.travis-ci.org/mapbox/node-mbtiles.png)](http://travis-ci.org/mapbox/node-mbtiles)
@@ -22,17 +60,19 @@ Installation instructions, development docs and other information are available
 # Depends
 
 - Mapnik v2.3.0
-- Node.js v0.10.x or v0.8.x
+- Node.js v6.x, v4.x, v0.10.x or v0.8.x
 - Protobuf: libprotobuf-lite and protoc
 
 However, node-mapnik (which depends on Mapnik and protobuf) is now packaged as a binary. So, you do not need an external Mapnik. See [Installation](#installation)
 
 # Installation
 
+Note: on Ubuntu make sure that you have the nodejs-legacy package installed!
+
 To install from source just do:
 
-    git clone https://github.com/mapbox/tilemill.git
-    cd tilemill
+    git clone https://github.com/florianf/tileoven.git
+    cd tileoven
     npm install
 
 Then to start TileMill do:

assets/css/code.css

@@ -15,13 +15,22 @@ div.CodeMirror {
 div.CodeMirror-lines,
 div.CodeMirror-gutter-text { padding:5px; }
 
-div.CodeMirror-gutter-text pre.error {
-  background:#fe8;
-  color:#222;
-  padding:0px 5px;
-  margin:0px -5px;
-  cursor:pointer;
-  }
+div.CodeMirror .errors, div.CodeMirror .search {
+  width: 12px;
+}
+
+div.CodeMirror .error-marker {
+  background-color: #822;
+  width: 8px;
+  height: 16px;
+  cursor: pointer;
+}
+
+div.CodeMirror .search-marker {
+  background-color: #009928;
+  width: 8px;
+  height: 16px;
+}
 
 span.cm-carto-variable           { color:#708; }
 span.cm-carto-color-variable     { color:#B60049; }