Skip to content

Commit 85e8b30

Browse files
rsavoyersavoye
committed
Merge branch 'main' of github.com:hotosm/osm-rawdata
Synv with upstream
2 parents f222941 + f3698ee commit 85e8b30

File tree

14 files changed

+86
-76
lines changed

14 files changed

+86
-76
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
!pdm.lock
99
!entrypoint.sh
1010
!README.md
11-
!LICENSE.md
11+
!LICENSE

‎.github/workflows/build-ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ on:
1313

1414
jobs:
1515
backend-ci-build:
16-
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
16+
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
1717
with:
1818
build_target: ci
1919
image_tags: |
2020
"ghcr.io/hotosm/osm-rawdata:ci"
21-
build_args: |
22-
COMMIT_REF=${{ github.sha }}

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88

99
jobs:
1010
ci-build:
11-
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
11+
uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
1212
with:
1313
build_target: prod
1414
image_name: "ghcr.io/${{ github.repository }}"
15-
build_args: |
16-
COMMIT_REF=${{ github.sha }}

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ on:
1212

1313
jobs:
1414
build_doxygen:
15-
uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@main
15+
uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.0.1
1616
with:
1717
output_path: docs/apidocs
1818

1919
publish_docs:
20-
uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@main
20+
uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
2121
needs: [build_doxygen]
2222
with:
2323
image: ghcr.io/${{ github.repository }}:ci

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ on:
88

99
jobs:
1010
publish_to_pypi:
11-
uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@main
11+
uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@1.0.1
1212
secrets:
1313
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

‎.github/workflows/pytest.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pytest
1+
name: PyTest
22

33
on:
44
# Run tests on all pushed branches
@@ -12,9 +12,7 @@ on:
1212

1313
jobs:
1414
pytest:
15-
uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@main
15+
uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@1.0.1
1616
with:
1717
image_name: ghcr.io/${{ github.repository }}
18-
build_args: |
19-
COMMIT_REF=${{ github.sha }}
2018
tag_override: ${{ github.event_name == 'push' && 'ci' || '' }}

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## 0.1.4 (2023-10-23)
2+
3+
### Fix
4+
5+
- Parser for Overture data files V2
6+
- Add importer script
7+
- Fix spelling of parquet
8+
- Remove extraneous timer.stop()
9+
- Make importing parquet files from Overture multi-threaded
10+
- Add timer for import GeoJson
11+
- Import MS Footprints into underpass schema
12+
- Import uriParse from rawdata instead of the local copy
13+
- If no config file is used, return the raw results
14+
- Add content on importing Overture data into a database
15+
- Add simple pages for all the utilities, add doc on the Overture data files
16+
17+
### Refactor
18+
19+
- rename LICENSE.md --> LICENSE
20+
- update version in Makefile & track
21+
122
## 0.1.3 (2023-10-09)
223

324
### Fix

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
PACKAGE := org.osm_rawdata.py
2020
NAME := osm-rawdata
21-
VERSION := 0.1.3
21+
VERSION := 0.1.4
2222

2323
# All python source files
2424
# MDS := $(wildcard ./docs/*.md)

‎README.md‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,48 @@
1-
# osm-rawdata
2-
3-
🕮 [Documentation](https://hotosm.github.io/osm-rawdata/)
1+
# OSM RawData
2+
3+
<!-- markdownlint-disable -->
4+
<p align="center">
5+
<img src="https://github.com/hotosm/fmtm/blob/main/images/hot_logo.png?raw=true" style="width: 200px;" alt="HOT"></a>
6+
</p>
7+
<p align="center">
8+
<em>A python module for accessing OSM data in a postgres database.</em>
9+
</p>
10+
<p align="center">
11+
<a href="https://github.com/hotosm/osm-rawdata/actions/workflows/build.yml" target="_blank">
12+
<img src="https://github.com/hotosm/osm-rawdata/workflows/Build/badge.svg" alt="Build">
13+
</a>
14+
<a href="https://github.com/hotosm/osm-rawdata/actions/workflows/build-ci.yml" target="_blank">
15+
<img src="https://github.com/hotosm/osm-rawdata/workflows/Build CI Img/badge.svg" alt="CI Build">
16+
</a>
17+
<a href="https://github.com/hotosm/osm-rawdata/actions/workflows/docs.yml" target="_blank">
18+
<img src="https://github.com/hotosm/osm-rawdata/workflows/Publish Docs/badge.svg" alt="Publish Docs">
19+
</a>
20+
<a href="https://github.com/hotosm/osm-rawdata/actions/workflows/publish.yml" target="_blank">
21+
<img src="https://github.com/hotosm/osm-rawdata/workflows/Publish to PyPi.org/badge.svg" alt="Publish">
22+
</a>
23+
<a href="https://github.com/hotosm/osm-rawdata/actions/workflows/pytest.yml" target="_blank">
24+
<img src="https://github.com/hotosm/osm-rawdata/workflows/PyTest/badge.svg" alt="Test">
25+
</a>
26+
<a href="https://pypi.org/project/osm-rawdata" target="_blank">
27+
<img src="https://img.shields.io/pypi/v/osm-rawdata?color=%2334D058&label=pypi%20package" alt="Package version">
28+
</a>
29+
<a href="https://pypistats.org/packages/osm-rawdata" target="_blank">
30+
<img src="https://img.shields.io/pypi/dm/osm-rawdata.svg" alt="Downloads">
31+
</a>
32+
<a href="https://github.com/hotosm/osm-rawdata/blob/main/LICENSE" target="_blank">
33+
<img src="https://img.shields.io/github/license/hotosm/osm-rawdata.svg" alt="License">
34+
</a>
35+
</p>
36+
37+
---
38+
39+
🕮 **Documentation**: <a href="https://hotosm.github.io/osm-rawdata/" target="_blank">https://hotosm.github.io/osm-rawdata/</a>
40+
41+
🖥️ **Source Code**: <a href="https://github.com/hotosm/osm-rawdata" target="_blank">https://github.com/hotosm/osm-rawdata</a>
42+
43+
---
44+
45+
<!-- markdownlint-enable -->
446

547
These is a module to work with
648
[OpenStreetMap](https://www.openstreetmap.org) data using postgres and
@@ -80,19 +122,19 @@ enhanced version to define the queries.
80122
The JSON format is also supported, both parsing the config file and
81123
also generating that query from a YAML config file.
82124

83-
# The files
125+
## The Files
84126

85-
## geofabrik.py
127+
### geofabrik.py
86128

87129
This is a simple utility to download a file from GeoGFabrik.
88130

89-
## config.py
131+
### config.py
90132

91133
This class parses either then JSON or YAML config file formatted
92134
files, and creates a data structure used later to generater the
93135
database query.
94136

95-
## postgres.py
137+
### postgres.py
96138

97139
This class handles working with the postgres database. It sets up the
98140
connections, and handles processing the results from the queries.

‎docs/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../CHANGELOG.md

0 commit comments

Comments
 (0)