Skip to content

Commit

Permalink
fix: refresh key (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
rendrom committed May 27, 2022
1 parent da0b407 commit c32e76d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 24 deletions.
17 changes: 9 additions & 8 deletions rosreestr2coord/merge_tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,14 +458,14 @@ def get_image(self, x, y):
# not in cache yet
pass

if not data:
data = self._load_image_data(meta_url, cache_path)
if data:
self._image_extent_list.append(data.get("extent"))
if data.get("imageData"):
return data.get("imageData")
else:
logger.warning("Can't get image meta data from: %s" % meta_url)
if not data:
data = self._load_image_data(meta_url, cache_path)
if data:
self._image_extent_list.append(data.get("extent"))
if data.get("imageData"):
return data.get("imageData")
else:
logger.warning("Can't get image meta data from: %s" % meta_url)

elif not self.extent:
logger.warning("Can't get image without extent")
Expand All @@ -484,6 +484,7 @@ def _load_image_data(self, url, cache_path):
if data.get("imageData"):
with open(cache_path, "w") as outfile:
json.dump(data, outfile)
return data

def _merge_tiles(self):
dx, dy = self._get_delta()
Expand Down
29 changes: 13 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,42 @@
from rosreestr2coord.version import VERSION

setup(
name='rosreestr2coord',
name="rosreestr2coord",
version=VERSION,
packages=find_packages(exclude=['tests*']),
packages=find_packages(exclude=["tests*"]),
zip_safe=False,
include_package_data=True,
license='MIT',
license="MIT",
classifiers=[
# How mature is this project? Common values are
# 3 - Alpha
# 4 - Beta
# 5 - Production/Stable
'Development Status :: 4 - Beta',

"Development Status :: 5 - Production/Stable",
# Indicate who your project is intended for
# 'Intended Audience :: Developers',
# 'Topic :: Software Development :: Build Tools',

# Pick your license as you wish (should match "license" above)
'License :: OSI Approved :: MIT License',

"License :: OSI Approved :: MIT License",
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
# 'Programming Language :: Python :: 2',
# 'Programming Language :: Python :: 2.6',
# 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3",
# 'Programming Language :: Python :: 3.3',
# 'Programming Language :: Python :: 3.4',
# 'Programming Language :: Python :: 3.5',
],
description='Get geometry from rosreestr',
long_description='Get area coordinates by its cadastral number',
description="Get geometry from rosreestr",
long_description="Get area coordinates by its cadastral number",
install_requires=["numpy", "Pillow>=8.2", "opencv-python"],
url='https://github.com/rendrom/rosreestr2coord',
author='Artemiy Doroshkov',
author_email='[email protected]',
url="https://github.com/rendrom/rosreestr2coord",
author="Artemiy Doroshkov",
author_email="[email protected]",
entry_points={
'console_scripts': [
'rosreestr2coord=rosreestr2coord.console:console',
"console_scripts": [
"rosreestr2coord=rosreestr2coord.console:console",
],
},
)
Expand Down

0 comments on commit c32e76d

Please sign in to comment.