Skip to content

Commit

Permalink
use underscore convention for driver code
Browse files Browse the repository at this point in the history
the raster subpackage has used an underscore to denote file format
drivers

this applies that convention to the vector subpackage for more
consistency
  • Loading branch information
njwilson23 committed Sep 16, 2016
1 parent e537c3d commit 8f4971c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
9 changes: 5 additions & 4 deletions karta/vector/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@
numbers.Integral.register(numpy.integer)

from . import geometry
from . import table
from . import geojson
from . import gpx
from . import quadtree
from . import rtree
from . import table
from . import _geojson as geojson
from . import _gpx as gpx
from . import _shp as shp
#from . import redblack

from .geometry import (Geometry, Point, Line, Polygon,
Multipoint, Multiline, Multipolygon,
multipart_from_singleparts)
from .read import (from_shape, read_geojson, read_shapefile,
read_gpx_waypts, read_gpx_tracks)
from .shp import write_shapefile
from .table import Table
from ._shp import write_shapefile

__all__ = ["geometry", "geojson", "gpx",
"Point", "Line", "Polygon",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions karta/vector/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import numbers
import numpy as np
from .decorators import cache_decorator
from .geojson import GeoJSONOutMixin
from .shp import ShapefileOutMixin
from ._geojson import GeoJSONOutMixin
from ._shp import ShapefileOutMixin
from .table import Table, Indexer
from .utilities import _reproject, _reproject_nested, _flatten, _as_nested_lists
from .coordstring import CoordString
Expand Down
6 changes: 3 additions & 3 deletions karta/vector/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
from numbers import Number
from osgeo import ogr
from . import geometry
from . import geojson
from . import shp
from . import gpx
from . import _geojson as geojson
from . import _shp as shp
from . import _gpx as gpx
from ..crs import GeographicalCRS, ProjectedCRS, LonLatWGS84
from .. import errors

Expand Down
4 changes: 2 additions & 2 deletions tests/geojson_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from test_helper import TESTDATA

import karta.vector as vector
import karta.vector.geojson as geojson
from karta.vector.geojson import GeoJSONReader, GeoJSONNamedCRS
import karta.vector._geojson as geojson
from karta.vector._geojson import GeoJSONReader, GeoJSONNamedCRS
from karta.vector.geometry import Point, Line, Polygon, Multipoint, Multiline, Multipolygon
from karta.crs import LonLatWGS84, WebMercator, Cartesian

Expand Down

0 comments on commit 8f4971c

Please sign in to comment.