From bef12a235a0bb19c8f6d47b65a40802b297ace2b Mon Sep 17 00:00:00 2001
From: Vlammar <valentin.jabre@gmail.com>
Date: Thu, 16 Jul 2020 14:07:08 +0200
Subject: [PATCH] Added scaling support, remove an unused print

---
 .../commands/maptool/UpdateCommand.java       | 22 ++++++++++++++++---
 .../image/ImageRendererExecutor.java          |  2 +-
 .../fr/moribus/imageonmap/map/ImageMap.java   |  3 ---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateCommand.java
index d1baf8c..9302c8d 100644
--- a/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateCommand.java
+++ b/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateCommand.java
@@ -58,7 +58,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 
-@CommandInfo (name =  "update", usageParameters = "<new url> <map name to update> [--confirm]")
+@CommandInfo (name =  "update", usageParameters = "<new url> [stretched|covered] \"<map name to update>\" [--confirm]")
 @WithFlags ({"confirm"})
 public class UpdateCommand extends IoMCommand
 {
@@ -66,14 +66,30 @@ public class UpdateCommand extends IoMCommand
     protected void run() throws CommandException
     {
         final Player player = playerSender();
-        ImageUtils.ScalingType scaling = ImageUtils.ScalingType.NONE;
+        ImageUtils.ScalingType scaling;
+
         URL url;
 
         if(args.length < 1) throwInvalidArgument(I.t("You must give an URL and a map name to update."));
         if(args.length < 2) throwInvalidArgument(I.t("You must give a map name to update."));
 
-        ImageMap map=getMapFromArgs(player,1,true);
+        switch(args[1]) {
 
+            case "stretched":
+                scaling = ImageUtils.ScalingType.STRETCHED;
+                break;
+            case "covered":
+                scaling = ImageUtils.ScalingType.COVERED;
+                break;
+            default:
+                scaling = ImageUtils.ScalingType.CONTAINED;
+                break;
+        }
+        ImageMap map;
+        if(scaling.equals(ImageUtils.ScalingType.CONTAINED))
+            map=getMapFromArgs(player,1,true);
+        else
+            map=getMapFromArgs(player,2,true);
         try
         {
             url = new URL(args[0]);
diff --git a/src/main/java/fr/moribus/imageonmap/image/ImageRendererExecutor.java b/src/main/java/fr/moribus/imageonmap/image/ImageRendererExecutor.java
index f8c1a35..a180448 100644
--- a/src/main/java/fr/moribus/imageonmap/image/ImageRendererExecutor.java
+++ b/src/main/java/fr/moribus/imageonmap/image/ImageRendererExecutor.java
@@ -142,7 +142,7 @@ public class ImageRendererExecutor extends Worker
                 // Limits are in place and the player does NOT have rights to avoid them.
                 checkSizeLimit(playerUUID, image );
 
-                updateMap(ImageUtils.ScalingType.CONTAINED.resize(image, width*128, height*128),playerUUID,map.getMapsIDs());
+                updateMap(scaling.resize(image, width*128, height*128),playerUUID,map.getMapsIDs());
                 return map;
 
             }
diff --git a/src/main/java/fr/moribus/imageonmap/map/ImageMap.java b/src/main/java/fr/moribus/imageonmap/map/ImageMap.java
index d1828c0..1b15290 100644
--- a/src/main/java/fr/moribus/imageonmap/map/ImageMap.java
+++ b/src/main/java/fr/moribus/imageonmap/map/ImageMap.java
@@ -39,7 +39,6 @@ package fr.moribus.imageonmap.map;
 import fr.moribus.imageonmap.ImageOnMap;
 import fr.moribus.imageonmap.ui.MapItemManager;
 import fr.zcraft.zlib.components.i18n.I;
-import fr.zcraft.zlib.tools.PluginLogger;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -162,10 +161,8 @@ public abstract class ImageMap implements ConfigurationSerializable
         List<Map<String, Object>> list = (List<Map<String, Object>>) section.getList("mapList");
         if(list == null) return null;
 
-        PluginLogger.info("list ");
         for(Map<String, Object> tMap : list)
         {
-            PluginLogger.info(" "+tMap.toString());
             if(tMap.get("id").equals(id)) {
                     return new Integer[]{(Integer)tMap.get("columns"), (Integer)tMap.get("rows")};
             }