Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rendering for man-made cranes #3501

Merged
merged 31 commits into from
Dec 14, 2018
Merged

Add rendering for man-made cranes #3501

merged 31 commits into from
Dec 14, 2018

Commits on Oct 17, 2018

  1. Merge pull request #1 from gravitystorm/master 

    update with changes from master in past month
    @jeisenbe
    jeisenbe authored Oct 17, 2018
    Configuration menu
    Copy the full SHA
    0f9646b View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Added amenity=internet_cafe 

    Follows pattern of amenity=bank
    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    11543b1 View commit details
    Browse the repository at this point in the history

  2. added amenity=internet_cafe 

    Followed pattern of amenity=bank
    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    8a201e3 View commit details
    Browse the repository at this point in the history

  3. added icon for amenity=internet_cafe from Tomasz-W

    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    5ec0f0c View commit details
    Browse the repository at this point in the history

  4. Rename amenity=internet_cafe.svg to internet_cafe.svg

    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    0e8bb15 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from jeisenbe/master 

    Added internet_cafe to amenitypoints and project.mss,  and added icon to symbol/amenity
    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    445e091 View commit details
    Browse the repository at this point in the history

  6. Delete internet_cafe.svg

    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    5ab0c1a View commit details
    Browse the repository at this point in the history

  7. Add new internet_cafe.svg from Tomasz-W

    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    76d8b64 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3 from jeisenbe/internet-cafe 

    Internet cafe icon changed
    @jeisenbe
    jeisenbe authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    57d1cca View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Update amenity-points.mss

    @jeisenbe
    jeisenbe authored Oct 20, 2018
    Configuration menu
    Copy the full SHA
    f5eceeb View commit details
    Browse the repository at this point in the history

  2. internet_cafe

    Joyanna Eisenberg authored and Joyanna Eisenberg committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    e2b6e32 View commit details
    Browse the repository at this point in the history

  3. readded

    Joyanna Eisenberg authored and Joyanna Eisenberg committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    e481bfe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto 

    

Merging local copy with changes made previously online only. Added username and email
    @jeisenbe
    jeisenbe committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    8f80832 View commit details
    Browse the repository at this point in the history

  5. Delete .DS_Store

    @jeisenbe
    jeisenbe authored Oct 20, 2018
    Configuration menu
    Copy the full SHA
    b5e3167 View commit details
    Browse the repository at this point in the history

  6. Removed .DS_Store files

    @jeisenbe
    jeisenbe committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    1b321a2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto 

    

Merging with github version
    @jeisenbe
    jeisenbe committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    e90d3ea View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/gravitystorm/openstreetma… 

    …p-carto

Updating my fork with the recent changes in the original master
    @jeisenbe
    jeisenbe committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    33f9472 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2018

  1. Merge remote-tracking branch 'upstream/master' 

    Merging new changes from gravitystorm/openstreetmap-carto.
    @jeisenbe
    jeisenbe committed Oct 22, 2018
    Configuration menu
    Copy the full SHA
    8166b3c View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Merge remote-tracking branch 'upstream/master' 

    merge upstream changes into fork
    @jeisenbe
    jeisenbe committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    771bd7a View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto

    @jeisenbe
    jeisenbe committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    4bc0cf1 View commit details
    Browse the repository at this point in the history

  2. Add man_made_crane rendering 

    Cranes will render at the same zoome levels as towers, based on height, or at z17 by default, with name lable at z17
    @jeisenbe
    jeisenbe committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    c4b8d0c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2018

  1. Merge remote-tracking branch 'upstream/master' into crane 

    Fixed merge conflict by adding optical and radio telescope code and fixing whitespace
    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    8e048fe View commit details
    Browse the repository at this point in the history

  2. Add marker-transform for crane icon

    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    bbad22e View commit details
    Browse the repository at this point in the history

  3. Add marker-transform for crane icon 

    Reduce text-dy from 10 to 6 for crane due to using translate (0,-6), which moves the icon up 6 pixels
    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    c2e0af6 View commit details
    Browse the repository at this point in the history

  4. Reduce crane initial zoom to z14 for >100m

    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    8af5fa1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'crane' of https://github.com/jeisenbe/openstreetmap-carto… 

    … into crane
    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    231af2f View commit details
    Browse the repository at this point in the history

  6. Reduce text-dy to 4 for cranes 

    This makes the text align properly with the icon now that the icon is moved up 6 pixels
    @jeisenbe
    jeisenbe committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    1296b00 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2018

  1. Revert marker-transform and text-dy change for cranes 

    Removed marker-transform translate(0,-6) and text-dy change; these changes will be added to the other PR instead
    @jeisenbe
    jeisenbe committed Nov 13, 2018
    Configuration menu
    Copy the full SHA
    88d8364 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Remove crane rendering from z14 

    Render cranes at z15 for height > 100m, at z16 for height >50m, and at z17 otherwise
    @jeisenbe
    jeisenbe committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    21d068a View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2018

  1. Render cranes at z16 if height >50 or at z17

    @jeisenbe
    jeisenbe committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    8f922ed View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2018

  1. Merge 'upstream/master' into crane

    @jeisenbe
    jeisenbe committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    7356649 View commit details
    Browse the repository at this point in the history