conform to revised API

Author: markolbert

J4JMapWinLibrary/map-control/J4JMapControl.cs

@@ -112,19 +112,19 @@ private void ScaleSliderOnValueChanged( object sender, RangeBaseValueChangedEven
     private void OnSizeChanged( object sender, SizeChangedEventArgs e ) =>
         MapRegion?.Size( (float) e.NewSize.Height, (float) e.NewSize.Width );
 
-    private void SetImagePanelTransforms( RegionBuildResults update )
+    private void SetImagePanelTransforms()
     {
-        if( _mapGrid == null )
+        if( _mapGrid == null || MapRegion == null )
             return;
 
         // define the transform to move and rotate the grid
         var transforms = new TransformGroup();
 
-        transforms.Children.Add( new TranslateTransform { X = update.Translation.X, Y = update.Translation.Y } );
+        transforms.Children.Add( new TranslateTransform { X = MapRegion.ViewpointOffset.X, Y = MapRegion.ViewpointOffset.Y } );
 
         transforms.Children.Add( new RotateTransform
         {
-            Angle = update.Rotation, CenterX = ActualWidth / 2, CenterY = ActualHeight / 2
+            Angle = MapRegion.Rotation, CenterX = ActualWidth / 2, CenterY = ActualHeight / 2
         } );
 
         _mapGrid.RenderTransform = transforms;

J4JMapWinLibrary/map-control/dep-props/projection.cs

@@ -23,7 +23,9 @@ public ProjectionFactory? ProjectionFactory
         set
         {
             _projFactory = value;
-            _projFactory?.ScanAssemblies();
+
+            if( _projFactory != null && !_projFactory.InitializeFactory() )
+                _logger?.LogError( "Projection factory failed to find projection classes" );
         }
     }
 

J4JMapWinLibrary/map-control/dep-props/region.cs

@@ -86,27 +86,27 @@ private void MapGridOnPointerWheelChanged( object sender, PointerRoutedEventArgs
         MapScale += point.Properties.MouseWheelDelta < 0 ? -1 : 1;
     }
 
-    private void MapRegionBuildUpdated( object? sender, RegionBuildResults e )
+    private void MapRegionBuildUpdated( object? sender, MapRegionChange change )
     {
-        switch( e.Change )
+        switch( change )
         {
             case MapRegionChange.Empty:
             case MapRegionChange.NoChange:
                 break;
 
             case MapRegionChange.OffsetChanged:
-                SetImagePanelTransforms( e );
+                SetImagePanelTransforms();
                 IncludeAnnotations();
                 break;
 
             case MapRegionChange.LoadRequired:
                 _projection!.LoadRegionAsync( MapRegion! );
-                SetImagePanelTransforms( e );
+                SetImagePanelTransforms();
                 IncludeAnnotations();
                 break;
 
             default:
-                throw new InvalidEnumArgumentException( $"Unsupported {typeof( MapRegionChange )} value '{e.Change}'" );
+                throw new InvalidEnumArgumentException( $"Unsupported {typeof( MapRegionChange )} value '{change}'" );
         }
     }
 

MapLibTests/DeusEx.DependencyInjection.cs

@@ -15,7 +15,7 @@ private void SetupDependencyInjection( HostBuilderContext hbc, ContainerBuilder
                     var retVal = new ProjectionFactory( c.Resolve<IConfiguration>(),
                                                   c.Resolve<ILoggerFactory>() );
 
-                    retVal.ScanAssemblies();
+                    retVal.InitializeFactory();
 
                     return retVal;
                 } )

WinAppTest/DeusEx.cs

@@ -47,7 +47,7 @@ private void SetupDependencyInjection(HostBuilderContext hbc, ContainerBuilder b
                     var retVal = new ProjectionFactory(c.Resolve<IConfiguration>(),
                                                        c.Resolve<ILoggerFactory>());
 
-                    retVal.ScanAssemblies();
+                    retVal.InitializeFactory();
 
                     return retVal;
                 })