Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
069fe56
version
GinaStavropoulou Mar 19, 2025
d8c4730
lint-format
GinaStavropoulou Apr 1, 2025
e36b051
test action
GinaStavropoulou Apr 1, 2025
84f79de
for every branch
GinaStavropoulou Apr 1, 2025
befa7ae
format tests
GinaStavropoulou Apr 1, 2025
8f33a25
fix cj validation
GinaStavropoulou Apr 1, 2025
35accb0
some more formatting
GinaStavropoulou Apr 1, 2025
d5b5520
formatting action fix
GinaStavropoulou Apr 1, 2025
7cf7c51
typo
GinaStavropoulou Apr 1, 2025
ede5e74
new tests
GinaStavropoulou May 1, 2025
529aaca
removed metadata from test data
GinaStavropoulou May 1, 2025
8a9508f
some formatting
GinaStavropoulou May 1, 2025
0676db9
added metadata_extended_remove back
GinaStavropoulou May 2, 2025
48384d2
renamed to 0.10.0
GinaStavropoulou May 2, 2025
d510aa5
deleted models
GinaStavropoulou May 2, 2025
b0d10f7
removed obsolete functions
GinaStavropoulou May 2, 2025
e75d1eb
removing unused functions
GinaStavropoulou May 2, 2025
83fa5f0
unused imports removed
GinaStavropoulou May 2, 2025
1a25d74
ut back materials_remove
GinaStavropoulou May 2, 2025
7f74899
test for subset
GinaStavropoulou May 2, 2025
dab9d99
arranged test
GinaStavropoulou May 2, 2025
a311637
renamed test
GinaStavropoulou May 2, 2025
042dd2b
test for wrong extension
GinaStavropoulou May 2, 2025
7f74da0
fixed tests
GinaStavropoulou May 2, 2025
57f7d8f
file suffixes
GinaStavropoulou May 6, 2025
3cf60d9
test lod_filter
GinaStavropoulou May 6, 2025
4d9264d
test_textures_locate
GinaStavropoulou May 6, 2025
02620af
textures_locate test
GinaStavropoulou May 6, 2025
f16912a
a few more cli tests
GinaStavropoulou May 6, 2025
fa0546c
remove -h option
GinaStavropoulou May 6, 2025
d4a3395
fixed textures_update test
GinaStavropoulou May 6, 2025
e33e434
text fix
GinaStavropoulou May 6, 2025
4deb07e
removed text assetion
GinaStavropoulou May 6, 2025
22a7370
removed text assettion
GinaStavropoulou May 6, 2025
4b1031e
more texture and subset tests
GinaStavropoulou May 6, 2025
3b7f7db
test for off files
GinaStavropoulou May 6, 2025
3a104c8
Merge branch 'develop' of https://github.com/cityjson/cjio into v0.9.1
GinaStavropoulou May 6, 2025
b30331c
test_save_with_texture_cli
GinaStavropoulou May 6, 2025
f9acc37
replaces sample texture
GinaStavropoulou May 8, 2025
c75ab1d
fixed textures
GinaStavropoulou May 8, 2025
88d5317
simple poly test
GinaStavropoulou May 8, 2025
d8794ca
typo
GinaStavropoulou May 8, 2025
e1c2b54
poly conversion fix
GinaStavropoulou May 8, 2025
c34b653
changelog
GinaStavropoulou May 8, 2025
2df444e
README
GinaStavropoulou May 8, 2025
0e5cac5
fixed linter
GinaStavropoulou May 8, 2025
cc8b0df
date
GinaStavropoulou May 8, 2025
f2b597a
reject faces with <3 points
GinaStavropoulou May 8, 2025
ed57555
format
GinaStavropoulou May 8, 2025
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
23 changes: 23 additions & 0 deletions .github/workflows/lint-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Lint and Format

on:
pull_request:
branches: [ "develop", "master" ]

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
run: pip install ruff pytest
- name: Lint
run: ruff check tests ; ruff check cjio
- name: Format
run: ruff format tests --check ; ruff format cjio --check
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [0.10.0] – 2025-05-08
### Changed
- The command `medata_remove` was renamed to `metadata_extended_remove` and can be used to remove the deprecated extended metadata from older files
- Fixed the `texture_update` and `texture_locate` commands and also the `save` command with the `--texture` flag.
- Fixed the conversion from .poly input when the file has comments or 1- index.

### Added
- More tests and coverage

### Removed:
- Support for extended metadata: specifically the commands `metadata_create` and `metadata_update`
- All API functionality is derecated: cjio.models and some functions from cjio.cityjson have been removed. Also all related tests.


## [0.9.0] – 2023-09-28
Expand Down
44 changes: 23 additions & 21 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,29 @@ possibilities:
cjio --help

Commands:
attribute_remove Remove an attribute.
attribute_rename Rename an attribute.
crs_assign Assign a (new) CRS (an EPSG).
crs_reproject Reproject to a new EPSG.
crs_translate Translate the coordinates.
export Export to another format.
info Output information about the dataset.
lod_filter Filter only one LoD for a dataset.
materials_remove Remove all materials.
merge Merge the current CityJSON with other ones.
metadata_get Shows the metadata.
print print the (pretty formatted) JSON to the console.
save Save to a CityJSON file.
subset Create a subset, City Objects can be selected by: (1)...
textures_locate Output the location of the texture files.
textures_remove Remove all textures.
textures_update Update the location of the texture files.
triangulate Triangulate every surface.
upgrade Upgrade the CityJSON to the latest version.
validate Validate the CityJSON: (1) against its schemas (2)...
vertices_clean Remove duplicate vertices + orphan vertices
attribute_remove Remove an attribute.
attribute_rename Rename an attribute.
crs_assign Assign a (new) CRS (an EPSG).
crs_reproject Reproject to a new EPSG.
crs_translate Translate the coordinates.
export Export to another format.
info Output information about the dataset.
lod_filter Filter only one LoD for a dataset.
materials_remove Remove all materials.
merge Merge the current CityJSON with other ones.
metadata_extended_remove Remove the deprecated +metadata-extended properties.
metadata_get Show the metadata of this dataset.
print Print the (pretty formatted) JSON to the to the console.
save Save to a CityJSON file.
subset Create a subset, City Objects can be selected by: (1) IDs of City Objects; (2) bbox (3) City Object type(s) (4) randomly.
textures_locate Print the location of the texture files.
textures_remove Remove all textures.
textures_update Update the location of the texture files.
triangulate Triangulate every surface.
upgrade Upgrade the CityJSON to the latest version.
validate Validate the CityJSON: (1) against its schemas (2) against the (potential) Extensions schemas (3) extra validations
vertices_clean Remove duplicate vertices + orphan vertices


Or see the command-specific help by calling ``--help`` after a command:

Expand Down
2 changes: 1 addition & 1 deletion cjio/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.9.0"
__version__ = "0.10.0"
import importlib


Expand Down
Loading