Skip to content
This repository has been archived by the owner on Mar 5, 2020. It is now read-only.

Leaflet map plus data #40

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Leaflet map plus data #40

wants to merge 15 commits into from

Commits on Mar 29, 2017

  1. Resolving merge conflicts in master branch update.

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    1010ba5 View commit details
    Browse the repository at this point in the history

  2. Beginning reformat specific to custom control.

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    029074f View commit details
    Browse the repository at this point in the history

  3. Added dependencies and added LeafletCustomControl component and story… 

    … to Storybook.
    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    2f88ac0 View commit details
    Browse the repository at this point in the history

  4. Removed controlled component and simply render info from neighborhood… 

    … GeoJSON below map in plain JSX.
    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    4c7dd73 View commit details
    Browse the repository at this point in the history

  5. Added RechartsPie and extended neighborhood GeoJSON data with mock de… 

    …mographic data. Donut chart and neighborhood title change as expected on click.
    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    8253475 View commit details
    Browse the repository at this point in the history

  6. Brought in content and basic styling to divs below map.

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    677bd97 View commit details
    Browse the repository at this point in the history

  7. Spelling

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    080eb95 View commit details
    Browse the repository at this point in the history

  8. Deleted unnecessary files

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    cf93abf View commit details
    Browse the repository at this point in the history

  9. Removed unused state properties in LeafletPlusData

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    bb98903 View commit details
    Browse the repository at this point in the history

  10. Resolved merge conflict

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    7782bbe View commit details
    Browse the repository at this point in the history

  11. Removed RechartsPie folder

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    e633583 View commit details
    Browse the repository at this point in the history

  12. Resolved merge conflicts

    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    01d042a View commit details
    Browse the repository at this point in the history

  13. Brough in RechartsPie after upstream master branch integration. Renam… 

    …ed variable and property of RechartsPie “legendStyles” to clarify from previous “styles”. Removed unnecessary style attributes in legendStyles. Added positioning offsets to the legendStyles in both RechartsPie and LeafletPlusData.
    @tyreer
    tyreer committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    6824efd View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2017

  1. Merge branch 'master' into customControl

    @tyreer
    tyreer authored Apr 7, 2017
    Configuration menu
    Copy the full SHA
    cd61728 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2017

  1. Merge branch 'master' into customControl

    @DavideDaniel
    DavideDaniel authored Apr 11, 2017
    Configuration menu
    Copy the full SHA
    707ecb4 View commit details
    Browse the repository at this point in the history