Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -r05da43c9c7424ffd7e5c17919884d9946cd07d5d --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 05da43c9c7424ffd7e5c17919884d9946cd07d5d) @@ -41,35 +41,176 @@ public void Execute(params object[] arguments) { - var line = new LineData(new Collection> + var line1 = new LineData(new Collection> { - Tuple.Create(0.0, 1.1), - Tuple.Create(1.0, 2.1), - Tuple.Create(1.6, 1.6) + Tuple.Create(0.0,0.500), + Tuple.Create(0.1,0.723), + Tuple.Create(0.2,0.892), + Tuple.Create(0.3,1.013), + Tuple.Create(0.4,1.092), + Tuple.Create(0.5,1.135), + Tuple.Create(0.6,1.148), + Tuple.Create(0.7,1.137), + Tuple.Create(0.8,1.108), + Tuple.Create(0.9,1.067), + Tuple.Create(1.0,1.020), + Tuple.Create(1.1,0.973), + Tuple.Create(1.2,0.932), + Tuple.Create(1.3,0.903), + Tuple.Create(1.4,0.892), + Tuple.Create(1.5,0.905), + Tuple.Create(1.6,0.948), + Tuple.Create(1.7,1.027), + Tuple.Create(1.8,1.148), + Tuple.Create(1.9,1.317), + Tuple.Create(2.0,1.540), + Tuple.Create(2.1,1.823) }); - var area = new AreaData(new Collection> + + var line2 = new LineData(new Collection> { - Tuple.Create(0.0, 1.1), - Tuple.Create(1.0, 2.1), - Tuple.Create(1.6, 1.6), - Tuple.Create(1.6, 0.5), - Tuple.Create(0.0, 0.5), - Tuple.Create(0.0, 1.1) + Tuple.Create(0.0,0.800), + Tuple.Create(0.1,1.009), + Tuple.Create(0.2,1.162), + Tuple.Create(0.3,1.267), + Tuple.Create(0.4,1.328), + Tuple.Create(0.5,1.351), + Tuple.Create(0.6,1.340), + Tuple.Create(0.7,1.302), + Tuple.Create(0.8,1.242), + Tuple.Create(0.9,1.165), + Tuple.Create(1.0,1.076), + Tuple.Create(1.1,0.982), + Tuple.Create(1.2,0.886), + Tuple.Create(1.3,0.796), + Tuple.Create(1.4,0.716), + Tuple.Create(1.5,0.652), + Tuple.Create(1.6,0.608), + Tuple.Create(1.7,0.591), + Tuple.Create(1.8,0.606), + Tuple.Create(1.9,0.658), + Tuple.Create(2.0,0.752), + Tuple.Create(2.1,0.895) }); - var clearArea = new AreaData(new Collection> + + + + + var area1 = new AreaData(new Collection> { - Tuple.Create(0.5, 0.5), - Tuple.Create(0.5, 1.0), - Tuple.Create(1.0, 1.0), - Tuple.Create(0.5, 0.5) + Tuple.Create(0.0,0.500), + Tuple.Create(0.1,0.723), + Tuple.Create(0.2,0.892), + Tuple.Create(0.3,1.013), + Tuple.Create(0.4,1.092), + Tuple.Create(0.5,1.135), + Tuple.Create(0.6,1.148), + Tuple.Create(0.7,1.137), + Tuple.Create(0.8,1.108), + Tuple.Create(0.9,1.067), + Tuple.Create(1.0,1.020), + Tuple.Create(1.1,0.973), + Tuple.Create(1.2,0.932), + Tuple.Create(1.3,0.903), + Tuple.Create(1.4,0.892), + Tuple.Create(1.5,0.905), + Tuple.Create(1.5,0.905-0.5), + Tuple.Create(1.4,0.892-0.5), + Tuple.Create(1.3,0.903-0.5), + Tuple.Create(1.2,0.932-0.5), + Tuple.Create(1.1,0.973-0.5), + Tuple.Create(1.0,1.020-0.5), + Tuple.Create(0.9,1.067-0.5), + Tuple.Create(0.8,1.108-0.51), + Tuple.Create(0.7,1.137-0.52), + Tuple.Create(0.6,1.148-0.53), + Tuple.Create(0.5,1.135-0.52), + Tuple.Create(0.4,1.092-0.51), + Tuple.Create(0.3,1.013-0.5), + Tuple.Create(0.2,0.892-0.5), + Tuple.Create(0.1,0.723-0.5), + Tuple.Create(0.0,0.000), + Tuple.Create(0.0,0.500) }); - var points = new PointData(new Collection> + var area2 = new AreaData(new Collection> { - Tuple.Create(0.0, 1.1), - Tuple.Create(0.5, 1.6), - Tuple.Create(1.0, 2.1) + + Tuple.Create(0.1,0.723-0.5), + Tuple.Create(0.2,0.892-0.5), + Tuple.Create(0.3,1.013-0.49), + Tuple.Create(0.4,1.092-0.48), + Tuple.Create(0.5,1.135-0.47), + Tuple.Create(0.6,1.148-0.46), + Tuple.Create(0.7,1.137-0.47), + Tuple.Create(0.8,1.108-0.48), + Tuple.Create(0.9,1.067-0.49), + Tuple.Create(1.0,1.020-0.50), + Tuple.Create(1.1,0.973-0.5), + Tuple.Create(1.2,0.932-0.5), + Tuple.Create(1.3,0.903-0.5), + Tuple.Create(1.4,0.892-0.5), + Tuple.Create(1.5,0.905-0.5), + Tuple.Create(1.5,0.905), + Tuple.Create(1.6,0.948), + Tuple.Create(1.7,1.027), + Tuple.Create(1.8,1.148), + Tuple.Create(1.8,0.606), + Tuple.Create(1.9,0.658), + Tuple.Create(2.0,0.752), + Tuple.Create(2.0,0.350), + Tuple.Create(1.5,0.905-0.7), + Tuple.Create(1.4,0.892-0.7), + Tuple.Create(1.3,0.903-0.7), + Tuple.Create(1.2,0.932-0.7), + Tuple.Create(1.1,0.973-0.7), + Tuple.Create(1.0,1.020-0.7), + Tuple.Create(0.9,1.067-0.7), + Tuple.Create(0.8,1.108-0.7), + Tuple.Create(0.7,1.137-0.7), + Tuple.Create(0.6,1.148-0.7), + Tuple.Create(0.5,1.135-0.7), + Tuple.Create(0.4,1.092-0.7), + Tuple.Create(0.3,1.013-0.7), + Tuple.Create(0.2,0.892-0.7), + Tuple.Create(0.1,0.723-0.7), + Tuple.Create(0.1,0.723-0.5) + + + + }); - documentViewController.DocumentViewsResolver.OpenViewForData(new ChartDataCollection(new List { area, clearArea, line, points })); + var points1 = new PointData(new Collection> + { + Tuple.Create(0.2,0.892+0.04), + Tuple.Create(0.3,1.013+0.02), + Tuple.Create(0.4,1.092), + Tuple.Create(0.5,1.135-0.02), + Tuple.Create(0.6,1.148+0.01), + Tuple.Create(1.4,0.892-0.02), + Tuple.Create(1.5,0.905+0.01), + Tuple.Create(1.8,1.148+0.02) + }); + + var points2 = new PointData(new Collection> + { + Tuple.Create(0.0,0.800 + 0.01), + Tuple.Create(0.1,1.009 + 0.02), + Tuple.Create(0.2,1.162 + 0.03), + Tuple.Create(0.2,1.162 + 0.05), + Tuple.Create(0.2,1.162 - 0.03), + Tuple.Create(0.2,1.162 - 0.01), + Tuple.Create(0.3,1.267), + Tuple.Create(0.4,1.328 - 0.01), + Tuple.Create(0.53,1.351), + Tuple.Create(0.69,1.340), + Tuple.Create(0.73,1.302), + Tuple.Create(1.4,0.716 - 0.02), + Tuple.Create(1.4,0.716 + 0.02), + Tuple.Create(1.7,0.591), + Tuple.Create(1.8,0.606) + }); + + documentViewController.DocumentViewsResolver.OpenViewForData(new ChartDataCollection(new List { area1, area2, line1, line2, points1, points2 })); } } } \ No newline at end of file Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs =================================================================== diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r05da43c9c7424ffd7e5c17919884d9946cd07d5d --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision 05da43c9c7424ffd7e5c17919884d9946cd07d5d) @@ -43,29 +43,129 @@ public void Execute(params object[] arguments) { - var points = new MapPointData(new Collection + + var polygons1 = new MapPolygonData(new Collection { - new Point2D(1.5, 2), - new Point2D(1.1, 1), - new Point2D(0.8, 0.5) - }, Resources.OpenMapViewCommand_Execute_Point_demo_data); + new Point2D(4.764723,52.990274), + new Point2D(4.713888,53.056108), + new Point2D(4.883333,53.184168) + + }, "Texel"); + + var polygons2 = new MapPolygonData(new Collection + { + new Point2D(4.957224,53.23778), + new Point2D(4.879999,53.214441), + new Point2D(5.10639,53.303331) + }, "Vlieland"); + + var polygons3 = new MapPolygonData(new Collection + { + new Point2D(5.213057,53.35), + new Point2D(5.16889,53.373888), + new Point2D(5.581945,53.447779) + }, "Terschelling"); + + var polygons4 = new MapPolygonData(new Collection + { + new Point2D(5.699167,53.462778), + new Point2D(5.956114,53.462778), + new Point2D(5.633055,53.441668) + }, "Ameland"); + + var polygons5 = new MapPolygonData(new Collection + { + new Point2D(6.135,53.453608), + new Point2D(6.14889,53.497499), + new Point2D(6.341112,53.502779) + }, "Schiermonnikoog"); + + + var pointsRandstad = new MapPointData(new Collection + { + new Point2D(4.4818, 51.9242), + new Point2D(4.7167, 52.0167), + new Point2D(5.1146, 52.0918), + new Point2D(4.3007, 52.0705), + new Point2D(4.8952, 52.3702), + new Point2D(4.3667, 52.0167) + }, "Randstad"); + + var linesRandstad = new MapLineData(new Collection + { + new Point2D(4.4818, 51.9242), + new Point2D(4.7167, 52.0167), + new Point2D(5.1146, 52.0918), + new Point2D(4.3007, 52.0705), + new Point2D(4.7167, 52.0167), + new Point2D(4.8952, 52.3702), + new Point2D(4.3667, 52.0167), + new Point2D(5.1146, 52.0918), + new Point2D(4.8952, 52.3702) + }, "Snelwegen randstad"); + + var lines = new MapLineData(new Collection { - new Point2D(0.0, 1.1), - new Point2D(1.0, 2.1), - new Point2D(1.6, 1.6) - }, Resources.OpenMapViewCommand_Execute_Line_demo_data); - var polygons = new MapPolygonData(new Collection + new Point2D(5.763887,52.415277), + new Point2D(5.573057,52.368052), + new Point2D(5.534166,52.283335), + new Point2D(5.428614,52.264162), + new Point2D(5.135557,52.380274), + new Point2D(5.643614,52.601107), + new Point2D(5.855558,52.544168), + new Point2D(5.855558,52.492495), + new Point2D(5.763887,52.415277) + + }, "Kustlijn Flevoland"); + var polygonNetherlands = new MapPolygonData(new Collection { - new Point2D(1.0, 1.3), - new Point2D(3.0, 2.6), - new Point2D(5.6, 1.6) - }, Resources.OpenMapViewCommand_Execute_Polygon_demo_data); + new Point2D(6.871668,53.416109), + new Point2D(7.208364,53.242807), + new Point2D(7.051668,52.64361), + new Point2D(6.68889,52.549166), + new Point2D(7.065557,52.385828), + new Point2D(6.82889,51.965555), + new Point2D(5.9625,51.807779), + new Point2D(6.222223,51.46583), + new Point2D(5.864721,51.046106), + new Point2D(6.011801,50.757273), + new Point2D(5.640833,50.839724), + new Point2D(5.849173,51.156382), + new Point2D(5.041391,51.486666), + new Point2D(4.252371,51.375147), + new Point2D(3.440832,51.53583), + new Point2D(4.286112,51.44861), + new Point2D(3.687502,51.709719), + new Point2D(4.167753,51.685572), + new Point2D(3.865557,51.814997), + new Point2D(4.584433,52.461504), + new Point2D(5.424444,52.248606), + new Point2D(5.533609,52.267221), + new Point2D(5.624723,52.354166), + new Point2D(5.774168,52.405275), + new Point2D(5.878057,52.509439), + new Point2D(5.855001,52.606913), + new Point2D(5.599443,52.658609), + new Point2D(5.599169,52.757776), + new Point2D(5.718351,52.838022), + new Point2D(5.368612,52.877779), + new Point2D(5.420557,52.964441), + new Point2D(5.364168,53.070276), + new Point2D(5.100279,52.948053), + new Point2D(5.304167,52.706942), + new Point2D(5.033335,52.634165), + new Point2D(5.028334,52.375834), + new Point2D(4.58,52.471666), + new Point2D(4.734167,52.955553), + new Point2D(6.871668,53.416109) + }, "Continentaal Nederland"); + documentViewController.DocumentViewsResolver.OpenViewForData(new MapDataCollection(new List { - points, lines, polygons - }, Resources.OpenMapViewCommand_Execute_List)); + polygons1, polygons2, polygons3, polygons4, polygons5, lines, polygonNetherlands, linesRandstad, pointsRandstad + }, "Demo kaart Nederland")); } } } \ No newline at end of file