Require Mapnik 3 and CartoCSS 0.16.0 #2473

pnorman · 2016-11-28T01:44:20Z

This should wait until after v2.45.0.

Enables #2470, #2045

pnorman · 2016-11-28T01:49:12Z

carto requires a .mml suffix. I could rename project.yaml to project.mml, but I'm reluctant because that would create a conflict in git for every existing PR that touches the layers.

sommerluk · 2016-11-28T17:02:49Z

I don’t understand well the mml/yaml/carto problem. Could you explain this further?

kocio-pl · 2016-11-28T17:26:30Z

Removing yaml2mml.py script in this PR also resolves #2447.

[EDIT:] It will also invalidate #2459.

jojo4u · 2016-11-28T18:11:57Z

carto requires a .mml suffix. I could rename project.yaml to project.mml, but I'm reluctant because that would create a conflict in git for every existing PR that touches the layers.

Quick count: 5 of the 16 other PRs touch project.yaml: #2472 #2385 #2370 #2361 #2279. Are other affected? Changing the PRs would not be asking too much imho. Probably just a local rename of project.yaml to project.mml?

kocio-pl · 2016-11-28T18:14:38Z

#2423 would be probably also resolved by upgrading the minimum required version of CartoCSS with this PR.

jojo4u · 2016-11-28T18:37:55Z

[EDIT:] It will also invalidate #2459.

No problem with dropping the script, the PR was good for learning python some more.

pnorman · 2016-11-28T19:03:14Z

I don’t understand well the mml/yaml/carto problem. Could you explain this further?

carto requires the MML file to have the suffix .mml

nebulon42 · 2016-11-28T19:08:03Z

I left the extension at .mml to keep the name. It just does not care anymore if it is JSON or YAML. An upstream change would also be possible but I'd rather only do this if absolutely necessary.

nebulon42 · 2016-11-28T19:09:15Z

.travis.yml

@@ -9,10 +9,8 @@ addons:
 node_js:
  - "0.10"
 install:
-  - npm install carto@0.12.1
+  - npm install carto@0.16.0


You should really use 0.16.3 as the versions before contain some regressions. For linting this does not make a difference but maybe is the wrong signal.

This is in sync with with INSTALL.md. I want to test with the minimum carto version and the latest, but that's a bigger change that I want to keep to a different PR.

kocio-pl · 2016-11-29T02:32:10Z

I left the extension at .mml to keep the name. It just does not care anymore if it is JSON or YAML. An upstream change would also be possible but I'd rather only do this if absolutely necessary.

Why? I think files recognized with their proper extensions would be the most natural solution (and .mml covering all as a fallback).

nebulon42 · 2016-11-29T07:37:18Z

In this case there is no proper extension. There is no convention that YAML files should be named .yml or .yaml. The current JSON is also not named .json. I don't know why Mapbox chose .mml and what it means. Maybe Map(box) markup language or something. The only change I see would be that Carto does no longer care about the extension at all.

gravitystorm · 2016-11-29T12:03:22Z

I don't know why Mapbox chose .mml and what it means.

Fun fact - .mml comes from Cascadenik, a predecessor to CartoCSS created outside of Mapbox. In Cascadenik it contained XML.

kocio-pl · 2016-11-29T13:23:24Z

Quick count: 5 of the 16 other PRs touch project.yaml: #2472 #2385 #2370 #2361 #2279. Are other affected? Changing the PRs would not be asking too much imho.

So, if MML doesn't mean anything special, let's make it The Right Way (TM). Three of these PRs are mine and I'm willing to fix them (except one which is probably going to waste anyway).

No problem with dropping the script, the PR was good for learning python some more.

So was my Bash code fix, which I've just dropped. 😄

pnorman · 2016-12-01T23:18:53Z

If we decide to merge this I'll probably just take the first commit, and redo the delete and rename instead of resolving merge conflicts.

kocio-pl · 2016-12-02T15:48:21Z

As far as I understand, we're positive about merging it.

The only problem I see is release policy. We should make a bugfix release very soon and it would be v2.45.1 then, but if we merge also this code, this would be v3.0.0 probably, which would break our typical release time frame. Which solution do you think would be better?

matthijsmelissen · 2016-12-02T16:07:37Z

We could release 2.45.1 and 3.0.0 at the same time, and leave it to the server admins which version to install.

pnorman · 2016-12-02T19:26:43Z

Merging this code doesn't mean we need to immediately do a release

kocio-pl · 2016-12-03T00:37:03Z

It also enables #1126.

pnorman · 2016-12-03T18:37:43Z

Consensus seems to be we're ready to merge. I'll rebase later today.

HolgerJeromin · 2016-12-03T20:35:40Z

It also enables #1126.

No, osm fr server do not run mapnik 3.

kocio-pl · 2016-12-03T20:48:57Z

So the milestone label for it was misleading, I've changed it now.

nebulon42 · 2016-12-03T21:16:48Z

Then I can merge it tomorrow (CET).

This - drops Tilemill support; - increments the major version; and - removes some additional requirements for non-Latin languages

With CartoCSS 0.16.0 required, we don't need to create JSON anymore. This simplifies the contribution process for layer editing.

matthijsmelissen · 2016-12-05T19:52:49Z

Small side-question: since I upgraded kosmtik and carto 0.16, my cache doesn't flush anymore, which is quite problematic when developing. Is this a known problem with the last version(s)? Is there a way to flush the cache manually?

kocio-pl · 2016-12-05T20:00:25Z

You mean kosmtik/tmp/? Each project keeps its cache files under separate directory.

pnorman · 2016-12-05T20:03:04Z

Small side-question: since I upgraded kosmtik and carto 0.16, my cache doesn't flush anymore, which is quite problematic when developing

My startup line is rm -rf tmp/ && ~/osm/kosmtik/index.js serve --host 192.168.1.1 project.yml when working on vector tile stuff where I need to get rid of the cache all the time.

matthijsmelissen · 2016-12-05T21:12:52Z

Thanks. Strange though, the cache used to be invalidated every time project files changed on disk. Removing tmp every time I change a file is quite cumbersome.

imagico · 2016-12-05T21:32:13Z

Having started using kosmtik not too long ago i had the impression this was normal but now that you mention it it seems indeed rather odd.

kocio-pl · 2016-12-05T21:37:11Z

I started to clean the Kosmtik cache from some moment, so it probably worked before. We have a fresh ticket about this problem now:

kosmtik/kosmtik#191

jojo4u · 2016-12-05T23:02:48Z

I'm in same situation as imagico.

nebulon42 · 2016-12-05T23:03:59Z

I'm pretty sure that this is unrelated to carto 0.16.x.

Ircama · 2016-12-06T01:13:48Z

Just wondering whether there is a reason why the latest YAML format of project.mml has the same basename of the Tilemill JSON format.

AFAIK Tilemill for Windows does not allow to change the project filename. Even if Tilemill is no more supported now, one can still try to keep on using it and in case there is the need to rename project.mml to project.yaml, restore yaml2mml.py (or equivalent command) and generate project.mml in JSON format: this might lead to errors/confusion with the original YAML file. Wouldn’t be more appropriate naming the new project.mml (YAML) to osm-carto.mml or similar?

pnorman · 2016-12-06T01:18:01Z

If someone is using tilemill I believe they need to be using a version from source to get an appropriate Mapnik version, which should also have a CartoCSS version which supports reading YAML. They'll have problems editing the layers through Tilemill, but given Tilemill's interface, there's problems doing any editing through it.

Ircama · 2016-12-06T07:45:11Z

If someone is using tilemill I believe they need to be using a version from source to get an appropriate Mapnik version, which should also have a CartoCSS version which supports reading YAML.

I haven't checked the Ubuntu version yet. I am afraid that with the Windows version (which is the only native way to run openstreetmap-carto with Windows and without an Ubuntu VM - just run, not edit) there is no possibility to perform a manual update (and manually updating node_modules\carto does not provide a working product).

pnorman · 2016-12-06T08:03:48Z

I haven't checked the Ubuntu version yet. I am afraid that with the Windows version (which is the only native way to run openstreetmap-carto with Windows and without an Ubuntu VM - just run, not edit) there is no possibility to perform a manual update (and manually updating node_modules\carto does not provide a working product).

My point is that you can't use the prebuilt tilemill binaries, since we require Mapnik 3, and the version of Mapnik that came with v0.10.1 is from 2012, so we don't need to worry if something else is broken on Tilemill v0.10.1

Rename project.yaml to project.mml following gravitystorm#2473

nebulon42 reviewed Nov 28, 2016

View reviewed changes

nebulon42 mentioned this pull request Dec 1, 2016

ignore admin_level on capital=yes places #2472

Closed

kocio-pl mentioned this pull request Dec 2, 2016

Release v2.45.1/v3.0.0 #2483

Closed

pnorman added 3 commits December 3, 2016 23:27

Require Mapnik 3 and CartoCSS 0.16.0

3117c13

This - drops Tilemill support; - increments the major version; and - removes some additional requirements for non-Latin languages

Remove JSON MML

3f47764

With CartoCSS 0.16.0 required, we don't need to create JSON anymore. This simplifies the contribution process for layer editing.

Rename project.yaml to project.mml

2f8e3f8

pnorman force-pushed the mapnik-3 branch from c0b7963 to 2f8e3f8 Compare December 4, 2016 07:34

pnorman merged commit ba2ddd6 into gravitystorm:master Dec 4, 2016

pnorman mentioned this pull request Dec 4, 2016

OpenStreetMap Carto changes openstreetmap/chef#104

Closed

pnorman deleted the mapnik-3 branch December 4, 2016 07:45

pnorman restored the mapnik-3 branch December 4, 2016 08:03

nebulon42 mentioned this pull request Dec 4, 2016

Use json.dumps() for yaml2mml.py #2459

Closed

kocio-pl mentioned this pull request Dec 6, 2016

Check range of supported Carto and Mapnik with Travis #2423

Closed

Ircama added a commit to Ircama/openstreetmap-carto that referenced this pull request Dec 7, 2016

Rename project.yaml to project.mml

e3ab17d

Rename project.yaml to project.mml following gravitystorm#2473

Ircama mentioned this pull request Dec 7, 2016

Update get-shapefiles.py renaming project.yaml to project.mml #2501

Merged

This was referenced Dec 15, 2016

yaml2mml not compatible with python 3.5 #2447

Closed

mention pre-commit hook in readme #2156

Closed

Stop landuse labels based on area #1028

Closed

sommerluk pushed a commit to sommerluk/openstreetmap-carto that referenced this pull request Dec 17, 2016

Rename project.yaml to project.mml

5ba3ce4

Rename project.yaml to project.mml following gravitystorm#2473

pnorman deleted the mapnik-3 branch December 20, 2016 07:13

mmd-osm mentioned this pull request Dec 22, 2016

issues with OpenStreetMap Carto release v3.0.0 kosmtik/kosmtik#207

Closed

Require Mapnik 3 and CartoCSS 0.16.0 #2473

Require Mapnik 3 and CartoCSS 0.16.0 #2473

Conversation

pnorman commented Nov 28, 2016

pnorman commented Nov 28, 2016

sommerluk commented Nov 28, 2016

kocio-pl commented Nov 28, 2016 • edited Loading

jojo4u commented Nov 28, 2016 • edited Loading

kocio-pl commented Nov 28, 2016

jojo4u commented Nov 28, 2016

pnorman commented Nov 28, 2016

nebulon42 commented Nov 28, 2016

nebulon42 Nov 28, 2016

Choose a reason for hiding this comment

pnorman Nov 28, 2016

Choose a reason for hiding this comment

nebulon42 Nov 28, 2016

Choose a reason for hiding this comment

kocio-pl commented Nov 29, 2016

nebulon42 commented Nov 29, 2016

gravitystorm commented Nov 29, 2016

kocio-pl commented Nov 29, 2016

pnorman commented Dec 1, 2016

kocio-pl commented Dec 2, 2016 • edited Loading

matthijsmelissen commented Dec 2, 2016

pnorman commented Dec 2, 2016

kocio-pl commented Dec 3, 2016

pnorman commented Dec 3, 2016

HolgerJeromin commented Dec 3, 2016

kocio-pl commented Dec 3, 2016

nebulon42 commented Dec 3, 2016

matthijsmelissen commented Dec 5, 2016

kocio-pl commented Dec 5, 2016

pnorman commented Dec 5, 2016

matthijsmelissen commented Dec 5, 2016

imagico commented Dec 5, 2016

kocio-pl commented Dec 5, 2016

jojo4u commented Dec 5, 2016

nebulon42 commented Dec 5, 2016 • edited Loading

Ircama commented Dec 6, 2016

pnorman commented Dec 6, 2016

Ircama commented Dec 6, 2016

pnorman commented Dec 6, 2016

kocio-pl commented Nov 28, 2016 •

edited

Loading

jojo4u commented Nov 28, 2016 •

edited

Loading

kocio-pl commented Dec 2, 2016 •

edited

Loading

nebulon42 commented Dec 5, 2016 •

edited

Loading