diff --git a/notebooks/tutorials/angles.ipynb b/notebooks/tutorials/angles.ipynb index 679294c..a487855 100644 --- a/notebooks/tutorials/angles.ipynb +++ b/notebooks/tutorials/angles.ipynb @@ -26,7 +26,7 @@ "metadata": {}, "source": [ "## Overview\n", - "If you have an introductory paragraph, lead with it here! Keep it short and tied to your material, then be sure to continue into the required list of topics below,\n", + "Angles are formed by the intersection of great circle paths\n", "\n", "1. Calculate the acute and obtuse angle of two great circle paths\n", "1. Calculate the directed angle of two great circle paths based on an intersection point\n", diff --git a/notebooks/tutorials/arc_path.ipynb b/notebooks/tutorials/arc_path.ipynb index 192c895..e44c1f0 100644 --- a/notebooks/tutorials/arc_path.ipynb +++ b/notebooks/tutorials/arc_path.ipynb @@ -31,13 +31,13 @@ "\n", "Great circles are circles that circumnavigate the globe\n", "\n", - "1. Determine the Length/Distance of a Great Circle Arc\n", + "1. Distance Between Points on a Great Circle Arc\n", "1. Determine the Bearing of a Great Circle Arc\n", "1. Generating a Great Circle Arc with Intermediates Points\n", "1. Determine the Midpoint of a Great Circle Arc\n", - "1. Compare Great Circle Arc to Rhumb Line (TODO)\n", "1. Generate a Great Circle Path\n", - "1. Antipodal point (TODO)" + "1. Antipodal\n", + "1. Compare Great Circle Arc to Rhumb Line (TODO)" ] }, { @@ -1397,7 +1397,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Antipodal point\n", + "## Antipodal\n", "\n", "Antipodal is the point on the globe that is on the exact opposite side of the Earth\n", "\n", diff --git a/notebooks/tutorials/arc_to_point.ipynb b/notebooks/tutorials/arc_to_point.ipynb index e7cfe24..0163018 100644 --- a/notebooks/tutorials/arc_to_point.ipynb +++ b/notebooks/tutorials/arc_to_point.ipynb @@ -30,7 +30,7 @@ "\n", "1. Determine the distance of a point to a great circle arc\n", "1. Determine the distance of a point to a great circle path\n", - "1. Determine if a point lies on a great circle arc and path (with/without tolerances)" + "1. Determine if a point lies on a great circle arc and path" ] }, { @@ -362,7 +362,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Generate Points At Intermediate Points along an Arc/Path" + "### Generate Points at Intermediate Points along an Arc/Path" ] }, { @@ -582,7 +582,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Determine if a point lies on a great circle arc and path (with/without tolerances)" + "## Determine if a point lies on a great circle arc and path\n", + "\n", + "With and without tolerances (in meters)" ] }, { @@ -752,13 +754,6 @@ "- [Aviation Formulary V1.47](https://edwilliams.org/avform147.htm)\n", "- [Moveable Type Script](https://www.movable-type.co.uk/scripts/latlong.html)" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/notebooks/tutorials/parallels_max_min.ipynb b/notebooks/tutorials/parallels_max_min.ipynb index 3b49272..cfea5e3 100644 --- a/notebooks/tutorials/parallels_max_min.ipynb +++ b/notebooks/tutorials/parallels_max_min.ipynb @@ -27,6 +27,8 @@ "source": [ "## Overview\n", "\n", + "A valid great circle path (that is not a path around the equator) will cross a maximum and minimum latitude\n", + "\n", "1. Maximum Latitude on a Great Circle Path\n", "1. Minimum Latitude on a Great Circle Path\n", "1. Determine when great circle path cross parallels (TODO)" @@ -355,7 +357,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Plot Maximum" + "### Plot Maximum" ] }, { @@ -753,11 +755,12 @@ ] }, { - "cell_type": "code", - "execution_count": null, + "cell_type": "markdown", "metadata": {}, - "outputs": [], - "source": [] + "source": [ + "- [Aviation Formulary V1.47](https://edwilliams.org/avform147.htm)\n", + "- [Moveable Type Script](https://www.movable-type.co.uk/scripts/latlong.html)" + ] } ], "metadata": { diff --git a/notebooks/tutorials/path_intersection.ipynb b/notebooks/tutorials/path_intersection.ipynb index eafc2ee..f16eb19 100644 --- a/notebooks/tutorials/path_intersection.ipynb +++ b/notebooks/tutorials/path_intersection.ipynb @@ -26,10 +26,11 @@ "metadata": {}, "source": [ "## Overview\n", - "If you have an introductory paragraph, lead with it here! Keep it short and tied to your material, then be sure to continue into the required list of topics below,\n", + "A great circle path crosses the entire planet and any two valid great circle paths will always intersect\n", "\n", - "1. Find the intersection of two great circle paths (always exists)1. Calculate the directed angle of two great circle paths based on an intersection point\n", - "1. Find the intersection of two great circle arcs (if it exists)" + "1. Find the intersection of two great circle paths\n", + "1. Find the intersection of two great circle arcs\n", + "1. Calculate the directed angle of two great circle paths" ] }, { @@ -244,6 +245,15 @@ "The intersection of two great circle paths always exists at two positions on the globe if both paths are valid great circle paths (not meridians)" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Math of intersection\n", + "\n", + "TODO" + ] + }, { "cell_type": "code", "execution_count": 4, @@ -300,15 +310,6 @@ "lat_lon_pts = generate_latitude_along_gc(\"boulder\", \"boston\", 360)" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Math of intersection\n", - "\n", - "TODO" - ] - }, { "cell_type": "code", "execution_count": 6, @@ -375,7 +376,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 9, "metadata": {}, "outputs": [], "source": [ @@ -432,15 +433,8 @@ " \n", " points_along_arc = interpolate_points_along_gc(start_point, end_point,\n", " distance_between_points_meter)\n", - " return points_along_arc" - ] - }, - { - "cell_type": "code", - "execution_count": 9, - "metadata": {}, - "outputs": [], - "source": [ + " return points_along_arc\n", + "\n", "def plot_gc_with_intersection(start_gc1=None, end_gc1=None,\n", " start_gc2=None, end_gc2=None,\n", " lon_west=-180, lon_east=180,\n", @@ -546,27 +540,6 @@ "outputs": [], "source": [] }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, { "cell_type": "markdown", "metadata": {}, @@ -592,11 +565,12 @@ ] }, { - "cell_type": "code", - "execution_count": null, + "cell_type": "markdown", "metadata": {}, - "outputs": [], - "source": [] + "source": [ + "- [Aviation Formulary V1.47](https://edwilliams.org/avform147.htm)\n", + "- [Moveable Type Script](https://www.movable-type.co.uk/scripts/latlong.html)" + ] } ], "metadata": {