Skip to content

Update From Master #131

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

Merged
merged 13 commits into from
Dec 27, 2021
Merged

Update From Master #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b98ca05
add Acacia podalyriifolia
emillipede Jun 14, 2020
71b7db9
add 5 species
emillipede Jun 14, 2020
1bddc79
add Elaeocarpaceae
emillipede Jun 14, 2020
cd290b1
add 7 species
emillipede Jun 16, 2020
dc6f79b
add missing family data for L petersonii
emillipede Jun 16, 2020
a17a43b
Merge pull request #116 from Public-Tree-Map/add-species-1
emillipede Jun 16, 2020
966cc2e
Update README.md
emillipede Jun 21, 2020
3e8a0f5
Merge pull request #123 from Public-Tree-Map/feature/additional-datasets
emillipede Jul 23, 2020
f5ae2d4
Update README.md
emillipede Aug 4, 2020
da9d593
add species synonyms, update latin names
Sep 2, 2020
49a42c9
update synonym format
Sep 3, 2020
c148da7
Merge pull request #127 from Public-Tree-Map/add-species-synonyms
emillipede Sep 3, 2020
cbd4f09
update Melaleuca decora
emillipede Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# public-tree-data

Public Tree Map uses open datasets to document publicly owned park + street + landmark trees in Santa Monica, California. Please see below for more information about the data sources and project.
Public Tree Map uses open datasets to document publicly owned park + street trees in Santa Monica, California. We're working to add data about other LA county public trees. Please see below for more information about the data sources and project.

## Running the Pipeline Locally

Expand Down Expand Up @@ -85,7 +85,7 @@ The pipeline in general works like this:

- Please review open issues and link your pull request to the relevant issue.
- Please create new branch!
- For all **new** changes, please submit your pull request to the test-circleci branch.
- For all **new** changes, please submit your pull request to the ```test-circleci``` branch.
- In your pull request, please list and explain all proposed changes to the code base (additions, deletions). If you reuse code from elsewhere, please make sure you've attributed it.
- Please apply all relevant labels to your pull request.
- Please request a review (either from a specific person or from the appropriate [slack channel](https://join.slack.com/t/publictreemap/shared_invite/zt-dzhrivk4-m8gaZ3wrZBE_leo_oeepPw)).
Expand Down
1 change: 1 addition & 0 deletions data/plant_family_names_EOL_IDs.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Celastraceae,Bittersweet,4241,http://eol.org/pages/4241/overview
Cupressaceae,Cypress,4065,http://eol.org/pages/4065/overview
Cyatheaceae,Tree-fern,4508,http://eol.org/pages/4508/overview
Ebenaceae,Ebony,4262,http://eol.org/pages/4262/overview
Elaeocarpaceae,Elaeocarpaceae,4322,http://eol.org/pages/4322/overview
Ericaceae,Heather,4267,http://eol.org/pages/4267/overview
Fabaceae,Legume,4277,http://eol.org/pages/4277/overview
Fagaceae,Beech,4197,http://eol.org/pages/4197/overview
Expand Down
Loading