From 8f9f935796a9724e176e5f7d3a87dd46a9e0c893 Mon Sep 17 00:00:00 2001
From: Tiberiu Chibici <chibicitiberiu@gmail.com>
Date: Fri, 13 Mar 2015 23:04:50 +0200
Subject: [PATCH] Implemented layers for MapViewer, fixed some issues.

---
 Game/Game-csharp.sln                          |   2 +-
 Game/Game.sln                                 |   2 +-
 Game/Library/assetDatabase3                   | Bin 1051320 -> 1051320 bytes
 .../00/00000000000000004000000000000000       | Bin 4325 -> 4325 bytes
 Game/UnityVS.Game.CSharp.csproj               |  12 +-
 Game/UnityVS.Game.v11.suo                     | Bin 181760 -> 186880 bytes
 .../MapViewer/Business/MapRenderer.cs         |   2 +-
 Tools/MapViewer/MapViewer/MainWindow.xaml     |  35 +--
 Tools/MapViewer/MapViewer/MainWindow.xaml.cs  | 263 +++++++++++++-----
 Tools/MapViewer/MapViewer/MapViewer.csproj    |   4 +
 .../MapViewer/MapViewer/Resources/zoom_in.png | Bin 0 -> 725 bytes
 .../MapViewer/Resources/zoom_out.png          | Bin 0 -> 708 bytes
 12 files changed, 228 insertions(+), 92 deletions(-)
 create mode 100644 Tools/MapViewer/MapViewer/Resources/zoom_in.png
 create mode 100644 Tools/MapViewer/MapViewer/Resources/zoom_out.png

diff --git a/Game/Game-csharp.sln b/Game/Game-csharp.sln
index 0b8e34b..f6c3fb1 100644
--- a/Game/Game-csharp.sln
+++ b/Game/Game-csharp.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																									GlobalSection(MonoDevelopProperties) = preSolution
+																																																										GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Game/Game.sln b/Game/Game.sln
index 692a937..4d128e6 100644
--- a/Game/Game.sln
+++ b/Game/Game.sln
@@ -29,7 +29,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																								GlobalSection(MonoDevelopProperties) = preSolution
+																																																									GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/Game/Library/assetDatabase3 b/Game/Library/assetDatabase3
index 20387a4621fa2d55836894bb7af8cd227df4c7ce..6a11755310398de4944d022c22a6922d364e7eab 100644
GIT binary patch
delta 165
zcmdln)nUg}hYdHR7_}z{DoRWiwNl?KBHhHw62&w>VDl^mE)GU{u*6>t>B#|_HjFBh
z8FhpwKQLvRY@{j2s5N<_rTpY08VZcEAXS@}YK99is!w*5mYV!oN|CW(y5n3f;pPCV
v_5dqJAZ7w$W*}w(Vpbq#17da{<^W<&Am##MZXo6XVqPHT+a6%WpK$>Ifm1P>

delta 148
zcmdln)nUg}hYdHRCRy2RmXK~@Wl?M1$-H@<0vE^R08Ix*`N<pglqR3n5M)%De9=^L
zvXQ17qsHVwO|i+JHB>iG&@2#O)Sj#;FERO}lsaR<bjP_|!p#9z?EzMdK+FWh%s|Wn
j#H>Kf2E^<@%mKulK+FZi+(66&#JoVvw>`j$KjQ)bGYKwk

diff --git a/Game/Library/metadata/00/00000000000000004000000000000000 b/Game/Library/metadata/00/00000000000000004000000000000000
index 54446c064dcfb1d75f807804c8dc352e4023b9f4..fb06d6ecb945c9a8ad10ffc7494e24be9a6741af 100644
GIT binary patch
delta 20
ccmaE=_*8L&g8<8d0OruiirgKO&j?5Y08!@$C;$Ke

delta 20
ccmaE=_*8L&g8<7eX6DezirgKO&j?5Y08h{c^#A|>

diff --git a/Game/UnityVS.Game.CSharp.csproj b/Game/UnityVS.Game.CSharp.csproj
index d0fa6ec..261e377 100644
--- a/Game/UnityVS.Game.CSharp.csproj
+++ b/Game/UnityVS.Game.CSharp.csproj
@@ -7,14 +7,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{02576F1D-BE9C-CFA7-763D-1EBF63B36977}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>5.0.0f4</UnityVersion>
@@ -86,8 +88,10 @@
   <ItemGroup>
     <None Include="Assets\Data\Biomes\Grassland\Grassland.xml" />
     <None Include="Assets\Data\Biomes\Mountain\Mountain.xml" />
-    <None Include="Assets\Data\Config\tergen.xml" />
+    <None Include="Assets\Data\Config\tergen.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Assets\Standard Assets\Environment\Water (Basic)\Shaders\FXWaterBasic.shader" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2012\UnityVS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Game/UnityVS.Game.v11.suo b/Game/UnityVS.Game.v11.suo
index 1a792739de33a09bb674ee900f59d45521f302dc..d93e2bedebde1f56b5de947ee318e3e3ee09afc4 100644
GIT binary patch
delta 5040
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
N^G<G7G82;@|2JLDoTC5$

delta 4020
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
Z-vZ&%=uPk)y7LoJyVQLf?;aL4{{r~nF1!E$

diff --git a/Tools/MapViewer/MapViewer/Business/MapRenderer.cs b/Tools/MapViewer/MapViewer/Business/MapRenderer.cs
index 7ece64c..5b405f3 100644
--- a/Tools/MapViewer/MapViewer/Business/MapRenderer.cs
+++ b/Tools/MapViewer/MapViewer/Business/MapRenderer.cs
@@ -41,7 +41,7 @@ namespace TransportGame.MapViewer
 
         private readonly Color WaterColor = Colors.Navy;
         private readonly Color ElevationTerrainColor = Colors.White;
-        private readonly Color TerrainColor = Colors.White;
+        private readonly Color TerrainColor = Colors.Gray;
 
         public MapRenderer()
         {
diff --git a/Tools/MapViewer/MapViewer/MainWindow.xaml b/Tools/MapViewer/MapViewer/MainWindow.xaml
index ab0ca83..391c093 100644
--- a/Tools/MapViewer/MapViewer/MainWindow.xaml
+++ b/Tools/MapViewer/MapViewer/MainWindow.xaml
@@ -22,20 +22,16 @@
                 <Image Source="pack://application:,,,/Resources/picture_save.png" />
             </Button>
             <Separator />
-            <TextBlock VerticalAlignment="Center" Margin="4,2,4,2">Zoom:</TextBlock>
-            <Slider Name="zoomSlider" Width="80" 
-                    Minimum="1" Maximum="15" 
-                    SmallChange="1" LargeChange="3" 
-                    TickPlacement="BottomRight"
-                    Ticks="1,2,5,10,15"
-                    Value="{Binding Renderer.Scale}" 
-                    ValueChanged="zoomSlider_ValueChanged">
-                <Slider.ToolTip>
-                    <ToolTip Content="{Binding RelativeSource={RelativeSource Self}, Path=PlacementTarget.Value}" />
-                </Slider.ToolTip>
-            </Slider>
+
+            <Button Name="buttonZoomIn" ToolTip="Zoom in" Click="buttonZoomIn_Click">
+                <Image Source="pack://application:,,,/Resources/zoom_in.png" />
+            </Button>
+            <Button Name="buttonZoomOut" ToolTip="Zoom out" Click="buttonZoomOut_Click">
+                <Image Source="pack://application:,,,/Resources/zoom_out.png" />
+            </Button>
+
             <TextBlock VerticalAlignment="Center">
-                <Run Text="{Binding ElementName=zoomSlider, Path=Value}" /><Run>00%</Run>
+                <Run Text="{Binding ZoomLevel}" /><Run>00%</Run>
             </TextBlock>
         </ToolBar>
 
@@ -62,19 +58,14 @@
 
             <Expander IsExpanded="True" Header="Layers">
                 <StackPanel Orientation="Vertical">
-                    <CheckBox>Elevation</CheckBox>
+                    <CheckBox IsChecked="{Binding LayersAll}">(All)</CheckBox>
+                    <CheckBox IsChecked="{Binding LayerElevation}">Elevation</CheckBox>
                     <CheckBox>Roads</CheckBox>
                     <CheckBox>Buildings</CheckBox>
                     <CheckBox>Vegetation</CheckBox>
                     
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                        </Grid.ColumnDefinitions>
-                        <Button Grid.Column="0" Content="Select all" />
-                        <Button Grid.Column="1" Content="Render" />
-                    </Grid>
+                    <Button Name="buttonRender" Grid.Column="1" Content="Render" Click="buttonRender_Click" />
+                    
                 </StackPanel>
             </Expander>
             <Expander IsExpanded="True" Header="General">
diff --git a/Tools/MapViewer/MapViewer/MainWindow.xaml.cs b/Tools/MapViewer/MapViewer/MainWindow.xaml.cs
index e4f2bd9..b14b3e4 100644
--- a/Tools/MapViewer/MapViewer/MainWindow.xaml.cs
+++ b/Tools/MapViewer/MapViewer/MainWindow.xaml.cs
@@ -15,12 +15,19 @@ namespace TransportGame.MapViewer
     /// </summary>
     public partial class MainWindow : Window, INotifyPropertyChanged
     {
+        private MapRenderer.Layers _layers = MapRenderer.Layers.All;
+
         public event PropertyChangedEventHandler PropertyChanged;
 
+        #region Public properties
+
         #region Map property
 
         private Map _map;
 
+        /// <summary>
+        /// Gets the map displayed by the map viewer.
+        /// </summary>
         public Map Map
         {
             get
@@ -42,6 +49,9 @@ namespace TransportGame.MapViewer
         
         private string _loadedFile;
 
+        /// <summary>
+        /// Gets the path of the currently loaded map file.
+        /// </summary>
         public string LoadedFile
         {
             get
@@ -63,6 +73,9 @@ namespace TransportGame.MapViewer
 
         private BitmapSource _renderedMap;
 
+        /// <summary>
+        /// Gets the rendered map bitmap
+        /// </summary>
         public BitmapSource RenderedMap
         {
             get
@@ -81,8 +94,85 @@ namespace TransportGame.MapViewer
 
         #endregion
 
+        /// <summary>
+        /// Gets the map renderer
+        /// </summary>
         public MapRenderer Renderer { get; private set; }
 
+        #region Renderer layers
+
+        /// <summary>
+        /// Gets or sets all the layers
+        /// </summary>
+        public bool? LayersAll
+        {
+            get
+            {
+                if (LayerElevation)
+                    return true;
+
+                if (!LayerElevation)
+                    return false;
+
+                return null;
+            }
+            set
+            {
+                if (value.HasValue)
+                {
+                    LayerElevation = value.Value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the layer elevation layer flag
+        /// </summary>
+        public bool LayerElevation
+        {
+            get
+            {
+                return _layers.HasFlag(MapRenderer.Layers.Elevation);
+            }
+            set
+            {
+                if (value) _layers |= MapRenderer.Layers.Elevation;
+                else _layers &= ~MapRenderer.Layers.Elevation;
+
+                if (PropertyChanged != null)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs("LayerElevation"));
+                    PropertyChanged(this, new PropertyChangedEventArgs("LayersAll"));
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets or sets the zoom level
+        /// </summary>
+        public int ZoomLevel
+        {
+            get
+            {
+                return Renderer.Scale;
+            }
+            set
+            {
+                Renderer.Scale = value;
+                if (PropertyChanged != null)
+                    PropertyChanged(this, new PropertyChangedEventArgs("ZoomLevel"));
+            }
+        }
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// Initializes the main window
+        /// </summary>
         public MainWindow()
         {
             InitializeComponent();
@@ -92,12 +182,121 @@ namespace TransportGame.MapViewer
             DataContext = this;
         }
 
+        #endregion
+
         private async Task OpenMapFile(string filename)
         {
             await LoadMap(filename);
             await RenderMap();
         }
 
+        private async Task LoadMap(string filename)
+        {
+            progress.Visibility = System.Windows.Visibility.Visible;
+            progressText.Text = "Loading map...";
+
+            try
+            {
+                Map = await Task.Run(() => MapStorage.Read(filename));
+                LoadedFile = filename;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Error");
+            }
+
+            progress.Visibility = System.Windows.Visibility.Hidden;
+        }
+
+        private async Task RenderMap()
+        {
+            progress.Visibility = System.Windows.Visibility.Visible;
+            progressText.Text = "Rendering map...";
+
+            try
+            {
+                RenderedMap = await Renderer.RenderToImageSource(Map, _layers);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Error");
+            }
+
+            progress.Visibility = System.Windows.Visibility.Hidden;
+        }
+
+        #region UI Event handlers
+
+        private async void buttonOpen_Click(object sender, RoutedEventArgs e)
+        {
+            // Open dialog
+            string filename;
+
+            if (!ShowOpenMapDialog(out filename))
+                return;
+
+            // Load file and generate image
+            await OpenMapFile(filename);
+        }
+
+        private void buttonSave_Click(object sender, RoutedEventArgs e)
+        {
+            // Show save dialog
+            string filename;
+            if (!ShowSaveMapDialog(out filename))
+                return;
+
+            // Save to filename
+            var encoder = new PngBitmapEncoder();
+            encoder.Frames.Add(BitmapFrame.Create(RenderedMap));
+
+            using (var writer = File.OpenWrite(filename))
+            {
+                encoder.Save(writer);
+                writer.Close();
+            }
+        }
+
+        private async void buttonZoomIn_Click(object sender, RoutedEventArgs e)
+        {
+            // Zoom
+            ZoomLevel++;
+
+            // Update IsEnabled
+            if (ZoomLevel >= 10)
+                buttonZoomIn.IsEnabled = false;
+            buttonZoomOut.IsEnabled = true;
+
+            // Render
+            if (Map != null)
+                await RenderMap();
+        }
+
+        private async void buttonZoomOut_Click(object sender, RoutedEventArgs e)
+        {
+            // Zoom
+            ZoomLevel--;
+
+            // Update IsEnabled
+            if (ZoomLevel <= 1)
+                buttonZoomOut.IsEnabled = false;
+            buttonZoomIn.IsEnabled = true;
+
+            // Render
+            if (Map != null)
+                await RenderMap();
+        }
+        
+        private async void buttonRender_Click(object sender, RoutedEventArgs e)
+        {
+            if (Map != null)
+                await RenderMap();
+        }
+
+        #endregion
+
+        #region Helper static functions
+
         private static bool ShowOpenMapDialog(out string filename)
         {
             OpenFileDialog dialog = new OpenFileDialog();
@@ -134,69 +333,7 @@ namespace TransportGame.MapViewer
             return true;
         }
 
-        private async Task LoadMap(string filename)
-        {
-            progress.Visibility = System.Windows.Visibility.Visible;
-            progressText.Text = "Loading map...";
+        #endregion
 
-            try
-            {
-                Map = await Task.Run(() => MapStorage.Read(filename));
-                LoadedFile = filename;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Error");
-            }
-
-            progress.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private async Task RenderMap()
-        {
-            progress.Visibility = System.Windows.Visibility.Visible;
-            progressText.Text = "Rendering map...";
-
-            try
-            {
-                RenderedMap = await Renderer.RenderToImageSource(Map);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Error");
-            }
-
-            progress.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private async void buttonOpen_Click(object sender, RoutedEventArgs e)
-        {
-            // Open dialog
-            string filename;
-
-            if (!ShowOpenMapDialog(out filename))
-                return;
-
-            // Load file and generate image
-            await OpenMapFile(filename);
-        }
-
-        private void buttonSave_Click(object sender, RoutedEventArgs e)
-        {
-            var encoder = new PngBitmapEncoder();
-            encoder.Frames.Add(BitmapFrame.Create(RenderedMap));
-
-            using (var writer = File.OpenWrite(LoadedFile + ".png"))
-            {
-                encoder.Save(writer);
-                writer.Close();
-            }
-        }
-
-        private async void zoomSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (Map != null)
-                await RenderMap();
-        }
     }
 }
diff --git a/Tools/MapViewer/MapViewer/MapViewer.csproj b/Tools/MapViewer/MapViewer/MapViewer.csproj
index 53a03d3..36bc59c 100644
--- a/Tools/MapViewer/MapViewer/MapViewer.csproj
+++ b/Tools/MapViewer/MapViewer/MapViewer.csproj
@@ -110,6 +110,10 @@
   <ItemGroup>
     <Resource Include="Resources\folder_page.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\zoom_in.png" />
+    <Resource Include="Resources\zoom_out.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Tools/MapViewer/MapViewer/Resources/zoom_in.png b/Tools/MapViewer/MapViewer/Resources/zoom_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdf0a52fe03715dcdf399e59c8071c4572dc51f7
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!XGugsR5;6}
zlJ83saU93}3wr9qqz7?Uh$wYLDFiN7+nPGJrEXVKkD05MBqL!<YkH+CZHA6*{-pMU
zrc44e@ix-w&c$}4!h{fuBCfcHJw85tzcHdZ3!w)uIF9e<^?83j-)|8B6#WlBKlreT
z<Res^k66Tfv`yl}EmC&IEN+Y&<LNOS`A-2KG1K{|Mc~5}pPgxPW+sfpM$kZP1oTcW
zVB|TUQCRiX(z^<9XIz|n+|1-Zek(;ZAnb_C2o2&u%3I5%ygDH{pq3>m%7v+TE=2L@
zAc44q=tejYU5HLZGooZ=NXsV%)bU*sTokj@jZSo^9&w{ke7#VNQ*<C|5{$~39MFg|
zK|azVWyX!TyX}{*KSr=VGl6B^2&QN~EZ<TR$w93oA0cFsIKLhXtcAj>1zG!rIRk_@
zCqOr;g6B6CM1oPv1(~U4k@Gd+5tN0(j@GA*K*busv3Lb0UyXuowiRkTRZ#85JN!eC
z_8ZVW>+upx5C#N|BTv2dK_EW@%(@F6yu1sZv>T3gm&*mIkvej1R4=RyYw<PiN1Vcu
zHDd~(BNTYJerO8npwdwWW%g2-x1Vg3J){@+&e5yGwL)@G!?S&7oJ&2YiA9%!z>#mS
zx}c)#2z<)=VQ1|=ux>5PwjVE+J!Q84EQyG-j9SFYV*6AQj$Gb(7!KJE!k5iQ@O3K$
z@0NQZ)>b7&TaFd~Ciolk*Q(7cL+9cB`Y;G@rr`tk5Hdjv+))zSdlF#gI!>6`zB<@i
zaKYP!9!Pl&5VMjydlq1x&}37{RQY+SSBXX-w?kCLKK%bXFYU6{?d+nH00000NkvXX
Hu0mjfTSP*+

literal 0
HcmV?d00001

diff --git a/Tools/MapViewer/MapViewer/Resources/zoom_out.png b/Tools/MapViewer/MapViewer/Resources/zoom_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..07bf98a79cfea526e250703356dbefdb6b80d166
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!R!KxbR5;6}
zlJ9F$Q5eVl7lL3AL8BmUZ+g+FOFto)Wlhs<>TNkCP1&*^7LC~A?iZQEu_hKZoQoXI
zA7tfTv}|~Fb8b^XuP>qvDk=)P)vYKtT12;}bKn-mwHWl`1Bb)&{XXC4IY$Nnvj5@N
zfekg1Y}gcI!)Cq|u?lR+A{2&=d~S$}&0ei1|7pO6jkZ$6%&{R8TNpk>=dV#j&aWqO
zgE~4pNU_-giktFkY-J5_XDlv`7+j?n3mXtxgadILp+c<9cr~t!x1LM6m69Z~V#pLL
z22Cs~BoIdtZHTjo7Q|_U0a2OmSF=gCGFB$RVZIP(pixmBqE!^15yd!#9Z{Wh)zB%o
zikBFa!WJPvMB(noe(U;k1e~Y|r$}@wh*Ymykd6>E3t69z5DT&Jq-fSG-dPdU{SG;i
zbSb3<`RfKgJD|lQC`6(Cdut1PbDV&$M=Y?U)x)A(0iQN+gAeOBg2Z6fr$_Is!%M70
z=n*z7{*s%3rO7yazIO)}qa&~o@WZ=R>!b#mOSR<m6&;uMsPQwdLF_Kq8H?YpSPi3&
z9SxF?G}(8+Hs#T9sa_S!IQP-xoqLFQyPSxhtESU^b;8`;Hh5X^!PDuBz?@gZt>&#2
zlCR8M*iRy2j7!PmWiiegA>Og~W1?FLk0*NI^}`$RW<Cgy5?v6r?i3=HEfs$l{Eg95
zyNv1ngYay|1KfiEJkMT+yx$Bx3gXGK3^2Ft+l`E~7Usv=VQ#DwGG0AIo5=UeHo)Ap
qk;Y(S6^wT&&<NzKplQ=eeE$QHa=)We*vaDn0000<MNUMnLSTaU!#{%n

literal 0
HcmV?d00001