-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Getting SharpMap.SimpleGeometries to build.
Project file reorganization to use Common.msbuild during solution for using project references or binary references. Updating to use WktEncoder and WkbEncoder
- Loading branch information
1 parent
6a60376
commit 5f999ce
Showing
32 changed files
with
1,073 additions
and
729 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net20|AnyCPU' "> | ||
| <UseProjectReference>false</UseProjectReference> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net20|AnyCPU' "> | ||
| <UseProjectReference>false</UseProjectReference> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Net35|AnyCPU' "> | ||
| <UseProjectReference>false</UseProjectReference> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Net35|AnyCPU' "> | ||
| <UseProjectReference>false</UseProjectReference> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| // Copyright 2006, 2007 - Rory Plaire ([email protected]) | ||
| // Portions copyright 2005, 2006 - Morten Nielsen (www.iter.dk) | ||
| // Portions copyright 2006, 2007 - Rory Plaire ([email protected]) | ||
| // | ||
| // This file is part of SharpMap. | ||
| // SharpMap is free software; you can redistribute it and/or modify | ||
|
|
@@ -17,10 +18,11 @@ | |
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using GeoAPI.Geometries; | ||
|
|
||
| namespace SharpMap.SimpleGeometries | ||
| { | ||
| internal static class BoundingBoxOperations | ||
| internal static class BoundingBoxSpatialOperations | ||
| { | ||
| internal static Geometry Difference(Extents lhs, Extents rhs) | ||
| { | ||
|
|
@@ -52,9 +54,10 @@ internal static Geometry Difference(Extents lhs, Extents rhs) | |
| } | ||
| } | ||
|
|
||
| internal static Geometry Intersection(Extents lhs, Extents rhs) | ||
| internal static Geometry Union(Extents lhs, Extents rhs) | ||
| { | ||
| return Extents.Intersection(lhs, rhs).ToGeometry(); | ||
| Extents union = new Extents(lhs, rhs); | ||
| return union.ToGeometry(); | ||
| } | ||
|
|
||
| internal static Geometry Union(Geometry lhs, Geometry rhs) | ||
|
|
@@ -85,9 +88,28 @@ internal static Geometry Union(Geometry lhs, Geometry rhs) | |
| return new Extents(lhs.Extents, rhs.Extents).ToGeometry(); | ||
| } | ||
|
|
||
| internal static IGeometry Union(IGeometry lhs, IGeometry rhs) | ||
| { | ||
| return Union( | ||
| ((Geometry)lhs).ExtentsInternal, | ||
| ((Geometry)rhs).ExtentsInternal); | ||
| } | ||
|
|
||
| internal static Geometry Intersection(Extents lhs, Extents rhs) | ||
| { | ||
| return Extents.Intersection(lhs, rhs).ToGeometry(); | ||
| } | ||
|
|
||
| internal static Geometry Intersection(Geometry lhs, Geometry rhs) | ||
| { | ||
| return BoundingBoxOperations.Intersection(lhs.ExtentsInternal, rhs.ExtentsInternal); | ||
| return Intersection(lhs.ExtentsInternal, rhs.ExtentsInternal); | ||
| } | ||
|
|
||
| internal static IGeometry Intersection(IGeometry lhs, IGeometry rhs) | ||
| { | ||
| return Intersection( | ||
| ((Geometry)lhs).ExtentsInternal, | ||
| ((Geometry)rhs).ExtentsInternal); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.