Fixed issue in diff generation.

xivk · xivk · commit 216ae52a712e · 2022-11-30T16:49:31.000+01:00
diff --git a/OsmSharp.Common.props b/OsmSharp.Common.props
@@ -3,7 +3,7 @@
   
   <!--- Package information, Version -->
   <PropertyGroup>
-    <PackageVersion>7.0.0-pre021</PackageVersion>
+    <PackageVersion>7.0.0-pre022</PackageVersion>
     <LangVersion>latest</LangVersion>
     <Company>Itinero BV</Company>
     <Authors>OsmSharp Contributors</Authors>
diff --git a/src/OsmSharp/Changesets/OsmChangeExtensions.cs b/src/OsmSharp/Changesets/OsmChangeExtensions.cs
@@ -204,17 +204,15 @@ public static OsmChange Diff(this IEnumerable<OsmGeo> source, IEnumerable<OsmGeo
                             if (sourceCurrent.Version < targetCurrent.Version)
                             {
                                 modify.Add(targetCurrent);
-                                targetHasNext = targetEnumerator.MoveNext();
                             }
                             else if (sourceCurrent.Version > targetCurrent.Version)
                             {
                                 throw new Exception("Source has newer data");
                             }
-                            else
-                            {
-                                sourceHasNext = sourceEnumerator.MoveNext();
-                                targetHasNext = targetEnumerator.MoveNext();
-                            }
+
+                            sourceHasNext = sourceEnumerator.MoveNext();
+                            targetHasNext = targetEnumerator.MoveNext();
+
 
                             break;
                         case < 0:

Original file line number	Diff line number	Diff line change
`@@ -204,17 +204,15 @@ public static OsmChange Diff(this IEnumerable<OsmGeo> source, IEnumerable<OsmGeo`
`204`	`204`	`if (sourceCurrent.Version < targetCurrent.Version)`
`205`	`205`	`{`
`206`	`206`	`modify.Add(targetCurrent);`
`207`		`- targetHasNext = targetEnumerator.MoveNext();`
`208`	`207`	`}`
`209`	`208`	`else if (sourceCurrent.Version > targetCurrent.Version)`
`210`	`209`	`{`
`211`	`210`	`throw new Exception("Source has newer data");`
`212`	`211`	`}`
`213`		`- else`
`214`		`- {`
`215`		`- sourceHasNext = sourceEnumerator.MoveNext();`
`216`		`- targetHasNext = targetEnumerator.MoveNext();`
`217`		`- }`
	`212`	`+`
	`213`	`+ sourceHasNext = sourceEnumerator.MoveNext();`
	`214`	`+ targetHasNext = targetEnumerator.MoveNext();`
	`215`	`+`
`218`	`216`
`219`	`217`	`break;`
`220`	`218`	`case < 0:`