Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[run]
include =
include =
*/src/*
omit =
*/__init__.py
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref_name }}
release_name: Release ${{ github.ref_name }}
tag_name: ${{ github.ref_name }}
release_name: Release ${{ github.ref_name }}
body_path: CHANGELOG.md
draft: false
prerelease: false
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
asset_content_type: application/zip

- name: Add tarball package to release
id: upload-release-targz
id: upload-release-targz
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -159,7 +159,7 @@ jobs:
commit_documentation:
name: Add documentation and unit tests results into gh-pages branch
needs: build_and_test
if: "always()&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status=='success')"
if: "always()&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status=='success')"
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
delete_version:
name: Remove release and tag if error occured
needs: build_and_test
if: "always()&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status!='success')"
if: "always()&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status!='success')"
runs-on: ubuntu-latest

steps:
Expand All @@ -219,4 +219,3 @@ jobs:
delete_release: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ These expressions may be used both in singular and plural form.
The purpose of the Agreement is the grant by the Licensor to the
Licensee of a non-exclusive, transferable and worldwide license for the
Software as set forth in Article 5 hereinafter for the whole term of the
protection granted by the rights over said Software.
protection granted by the rights over said Software.


Article 3 - ACCEPTANCE
Expand Down Expand Up @@ -268,7 +268,7 @@ When the Licensee creates Derivative Software, this Derivative Software
may be distributed under a license agreement other than this Agreement,
subject to compliance with the requirement to include a notice
concerning the rights over the Software as defined in Article 6.4.
In the event the creation of the Derivative Software required modification
In the event the creation of the Derivative Software required modification
of the Source Code, the Licensee undertakes that:

1. the resulting Modified Software will be governed by this Agreement,
Expand Down
2 changes: 1 addition & 1 deletion README.pypi.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ except Exception as exc:
print(exc)
```

More examples in the developer documentation
More examples in the developer documentation
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from setuptools import setup

setup()
setup()
19 changes: 9 additions & 10 deletions src/rok4/Layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def from_descriptor(cls, descriptor: str) -> 'Layer':

Returns:
Layer: a Layer instance
"""
"""
try:
data = json.loads(get_data_str(descriptor))

Expand All @@ -72,7 +72,7 @@ def from_descriptor(cls, descriptor: str) -> 'Layer':
layer.__keywords.append(k)


if layer.type == PyramidType.RASTER:
if layer.type == PyramidType.RASTER:
if "resampling" in data:
layer.__resampling = data["resampling"]

Expand Down Expand Up @@ -145,7 +145,7 @@ def from_parameters(cls, pyramids: List[Dict[str, str]], name: str, **kwargs) ->
else:
layer.__abstract = name

if layer.type == PyramidType.RASTER:
if layer.type == PyramidType.RASTER:
if "styles" in kwargs and kwargs["styles"] is not None and len(kwargs["styles"]) > 0:
layer.__styles = kwargs["styles"]
else:
Expand All @@ -161,7 +161,7 @@ def __init__(self) -> None:
self.__format = None
self.__tms = None
self.__best_level = None
self.__levels = dict()
self.__levels = {}
self.__keywords = []
self.__pyramids = []

Expand All @@ -176,7 +176,7 @@ def __load_pyramids(self, pyramids: List[Dict[str, str]]) -> None:
Exception: Pyramids' do not all own the same TMS
Exception: Pyramids' do not all own the same channels number
Exception: Overlapping in usage pyramids' levels
"""
"""

## Toutes les pyramides doivent avoir les même caractéristiques
channels = None
Expand Down Expand Up @@ -227,12 +227,12 @@ def __str__(self) -> str:
return f"{self.type.name} layer '{self.__name}'"

@property
def serializable(self) -> Dict:
def serializable(self) -> Dict:
"""Get the dict version of the layer object, descriptor compliant

Returns:
Dict: descriptor structured object description
"""
"""
serialization = {
"title": self.__title,
"abstract": self.__abstract,
Expand Down Expand Up @@ -273,7 +273,7 @@ def serializable(self) -> Dict:

if self.__tms.srs.upper() not in serialization["wms"]["crs"]:
serialization["wms"]["crs"].append(self.__tms.srs.upper())

serialization["styles"] = self.__styles
serialization["resampling"] = self.__resampling

Expand All @@ -284,7 +284,7 @@ def write_descriptor(self, directory: str = None) -> None:

Args:
directory (str, optional): Directory (file or object) where to print the layer's descriptor, called <layer's name>.json. Defaults to None, JSON is printed to standard output.
"""
"""
content = json.dumps(self.serializable)

if directory is None:
Expand All @@ -306,4 +306,3 @@ def bbox(self) -> Tuple[float, float, float, float]:
@property
def geobbox(self) -> Tuple[float, float, float, float]:
return self.__geobbox

Loading