Fix export strategy (#177)

* fix warnings

* fix export strategy

* remove unused imports

* review changes

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
  <br>
- <img src="https://github.com/dartclub/turf_dart/blob/update-readme/.github/turf-logo.png" alt="TurfDart Logo" width="250">
+ <img src="https://github.com/dartclub/turf_dart/blob/main/.github/turf-logo.png" alt="TurfDart Logo" width="250">
 </h1>
 
 <h4 align="center">A <a href="https://github.com/Turfjs/turf">TurfJs</a>-like geospatial analysis library written in pure Dart.

benchmark/explode_benchmark.dart

@@ -1,5 +1,4 @@
 import 'package:benchmark/benchmark.dart';
-import 'package:turf/src/explode.dart';
 import 'package:turf/turf.dart';
 
 var poly = Polygon(coordinates: [

benchmark/line_segment_benchmark.dart

@@ -1,6 +1,5 @@
 import 'package:benchmark/benchmark.dart';
 import 'package:turf/line_segment.dart';
-import 'package:turf/helpers.dart';
 
 void main() {
  LineString lineString = LineString(

lib/along.dart

@@ -1,3 +1,4 @@
 library turf_along;
 
+export 'package:geotypes/geotypes.dart';
 export "src/along.dart";

lib/area.dart

@@ -1,3 +1,4 @@
 library turf_area;
 
+export 'package:geotypes/geotypes.dart';
 export "src/area.dart";

lib/bbox.dart

@@ -1,3 +1,4 @@
 library turf_bbox;
 
+export 'package:geotypes/geotypes.dart';
 export "src/bbox.dart";

lib/bbox_polygon.dart

@@ -1,3 +1,4 @@
 library turf_bbox_polygon.dart;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/bbox_polygon.dart';

lib/bearing.dart

@@ -1,4 +1,5 @@
 library turf_bearing;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/bearing.dart';
 export 'src/rhumb_bearing.dart';

lib/boolean.dart

@@ -1,5 +1,6 @@
 library turf_boolean;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/booleans/boolean_clockwise.dart';
 export 'src/booleans/boolean_concave.dart';
 export 'src/booleans/boolean_contains.dart';

lib/center.dart

@@ -1,3 +1,4 @@
 library turf_center;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/center.dart';

lib/centroid.dart

@@ -1,3 +1,4 @@
 library turf_centroid;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/centroid.dart';

lib/clean_coords.dart

@@ -1,3 +1,4 @@
-library clean_coords.dart;
+library turf_clean_coords;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/clean_coords.dart';

lib/clusters.dart

@@ -1,3 +1,4 @@
 library turf_clusters;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/meta/cluster.dart';

lib/destination.dart

@@ -1,4 +1,5 @@
 library turf_destination;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/destination.dart';
 export 'src/rhumb_destination.dart';

lib/distance.dart

@@ -1,4 +1,5 @@
 library turf_distance;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/distance.dart';
 export 'src/rhumb_distance.dart';

lib/explode.dart

@@ -1,3 +1,4 @@
-library explode;
+library turf_explode;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/explode.dart';

lib/extensions.dart

@@ -1,3 +1,4 @@
 library turf_extensions;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/meta/extensions.dart';

lib/helpers.dart

@@ -1,4 +1,4 @@
 library turf_helpers;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/helpers.dart';
-export 'src/geojson.dart';

lib/invariant.dart

@@ -0,0 +1,4 @@
+library turf_invariant;
+
+export 'package:geotypes/geotypes.dart';
+export 'src/invariant.dart';

lib/length.dart

@@ -1,3 +1,4 @@
 library turf_length;
 
+export 'package:geotypes/geotypes.dart';
 export "src/length.dart";

lib/line_intersect.dart

@@ -0,0 +1,4 @@
+library turf_line_intersect;
+
+export 'package:geotypes/geotypes.dart';
+export "src/line_intersect.dart";

lib/line_overlap.dart

@@ -1,3 +1,4 @@
 library turf_line_overlap;
 
+export 'package:geotypes/geotypes.dart';
 export "src/line_overlap.dart";

lib/line_segment.dart

@@ -1,3 +1,4 @@
 library turf_line_segment;
 
+export 'package:geotypes/geotypes.dart';
 export "src/line_segment.dart";

lib/line_slice.dart

@@ -1,3 +1,4 @@
-library turf_along;
+library turf_line_slice;
 
+export 'package:geotypes/geotypes.dart';
 export "src/line_slice.dart";

lib/line_to_polygon.dart

@@ -1,3 +1,4 @@
-library turf_line_to_polygon.dart;
+library turf_line_to_polygon;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/line_to_polygon.dart';

lib/meta.dart

@@ -1,5 +1,6 @@
 library turf_meta;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/meta/cluster.dart';
 export 'src/meta/coord.dart';
 export 'src/meta/feature.dart';

lib/midpoint.dart

@@ -1,3 +1,4 @@
 library turf_midpoint;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/midpoint.dart';

lib/nearest_point.dart

@@ -1,3 +1,4 @@
 library turf_nearest_point;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/nearest_point.dart';

lib/nearest_point_on_line.dart

@@ -1,3 +1,4 @@
 library turf_nearest_point_on_line;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/nearest_point_on_line.dart';

lib/polygon_smooth.dart

@@ -1,3 +1,4 @@
 library turf_polygon_smooth;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/polygon_smooth.dart';

lib/polygon_to_line.dart

@@ -1,3 +1,4 @@
 library turf_polygon_to_line;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/polygon_to_line.dart';

lib/polyline.dart

@@ -1,3 +1,4 @@
 library turf_polyline;
 
+export 'package:geotypes/geotypes.dart';
 export 'src/polyline.dart';

lib/src/along.dart

@@ -4,8 +4,8 @@ import 'package:turf/bearing.dart';
 import 'package:turf/destination.dart';
 import 'package:turf/helpers.dart';
 import 'package:turf/length.dart';
-import 'package:turf/src/distance.dart' as measure_distance;
-import 'package:turf/src/invariant.dart';
+import 'distance.dart' as measure_distance;
+import 'invariant.dart';
 
 /// Takes a [line] and returns a [Point] at a specified [distance] along the line.
 ///
@@ -24,16 +24,16 @@ Feature<Point> along(Feature<LineString> line, num distance,
  if (distance < 0) {
  distance = max(0, length(line, unit) + distance);
  }
- num travelled = 0;
+ num traveled = 0;
  for (int i = 0; i < coords.length; i++) {
- if (distance >= travelled && i == coords.length - 1) {
+ if (distance >= traveled && i == coords.length - 1) {
  break;
  }
- if (travelled == distance) {
+ if (traveled == distance) {
  return Feature<Point>(geometry: Point(coordinates: coords[i]));
  }
- if (travelled > distance) {
- final overshot = distance - travelled;
+ if (traveled > distance) {
+ final overshot = distance - traveled;
  final direction = bearing(Point(coordinates: coords[i]),
  Point(coordinates: coords[i - 1])) -
  180;
@@ -45,7 +45,7 @@ Feature<Point> along(Feature<LineString> line, num distance,
  );
  return Feature<Point>(geometry: interpolated);
  } else {
- travelled += measure_distance.distance(Point(coordinates: coords[i]),
+ traveled += measure_distance.distance(Point(coordinates: coords[i]),
  Point(coordinates: coords[i + 1]), unit);
  }
  }

lib/src/bbox.dart

@@ -1,4 +1,3 @@
-import 'package:turf/helpers.dart';
 import 'package:turf/meta.dart';
 
 /// Calculates the bounding box for any [geoJson] object, including [FeatureCollection].

lib/src/bearing.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
-
-import 'geojson.dart';
 import 'helpers.dart';
+import 'package:geotypes/geotypes.dart';
 
 // http://en.wikipedia.org/wiki/Haversine_formula
 // http://www.movable-type.co.uk/scripts/latlong.html

lib/src/booleans/boolean_contains.dart

@@ -1,4 +1,3 @@
-import 'package:turf/src/invariant.dart';
 import 'package:turf/turf.dart';
 import 'boolean_helper.dart';
 

lib/src/booleans/boolean_crosses.dart

@@ -4,11 +4,12 @@ import '../../helpers.dart';
 import '../line_intersect.dart';
 import '../polygon_to_line.dart';
 import 'boolean_point_in_polygon.dart';
+import 'boolean_point_on_line.dart';
 
 /// [booleanCrosses] returns [true] if the intersection results in a geometry whose
 /// dimension is one less than the maximum dimension of the two source geometries
 /// and the intersection set is interior to both source geometries.
-/// [booleanCsses] returns [true] for only [MultiPoint]/[Polygon], [MultiPoint]/[LineString],
+/// [booleanCrosses] returns [true] for only [MultiPoint]/[Polygon], [MultiPoint]/[LineString],
 /// [LineString]/[LineString], [LineString]/[Polygon], and [LineString]/[MultiPolygon] comparisons.
 /// Other comparisons are not supported as they are outside the OpenGIS Simple
 /// [Feature]s spec and may give unexpected results.
@@ -31,7 +32,7 @@ bool booleanCrosses(GeoJSONObject feature1, GeoJSONObject feature2) {
  var geom1 = getGeom(feature1);
  var geom2 = getGeom(feature2);
 
- var exception = Exception("$geom2 is not supperted");
+ var exception = Exception("$geom2 is not supported");
  if (geom1 is MultiPoint) {
  if (geom2 is LineString) {
  return _doMultiPointAndLineStringCross(geom1, geom2);
@@ -78,7 +79,7 @@ bool _doMultiPointAndLineStringCross(
  if (i2 == 0 || i2 == lineString.coordinates.length - 2) {
  incEndVertices = false;
  }
- if (isPointOnLineSegment(
+ if (isPointOnLineSegmentCrossesVariant(
  lineString.coordinates[i2],
  lineString.coordinates[i2 + 1],
  multiPoint.coordinates[i],
@@ -102,7 +103,7 @@ bool _doLineStringsCross(LineString lineString1, LineString lineString2) {
  if (i2 == 0 || i2 == lineString2.coordinates.length - 2) {
  incEndVertices = false;
  }
- if (isPointOnLineSegment(
+ if (isPointOnLineSegmentCrossesVariant(
  lineString1.coordinates[i],
  lineString1.coordinates[i + 1],
  lineString2.coordinates[i2],
@@ -137,44 +138,3 @@ bool _doesMultiPointCrossPoly(MultiPoint multiPoint, Polygon polygon) {
 
  return foundExtPoint && foundIntPoint;
 }
-
-/// Only takes into account outer rings
-/// See http://stackoverflow.com/a/4833823/1979085
-/// lineSegmentStart [Position] of start of line
-/// lineSegmentEnd [Position] of end of line
-/// pt [Position] of point to check
-/// [incEnd] controls whether the [Point] is allowed to fall on the line ends
-bool isPointOnLineSegment(
- Position lineSegmentStart,
- Position lineSegmentEnd,
- Position pt,
- bool incEnd,
-) {
- var dxc = pt[0]! - lineSegmentStart[0]!;
- var dyc = pt[1]! - lineSegmentStart[1]!;
- var dxl = lineSegmentEnd[0]! - lineSegmentStart[0]!;
- var dyl = lineSegmentEnd[1]! - lineSegmentStart[1]!;
- var cross = dxc * dyl - dyc * dxl;
- if (cross != 0) {
- return false;
- }
- if (incEnd) {
- if ((dxl).abs() >= (dyl).abs()) {
- return dxl > 0
- ? lineSegmentStart[0]! <= pt[0]! && pt[0]! <= lineSegmentEnd[0]!
- : lineSegmentEnd[0]! <= pt[0]! && pt[0]! <= lineSegmentStart[0]!;
- }
- return dyl > 0
- ? lineSegmentStart[1]! <= pt[1]! && pt[1]! <= lineSegmentEnd[1]!
- : lineSegmentEnd[1]! <= pt[1]! && pt[1]! <= lineSegmentStart[1]!;
- } else {
- if ((dxl).abs() >= (dyl).abs()) {
- return dxl > 0
- ? lineSegmentStart[0]! < pt[0]! && pt[0]! < lineSegmentEnd[0]!
- : lineSegmentEnd[0]! < pt[0]! && pt[0]! < lineSegmentStart[0]!;
- }
- return dyl > 0
- ? lineSegmentStart[1]! < pt[1]! && pt[1]! < lineSegmentEnd[1]!
- : lineSegmentEnd[1]! < pt[1]! && pt[1]! < lineSegmentStart[1]!;
- }
-}

lib/src/booleans/boolean_disjoint.dart

@@ -1,10 +1,8 @@
-import 'package:turf/src/booleans/boolean_crosses.dart';
-
-import '../../helpers.dart';
+import 'boolean_point_on_line.dart';
+import 'boolean_point_in_polygon.dart';
 import '../../meta.dart';
 import '../line_intersect.dart';
 import '../polygon_to_line.dart';
-import 'boolean_point_in_polygon.dart';
 
 /// Returns [true] if the intersection of the two geometries is an empty set.
 /// example:
@@ -73,7 +71,7 @@ bool _disjoint(GeometryType geom1, GeometryType geom2) {
 // http://stackoverflow.com/a/11908158/1979085
 bool _isPointOnLine(LineString lineString, Point pt) {
  for (var i = 0; i < lineString.coordinates.length - 1; i++) {
- if (isPointOnLineSegment(lineString.coordinates[i],
+ if (isPointOnLineSegmentCrossesVariant(lineString.coordinates[i],
  lineString.coordinates[i + 1], pt.coordinates, true)) {
  return true;
  }

lib/src/booleans/boolean_intersects.dart

@@ -1,4 +1,3 @@
-import '../../helpers.dart';
 import '../../meta.dart';
 import 'boolean_disjoint.dart';
 

lib/src/booleans/boolean_overlap.dart

@@ -1,4 +1,3 @@
-import 'package:turf/helpers.dart';
 import 'package:turf/line_overlap.dart';
 import 'package:turf/line_segment.dart';
 import 'package:turf/src/invariant.dart';