From 7766e2533ce487dc3cef158bc02ae56ccebf6b72 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 24 Jun 2020 20:15:59 -0400 Subject: [PATCH] move OGR environment variable to plugin (#462) --- pygeoapi/plugin.py | 5 ----- pygeoapi/provider/ogr.py | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pygeoapi/plugin.py b/pygeoapi/plugin.py index fe1ce9e..999eca3 100644 --- a/pygeoapi/plugin.py +++ b/pygeoapi/plugin.py @@ -30,7 +30,6 @@ import importlib import logging -import os LOGGER = logging.getLogger(__name__) @@ -68,10 +67,6 @@ def load_plugin(plugin_type, plugin_def): name = plugin_def['name'] - if name == "OGR": - os.environ["OGR_GEOJSON_MAX_OBJ_SIZE"] = os.environ.get( - "OGR_GEOJSON_MAX_OBJ_SIZE", "20MB") - if plugin_type not in PLUGINS.keys(): msg = 'Plugin type {} not found'.format(plugin_type) LOGGER.exception(msg) diff --git a/pygeoapi/provider/ogr.py b/pygeoapi/provider/ogr.py index e591e2e..5407bcf 100644 --- a/pygeoapi/provider/ogr.py +++ b/pygeoapi/provider/ogr.py @@ -29,9 +29,10 @@ # # ================================================================= +import functools import importlib import logging -import functools +import os from typing import Any from osgeo import gdal as osgeo_gdal @@ -67,6 +68,8 @@ class OGRProvider(BaseProvider): 'WFS': 'pygeoapi.provider.ogr.WFSHelper', '*': 'pygeoapi.provider.ogr.CommonSourceHelper' } + os.environ['OGR_GEOJSON_MAX_OBJ_SIZE'] = os.environ.get( + 'OGR_GEOJSON_MAX_OBJ_SIZE', '20MB') # Setting for traditional CRS axis order. OAMS_TRADITIONAL_GIS_ORDER = osgeo_osr.OAMS_TRADITIONAL_GIS_ORDER