Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove unneeded dependency #19

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix: remove unneeded dependency #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ dependencies {
implementation "org.geotools:gt-api:${geotoolsVersion}"
// implementation "org.geotools:gt-geometry:${geotoolsVersion}"
implementation "org.geotools:gt-referencing:${geotoolsVersion}"

implementation 'javax.xml.bind:jaxb-api:2.3.1'
implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
implementation 'com.sun.xml.bind:jaxb-impl:2.3.9'

testImplementation 'junit:junit:4.13.2'

Expand Down
7 changes: 2 additions & 5 deletions src/json/tools/Compress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import java.nio.charset.StandardCharsets;

import javax.xml.bind.DatatypeConverter;

import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Decompressor;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4UnknownSizeDecompressor;

Expand All @@ -25,14 +22,14 @@ public static String compressB64(String iStr){
byte[] compressedFinal = new byte[compressedLength];
System.arraycopy(compressed, 0, compressedFinal, 0, compressedLength);

return DatatypeConverter.printBase64Binary(compressedFinal);
return java.util.Base64.getEncoder().encodeToString(compressedFinal);

}

public static String decompressB64(String iStr){


byte[] aInputData = DatatypeConverter.parseBase64Binary(iStr);
byte[] aInputData = java.util.Base64.getDecoder().decode(iStr);

LZ4Factory factory = LZ4Factory.fastestInstance();

Expand Down
9 changes: 0 additions & 9 deletions src/json/topojson/api/TopojsonApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
package json.topojson.api;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.TreeSet;

import javax.xml.bind.DatatypeConverter;

import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;

import org.geotools.api.referencing.crs.CoordinateReferenceSystem;

import json.converter.csv.merger.Merger;
import json.converter.shp.ShpFileReader;
import json.geojson.FeatureCollection;
import json.geojson.objects.Bounding;
import json.tools.Compress;
import json.tools.Toolbox;
import json.topojson.algorithm.ArcMap;
Expand Down
Loading