From 8f4971cbf9f368ea4b0125040d7f79472ce8795b Mon Sep 17 00:00:00 2001
From: Nat Wilson <njwilson23@gmail.com>
Date: Fri, 16 Sep 2016 11:47:24 -0700
Subject: [PATCH] use underscore convention for driver code

the raster subpackage has used an underscore to denote file format
drivers

this applies that convention to the vector subpackage for more
consistency
---
 karta/vector/__init__.py                 | 9 +++++----
 karta/vector/{geojson.py => _geojson.py} | 0
 karta/vector/{gpx.py => _gpx.py}         | 0
 karta/vector/{shp.py => _shp.py}         | 0
 karta/vector/geometry.py                 | 4 ++--
 karta/vector/read.py                     | 6 +++---
 tests/geojson_tests.py                   | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename karta/vector/{geojson.py => _geojson.py} (100%)
 rename karta/vector/{gpx.py => _gpx.py} (100%)
 rename karta/vector/{shp.py => _shp.py} (100%)

diff --git a/karta/vector/__init__.py b/karta/vector/__init__.py
index cbf257e..9345d35 100644
--- a/karta/vector/__init__.py
+++ b/karta/vector/__init__.py
@@ -9,11 +9,12 @@
 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,
@@ -21,8 +22,8 @@
                        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",
diff --git a/karta/vector/geojson.py b/karta/vector/_geojson.py
similarity index 100%
rename from karta/vector/geojson.py
rename to karta/vector/_geojson.py
diff --git a/karta/vector/gpx.py b/karta/vector/_gpx.py
similarity index 100%
rename from karta/vector/gpx.py
rename to karta/vector/_gpx.py
diff --git a/karta/vector/shp.py b/karta/vector/_shp.py
similarity index 100%
rename from karta/vector/shp.py
rename to karta/vector/_shp.py
diff --git a/karta/vector/geometry.py b/karta/vector/geometry.py
index 306defd..02f4c80 100644
--- a/karta/vector/geometry.py
+++ b/karta/vector/geometry.py
@@ -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
diff --git a/karta/vector/read.py b/karta/vector/read.py
index b27b863..e410cc9 100644
--- a/karta/vector/read.py
+++ b/karta/vector/read.py
@@ -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
 
diff --git a/tests/geojson_tests.py b/tests/geojson_tests.py
index 13716d7..32a56a7 100644
--- a/tests/geojson_tests.py
+++ b/tests/geojson_tests.py
@@ -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