Merge branch 'main' of github.com:hotosm/osm-rawdata

Synv with upstream

.dockerignore

@@ -8,4 +8,4 @@
 !pdm.lock
 !entrypoint.sh
 !README.md
-!LICENSE.md
+!LICENSE

.github/workflows/build-ci.yml

@@ -13,10 +13,8 @@ on:
 
 jobs:
   backend-ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
     with:
       build_target: ci
       image_tags: |
         "ghcr.io/hotosm/osm-rawdata:ci"
-      build_args: |
-        COMMIT_REF=${{ github.sha }}

.github/workflows/build.yml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
     with:
       build_target: prod
       image_name: "ghcr.io/${{ github.repository }}"
-      build_args: |
-        COMMIT_REF=${{ github.sha }}

.github/workflows/docs.yml

@@ -12,12 +12,12 @@ on:
 
 jobs:
   build_doxygen:
-    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.0.1
     with:
       output_path: docs/apidocs
 
   publish_docs:
-    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
     needs: [build_doxygen]
     with:
       image: ghcr.io/${{ github.repository }}:ci

.github/workflows/publish.yml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   publish_to_pypi:
-    uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@1.0.1
     secrets:
       PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

.github/workflows/pytest.yml

@@ -1,4 +1,4 @@
-name: pytest
+name: PyTest
 
 on:
   # Run tests on all pushed branches
@@ -12,9 +12,7 @@ on:
 
 jobs:
   pytest:
-    uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@main
+    uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@1.0.1
     with:
       image_name: ghcr.io/${{ github.repository }}
-      build_args: |
-        COMMIT_REF=${{ github.sha }}
       tag_override: ${{ github.event_name == 'push' && 'ci' || '' }}

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.1.4 (2023-10-23)
+
+### Fix
+
+- Parser for Overture data files V2
+- Add importer script
+- Fix spelling of parquet
+- Remove extraneous timer.stop()
+- Make importing parquet files from Overture multi-threaded
+- Add timer for import GeoJson
+- Import MS Footprints into underpass schema
+- Import uriParse from rawdata instead of the local copy
+- If no config file is used, return the raw results
+- Add content on importing Overture data into a database
+- Add simple pages for all the utilities, add doc on the Overture data files
+
+### Refactor
+
+- rename LICENSE.md --> LICENSE
+- update version in Makefile & track
+
 ## 0.1.3 (2023-10-09)
 
 ### Fix

Makefile

@@ -18,7 +18,7 @@
 
 PACKAGE := org.osm_rawdata.py
 NAME := osm-rawdata
-VERSION := 0.1.3
+VERSION := 0.1.4
 
 # All python source files
 # MDS := $(wildcard ./docs/*.md)

README.md

@@ -1,6 +1,48 @@
-# osm-rawdata
-
-🕮 [Documentation](https://hotosm.github.io/osm-rawdata/)
+# OSM RawData
+
+<!-- markdownlint-disable -->
+<p align="center">
+  <img src="https://github.com/hotosm/fmtm/blob/main/images/hot_logo.png?raw=true" style="width: 200px;" alt="HOT"></a>
+</p>
+<p align="center">
+  <em>A python module for accessing OSM data in a postgres database.</em>
+</p>
+<p align="center">
+  <a href="https://github.com/hotosm/osm-rawdata/actions/workflows/build.yml" target="_blank">
+      <img src="https://github.com/hotosm/osm-rawdata/workflows/Build/badge.svg" alt="Build">
+  </a>
+  <a href="https://github.com/hotosm/osm-rawdata/actions/workflows/build-ci.yml" target="_blank">
+      <img src="https://github.com/hotosm/osm-rawdata/workflows/Build CI Img/badge.svg" alt="CI Build">
+  </a>
+  <a href="https://github.com/hotosm/osm-rawdata/actions/workflows/docs.yml" target="_blank">
+      <img src="https://github.com/hotosm/osm-rawdata/workflows/Publish Docs/badge.svg" alt="Publish Docs">
+  </a>
+  <a href="https://github.com/hotosm/osm-rawdata/actions/workflows/publish.yml" target="_blank">
+      <img src="https://github.com/hotosm/osm-rawdata/workflows/Publish to PyPi.org/badge.svg" alt="Publish">
+  </a>
+  <a href="https://github.com/hotosm/osm-rawdata/actions/workflows/pytest.yml" target="_blank">
+      <img src="https://github.com/hotosm/osm-rawdata/workflows/PyTest/badge.svg" alt="Test">
+  </a>
+  <a href="https://pypi.org/project/osm-rawdata" target="_blank">
+      <img src="https://img.shields.io/pypi/v/osm-rawdata?color=%2334D058&label=pypi%20package" alt="Package version">
+  </a>
+  <a href="https://pypistats.org/packages/osm-rawdata" target="_blank">
+      <img src="https://img.shields.io/pypi/dm/osm-rawdata.svg" alt="Downloads">
+  </a>
+  <a href="https://github.com/hotosm/osm-rawdata/blob/main/LICENSE" target="_blank">
+      <img src="https://img.shields.io/github/license/hotosm/osm-rawdata.svg" alt="License">
+  </a>
+</p>
+
+---
+
+🕮 **Documentation**: <a href="https://hotosm.github.io/osm-rawdata/" target="_blank">https://hotosm.github.io/osm-rawdata/</a>
+
+🖥️ **Source Code**: <a href="https://github.com/hotosm/osm-rawdata" target="_blank">https://github.com/hotosm/osm-rawdata</a>
+
+---
+
+<!-- markdownlint-enable -->
 
 These is a module to work with
 [OpenStreetMap](https://www.openstreetmap.org) data using postgres and
@@ -80,19 +122,19 @@ enhanced version to define the queries.
 The JSON format is also supported, both parsing the config file and
 also generating that query from a YAML config file.
 
-# The files
+## The Files
 
-## geofabrik.py
+### geofabrik.py
 
 This is a simple utility to download a file from GeoGFabrik.
 
-## config.py
+### config.py
 
 This class parses either then JSON or YAML config file formatted
 files, and creates a data structure used later to generater the
 database query.
 
-## postgres.py
+### postgres.py
 
 This class handles working with the postgres database. It sets up the
 connections, and handles processing the results from the queries.

docs/CHANGELOG.md

@@ -0,0 +1 @@
+../CHANGELOG.md

docs/index.md

@@ -0,0 +1 @@
+../README.md

mkdocs.yml

@@ -73,4 +73,5 @@ nav:
       - YAML: yaml.md
       - Overture: overture.md
   - API: api.md
-  - License: LICENSE.md
+  - License: LICENSE
+  - Changelog: CHANGELOG.md

osm_rawdata/__version__.py

@@ -1,2 +1,2 @@
 """Project version"""
-__version__ = "0.1.3"
+__version__ = "0.1.4"

pyproject.toml

@@ -48,7 +48,7 @@ pythonpath = "osm_rawdata"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.1.3"
+version = "0.1.4"
 version_files = [
     "pyproject.toml:version",
     "osm_rawdata/__version__.py",
@@ -59,7 +59,7 @@ version_files = [
 version = {from = "osm_rawdata/__version__.py"}
 [tool.pdm.build]
 includes = ["osm_rawdata"]
-source-includes = ["tests", "LICENSE.md", "README.md"]
+source-includes = ["tests", "LICENSE", "README.md"]
 [tool.pdm.dev-dependencies]
 dev = [
     "black>=23.7.0",