Skip to content

Commit

Permalink
Test commit (rebased), 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 gravitystorm#2451.

This commit also would like to help @jojo4u in testing his last update at gravitystorm#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.

______________________________________________________________________

**Rendering of tag tourism=wilderness_hut**

Latest changes:

- Use wilderness-hut.svg icon by @nebulon42
- Rebased to master

______________________________________________________________________

To summarize, the following different kind of huts have specific symbols now:

- amenity=shelter (only shown at zoom >=16)
- tourism=alpine_hut  (not modified within this drop)
- tourism=wilderness_hut (zoom>=13)

Symbols:
- wilderness_hut: symbols/wilderness_hut.svg (new)
- alpine_hut: symbols/alpinehut.p.16.png (unmodified)
- generic shelter: symbols/shelter.svg (unmodified)
  • Loading branch information
Ircama committed Nov 26, 2016
1 parent 26ffa3b commit a312fb7
Show file tree
Hide file tree
Showing 5 changed files with 873 additions and 831 deletions.
6 changes: 5 additions & 1 deletion amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@
point-placement: interior;
}

[feature = 'tourism_wilderness_hut'][zoom >= 13],
[feature = 'amenity_shelter'][zoom >= 16] {
marker-file: url('symbols/shelter.svg');
[feature = 'tourism_wilderness_hut'] {
marker-file: url('symbols/wilderness_hut.svg');
}
marker-fill: @transportation-icon;
marker-placement: interior;
marker-clip: false;
Expand Down Expand Up @@ -1741,6 +1745,7 @@
[feature = 'tourism_hostel'][zoom >= 17],
[feature = 'tourism_chalet'][zoom >= 17],
[feature = 'tourism_guest_house'][zoom >= 17],
[feature = 'tourism_wilderness_hut'][zoom >= 14],
[feature = 'tourism_camp_site'][zoom >= 17] {
text-name: "[name]";
text-size: @standard-text-size;
Expand Down Expand Up @@ -2257,4 +2262,3 @@
}
}
}

Loading

0 comments on commit a312fb7

Please sign in to comment.