Skip to content

Commit

Permalink
Test commit without rebasing, just to allow revision
Browse files Browse the repository at this point in the history
amenity-points.mss and symbols/wilderness_hut.svg are ready for revision.

I have now changed the file naming of wilderness_hut.svg (with icon produced by @nebulon42) following @nebulon42's convention in #2451.

This commit also would like to help @jojo4u in testing his last update at #2459. I generated project.mml with Windows; I temporarily added the new yaml2mml.py, just to allow testing. Due to the inclusion of the new project.mml and new yaml2mml.py with this commit, please, do not merge by now.
  • Loading branch information
Ircama committed Nov 26, 2016
1 parent 383f966 commit e2faadf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[feature = 'amenity_shelter'][zoom >= 16] {
marker-file: url('symbols/shelter-14.svg');
[feature = 'tourism_wilderness_hut'] {
marker-file: url('symbols/wilderness-hut-14.svg');
marker-file: url('symbols/wilderness_hut.svg');
}
marker-fill: @transportation-icon;
marker-placement: interior;
Expand Down
5 changes: 3 additions & 2 deletions scripts/yaml2mml.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
try:
if not args.check:
mml_file = open(mml_path, 'wb')
json.dump(yaml, mml_file, indent=2, separators=(',', ': '))
json_bytes = (json.dumps(yaml, sort_keys=True, indent=2, separators=(',', ': '))).encode(encoding="ascii")
mml_file.write(json_bytes)
mml_file.close()
else:
json.dump(yaml, sys.stdout, indent=2, separators=(',', ': '))
json.dump(yaml, sys.stdout, sort_keys=True, indent=2, separators=(',', ': '))
except IOError:
print('Could not save MML file. Aborting.')
sys.exit(1)
Expand Down
File renamed without changes

0 comments on commit e2faadf

Please sign in to comment.