simple features

Author: bosborn

mapcache/build.gradle

@@ -51,7 +51,7 @@ task androidAppVersion {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:26.0.2'
-    compile "mil.nga.geopackage.map:geopackage-android-map:2.0.2" // comment out to build locally
+    compile "mil.nga.geopackage.map:geopackage-android-map:3.0.0" // comment out to build locally
     //compile project(':geopackage-map') // uncomment me to build locally
     compile 'com.android.support:multidex:1.0.2'
     androidTestCompile 'com.android.support:multidex:1.0.2'

mapcache/src/main/java/mil/nga/mapcache/GeoPackageManagerFragment.java

@@ -110,7 +110,8 @@
 import mil.nga.mapcache.io.MapCacheFileUtils;
 import mil.nga.mapcache.load.ILoadTilesTask;
 import mil.nga.mapcache.load.LoadTilesTask;
-import mil.nga.wkb.geom.GeometryType;
+import mil.nga.sf.GeometryType;
+import mil.nga.sf.wkb.GeometryCodes;
 
 /**
  * GeoPackage Manager Fragment
@@ -1692,8 +1693,8 @@ private void editTableOption(final GeoPackageTable table) {
                             .queryForTableName(table.getName());
                     tempContents = tempGeometryColumns.getContents();
 
-                    tempGeometryTypeSpinner.setSelection(tempGeometryColumns
-                            .getGeometryType().getCode());
+                    tempGeometryTypeSpinner.setSelection(GeometryCodes.getCode(tempGeometryColumns
+                            .getGeometryType()));
                     tempZInput.setText(String.valueOf(tempGeometryColumns.getZ()));
                     tempMInput.setText(String.valueOf(tempGeometryColumns.getM()));
                     break;

mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java

@@ -151,12 +151,12 @@
 import mil.nga.mapcache.indexer.IIndexerTask;
 import mil.nga.mapcache.load.ILoadTilesTask;
 import mil.nga.mapcache.load.LoadTilesTask;
-import mil.nga.wkb.geom.Geometry;
-import mil.nga.wkb.geom.GeometryEnvelope;
-import mil.nga.wkb.geom.GeometryType;
-import mil.nga.wkb.geom.LineString;
-import mil.nga.wkb.util.GeometryEnvelopeBuilder;
-import mil.nga.wkb.util.GeometryPrinter;
+import mil.nga.sf.Geometry;
+import mil.nga.sf.GeometryEnvelope;
+import mil.nga.sf.GeometryType;
+import mil.nga.sf.LineString;
+import mil.nga.sf.util.GeometryEnvelopeBuilder;
+import mil.nga.sf.util.GeometryPrinter;
 
 /**
  * GeoPackage Map Fragment
@@ -1019,7 +1019,7 @@ private void saveEditFeatures() {
                 case POINT:
 
                     for (Marker pointMarker : editPoints.values()) {
-                        mil.nga.wkb.geom.Point point = converter
+                        mil.nga.sf.Point point = converter
                                 .toPoint(pointMarker.getPosition());
                         FeatureRow newPoint = featureDao.newRow();
                         GeoPackageGeometryData pointGeomData = new GeoPackageGeometryData(
@@ -1056,7 +1056,7 @@ private void saveEditFeatures() {
                 case POLYGON:
                 case POLYGON_HOLE:
 
-                    mil.nga.wkb.geom.Polygon polygon = converter
+                    mil.nga.sf.Polygon polygon = converter
                             .toPolygon(editPolygon);
                     FeatureRow newPolygon = featureDao.newRow();
                     GeoPackageGeometryData polygonGeomData = new GeoPackageGeometryData(
@@ -2497,7 +2497,7 @@ private void processFeatureRow(MapFeaturesUpdateTask task, String database, Feat
                         }
                         if (envelope != null) {
                             if (geometry.getGeometryType() == GeometryType.POINT) {
-                                mil.nga.wkb.geom.Point point = (mil.nga.wkb.geom.Point) geometry;
+                                mil.nga.sf.Point point = (mil.nga.sf.Point) geometry;
                                 passesFilter = TileBoundingBoxUtils.isPointInBoundingBox(point, boundingBox, maxLongitude);
                             } else {
                                 BoundingBox geometryBoundingBox = new BoundingBox(envelope);

mapcache/src/main/java/mil/nga/mapcache/data/GeoPackageFeatureOverlayTable.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import mil.nga.wkb.geom.GeometryType;
+import mil.nga.sf.GeometryType;
 
 /**
  * GeoPackage Feature Overlay table information

mapcache/src/main/java/mil/nga/mapcache/data/GeoPackageFeatureTable.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import mil.nga.wkb.geom.GeometryType;
+import mil.nga.sf.GeometryType;
 
 /**
  * GeoPackage Feature table information