Zasadniczy wsad inicjalizacyjny.

src/main/java/pl/wat/ms4ds/terenfunkcje/MapConsts.java

@@ -1,7 +1,7 @@
 package pl.wat.ms4ds.terenfunkcje;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -9,7 +9,7 @@ import java.util.Properties;
 
 public final class MapConsts {
 
-	private static final Logger LOGGER = Logger.getLogger(MapConsts.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(MapConsts.class);
 
 	/**
 	 * Umowny uklad odniesienia dla lokalizacji geograficznej: <p>

src/main/java/pl/wat/ms4ds/terenfunkcje/RightBigSquare.java

@@ -1,12 +1,12 @@
 package pl.wat.ms4ds.terenfunkcje;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 import java.io.*;
 
 public class RightBigSquare extends BigSquare implements Serializable {
 
-    private static final Logger logger = Logger.getLogger(RightBigSquare.class);
+    private static final Logger logger = LoggerFactory.getLogger(RightBigSquare.class);
 
     private Kwadrat kwadraty[][];
 

src/main/java/pl/wat/ms4ds/terenfunkcje/SiecDrogowa.java

@@ -6,13 +6,13 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-
+import org.slf4j.Logger;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.wat.ms4ds.common.EGeoDirection;
 
 public class SiecDrogowa {
 
-	static final Logger logger = Logger.getLogger(SiecDrogowa.class);
+	static final Logger logger = LoggerFactory.getLogger(SiecDrogowa.class);
 
 	ArrayList<LukDrogowy> luki;
 	ArrayList<WezelDrogowy> wezly;

src/main/java/pl/wat/ms4ds/terenfunkcje/Teren.java

@@ -3,8 +3,8 @@ package pl.wat.ms4ds.terenfunkcje;
 import java.io.*;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
-
+import org.slf4j.Logger;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.wat.ms4ds.common.EGeoDirection;
 import pl.wat.ms4ds.common.ERodzajPodwozia;
 import pl.wat.ms4ds.common.ERodzajTerenuPokrycie;
@@ -14,7 +14,7 @@ import static pl.wat.ms4ds.terenfunkcje.Kwadrat.EMPTY_SQUARE;
 
 public class Teren {
 
-    private static final Logger LOGGER = Logger.getLogger(Teren.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Teren.class);
 
     private static final int BIG_X_MAX = 100;
     private static final int BIG_Y_MAX = 100;

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/CoordUtils.java

@@ -1,11 +1,11 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
 import pl.wat.ms4ds.terenfunkcje.GeoCoord;
 import pl.wat.ms4ds.terenfunkcje.GridCoord;
 import pl.wat.ms4ds.terenfunkcje.Kwadrat;
 import pl.wat.ms4ds.terenfunkcje.Teren;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -19,7 +19,7 @@ import java.util.StringTokenizer;
  */
 public class CoordUtils {
 
-    private static final Logger logger = Logger.getLogger(CoordUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(CoordUtils.class);
 
     static String dataDir = "d:/Workspace2/dane_wysok/";
 

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/EsriFileReader.java

@@ -1,6 +1,5 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
 import org.nocrala.tools.gis.data.esri.shapefile.ShapeFileReader;
 import org.nocrala.tools.gis.data.esri.shapefile.ValidationPreferences;
 import org.nocrala.tools.gis.data.esri.shapefile.exception.InvalidShapeFileException;
@@ -14,13 +13,14 @@ import org.nocrala.tools.gis.data.esri.shapefile.shape.shapes.PolylineShape;
 import pl.wat.ms4ds.terenfunkcje.GridCoord;
 import pl.wat.ms4ds.terenfunkcje.MapConsts;
 import pl.wat.ms4ds.terenfunkcje.Teren;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.HashMap;
 
 public class EsriFileReader {
-    private static final Logger LOGGER = Logger.getLogger(EsriFileReader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EsriFileReader.class);
 
     public static void main(String[] args) throws IOException, InvalidShapeFileException {
         String fn = "C:/Workspace/osm/dolnoslaskie-251217-free.shp/gis_osm_water_a_free_1.shp";

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/OpenStreetMapReader.java

@@ -1,9 +1,9 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
 import pl.wat.ms4ds.terenfunkcje.GridCoord;
 import pl.wat.ms4ds.terenfunkcje.Teren;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,7 +13,7 @@ import javax.xml.stream.*;
  *
  */
 public class OpenStreetMapReader {
-    private static final Logger LOGGER = Logger.getLogger(OpenStreetMapReader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenStreetMapReader.class);
 
     private static final String DATA_DIR = "c:/Workspace/openstreetmap-data-20160925/";
 

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/Relation.java

@@ -1,14 +1,14 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 
 /**
  * Bazowa klasa dla obiektów OpenStreetMap.
  */
 public class Relation {
-    private static final Logger logger = Logger.getLogger(Relation.class);
+    private static final Logger logger = LoggerFactory.getLogger(Relation.class);
 
     public String id;
     /**

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/Way.java

@@ -1,16 +1,16 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
 import pl.wat.ms4ds.common.EGeoDirection;
 import pl.wat.ms4ds.terenfunkcje.*;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 
 /**
  * Bazowa klasa dla obiektów OpenStreetMap.
  */
 public class Way {
-    private static final Logger logger = Logger.getLogger(Way.class);
+    private static final Logger logger = LoggerFactory.getLogger(Way.class);
 
     public String id;
 

src/main/java/pl/wat/ms4ds/terenfunkcje/konwersja/Worker.java

@@ -1,8 +1,8 @@
 package pl.wat.ms4ds.terenfunkcje.konwersja;
 
-import org.apache.log4j.Logger;
 import pl.wat.ms4ds.terenfunkcje.GridCoord;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 
 /**
@@ -10,7 +10,7 @@ import java.util.ArrayList;
  */
 public class Worker extends Thread {
 
-    private static final Logger logger = Logger.getLogger(Worker.class);
+    private static final Logger logger = LoggerFactory.getLogger(Worker.class);
 
     static ArrayList<Worker> workers = new ArrayList<>();
 

src/main/java/pl/wat/ms4ds/terenfunkcje/nmt/NMTDataProvider.java

@@ -1,7 +1,7 @@
 package pl.wat.ms4ds.terenfunkcje.nmt;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
@@ -23,7 +23,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class NMTDataProvider {
-    private static final Logger LOGGER = Logger.getLogger(NMTDataProvider.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMTDataProvider.class);
 
     public static void main(String[] args) throws Exception {
 //        File dir = new File(System.getProperty("user.home") + "/nmt/gugik_SkorowidzNMT2018.gml");

src/main/java/pl/wat/ms4ds/terenfunkcje/nmt/NMTReader.java

@@ -5,7 +5,7 @@ import java.io.*;
 public class NMTReader {
 
 
-    public static void main(String[] args) {
+    static void main(String[] args) {
 //        File dir = new File(System.getProperty("user.home") + "/nmt/gugik_SkorowidzNMT2018.gml");
 
         InputStream is = null;

src/main/java/pl/wat/ms4ds/terenfunkcje/osm/shapefile/DbfRecord.java

@@ -1,8 +1,6 @@
 package pl.wat.ms4ds.terenfunkcje.osm.shapefile;
 
 import java.io.BufferedInputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 
 public class DbfRecord {

src/main/java/pl/wat/ms4ds/terenfunkcje/osm/shapefile/Main.java

@@ -3,10 +3,10 @@ package pl.wat.ms4ds.terenfunkcje.osm.shapefile;
 
 public class Main {
 
-    public static void main(String[] args) {
+    static void main(String[] args) {
         try {
             // GET DIRECTORY
-            String curDir = System.getProperty("user.dir");
+            String curDir = (args[0] != null) ? args[0] : System.getProperty("user.dir");
             curDir = "";
             String folder = "C:/Workspace/osm/dolnoslaskie-251217-free.shp/";
 

src/main/java/pl/wat/ms4ds/terenfunkcje/osm/shapefile/ShpPolygon.java

@@ -1,6 +1,5 @@
 package pl.wat.ms4ds.terenfunkcje.osm.shapefile;
 
-import java.nio.ByteBuffer;
 
 /**
  * Shape: Polygon.<br>