From 14065b7d16b14ac6aeb45ddf37972553a45775de Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 15 Sep 2017 16:13:28 -0400 Subject: [PATCH] matrix, optimization, and turf modules added --- .gitignore | 15 +- .idea/gradle.xml | 4 + .idea/modules.xml | 4 + ...rectionsCriteria$DestinationCriteria.class | Bin 443 -> 0 bytes .../DirectionsCriteria$SourceCriteria.class | Bin 433 -> 0 bytes .../directions/v5/DirectionsCriteria.class | Bin 1817 -> 1470 bytes .../directions/v5/DirectionsCriteria.java | 58 - services-geocoding/build.gradle | 29 + .../geocoding/v5/GeocodingCriteria.java | 132 + .../mapbox/geocoding/v5/GeocodingService.java | 84 + .../mapbox/geocoding/v5/MapboxGeocoding.java | 624 + .../mapbox/geocoding/v5/MapboxService.java | 111 + .../geocoding/v5/models/CarmenContext.java | 177 + .../geocoding/v5/models/CarmenFeature.java | 446 + .../v5/models/GeocodingResponse.java | 210 + .../geocoding/v5/models/package-info.java | 5 + .../com/mapbox/geocoding/v5/package-info.java | 4 + .../com/mapbox/geocoding/v5/BaseTest.java | 49 + .../geocoding/v5/MapboxGeocodingTest.java | 257 + .../v5/models/CarmenContextTest.java | 165 + .../v5/models/CarmenFeatureTest.java | 322 + .../v5/models/GeocodingResponseTest.java | 89 + .../test/resources/bbox_geocoding_result.json | 1 + .../test/resources/geocoder_tofromjson.json | 21 + .../src/test/resources/geocoding.json | 1 + .../src/test/resources/geocoding_batch.json | 263 + .../geocoding_country_not_supported.json | 1 + .../src/test/resources/geocoding_reverse.json | 1 + .../resources/language_geocoding_result.json | 1 + .../main/java/com/mapbox/geojson/Feature.java | 2 +- services-matrix/.gitignore | 1 + services-matrix/build.gradle | 30 + .../com/mapbox/matrix/v1/MapboxMatrix.java | 340 + .../com/mapbox/matrix/v1/MapboxService.java | 111 + .../com/mapbox/matrix/v1/MatrixService.java | 47 + .../matrix/v1/models/MatrixResponse.java | 183 + .../mapbox/matrix/v1/models/package-info.java | 4 + .../com/mapbox/matrix/v1/package-info.java | 6 + .../java/com/mapbox/matrix/v1/BaseTest.java | 49 + .../mapbox/matrix/v1/MapboxMatrixTest.java | 160 + .../test/resources/directions_matrix_2x3.json | 54 + .../test/resources/directions_matrix_3x3.json | 66 + services-optimization/build.gradle | 30 + .../optimization/v1/MapboxOptimization.java | 582 + .../mapbox/optimization/v1/MapboxService.java | 111 + .../optimization/v1/OptimizationCriteria.java | 232 + .../optimization/v1/OptimizationService.java | 67 + .../v1/models/OptimizationResponse.java | 159 + .../v1/models/OptimizationWaypoint.java | 154 + .../com/mapbox/optimization/v1/BaseTest.java | 49 + .../v1/MapboxOptimizationTest.java | 88 + .../v1/models/OptimizationResponseTest.java | 98 + .../v1/models/OptimizationWaypointTest.java | 133 + .../src/test/resources/optimization.json | 64 + .../optimized_trip_distributions.json | 80 + .../test/resources/optimized_trip_steps.json | 9764 ++++++++++ services-turf/.gitignore | 1 + services-turf/build.gradle | 21 + .../java/com/mapbox/turf/TurfConstants.java | 168 + .../java/com/mapbox/turf/TurfException.java | 27 + .../java/com/mapbox/turf/TurfHelpers.java | 150 + .../java/com/mapbox/turf/TurfInvariant.java | 108 + .../main/java/com/mapbox/turf/TurfJoins.java | 115 + .../java/com/mapbox/turf/TurfMeasurement.java | 358 + .../main/java/com/mapbox/turf/TurfMeta.java | 131 + .../main/java/com/mapbox/turf/TurfMisc.java | 208 + .../turf/models/LineIntersectsResult.java | 106 + .../com/mapbox/turf/models/package-info.java | 4 + .../java/com/mapbox/turf/package-info.java | 6 + .../test/java/com/mapbox/turf/BaseTest.java | 49 + .../java/com/mapbox/turf/TurfHelpersTest.java | 65 + .../com/mapbox/turf/TurfInvariantTest.java | 118 + .../java/com/mapbox/turf/TurfJoinsTest.java | 154 + .../com/mapbox/turf/TurfMeasurementTest.java | 313 + .../java/com/mapbox/turf/TurfMetaTest.java | 79 + .../java/com/mapbox/turf/TurfMiscTest.java | 322 + .../test/resources/turf-along/dc-line.geojson | 77 + .../turf-bbox/feature_collection.geojson | 72 + .../resources/turf-bbox/linestring.geojson | 21 + .../turf-bbox/multilinestring.geojson | 25 + .../resources/turf-bbox/multipolygon.geojson | 75 + .../test/resources/turf-bbox/point.geojson | 10 + .../test/resources/turf-bbox/polygon.geojson | 26 + .../turf-inside/multipoly-with-hole.geojson | 89 + .../turf-inside/poly-with-hole.geojson | 22 + .../featurecollection.geojson | 42 + .../multilinestring.geojson | 20 + .../turf-line-distance/polygon.geojson | 17 + .../turf-line-distance/route1.geojson | 2 + .../turf-line-distance/route2.geojson | 15066 ++++++++++++++++ .../resources/turf-line-slice/line1.geojson | 21 + .../resources/turf-line-slice/route1.geojson | 2 + .../resources/turf-line-slice/route2.geojson | 2 + .../turf-line-slice/vertical.geojson | 17 + settings.gradle | 2 +- 95 files changed, 33785 insertions(+), 64 deletions(-) delete mode 100644 services-directions/build/classes/java/main/com/mapbox/directions/v5/DirectionsCriteria$DestinationCriteria.class delete mode 100644 services-directions/build/classes/java/main/com/mapbox/directions/v5/DirectionsCriteria$SourceCriteria.class create mode 100644 services-geocoding/build.gradle create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/GeocodingCriteria.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/GeocodingService.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/MapboxGeocoding.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/MapboxService.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/models/CarmenContext.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/models/CarmenFeature.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/models/GeocodingResponse.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/models/package-info.java create mode 100644 services-geocoding/src/main/java/com/mapbox/geocoding/v5/package-info.java create mode 100644 services-geocoding/src/test/java/com/mapbox/geocoding/v5/BaseTest.java create mode 100644 services-geocoding/src/test/java/com/mapbox/geocoding/v5/MapboxGeocodingTest.java create mode 100644 services-geocoding/src/test/java/com/mapbox/geocoding/v5/models/CarmenContextTest.java create mode 100644 services-geocoding/src/test/java/com/mapbox/geocoding/v5/models/CarmenFeatureTest.java create mode 100644 services-geocoding/src/test/java/com/mapbox/geocoding/v5/models/GeocodingResponseTest.java create mode 100644 services-geocoding/src/test/resources/bbox_geocoding_result.json create mode 100644 services-geocoding/src/test/resources/geocoder_tofromjson.json create mode 100644 services-geocoding/src/test/resources/geocoding.json create mode 100644 services-geocoding/src/test/resources/geocoding_batch.json create mode 100644 services-geocoding/src/test/resources/geocoding_country_not_supported.json create mode 100644 services-geocoding/src/test/resources/geocoding_reverse.json create mode 100644 services-geocoding/src/test/resources/language_geocoding_result.json create mode 100644 services-matrix/.gitignore create mode 100644 services-matrix/build.gradle create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/MapboxMatrix.java create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/MapboxService.java create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/MatrixService.java create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/models/MatrixResponse.java create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/models/package-info.java create mode 100644 services-matrix/src/main/java/com/mapbox/matrix/v1/package-info.java create mode 100644 services-matrix/src/test/java/com/mapbox/matrix/v1/BaseTest.java create mode 100644 services-matrix/src/test/java/com/mapbox/matrix/v1/MapboxMatrixTest.java create mode 100755 services-matrix/src/test/resources/directions_matrix_2x3.json create mode 100755 services-matrix/src/test/resources/directions_matrix_3x3.json create mode 100644 services-optimization/build.gradle create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/MapboxOptimization.java create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/MapboxService.java create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/OptimizationCriteria.java create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/OptimizationService.java create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/models/OptimizationResponse.java create mode 100644 services-optimization/src/main/java/com/mapbox/optimization/v1/models/OptimizationWaypoint.java create mode 100644 services-optimization/src/test/java/com/mapbox/optimization/v1/BaseTest.java create mode 100644 services-optimization/src/test/java/com/mapbox/optimization/v1/MapboxOptimizationTest.java create mode 100644 services-optimization/src/test/java/com/mapbox/optimization/v1/models/OptimizationResponseTest.java create mode 100644 services-optimization/src/test/java/com/mapbox/optimization/v1/models/OptimizationWaypointTest.java create mode 100644 services-optimization/src/test/resources/optimization.json create mode 100644 services-optimization/src/test/resources/optimized_trip_distributions.json create mode 100644 services-optimization/src/test/resources/optimized_trip_steps.json create mode 100644 services-turf/.gitignore create mode 100644 services-turf/build.gradle create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfConstants.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfException.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfHelpers.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfInvariant.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfJoins.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfMeasurement.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfMeta.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/TurfMisc.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/models/LineIntersectsResult.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/models/package-info.java create mode 100644 services-turf/src/main/java/com/mapbox/turf/package-info.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/BaseTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfHelpersTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfInvariantTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfJoinsTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfMeasurementTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfMetaTest.java create mode 100644 services-turf/src/test/java/com/mapbox/turf/TurfMiscTest.java create mode 100644 services-turf/src/test/resources/turf-along/dc-line.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/feature_collection.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/linestring.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/multilinestring.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/multipolygon.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/point.geojson create mode 100644 services-turf/src/test/resources/turf-bbox/polygon.geojson create mode 100644 services-turf/src/test/resources/turf-inside/multipoly-with-hole.geojson create mode 100644 services-turf/src/test/resources/turf-inside/poly-with-hole.geojson create mode 100644 services-turf/src/test/resources/turf-line-distance/featurecollection.geojson create mode 100644 services-turf/src/test/resources/turf-line-distance/multilinestring.geojson create mode 100644 services-turf/src/test/resources/turf-line-distance/polygon.geojson create mode 100644 services-turf/src/test/resources/turf-line-distance/route1.geojson create mode 100644 services-turf/src/test/resources/turf-line-distance/route2.geojson create mode 100644 services-turf/src/test/resources/turf-line-slice/line1.geojson create mode 100644 services-turf/src/test/resources/turf-line-slice/route1.geojson create mode 100644 services-turf/src/test/resources/turf-line-slice/route2.geojson create mode 100644 services-turf/src/test/resources/turf-line-slice/vertical.geojson diff --git a/.gitignore b/.gitignore index 39fb081a4..6e8c50e14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,16 @@ -*.iml .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store /build +build/ /captures .externalNativeBuild + +# Idea +.idea +*.iml +classes + +obj + +#MacOS +.DS_Store diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 92fb531b4..aa85046fe 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,7 +11,11 @@