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.

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

GeoJSON functions #301

Merged
merged 92 commits into from
Dec 30, 2023
Merged
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
39321be
polygons_to_cells
ajfriend Nov 25, 2022
85d112e
Helpers for cells_to_geojson and geojson_to_cells
ajfriend Nov 30, 2022
cfc6ba3
ValueError
ajfriend Nov 30, 2022
0ae6115
Remove gj (#316)
ajfriend Mar 26, 2023
d41eb15
actions/[email protected]
ajfriend Mar 26, 2023
cad94ca
Solution copied from https://github.com/actions/setup-python/issues/544
ajfriend Mar 26, 2023
66c2731
Merge branch 'master' into poly
ajfriend Mar 26, 2023
299b756
playing around with polygons
ajfriend Mar 26, 2023
b997c73
make a directory
ajfriend Mar 26, 2023
93fcfef
bah
ajfriend Mar 26, 2023
49f61c0
start migrating `h3.Polygon` to `H3Poly`
ajfriend Mar 27, 2023
3b641a8
migrate most
ajfriend Mar 27, 2023
a85544a
finish migrating
ajfriend Mar 27, 2023
91560a8
H3MultiPoly repr
ajfriend Mar 27, 2023
1d4da65
shape_to_cells and cells_to_shape
ajfriend Mar 27, 2023
6786132
tests: polygon_to_cells to shape_to_cells
ajfriend Mar 27, 2023
c0cdc50
finish migrating tests
ajfriend Mar 27, 2023
64476c7
update util.py and example
ajfriend Mar 27, 2023
5e06441
notes
ajfriend Mar 27, 2023
c436bda
bah
ajfriend Apr 2, 2023
5655624
fix lint
isaacbrodsky Jun 18, 2023
5d6ccef
fix
isaacbrodsky Jun 18, 2023
4cb001d
remove X_to_shape
isaacbrodsky Jun 18, 2023
e0b5afd
run tests
isaacbrodsky Jun 18, 2023
ffd8e54
run other CIs too
isaacbrodsky Jun 18, 2023
91fa567
don't use f-string
isaacbrodsky Jun 18, 2023
02e912b
test update
isaacbrodsky Jun 18, 2023
33660ae
change errors per review
isaacbrodsky Jun 21, 2023
1eebc70
Merge branch 'master' into poly-2
isaacbrodsky Aug 13, 2023
178065f
remove unused per review
isaacbrodsky Aug 13, 2023
f681b0b
fix lint
isaacbrodsky Aug 13, 2023
5c7614e
Merge pull request #322 from isaacbrodsky/poly-2
isaacbrodsky Aug 13, 2023
f6f8b58
test run
ajfriend Aug 14, 2023
18e0c10
fix exclude logic in tests
ajfriend Aug 14, 2023
311dd88
" to ' in yaml
ajfriend Aug 14, 2023
6f107a1
move conversion logic to geo_to_cells function
ajfriend Aug 16, 2023
22cab2e
linting
ajfriend Aug 16, 2023
b31a6fc
few more tests
ajfriend Aug 16, 2023
f63c0da
lint
ajfriend Aug 16, 2023
96b17ce
clean up
ajfriend Aug 16, 2023
f0ef783
complete tests
ajfriend Aug 16, 2023
f27f1b4
group geojson/polygon tests into a folder
ajfriend Aug 17, 2023
7e8f20c
move MockGeoInterface into the file that uses it
ajfriend Aug 17, 2023
ba29eb8
move test_input_format to its own file, since it has a lot of helper …
ajfriend Aug 17, 2023
82a23bc
test module description
ajfriend Aug 19, 2023
aad0a08
rename _polygon.py to _h3shape.py
ajfriend Aug 20, 2023
5680314
make H3Shape an ABC
ajfriend Nov 3, 2023
8ab1cc1
shape -> h3shape
ajfriend Nov 3, 2023
ae33ac5
geos to polys
ajfriend Nov 4, 2023
df70c05
rename geo files to latlng
ajfriend Nov 4, 2023
35b7ace
docstrings
ajfriend Nov 4, 2023
f320c13
__init__.py
ajfriend Nov 8, 2023
56c35d8
lint
ajfriend Nov 8, 2023
ffa451b
notebooks
ajfriend Nov 9, 2023
75640d0
more interface tests
ajfriend Nov 9, 2023
dbfa39d
notebooks
ajfriend Nov 10, 2023
23dfc3e
merp
ajfriend Nov 10, 2023
3cac289
clean up geo_to_h3shape()
ajfriend Nov 10, 2023
3810cd3
simplify sydney coords
ajfriend Nov 10, 2023
72e6643
simplify far east test
ajfriend Nov 10, 2023
11befdc
simplify sf coords
ajfriend Nov 10, 2023
6725d98
tuples
ajfriend Nov 10, 2023
8922cc8
geo interface tests
ajfriend Nov 10, 2023
e9041fc
more interface tests
ajfriend Nov 10, 2023
08e1201
clean up maine lat/lngs
ajfriend Nov 10, 2023
5f37f43
messed up lat/lng order in tests. this mistake gets made all the time!
ajfriend Nov 10, 2023
1fea86c
expand geo_to_h3shape test
ajfriend Nov 10, 2023
d52679a
plotting with contextily and geoviews
ajfriend Nov 12, 2023
d60a5af
reprs for H3Shape objects should work better with geopandas
ajfriend Nov 12, 2023
297ecf6
different representations of the same information. which is best?
ajfriend Nov 12, 2023
07850dc
us "loopcode" in H3Poly and H3MultiPoly reprs
ajfriend Nov 12, 2023
acd629d
set tight=True as default
ajfriend Nov 12, 2023
86d7f2a
can't use f-strings in python 3.5
ajfriend Nov 12, 2023
58ea719
notebooks
ajfriend Nov 19, 2023
026f96e
basic plotting
ajfriend Nov 23, 2023
3a0c5af
plotting
ajfriend Nov 23, 2023
1210106
plotting
ajfriend Dec 2, 2023
78b5a6d
tutorial notebook
ajfriend Dec 3, 2023
31e3fcf
cleaning up
ajfriend Dec 3, 2023
ce361d6
clean up geoviews example
ajfriend Dec 3, 2023
d8ea193
remove geoviews example
ajfriend Dec 3, 2023
e822e10
todos
ajfriend Dec 3, 2023
461ef90
Merge branch 'master' into test_poly
ajfriend Dec 3, 2023
88f9ab4
reworking tutorial order
ajfriend Dec 4, 2023
cab31d8
notebook dump
ajfriend Dec 21, 2023
76f9965
cleaner
ajfriend Dec 30, 2023
7001e71
move tutorial
ajfriend Dec 30, 2023
2b4b249
Update src/h3/api/_api_template.py
ajfriend Dec 30, 2023
ef1ac95
Update src/h3/api/_api_template.py
ajfriend Dec 30, 2023
6b46459
Update src/h3/api/_api_template.py
ajfriend Dec 30, 2023
bee3bd2
setting loops
ajfriend Dec 30, 2023
dc2f550
bug and lint
ajfriend Dec 30, 2023
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
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ ignore =
E241,
# E731 do not assign a lambda expression, use a def
E731,
# https://stackoverflow.com/questions/67942075/w504-line-break-after-binary-operator
W503,W504
4 changes: 2 additions & 2 deletions .github/workflows/coverage-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [master]
pull_request:
branches: [master]
branches: ['*']

jobs:
tests:
Expand All @@ -18,7 +18,7 @@ jobs:

- uses: actions/[email protected]
with:
python-version: 3.8
python-version: 3.11

- name: Install from source
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [master]
pull_request:
branches: [master]
branches: ['*']

jobs:
tests:
Expand All @@ -15,6 +15,7 @@ jobs:
matrix:
os: [macos-latest, windows-latest, ubuntu-20.04]
python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
exclude:
- os: windows-latest
python-version: 3.5

Expand All @@ -25,7 +26,7 @@ jobs:

- uses: actions/[email protected]
with:
python-version: "${{ matrix.python-version }}"
python-version: '${{ matrix.python-version }}'

## Start Windows stuff
- uses: ilammy/[email protected]
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [master]
pull_request:
branches: [master]
branches: ['*']
types:
# Opened, synchronize, and reopened are the default types
# We add ready_for_review to additionally trigger when converting from draft to non-draft
Expand All @@ -19,7 +19,7 @@ on:

jobs:
make_sdist:
name: "SDist: ${{ matrix.os }}"
name: 'SDist: ${{ matrix.os }}'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were the quotes changed by a yaml formatter? If not I would recommend having this enforced by formatted rather than manual changes

if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -57,18 +57,18 @@ jobs:
path: ./dist

make_cibw_v1_wheels:
name: "cibuildwheel v1: ${{ matrix.name }}"
name: 'cibuildwheel v1: ${{ matrix.name }}'
if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Only build for platforms that cibw v2 doesn't support
include:
- os: macos-latest
build: "cp27-macosx_x86_64"
build: 'cp27-macosx_x86_64'
name: macOS Intel
- os: ubuntu-20.04
build: "cp27-manylinux_x86_64"
build: 'cp27-manylinux_x86_64'
name: Linux Intel 64-bit

steps:
Expand All @@ -95,41 +95,41 @@ jobs:
path: wheelhouse/*.whl

make_cibw_v2_wheels:
name: "cibuildwheel v2: ${{ matrix.name }}"
name: 'cibuildwheel v2: ${{ matrix.name }}'
if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: macos-latest
build: "cp*-macosx*"
build: 'cp*-macosx*'
name: macOS
- os: windows-latest
build: "cp3*-win_amd64"
build: 'cp3*-win_amd64'
name: Windows 64-bit
- os: ubuntu-20.04
build: "cp*-manylinux_x86_64"
build: 'cp*-manylinux_x86_64'
name: Linux Intel glibc 64-bit
- os: ubuntu-20.04
build: "cp*-musllinux_x86_64"
build: 'cp*-musllinux_x86_64'
name: Linux Intel musl 64-bit
- os: ubuntu-20.04
build: "cp36-manylinux_aarch64"
build: 'cp36-manylinux_aarch64'
name: Linux Aarch64 3.6
- os: ubuntu-20.04
build: "cp37-manylinux_aarch64"
build: 'cp37-manylinux_aarch64'
name: Linux Aarch64 3.7
- os: ubuntu-20.04
build: "cp38-manylinux_aarch64"
build: 'cp38-manylinux_aarch64'
name: Linux Aarch64 3.8
- os: ubuntu-20.04
build: "cp39-manylinux_aarch64"
build: 'cp39-manylinux_aarch64'
name: Linux Aarch64 3.9
- os: ubuntu-20.04
build: "cp310-manylinux_aarch64"
build: 'cp310-manylinux_aarch64'
name: Linux Aarch64 3.10
- os: ubuntu-20.04
build: "cp311-manylinux_aarch64"
build: 'cp311-manylinux_aarch64'
name: Linux Aarch64 3.11

steps:
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ lint:
./env/bin/pylint --disable=all --enable=import-error tests/

lab:
./env/bin/pip install jupyterlab
./env/bin/pip install -r requirements-dev.txt
./env/bin/jupyter lab
Loading
Loading