use golang dep tool for depsHEADmaster

2 files changed, 476 insertions, 202 deletions

diff --git a/vendor/github.com/golang/geo/r2/LICENSE b/vendor/github.com/golang/geo/r2/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/vendor/github.com/golang/geo/r2/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/golang/geo/r2/rect_test.go b/vendor/github.com/golang/geo/r2/rect_test.go
new file mode 100644
index 0000000..0ed9cae
--- /dev/null
+++ b/vendor/github.com/golang/geo/r2/rect_test.go
@@ -0,0 +1,476 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Most of the Rect methods have trivial implementations in terms of the
+// Interval class, so most of the testing is done in that unit test.
+
+package r2
+
+import (
+	"math"
+	"reflect"
+	"testing"
+
+	"github.com/golang/geo/r1"
+)
+
+var (
+	sw = Point{0, 0.25}
+	se = Point{0.5, 0.25}
+	ne = Point{0.5, 0.75}
+	nw = Point{0, 0.75}
+
+	empty   = EmptyRect()
+	rect    = RectFromPoints(sw, ne)
+	rectMid = RectFromPoints(Point{0.25, 0.5}, Point{0.25, 0.5})
+	rectSW  = RectFromPoints(sw, sw)
+	rectNE  = RectFromPoints(ne, ne)
+)
+
+func float64Eq(x, y float64) bool { return math.Abs(x-y) < 1e-14 }
+
+func pointsApproxEqual(a, b Point) bool {
+	return float64Eq(a.X, b.X) && float64Eq(a.Y, b.Y)
+}
+
+func TestOrtho(t *testing.T) {
+	tests := []struct {
+		p    Point
+		want Point
+	}{
+		{Point{0, 0}, Point{0, 0}},
+		{Point{0, 1}, Point{-1, 0}},
+		{Point{1, 1}, Point{-1, 1}},
+		{Point{-4, 7}, Point{-7, -4}},
+		{Point{1, math.Sqrt(3)}, Point{-math.Sqrt(3), 1}},
+	}
+	for _, test := range tests {
+		if got := test.p.Ortho(); !pointsApproxEqual(got, test.want) {
+			t.Errorf("%v.Ortho() = %v, want %v", test.p, got, test.want)
+		}
+	}
+}
+
+func TestDot(t *testing.T) {
+	tests := []struct {
+		p    Point
+		op   Point
+		want float64
+	}{
+		{Point{0, 0}, Point{0, 0}, 0},
+		{Point{0, 1}, Point{0, 0}, 0},
+		{Point{1, 1}, Point{4, 3}, 7},
+		{Point{-4, 7}, Point{1, 5}, 31},
+	}
+	for _, test := range tests {
+		if got := test.p.Dot(test.op); !float64Eq(got, test.want) {
+			t.Errorf("%v.Dot(%v) = %v, want %v", test.p, test.op, got, test.want)
+		}
+	}
+}
+
+func TestCross(t *testing.T) {
+	tests := []struct {
+		p    Point
+		op   Point
+		want float64
+	}{
+		{Point{0, 0}, Point{0, 0}, 0},
+		{Point{0, 1}, Point{0, 0}, 0},
+		{Point{1, 1}, Point{-1, -1}, 0},
+		{Point{1, 1}, Point{4, 3}, -1},
+		{Point{1, 5}, Point{-2, 3}, 13},
+	}
+
+	for _, test := range tests {
+		if got := test.p.Cross(test.op); !float64Eq(got, test.want) {
+			t.Errorf("%v.Cross(%v) = %v, want %v", test.p, test.op, got, test.want)
+		}
+	}
+}
+
+func TestNorm(t *testing.T) {
+	tests := []struct {
+		p    Point
+		want float64
+	}{
+		{Point{0, 0}, 0},
+		{Point{0, 1}, 1},
+		{Point{-1, 0}, 1},
+		{Point{3, 4}, 5},
+		{Point{3, -4}, 5},
+		{Point{2, 2}, 2 * math.Sqrt(2)},
+		{Point{1, math.Sqrt(3)}, 2},
+		{Point{29, 29 * math.Sqrt(3)}, 29 * 2},
+		{Point{1, 1e15}, 1e15},
+		{Point{1e14, math.MaxFloat32 - 1}, math.MaxFloat32},
+	}
+
+	for _, test := range tests {
+		if !float64Eq(test.p.Norm(), test.want) {
+			t.Errorf("%v.Norm() = %v, want %v", test.p, test.p.Norm(), test.want)
+		}
+	}
+}
+
+func TestNormalize(t *testing.T) {
+	tests := []struct {
+		have Point
+		want Point
+	}{
+		{Point{}, Point{}},
+		{Point{0, 0}, Point{0, 0}},
+		{Point{0, 1}, Point{0, 1}},
+		{Point{-1, 0}, Point{-1, 0}},
+		{Point{3, 4}, Point{0.6, 0.8}},
+		{Point{3, -4}, Point{0.6, -0.8}},
+		{Point{2, 2}, Point{math.Sqrt(2) / 2, math.Sqrt(2) / 2}},
+		{Point{7, 7 * math.Sqrt(3)}, Point{0.5, math.Sqrt(3) / 2}},
+		{Point{1e21, 1e21 * math.Sqrt(3)}, Point{0.5, math.Sqrt(3) / 2}},
+		{Point{1, 1e16}, Point{0, 1}},
+		{Point{1e4, math.MaxFloat32 - 1}, Point{0, 1}},
+	}
+
+	for _, test := range tests {
+		if got := test.have.Normalize(); !pointsApproxEqual(got, test.want) {
+			t.Errorf("%v.Normalize() = %v, want %v", test.have, got, test.want)
+		}
+	}
+
+}
+
+func TestEmptyRect(t *testing.T) {
+	if !empty.IsValid() {
+		t.Errorf("empty Rect should be valid: %v", empty)
+	}
+	if !empty.IsEmpty() {
+		t.Errorf("empty Rect should be empty: %v", empty)
+	}
+}
+
+func TestFromVariousTypes(t *testing.T) {
+	d1 := RectFromPoints(Point{0.1, 0}, Point{0.25, 1})
+	tests := []struct {
+		r1, r2 Rect
+	}{
+		{
+			RectFromCenterSize(Point{0.3, 0.5}, Point{0.2, 0.4}),
+			RectFromPoints(Point{0.2, 0.3}, Point{0.4, 0.7}),
+		},
+		{
+			RectFromCenterSize(Point{1, 0.1}, Point{0, 2}),
+			RectFromPoints(Point{1, -0.9}, Point{1, 1.1}),
+		},
+		{
+			d1,
+			Rect{d1.X, d1.Y},
+		},
+		{
+			RectFromPoints(Point{0.15, 0.3}, Point{0.35, 0.9}),
+			RectFromPoints(Point{0.15, 0.9}, Point{0.35, 0.3}),
+		},
+		{
+			RectFromPoints(Point{0.12, 0}, Point{0.83, 0.5}),
+			RectFromPoints(Point{0.83, 0}, Point{0.12, 0.5}),
+		},
+	}
+
+	for _, test := range tests {
+		if got := test.r1.ApproxEquals(test.r2); !got {
+			t.Errorf("%v.ApproxEquals(%v); got %v want true", test.r1, test.r2, got)
+		}
+	}
+}
+
+func TestCenter(t *testing.T) {
+	tests := []struct {
+		rect Rect
+		want Point
+	}{
+		{empty, Point{0.5, 0.5}},
+		{rect, Point{0.25, 0.5}},
+	}
+	for _, test := range tests {
+		if got := test.rect.Center(); got != test.want {
+			t.Errorf("%v.Center(); got %v want %v", test.rect, got, test.want)
+		}
+	}
+}
+
+func TestVertices(t *testing.T) {
+	want := [4]Point{sw, se, ne, nw}
+	got := rect.Vertices()
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("%v.Vertices(); got %v want %v", rect, got, want)
+	}
+}
+
+func TestContainsPoint(t *testing.T) {
+	tests := []struct {
+		rect Rect
+		p    Point
+		want bool
+	}{
+		{rect, Point{0.2, 0.4}, true},
+		{rect, Point{0.2, 0.8}, false},
+		{rect, Point{-0.1, 0.4}, false},
+		{rect, Point{0.6, 0.1}, false},
+		{rect, Point{rect.X.Lo, rect.Y.Lo}, true},
+		{rect, Point{rect.X.Hi, rect.Y.Hi}, true},
+	}
+	for _, test := range tests {
+		if got := test.rect.ContainsPoint(test.p); got != test.want {
+			t.Errorf("%v.ContainsPoint(%v); got %v want %v", test.rect, test.p, got, test.want)
+		}
+	}
+}
+
+func TestInteriorContainsPoint(t *testing.T) {
+	tests := []struct {
+		rect Rect
+		p    Point
+		want bool
+	}{
+		// Check corners are not contained.
+		{rect, sw, false},
+		{rect, ne, false},
+		// Check a point on the border is not contained.
+		{rect, Point{0, 0.5}, false},
+		{rect, Point{0.25, 0.25}, false},
+		{rect, Point{0.5, 0.5}, false},
+		// Check points inside are contained.
+		{rect, Point{0.125, 0.6}, true},
+	}
+	for _, test := range tests {
+		if got := test.rect.InteriorContainsPoint(test.p); got != test.want {
+			t.Errorf("%v.InteriorContainsPoint(%v); got %v want %v",
+				test.rect, test.p, got, test.want)
+		}
+	}
+}
+
+func TestIntervalOps(t *testing.T) {
+	tests := []struct {
+		r1, r2                                           Rect
+		contains, intContains, intersects, intIntersects bool
+		wantUnion, wantIntersection                      Rect
+	}{
+		{
+			rect, rectMid,
+			true, true, true, true,
+			rect, rectMid,
+		},
+		{
+			rect, rectSW,
+			true, false, true, false,
+			rect, rectSW,
+		},
+		{
+			rect, rectNE,
+			true, false, true, false,
+			rect, rectNE,
+		},
+		{
+			rect,
+			RectFromPoints(Point{0.45, 0.1}, Point{0.75, 0.3}),
+			false, false, true, true,
+			RectFromPoints(Point{0, 0.1}, Point{0.75, 0.75}),
+			RectFromPoints(Point{0.45, 0.25}, Point{0.5, 0.3}),
+		},
+		{
+			rect,
+			RectFromPoints(Point{0.5, 0.1}, Point{0.7, 0.3}),
+			false, false, true, false,
+			RectFromPoints(Point{0, 0.1}, Point{0.7, 0.75}),
+			RectFromPoints(Point{0.5, 0.25}, Point{0.5, 0.3}),
+		},
+		{
+			rect,
+			RectFromPoints(Point{0.45, 0.1}, Point{0.7, 0.25}),
+			false, false, true, false,
+			RectFromPoints(Point{0, 0.1}, Point{0.7, 0.75}),
+			RectFromPoints(Point{0.45, 0.25}, Point{0.5, 0.25}),
+		},
+		{
+			RectFromPoints(Point{0.1, 0.2}, Point{0.1, 0.3}),
+			RectFromPoints(Point{0.15, 0.7}, Point{0.2, 0.8}),
+			false, false, false, false,
+			RectFromPoints(Point{0.1, 0.2}, Point{0.2, 0.8}),
+			EmptyRect(),
+		},
+		// Check that the intersection of two rectangles that overlap in x but not y
+		// is valid, and vice versa.
+		{
+			RectFromPoints(Point{0.1, 0.2}, Point{0.4, 0.5}),
+			RectFromPoints(Point{0, 0}, Point{0.2, 0.1}),
+			false, false, false, false,
+			RectFromPoints(Point{0, 0}, Point{0.4, 0.5}),
+			EmptyRect(),
+		},
+		{
+			RectFromPoints(Point{0, 0}, Point{0.1, 0.3}),
+			RectFromPoints(Point{0.2, 0.1}, Point{0.3, 0.4}),
+			false, false, false, false,
+			RectFromPoints(Point{0, 0}, Point{0.3, 0.4}),
+			EmptyRect(),
+		},
+	}
+	for _, test := range tests {
+		if got := test.r1.Contains(test.r2); got != test.contains {
+			t.Errorf("%v.Contains(%v); got %v want %v",
+				test.r1, test.r2, got, test.contains)
+		}
+
+		if got := test.r1.InteriorContains(test.r2); got != test.intContains {
+			t.Errorf("%v.InteriorContains(%v); got %v want %v",
+				test.r1, test.r2, got, test.contains)
+		}
+
+		if got := test.r1.Intersects(test.r2); got != test.intersects {
+			t.Errorf("%v.Intersects(%v); got %v want %v",
+				test.r1, test.r2, got, test.intersects)
+		}
+
+		if got := test.r1.InteriorIntersects(test.r2); got != test.intIntersects {
+			t.Errorf("%v.InteriorIntersects(%v); got %v want %v",
+				test.r1, test.r2, got, test.intIntersects)
+		}
+
+		tCon := test.r1.Contains(test.r2)
+		if got := test.r1.Union(test.r2).ApproxEquals(test.r1); got != tCon {
+			t.Errorf("%v.Union(%v) == %v.Contains(%v); got %v want %v",
+				test.r1, test.r2, test.r1, test.r2, got, tCon)
+		}
+
+		tInter := test.r1.Intersects(test.r2)
+		if got := !test.r1.Intersection(test.r2).IsEmpty(); got != tInter {
+			t.Errorf("%v.Intersection(%v).IsEmpty() == %v.Intersects(%v); got %v want %v",
+				test.r1, test.r2, test.r1, test.r2, got, tInter)
+		}
+
+		if got := test.r1.Union(test.r2); got != test.wantUnion {
+			t.Errorf("%v.Union(%v); got %v want %v",
+				test.r1, test.r2, got, test.wantUnion)
+		}
+
+		if got := test.r1.Intersection(test.r2); got != test.wantIntersection {
+			t.Errorf("%v.Intersection(%v); got %v want %v",
+				test.r1, test.r2, got, test.wantIntersection)
+		}
+
+		r := test.r1.AddRect(test.r2)
+
+		if r != test.wantUnion {
+			t.Errorf("%v.AddRect(%v); got %v want %v", test.r1, test.r2, r, test.wantUnion)
+		}
+	}
+}
+
+func TestAddPoint(t *testing.T) {
+	r1 := rect
+	r2 := EmptyRect()
+
+	r2 = r2.AddPoint(sw)
+	r2 = r2.AddPoint(se)
+	r2 = r2.AddPoint(nw)
+	r2 = r2.AddPoint(Point{0.1, 0.4})
+
+	if !r1.ApproxEquals(r2) {
+		t.Errorf("%v.AddPoint(%v); got false want true", r1, r2)
+	}
+}
+
+func TestClampPoint(t *testing.T) {
+	r := Rect{r1.Interval{Lo: 0, Hi: 0.5}, r1.Interval{Lo: 0.25, Hi: 0.75}}
+	tests := []struct {
+		p    Point
+		want Point
+	}{
+		{Point{-0.01, 0.24}, Point{0, 0.25}},
+		{Point{-5.0, 0.48}, Point{0, 0.48}},
+		{Point{-5.0, 2.48}, Point{0, 0.75}},
+		{Point{0.19, 2.48}, Point{0.19, 0.75}},
+
+		{Point{6.19, 2.48}, Point{0.5, 0.75}},
+		{Point{6.19, 0.53}, Point{0.5, 0.53}},
+		{Point{6.19, -2.53}, Point{0.5, 0.25}},
+		{Point{0.33, -2.53}, Point{0.33, 0.25}},
+		{Point{0.33, 0.37}, Point{0.33, 0.37}},
+	}
+	for _, test := range tests {
+		if got := r.ClampPoint(test.p); got != test.want {
+			t.Errorf("%v.ClampPoint(%v); got %v want %v", r, test.p, got, test.want)
+		}
+	}
+}
+
+func TestExpandedEmpty(t *testing.T) {
+	tests := []struct {
+		rect Rect
+		p    Point
+	}{
+		{
+			EmptyRect(),
+			Point{0.1, 0.3},
+		},
+		{
+			EmptyRect(),
+			Point{-0.1, -0.3},
+		},
+		{
+			RectFromPoints(Point{0.2, 0.4}, Point{0.3, 0.7}),
+			Point{-0.1, 0.3},
+		},
+		{
+			RectFromPoints(Point{0.2, 0.4}, Point{0.3, 0.7}),
+			Point{0.1, -0.2},
+		},
+	}
+	for _, test := range tests {
+		if got := test.rect.Expanded(test.p); !got.IsEmpty() {
+			t.Errorf("%v.Expanded(%v); got %v want true", test.rect, test.p, got.IsEmpty())
+		}
+	}
+}
+
+func TestExpandedEquals(t *testing.T) {
+	tests := []struct {
+		rect Rect
+		p    Point
+		want Rect
+	}{
+		{
+			RectFromPoints(Point{0.2, 0.4}, Point{0.3, 0.7}),
+			Point{0.1, 0.3},
+			RectFromPoints(Point{0.1, 0.1}, Point{0.4, 1.0}),
+		},
+		{
+			RectFromPoints(Point{0.2, 0.4}, Point{0.3, 0.7}),
+			Point{0.1, -0.1},
+			RectFromPoints(Point{0.1, 0.5}, Point{0.4, 0.6}),
+		},
+		{
+			RectFromPoints(Point{0.2, 0.4}, Point{0.3, 0.7}),
+			Point{0.1, 0.1},
+			RectFromPoints(Point{0.1, 0.3}, Point{0.4, 0.8}),
+		},
+	}
+	for _, test := range tests {
+		if got := test.rect.Expanded(test.p); !got.ApproxEquals(test.want) {
+			t.Errorf("%v.Expanded(%v); got %v want %v", test.rect, test.p, got, test.want)
+		}
+	}
+}