diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ef18e1dd..44d5f4406 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ env: # Markdown template of the artifact download extra information # {0}: Artifact download URL ARTIFACT_DOWNLOAD_TEMPLATE: | - 📦 **Download artifact**: [Generator.jar]({0}) + 📦 **Download artifact**: [voxatile.jar]({0}) # Markdown template of the build logs extra information # {0}: Build logs BUILD_LOGS_TEMPLATE: | @@ -86,12 +86,12 @@ jobs: } >> "$GITHUB_OUTPUT" echo "date=$(TZ=Europe/Paris date +'%Y-%m-%dT%H:%M:%S (%Z)')" >> "$GITHUB_OUTPUT" exit $code - - name: Upload Generator.jar as build artifact + - name: Upload voxatile.jar as build artifact uses: actions/upload-artifact@v4 id: upload-artifact with: - name: Generator.jar - path: target/Generator.jar + name: voxatile.jar + path: target/voxatile.jar if-no-files-found: error - name: Find PR with commit id: find-pr diff --git a/.github/workflows/parameters-tests.yml b/.github/workflows/parameters-tests.yml index 36530b079..1db70a2ca 100644 --- a/.github/workflows/parameters-tests.yml +++ b/.github/workflows/parameters-tests.yml @@ -24,7 +24,7 @@ jobs: run: | mvn --batch-mode --no-transfer-progress --update-snapshots -Dmaven.test.skip=true package - - name: Run generator to validate example parameters + - name: Run Voxatile to validate example parameters run: | FORMATS=$(./generate.sh -l formats) PLACES=$(./generate.sh -l places) diff --git a/Dockerfile b/Dockerfile index b16e28948..2751d7072 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,12 +66,12 @@ EOF # Pick results from builder WORKDIR /app -COPY --from=builder /root/target/Generator.jar Generator.jar +COPY --from=builder /root/target/voxatile.jar voxatile.jar # Run as user and group USER ${USER}:${GROUP} -# Generator as entrypoint -ENTRYPOINT ["java", "-jar", "/app/Generator.jar"] +# Voxatile as entrypoint +ENTRYPOINT ["java", "-jar", "/app/voxatile.jar"] # Output directory default value CMD ["/output"] diff --git a/README.md b/README.md index 3a38c06b5..e3ecffab2 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,6 @@ Voxatile is a geo-voxelizer. It can turn geographical data into voxels (small cubes). -> [!WARNING] -> Before the opening, the project was named "Minalac generator". -> It is being renamed to "Voxatile". -> You may find both names in code and documentation, keep in mind that they both refer to the same thing. -> Old name occurrences will be progressively replaced, starting with the package name. - ## Project status The tool is available in very early alpha version. It is still being actively developed, and many changes will occur in parameters syntax, along with new features being added. diff --git a/checkstyle.xml b/checkstyle.xml index aee51075c..592e777a2 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -130,15 +130,15 @@ - - - + + + - + diff --git a/docs/README.md b/docs/README.md index a0f6b006b..7c372ab42 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,7 +5,7 @@ This folder contains additional documentation on various topics. Technical code ## Quick links You may find useful the following links: -- [`usage/Run.md`](usage/Run.md): How to run the generator? +- [`usage/Run.md`](usage/Run.md): How to run Voxatile? - [`tools/Maven.md`](tools/Maven.md): How to use Maven? - [Online Javadoc](https://ignfab.github.io/voxatile), automatically deployed on GitHub Pages. @@ -14,8 +14,9 @@ If none of the above helped you, consider searching through the complete documen ## Overview - `/`: Important and generic documentation. + - `usage`: How to use Voxatile, without looking at the code. - `tools`: You can find explanation about the dev tools used. - - `usage`: How to use the generator, without looking at the code. + - `dev`: Developer-oriented documentation to understand the code and create modules. ## Redaction diff --git a/docs/dev/Modules.md b/docs/dev/Modules.md index a07c4ed6e..8fde13b46 100644 --- a/docs/dev/Modules.md +++ b/docs/dev/Modules.md @@ -1,26 +1,26 @@ # Module development -Generator features can be extended with modules. Typical usage of modules is adding new task types (see [Generator.md](../usage/Generator.md#modules)). +Voxatile features can be extended with modules. Typical usage of modules is adding new task types (see [Voxatile.md](../usage/Voxatile.md#modules)). ## Set up development environment -Module project must have a dependency to `Generator.jar`. This file could be copied locally but it's preferable to tell `maven` where to fetch it from. +Module project must have a dependency to `voxatile.jar`. This file could be copied locally, but it's preferable to tell `maven` where to fetch it from. In `pom.xml`, add following dependency: ```xml - com.ignfab + fr.ign voxatile 1.0-SNAPSHOT provided ``` -Don't forget the `provided` to avoid shading the generator classes into the module's JAR file! +Don't forget the `provided` to avoid shading Voxatile classes into the module's JAR file! Add eventual corresponding `repository`. -If you use a `Generator.jar` from a GitHub repository, you should create a personal access token (classic) with `read:package` permission and modify your `~/.m2/settings.xml` according to [GitHub instructions](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-with-a-personal-access-token). +If you use a `voxatile.jar` from a GitHub repository, you should create a personal access token (classic) with `read:package` permission and modify your `~/.m2/settings.xml` according to [GitHub instructions](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-with-a-personal-access-token). ## Minimal module @@ -31,9 +31,9 @@ Minimal module consists of two files: Example of `HelloWorldModule` subclass: ```java -package com.ignfab.minalac.helloworld; +package fr.ign.voxatile.modules.helloworld; -import com.ignfab.minalac.generator.Module; +import fr.ign.voxatile.core.utils.modules.Module; public class HelloWorldModule extends Module { public HelloWorldModule() { @@ -42,21 +42,21 @@ public class HelloWorldModule extends Module { } ``` -This class **must** have a public no-argument constructor that will be used by the generator to instantiate it! +This class **must** have a public no-argument constructor that will be used by Voxatile to instantiate it! Example of corresponding `module.properties`: ```properties -class=com.ignfab.minalac.helloworld.HelloWorldModule +class=fr.ign.voxatile.modules.helloworld.HelloWorldModule ``` -Now, a module Jar file has to be created from these two files. This is achieved with usual build tools like [Maven](https://maven.apache.org/) or [Gradle](https://gradle.org/). The only specific need is that `Generator.jar` should be added as a compile-only dependency (and not included in final module Jar). +Now, a module Jar file has to be created from these two files. This is achieved with usual build tools like [Maven](https://maven.apache.org/) or [Gradle](https://gradle.org/). The only specific need is that `voxatile.jar` should be added as a compile-only dependency (and not included in final module Jar). Once Jar created, put it in the appropriate module directory and you are done! ## Go further -`Module` subclass is the module entrypoint. In that class, it is possible to add new capabilities to Generator by making it able to understand new parameters. +`Module` subclass is the module entrypoint. In that class, it is possible to add new capabilities to Voxatile by making it able to understand new parameters. Override `registerParams` method to add, for example, new tasks: ```java @@ -66,6 +66,6 @@ public void registerParams(ParamsParser parser) { } ``` -Of course, `MyOperationTaskParams` class and probably other classes have to be defined in the module project. Classes from the Generator jar may also be used. +Of course, `MyOperationTaskParams` class and probably other classes have to be defined in the module project. Classes from Voxatile jar may also be used. Refer to [parameters](Parameters.md) documentation for further information. diff --git a/docs/dev/TileTasks.md b/docs/dev/TileTasks.md index c4e188519..268886cd2 100644 --- a/docs/dev/TileTasks.md +++ b/docs/dev/TileTasks.md @@ -1,6 +1,6 @@ # Tile tasks cookbook -Tile tasks are tasks performed on each map tile. They are described by classes extending `TileTask` or `ModelTask` if they process models one by one. All work in generator is done by different tasks. +Tile tasks are tasks performed on each map tile. They are described by classes extending `TileTask` or `ModelTask` if they process models one by one. All work in Voxatile is done by different tasks. ## Deserialization from Yaml/Json @@ -21,7 +21,7 @@ Optional `validate()` method can perform some more checks that *Jackson* could n *Example of parameter class implementation:* ```java -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; ... public class FooTaskParams extends TileTaskParam { diff --git a/docs/legacy/QuickStart.md b/docs/legacy/QuickStart.md index 1ec77d6f5..895e78316 100644 --- a/docs/legacy/QuickStart.md +++ b/docs/legacy/QuickStart.md @@ -1,9 +1,9 @@ # Overview - + > [!WARNING] -> This document is not completely up-to-date! It should be reviewed / rewritten and then moved out of the `legacy` folder. +> This document is completely out-of-date! It should be removed and replaced by "How To" guides. The generator has three main interfaces: - `VoxelWorld`: Its two main methods are: diff --git a/docs/tools/GitHub-workflows.md b/docs/tools/GitHub-workflows.md index 61f00338f..e1204966e 100644 --- a/docs/tools/GitHub-workflows.md +++ b/docs/tools/GitHub-workflows.md @@ -31,7 +31,7 @@ It consists of a first job, [building the JAR](Maven.md#create-an-executable-jar If the project fails to build (compilation failure, missing dependency, packaging issue...), the workflow will fail, but the status will still be reported, with the build logs to help troubleshooting the problem. -Otherwise, the workflow will upload the `Generator.jar` file as an artifact, and include the download URL in the report message. You can [download and run the JAR](../usage/Run.md#download-workflow-artifact) to test it locally. +Otherwise, the workflow will upload the `voxatile.jar` file as an artifact, and include the download URL in the report message. You can [download and run the JAR](../usage/Voxatile.md#download-workflow-artifact) to test it locally. ### checkstyle diff --git a/docs/tools/Maven.md b/docs/tools/Maven.md index 5e6a610b9..77638e8d4 100644 --- a/docs/tools/Maven.md +++ b/docs/tools/Maven.md @@ -77,7 +77,7 @@ mvn -Dtest="my.package.MyClassTest#testMyMethod" clean test ### Create an executable JAR -To build the project into a dependency-shaded, executable JAR (to [execute it](../usage/Run.md) locally, for example), you can run the `package` phase. It will compile the source and bundle all the dependencies into a single JAR (`target/Generator.jar`). +To build the project into a dependency-shaded, executable JAR (to [execute it](../usage/Run.md) locally, for example), you can run the `package` phase. It will compile the source and bundle all the dependencies into a single JAR (`target/voxatile.jar`). Because this phase is after the `test` one, they will be executed as well. If you want to speed up the process, you can explicitly ignore them using `-DskipTests=true`. diff --git a/docs/usage/Run.md b/docs/usage/Run.md index d0bc4c681..1d3d67c3b 100644 --- a/docs/usage/Run.md +++ b/docs/usage/Run.md @@ -19,7 +19,7 @@ Run only (from repository root): ## generate.sh -`generate.sh` scripts creates yaml configuration from configuration fragments and passes it to `Generator.jar`. +`generate.sh` scripts creates yaml configuration from configuration fragments and passes it to `voxatile.jar`. It mimics a simple behavior of future `voxatile-configurator` and is only intended to be used for testing purpose. diff --git a/docs/usage/Generator.md b/docs/usage/Voxatile.md similarity index 83% rename from docs/usage/Generator.md rename to docs/usage/Voxatile.md index f1c992aa7..a6df88c38 100644 --- a/docs/usage/Generator.md +++ b/docs/usage/Voxatile.md @@ -3,7 +3,7 @@ > [!IMPORTANT] > Don't forget to configure your [proxy](../Proxy.md) if needed! -This page is about different methods for building and running Generator. They are provided for informational purpose. If you just want to run the generator, please refer to [Run.md](Run.md). +This page is about different methods for building and running Voxatile. They are provided for informational purpose. If you just want to run Voxatile, please refer to [Run.md](Run.md). ## Generation parameters @@ -16,7 +16,7 @@ To avoid useless efforts building a parameter file, you can use provided `genera ## Command line arguments Usage: ``` -java -jar Generator.jar [OPTIONS] +java -jar voxatile.jar [OPTIONS] ``` Options: @@ -49,7 +49,7 @@ Path to modules directory (see [modules](#modules)). If you have cloned the project repository, you can [build the JAR using Maven](../tools/Maven.md#create-an-executable-jar) and run it: ```shell -mvn -Dmaven.test.skip=true clean package && java -jar target/Generator.jar -p parameters.yaml $HOME/.minetest/worlds/voxatile +mvn -Dmaven.test.skip=true clean package && java -jar target/voxatile.jar -p parameters.yaml $HOME/.minetest/worlds/voxatile ``` ## Download workflow artifact @@ -59,9 +59,9 @@ mvn -Dmaven.test.skip=true clean package && java -jar target/Generator.jar -p pa If you just want to test the JAR from a different branch (e.g. to validate a PR), you can just download the [JAR built by the GitHub workflow](../tools/GitHub-workflows.md#build-jar), available as an artifact. You can find the link in the PR discussion or in the commit comments if no PR is open for the desired branch. -Once you downloaded (and extracted) the artifact, you should have the `Generator.jar` file and will be able to run it: +Once you downloaded (and extracted) the artifact, you should have the `voxatile.jar` file and will be able to run it: ```shell -java -jar Generator.jar -p parameters.yaml $HOME/.minetest/worlds/voxatile +java -jar voxatile.jar -p parameters.yaml $HOME/.minetest/worlds/voxatile ``` ## Run using Maven @@ -70,13 +70,13 @@ If, for some reason, you don't want to build the JAR, you can run the [`exec:jav ```shell mvn clean compile exec:java \ -Dexec.cleanupDaemonThreads=false \ - -Dexec.mainClass="com.ignfab.minalac.generator.Voxatile" \ + -Dexec.mainClass="fr.ign.voxatile.core.Voxatile" \ -Dexec.args="-p parameters.yaml $HOME/.minetest/worlds/voxatile" ``` # Modules -Modules are Jar files adding features to generator (output formats, source types, task types, ...). +Modules are Jar files adding features to Voxatile (output formats, source types, task types, ...). They should be placed in a directory specified either by `--modules-path` command line option or `VOXATILE_MODULES_PATH` environment variable. If command line option is set, environment variable is ignored. If none set, no modules will be loaded. diff --git a/docs/usage/parameters/Parameters.md b/docs/usage/parameters/Parameters.md index 0279a233a..d7aa40d8e 100644 --- a/docs/usage/parameters/Parameters.md +++ b/docs/usage/parameters/Parameters.md @@ -1,6 +1,6 @@ # Generation parameters -Generator makes a heavy use of parameters. Generation is described in Yaml (or Json). +Voxatile makes a heavy use of parameters. Generation is described in Yaml (or Json). ## Table of contents @@ -96,7 +96,7 @@ forEachTile: ## Fields description -- `worldName`: World name (text, default `Minalac`) +- `worldName`: World name (text, default `Voxatile`) - `references`: Ignored field where references (or other content) can be put in - `area`: Area to be rendered - `center`: Coordinates of the area's center point, expressed in the commonly used coordinate system (EPSG:4326) @@ -125,4 +125,4 @@ forEachTile: ## References -YAML references are processed by the generator. They can be defined anywhere in parameters. A `references` field is available at root to put references not going anywhere else. +YAML references are processed by Voxatile. They can be defined anywhere in parameters. A `references` field is available at root to put references not going anywhere else. diff --git a/generate.sh b/generate.sh index bc281c2cd..199114441 100755 --- a/generate.sh +++ b/generate.sh @@ -6,7 +6,7 @@ cd "$SCRIPT_DIR" || exit # Check if JAVA_CMD is set, if not, set it to java JAVA_CMD=${JAVA_CMD:-java} -JAR_PATH=./target/Generator.jar +JAR_PATH=./target/voxatile.jar PARAMS_DIR=./examples FORMATS_DIR=$PARAMS_DIR/formats PROCESSES_DIR=$PARAMS_DIR/processes @@ -32,17 +32,17 @@ usage() { } output_dir_needed=1 -generator_opt="" +voxatile_opt="" while [[ "$1" == "-"* ]]; do opt=$1 shift case $opt in -g) - generator_opt="$generator_opt --generation-disabled" + voxatile_opt="$voxatile_opt --generation-disabled" ;; -s) - generator_opt="$generator_opt --save-disabled" + voxatile_opt="$voxatile_opt --save-disabled" unset output_dir_needed ;; -y) @@ -136,4 +136,4 @@ if [ "$display_only" ]; then exit 0 fi -VOXATILE_PARAMS=$params VOXATILE_MODULES_PATH=modules $JAVA_CMD -jar $JAR_PATH $generator_opt "$output_dir" +VOXATILE_PARAMS=$params VOXATILE_MODULES_PATH=modules $JAVA_CMD -jar $JAR_PATH $voxatile_opt "$output_dir" diff --git a/pom.xml b/pom.xml index af5dfac95..118e07231 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ignfab + fr.ign voxatile 1.0-SNAPSHOT Voxatile - Minecraft/Minetest world generator from real world geographic data - https://www.ign.fr/minecraft + Voxel world generator from real world geographic data + https://github.com/ignfab/voxatile UTF-8 @@ -225,8 +225,8 @@ - - Generator + + voxatile @@ -280,7 +280,7 @@ - com.ignfab.minalac.generator.Voxatile + fr.ign.voxatile.core.Voxatile diff --git a/src/main/java/com/ignfab/minalac/generator/models/Shape2dConvertibleModel.java b/src/main/java/com/ignfab/minalac/generator/models/Shape2dConvertibleModel.java deleted file mode 100644 index 21c6a316e..000000000 --- a/src/main/java/com/ignfab/minalac/generator/models/Shape2dConvertibleModel.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ignfab.minalac.generator.models; - -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; - -/** - * A model convertible to a {@link Shape2d}. - */ -public interface Shape2dConvertibleModel extends Shape2dConvertible, Model { -} diff --git a/src/main/java/com/ignfab/minalac/generator/models/Shape3dConvertibleModel.java b/src/main/java/com/ignfab/minalac/generator/models/Shape3dConvertibleModel.java deleted file mode 100644 index adac00869..000000000 --- a/src/main/java/com/ignfab/minalac/generator/models/Shape3dConvertibleModel.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ignfab.minalac.generator.models; - -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3dConvertible; - -/** - * A model convertible to a {@link Shape3d}. - */ -public interface Shape3dConvertibleModel extends Shape3dConvertible, Model { -} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParams.java b/src/main/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParams.java deleted file mode 100644 index adab04956..000000000 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParams.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ignfab.minalac.generator.parameters.models.values; - -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.AbsentValue; -import com.ignfab.minalac.generator.models.values.ModelValue; - -/** - * Parameters for an {@link AbsentValue}. - */ -public class AbsentValueParams extends ModelValueParams { - @Override - public ModelValue create(Generation generation) { - return AbsentValue.INSTANCE; - } -} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/NothingParams.java b/src/main/java/com/ignfab/minalac/generator/parameters/placeables/NothingParams.java deleted file mode 100644 index 863997cce..000000000 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/NothingParams.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ignfab.minalac.generator.parameters.placeables; - -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; - -/** - * Places nothing. - */ -public class NothingParams extends PlaceableParams { - @Override - public Placeable create(Seed seed) { - return Nothing.INSTANCE; - } -} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParams.java b/src/main/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParams.java deleted file mode 100644 index 8218c5704..000000000 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParams.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ignfab.minalac.generator.parameters.processors; - -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.models.FloatMatrixModel; -import com.ignfab.minalac.generator.processors.FloatMatrixProcessor; -import com.ignfab.minalac.generator.processors.Processor; - -/** - * Parameters for float matrix processors. - */ -public class FloatMatrixProcessorParams extends ProcessorParams { - @Override - public Processor create(Generation generation) { - return new FloatMatrixProcessor(generation::makeCoordsConverter); - } -} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParams.java b/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParams.java deleted file mode 100644 index 0ec4d4a8d..000000000 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParams.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ignfab.minalac.generator.parameters.processors.post; - -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.processors.post.DiscardPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; - -/** - * Parameters for {@link DiscardPostProcessor}. - */ -public class DiscardPostProcessorParams extends PostProcessorParams { - @Override - public PostProcessor create(Generation generation) { - return DiscardPostProcessor.INSTANCE; - } -} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/NoOperationTaskParams.java b/src/main/java/com/ignfab/minalac/generator/parameters/tasks/NoOperationTaskParams.java deleted file mode 100644 index f96cf2ec7..000000000 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/NoOperationTaskParams.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ignfab.minalac.generator.parameters.tasks; - -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.tasks.NoOperationTask; -import com.ignfab.minalac.generator.utils.execution.Task; - -/** - * Parameters for a {@link NoOperationTask}. - */ -public class NoOperationTaskParams extends TaskParams { - @Override - public Task create(Generation generation) { - return NoOperationTask.INSTANCE; - } -} diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/Task.java b/src/main/java/com/ignfab/minalac/generator/utils/execution/Task.java deleted file mode 100644 index aea688278..000000000 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/Task.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ignfab.minalac.generator.utils.execution; - -/** - * A convenience interface to represent a runnable task in generator. - */ -public interface Task extends Runnable { -} diff --git a/src/main/java/com/ignfab/minalac/generator/Voxatile.java b/src/main/java/fr/ign/voxatile/core/Voxatile.java similarity index 68% rename from src/main/java/com/ignfab/minalac/generator/Voxatile.java rename to src/main/java/fr/ign/voxatile/core/Voxatile.java index 6a418d68a..9b30b8251 100644 --- a/src/main/java/com/ignfab/minalac/generator/Voxatile.java +++ b/src/main/java/fr/ign/voxatile/core/Voxatile.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator; +package fr.ign.voxatile.core; import java.io.File; import java.io.IOException; @@ -9,58 +9,58 @@ import org.geotools.api.referencing.FactoryException; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.modules.luanti.LuantiOutputModule; -import com.ignfab.minalac.generator.modules.minecraft.MinecraftOutputModule; -import com.ignfab.minalac.generator.parameters.ParamsParser; -import com.ignfab.minalac.generator.parameters.ParseException; -import com.ignfab.minalac.generator.parameters.processors.FloatMatrixProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.GeoToolsVectorProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.OsmProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.ConditionalPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.DiscardPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.IdentityPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.JTSGeometryBufferPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataCopyPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataDefaultPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataParsePostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataSetPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataTruncatePostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataValueMappingPostProcessorParams; -import com.ignfab.minalac.generator.parameters.providers.GeoPackageProviderParams; -import com.ignfab.minalac.generator.parameters.providers.GeoTiffProviderParams; -import com.ignfab.minalac.generator.parameters.providers.OverpassProviderParams; -import com.ignfab.minalac.generator.parameters.providers.ShapefileProviderParams; -import com.ignfab.minalac.generator.parameters.providers.WFSProviderParams; -import com.ignfab.minalac.generator.parameters.providers.WMSFloatBilProviderParams; -import com.ignfab.minalac.generator.parameters.tasks.BuildLayoutTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.CopyHeightmapTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.FetchDataTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.FillBetweenHeightmapAndValueTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.HeightmapStatsTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.NoOperationTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.PopulateHeightmapTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderBuildingsTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderFacadesTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderHeightmapTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderLines2dTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderLinesTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderPoints2dTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderPointsTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderSurfacesTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.ScheduleTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.SequenceTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.SetSpawnTaskParams; -import com.ignfab.minalac.generator.utils.FileHelpers; -import com.ignfab.minalac.generator.utils.execution.TaskFailedException; -import com.ignfab.minalac.generator.utils.modules.ModulesLoader; -import com.ignfab.minalac.generator.utils.modules.ModulesManager; -import com.ignfab.minalac.generator.utils.network.HttpTrustAllSSL; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.MapWriteException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.parameters.ParamsParser; +import fr.ign.voxatile.core.parameters.ParseException; +import fr.ign.voxatile.core.parameters.processors.FloatMatrixProcessorParams; +import fr.ign.voxatile.core.parameters.processors.GeoToolsVectorProcessorParams; +import fr.ign.voxatile.core.parameters.processors.OsmProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.ConditionalPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.DiscardPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.IdentityPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.JTSGeometryBufferPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataCopyPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataDefaultPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataParsePostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataSetPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataTruncatePostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.MetadataValueMappingPostProcessorParams; +import fr.ign.voxatile.core.parameters.providers.GeoPackageProviderParams; +import fr.ign.voxatile.core.parameters.providers.GeoTiffProviderParams; +import fr.ign.voxatile.core.parameters.providers.OverpassProviderParams; +import fr.ign.voxatile.core.parameters.providers.ShapefileProviderParams; +import fr.ign.voxatile.core.parameters.providers.WFSProviderParams; +import fr.ign.voxatile.core.parameters.providers.WMSFloatBilProviderParams; +import fr.ign.voxatile.core.parameters.tasks.BuildLayoutTaskParams; +import fr.ign.voxatile.core.parameters.tasks.CopyHeightmapTaskParams; +import fr.ign.voxatile.core.parameters.tasks.FetchDataTaskParams; +import fr.ign.voxatile.core.parameters.tasks.FillBetweenHeightmapAndValueTaskParams; +import fr.ign.voxatile.core.parameters.tasks.HeightmapStatsTaskParams; +import fr.ign.voxatile.core.parameters.tasks.NoOperationTaskParams; +import fr.ign.voxatile.core.parameters.tasks.PopulateHeightmapTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderBuildingsTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderFacadesTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderHeightmapTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderLines2dTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderLinesTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderPoints2dTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderPointsTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderSurfacesTaskParams; +import fr.ign.voxatile.core.parameters.tasks.ScheduleTaskParams; +import fr.ign.voxatile.core.parameters.tasks.SequenceTaskParams; +import fr.ign.voxatile.core.parameters.tasks.SetSpawnTaskParams; +import fr.ign.voxatile.core.utils.FileHelpers; +import fr.ign.voxatile.core.utils.execution.TaskFailedException; +import fr.ign.voxatile.core.utils.modules.ModulesLoader; +import fr.ign.voxatile.core.utils.modules.ModulesManager; +import fr.ign.voxatile.core.utils.network.HttpTrustAllSSL; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.modules.luanti.LuantiOutputModule; +import fr.ign.voxatile.modules.minecraft.MinecraftOutputModule; /** * Main class of Voxatile project. diff --git a/src/main/java/com/ignfab/minalac/generator/VoxatileCLI.java b/src/main/java/fr/ign/voxatile/core/VoxatileCLI.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/VoxatileCLI.java rename to src/main/java/fr/ign/voxatile/core/VoxatileCLI.java index 366106f3d..40347de05 100644 --- a/src/main/java/com/ignfab/minalac/generator/VoxatileCLI.java +++ b/src/main/java/fr/ign/voxatile/core/VoxatileCLI.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator; +package fr.ign.voxatile.core; import java.io.IOException; import java.nio.file.Files; @@ -14,7 +14,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import com.ignfab.minalac.generator.utils.FileHelpers; +import fr.ign.voxatile.core.utils.FileHelpers; /** * A command line parser and basic processor. @@ -38,7 +38,7 @@ public class VoxatileCLI { private final Options options; /** - * Creates a new GeneratorCommandLine. + * Creates a new {@code VoxatileCLI}. */ public VoxatileCLI() { options = new Options(); @@ -181,7 +181,7 @@ public String readParameters() { /** * Returns output path. - * Allows saving the result of the generator. + * Allows saving the result of the generation. * * @return output path */ @@ -191,7 +191,7 @@ public Path outputPath() { /** * Returns generation disabled. - * Allows stopping execution when the generator finishes deserializing the parameters. + * Allows stopping execution when parameters are deserialized (before actual generation). * * @return generation disabled flag */ diff --git a/src/main/java/com/ignfab/minalac/generator/exceptions/GenerationFailedException.java b/src/main/java/fr/ign/voxatile/core/exceptions/GenerationFailedException.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/exceptions/GenerationFailedException.java rename to src/main/java/fr/ign/voxatile/core/exceptions/GenerationFailedException.java index 567d1e1a8..796a5d641 100644 --- a/src/main/java/com/ignfab/minalac/generator/exceptions/GenerationFailedException.java +++ b/src/main/java/fr/ign/voxatile/core/exceptions/GenerationFailedException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.exceptions; +package fr.ign.voxatile.core.exceptions; /** * Exception thrown when a fatal error occurs. This means that nothing can be diff --git a/src/main/java/com/ignfab/minalac/generator/exceptions/IgnorableException.java b/src/main/java/fr/ign/voxatile/core/exceptions/IgnorableException.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/exceptions/IgnorableException.java rename to src/main/java/fr/ign/voxatile/core/exceptions/IgnorableException.java index 1dc0e0250..f0222ad55 100644 --- a/src/main/java/com/ignfab/minalac/generator/exceptions/IgnorableException.java +++ b/src/main/java/fr/ign/voxatile/core/exceptions/IgnorableException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.exceptions; +package fr.ign.voxatile.core.exceptions; /** * Exception thrown when something goes wrong with an element that can be ignored. diff --git a/src/main/java/com/ignfab/minalac/generator/exceptions/RetryableException.java b/src/main/java/fr/ign/voxatile/core/exceptions/RetryableException.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/exceptions/RetryableException.java rename to src/main/java/fr/ign/voxatile/core/exceptions/RetryableException.java index cec6e5bcb..a2f0d400a 100644 --- a/src/main/java/com/ignfab/minalac/generator/exceptions/RetryableException.java +++ b/src/main/java/fr/ign/voxatile/core/exceptions/RetryableException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.exceptions; +package fr.ign.voxatile.core.exceptions; /** * Exception thrown when something goes wrong but retrying may solve the problem. diff --git a/src/main/java/com/ignfab/minalac/generator/exceptions/TransformException.java b/src/main/java/fr/ign/voxatile/core/exceptions/TransformException.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/exceptions/TransformException.java rename to src/main/java/fr/ign/voxatile/core/exceptions/TransformException.java index c0251c250..f1e240fcd 100644 --- a/src/main/java/com/ignfab/minalac/generator/exceptions/TransformException.java +++ b/src/main/java/fr/ign/voxatile/core/exceptions/TransformException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.exceptions; +package fr.ign.voxatile.core.exceptions; /** * Exception thrown when something goes wrong related to coordinates transformation. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/Generation.java b/src/main/java/fr/ign/voxatile/core/generation/Generation.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/generation/Generation.java rename to src/main/java/fr/ign/voxatile/core/generation/Generation.java index 6b02617a0..fc4fc4c13 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/Generation.java +++ b/src/main/java/fr/ign/voxatile/core/generation/Generation.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import java.util.Collection; import java.util.Iterator; @@ -12,16 +12,16 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.util.AffineTransformation; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.coordinates.WorldToMapConverter; -import com.ignfab.minalac.generator.utils.execution.Scheduler; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.VoxelWorld; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.coordinates.WorldToMapConverter; +import fr.ign.voxatile.core.utils.execution.Scheduler; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.VoxelWorld; /** * This {@code Generation} class contains information about the ongoing generation diff --git a/src/main/java/com/ignfab/minalac/generator/generation/GenerationTile.java b/src/main/java/fr/ign/voxatile/core/generation/GenerationTile.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/generation/GenerationTile.java rename to src/main/java/fr/ign/voxatile/core/generation/GenerationTile.java index c88bf5fe7..ad45c861c 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/GenerationTile.java +++ b/src/main/java/fr/ign/voxatile/core/generation/GenerationTile.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.generation; - -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelStore; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.MapWriteException; -import com.ignfab.minalac.generator.world.VoxelTile; +package fr.ign.voxatile.core.generation; + +import fr.ign.voxatile.core.generation.heightmaps.HeightmapStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelStore; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.core.world.VoxelTile; /** * A tiled part of the generation. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGenerator.java b/src/main/java/fr/ign/voxatile/core/generation/SquareUnitsTileGenerator.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGenerator.java rename to src/main/java/fr/ign/voxatile/core/generation/SquareUnitsTileGenerator.java index 7a5912509..13bbf2af2 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGenerator.java +++ b/src/main/java/fr/ign/voxatile/core/generation/SquareUnitsTileGenerator.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import com.ignfab.minalac.generator.utils.IntegerInterval; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.IntegerInterval; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A tile generator for worlds with square map units. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/Heightmap.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/Heightmap.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/Heightmap.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/Heightmap.java index 846d86208..b590d45c9 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/Heightmap.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/Heightmap.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; import java.util.Arrays; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A 2d heightmap in voxel world units. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclaration.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclaration.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclaration.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclaration.java index 99203f214..871cf9571 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclaration.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclaration.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A stored heightmap declaration. Describes how a {@link Heightmap} should be created. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclarationStore.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclarationStore.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclarationStore.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclarationStore.java index 5bcaf0d64..fa553ab4b 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapDeclarationStore.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapDeclarationStore.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapStore.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapStore.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapStore.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapStore.java index 340d329ea..26ae1f62c 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapStore.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapStore.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; import java.util.HashMap; import java.util.Map; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A store of heightmaps, indexed by their specs. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmap.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmap.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmap.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmap.java index 11cce10da..299ac4373 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmap.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmap.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * Represents a 2d readable heightmap (in voxel world units). diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmapSpec.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmapSpec.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmapSpec.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmapSpec.java index cf758f91b..5d1eb88ac 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/ReadableHeightmapSpec.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/ReadableHeightmapSpec.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; /** * Spec for a readable heightmap. This is an abstract class to be derivated for each type of heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmap.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmap.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmap.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmap.java index c02da5cd4..e5c956475 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmap.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmap.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * Represents a 2d readable and writable heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmapSpec.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmapSpec.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmapSpec.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmapSpec.java index 71f150edd..cda31bfb7 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/WritableHeightmapSpec.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/WritableHeightmapSpec.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; /** * Spec for a writable {@link Heightmap}. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java index 002b1fe4d..d1833c5ab 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/BinaryOperationHeightmapSpec.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed; +package fr.ign.voxatile.core.generation.heightmaps.computed; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.BinaryHeightmapOperator; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.BinaryHeightmapOperator; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A {@code ReadableHeightmapSpec} representing an operation between two heightmaps. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmap.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmap.java similarity index 67% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmap.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmap.java index 2f98a357e..ba5fbb2ec 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmap.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmap.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed; +package fr.ign.voxatile.core.generation.heightmaps.computed; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A readable heightmap that always returns the specified value. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java index 3cd1d27fc..cd06db987 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/UnaryOperationHeightmapSpec.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed; +package fr.ign.voxatile.core.generation.heightmaps.computed; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.UnaryHeightmapOperator; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.UnaryHeightmapOperator; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A {@code ReadableHeightmapSpec} representing an operation on a heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java index 208cbdeb3..e7d0fba79 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/BinaryHeightmapOperator.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import java.util.function.IntBinaryOperator; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * An operator on two heightmaps. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java index cc8718863..fd13bcd34 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperator.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; /** * Takes a heightmap and transforms its values to Manhattan distances. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java index 762a68b29..b0e9980d0 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapOperator.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; /** * Gives the local minimum, around a specified range, at each point of the specified heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java rename to src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java index 3a64595f1..dd4466cd0 100644 --- a/src/main/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java +++ b/src/main/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryHeightmapOperator.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import java.util.function.IntUnaryOperator; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * An operator on a heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/FloatArrayGeographicDataMatrix2d.java b/src/main/java/fr/ign/voxatile/core/inputs/FloatArrayGeographicDataMatrix2d.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/inputs/FloatArrayGeographicDataMatrix2d.java rename to src/main/java/fr/ign/voxatile/core/inputs/FloatArrayGeographicDataMatrix2d.java index 92d7185a7..47fd51bb5 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/FloatArrayGeographicDataMatrix2d.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/FloatArrayGeographicDataMatrix2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; /** * A matrix of float values. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/FloatGeographicDataMatrix2d.java b/src/main/java/fr/ign/voxatile/core/inputs/FloatGeographicDataMatrix2d.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/inputs/FloatGeographicDataMatrix2d.java rename to src/main/java/fr/ign/voxatile/core/inputs/FloatGeographicDataMatrix2d.java index f6dc55a4c..58c004b78 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/FloatGeographicDataMatrix2d.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/FloatGeographicDataMatrix2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; /** * A matrix of float values. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/FloatImageGeographicDataMatrix2d.java b/src/main/java/fr/ign/voxatile/core/inputs/FloatImageGeographicDataMatrix2d.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/inputs/FloatImageGeographicDataMatrix2d.java rename to src/main/java/fr/ign/voxatile/core/inputs/FloatImageGeographicDataMatrix2d.java index 91c8537ed..1e84f8593 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/FloatImageGeographicDataMatrix2d.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/FloatImageGeographicDataMatrix2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import org.eclipse.imagen.iterator.RandomIter; diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/GeoPackageDataProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/GeoPackageDataProvider.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/inputs/GeoPackageDataProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/GeoPackageDataProvider.java index 05e255773..0d661199a 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/GeoPackageDataProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/GeoPackageDataProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.File; import java.util.Map; @@ -6,7 +6,7 @@ import org.geotools.api.data.DataStore; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; /** * Data provider using GeoPackage. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/GeoTiffDataProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/GeoTiffDataProvider.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/inputs/GeoTiffDataProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/GeoTiffDataProvider.java index 9c8beb22f..b8ba6d74c 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/GeoTiffDataProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/GeoTiffDataProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.File; import java.io.IOException; @@ -13,12 +13,12 @@ import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.factory.Hints; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Data provider for GeoTiff files (raster data). diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/GeoToolsDataStoreProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/GeoToolsDataStoreProvider.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/inputs/GeoToolsDataStoreProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/GeoToolsDataStoreProvider.java index 8b1b5006a..06d00bcc0 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/GeoToolsDataStoreProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/GeoToolsDataStoreProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.IOException; import java.util.Map; @@ -18,12 +18,12 @@ import org.geotools.factory.CommonFactoryFinder; import org.geotools.geometry.jts.ReferencedEnvelope; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Data provider using GeoTools {@link DataStore}. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/GeographicDataMatrix2d.java b/src/main/java/fr/ign/voxatile/core/inputs/GeographicDataMatrix2d.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/inputs/GeographicDataMatrix2d.java rename to src/main/java/fr/ign/voxatile/core/inputs/GeographicDataMatrix2d.java index 956d9fee2..686bc8d7d 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/GeographicDataMatrix2d.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/GeographicDataMatrix2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; /** * A matrix of values. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/OsmData.java b/src/main/java/fr/ign/voxatile/core/inputs/OsmData.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/inputs/OsmData.java rename to src/main/java/fr/ign/voxatile/core/inputs/OsmData.java index fc331417f..ce3b14f46 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/OsmData.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/OsmData.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import de.topobyte.osm4j.core.model.iface.OsmEntity; import de.topobyte.osm4j.core.resolve.OsmEntityProvider; diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/OverpassProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/OverpassProvider.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/inputs/OverpassProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/OverpassProvider.java index 06732befa..e75259fb6 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/OverpassProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/OverpassProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.BufferedReader; import java.io.IOException; @@ -24,12 +24,12 @@ import org.geotools.api.referencing.FactoryException; import org.geotools.geometry.jts.ReferencedEnvelope; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Data provider for Overpass. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/ParameterizedURL.java b/src/main/java/fr/ign/voxatile/core/inputs/ParameterizedURL.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/inputs/ParameterizedURL.java rename to src/main/java/fr/ign/voxatile/core/inputs/ParameterizedURL.java index cc66a41ef..9504251f9 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/ParameterizedURL.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/ParameterizedURL.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/Provider.java b/src/main/java/fr/ign/voxatile/core/inputs/Provider.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/inputs/Provider.java rename to src/main/java/fr/ign/voxatile/core/inputs/Provider.java index 52e2b7516..9940efa40 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/Provider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/Provider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.util.Iterator; import java.util.List; @@ -6,10 +6,10 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * A provider is responsible for acquiring data. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/ShapefileDataProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/ShapefileDataProvider.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/inputs/ShapefileDataProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/ShapefileDataProvider.java index 5de2df951..03c756a74 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/ShapefileDataProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/ShapefileDataProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.File; import java.io.IOException; @@ -8,9 +8,9 @@ import org.geotools.api.data.DataStore; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; /** * Data provider using Shapefile. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/WFS1_1_GML3_1_DataProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/WFS1_1_GML3_1_DataProvider.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/inputs/WFS1_1_GML3_1_DataProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/WFS1_1_GML3_1_DataProvider.java index e71f0860e..31c81ad86 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/WFS1_1_GML3_1_DataProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/WFS1_1_GML3_1_DataProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -26,11 +26,11 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Data provider using WFS 1.1 and GML 3.1. diff --git a/src/main/java/com/ignfab/minalac/generator/inputs/WMSFloatBilDataProvider.java b/src/main/java/fr/ign/voxatile/core/inputs/WMSFloatBilDataProvider.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/inputs/WMSFloatBilDataProvider.java rename to src/main/java/fr/ign/voxatile/core/inputs/WMSFloatBilDataProvider.java index 72b296fac..e20135f1d 100644 --- a/src/main/java/com/ignfab/minalac/generator/inputs/WMSFloatBilDataProvider.java +++ b/src/main/java/fr/ign/voxatile/core/inputs/WMSFloatBilDataProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.io.IOException; import java.io.InputStream; @@ -11,13 +11,13 @@ import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.Rounding; -import com.ignfab.minalac.generator.utils.coordinates.EnvelopeProvider; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.Rounding; +import fr.ign.voxatile.core.utils.coordinates.EnvelopeProvider; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Data provider for Web Map Service (raster data). diff --git a/src/main/java/com/ignfab/minalac/generator/models/FloatMatrixModel.java b/src/main/java/fr/ign/voxatile/core/models/FloatMatrixModel.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/models/FloatMatrixModel.java rename to src/main/java/fr/ign/voxatile/core/models/FloatMatrixModel.java index 82b05e4de..d683cf8cf 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/FloatMatrixModel.java +++ b/src/main/java/fr/ign/voxatile/core/models/FloatMatrixModel.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.utils.coordinates.MapCoordinates; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.coordinates.WorldToMapConverter; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.Matrix2d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.utils.coordinates.MapCoordinates; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.coordinates.WorldToMapConverter; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.Matrix2d; /** * A model based on a matrix of floats (usually a heightmap model). diff --git a/src/main/java/com/ignfab/minalac/generator/models/JTSGeometryModel.java b/src/main/java/fr/ign/voxatile/core/models/JTSGeometryModel.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/models/JTSGeometryModel.java rename to src/main/java/fr/ign/voxatile/core/models/JTSGeometryModel.java index eda0ce495..514c7f781 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/JTSGeometryModel.java +++ b/src/main/java/fr/ign/voxatile/core/models/JTSGeometryModel.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.ArrayList; import java.util.List; @@ -11,22 +11,22 @@ import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LinearRing2d; -import com.ignfab.minalac.generator.voxelization.shape2d.MultiShape2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Point2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Polygon2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2d; -import com.ignfab.minalac.generator.voxelization.shape3d.LineString3d; -import com.ignfab.minalac.generator.voxelization.shape3d.LinearRing3d; -import com.ignfab.minalac.generator.voxelization.shape3d.MultiShape3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Point3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Polygon3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.LinearRing2d; +import fr.ign.voxatile.core.voxelization.shape2d.MultiShape2d; +import fr.ign.voxatile.core.voxelization.shape2d.Point2d; +import fr.ign.voxatile.core.voxelization.shape2d.Polygon2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2d; +import fr.ign.voxatile.core.voxelization.shape3d.LineString3d; +import fr.ign.voxatile.core.voxelization.shape3d.LinearRing3d; +import fr.ign.voxatile.core.voxelization.shape3d.MultiShape3d; +import fr.ign.voxatile.core.voxelization.shape3d.Point3d; +import fr.ign.voxatile.core.voxelization.shape3d.Polygon3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3d; /** * Model represented by a JTS Geometry. diff --git a/src/main/java/com/ignfab/minalac/generator/models/Model.java b/src/main/java/fr/ign/voxatile/core/models/Model.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/models/Model.java rename to src/main/java/fr/ign/voxatile/core/models/Model.java index 34143c5fd..88e4fb814 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/Model.java +++ b/src/main/java/fr/ign/voxatile/core/models/Model.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.utils.random.Salting; +import fr.ign.voxatile.core.utils.random.Salting; /** * Models are objects that can be rendered. diff --git a/src/main/java/com/ignfab/minalac/generator/models/ModelImpl.java b/src/main/java/fr/ign/voxatile/core/models/ModelImpl.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/models/ModelImpl.java rename to src/main/java/fr/ign/voxatile/core/models/ModelImpl.java index a01e3003d..a65068582 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/ModelImpl.java +++ b/src/main/java/fr/ign/voxatile/core/models/ModelImpl.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/ignfab/minalac/generator/models/ModelSelection.java b/src/main/java/fr/ign/voxatile/core/models/ModelSelection.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/models/ModelSelection.java rename to src/main/java/fr/ign/voxatile/core/models/ModelSelection.java index 70b1ae7e7..0c0dab59b 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/ModelSelection.java +++ b/src/main/java/fr/ign/voxatile/core/models/ModelSelection.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.List; import java.util.function.Predicate; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.utils.iterator.Iterables; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.utils.iterator.Iterables; /** * This class selects the models in the {@link ModelStore} matching a specified type. diff --git a/src/main/java/com/ignfab/minalac/generator/models/ModelStore.java b/src/main/java/fr/ign/voxatile/core/models/ModelStore.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/models/ModelStore.java rename to src/main/java/fr/ign/voxatile/core/models/ModelStore.java index 3ce11bd84..2db0b9353 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/ModelStore.java +++ b/src/main/java/fr/ign/voxatile/core/models/ModelStore.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/fr/ign/voxatile/core/models/Shape2dConvertibleModel.java b/src/main/java/fr/ign/voxatile/core/models/Shape2dConvertibleModel.java new file mode 100644 index 000000000..9b7cdc9aa --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/models/Shape2dConvertibleModel.java @@ -0,0 +1,10 @@ +package fr.ign.voxatile.core.models; + +import fr.ign.voxatile.core.voxelization.shape2d.Shape2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; + +/** + * A model convertible to a {@link Shape2d}. + */ +public interface Shape2dConvertibleModel extends Shape2dConvertible, Model { +} diff --git a/src/main/java/fr/ign/voxatile/core/models/Shape3dConvertibleModel.java b/src/main/java/fr/ign/voxatile/core/models/Shape3dConvertibleModel.java new file mode 100644 index 000000000..16eec2a1c --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/models/Shape3dConvertibleModel.java @@ -0,0 +1,10 @@ +package fr.ign.voxatile.core.models; + +import fr.ign.voxatile.core.voxelization.shape3d.Shape3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3dConvertible; + +/** + * A model convertible to a {@link Shape3d}. + */ +public interface Shape3dConvertibleModel extends Shape3dConvertible, Model { +} diff --git a/src/main/java/com/ignfab/minalac/generator/models/Voxelizable2d.java b/src/main/java/fr/ign/voxatile/core/models/Voxelizable2d.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/models/Voxelizable2d.java rename to src/main/java/fr/ign/voxatile/core/models/Voxelizable2d.java index f6e9df569..250466417 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/Voxelizable2d.java +++ b/src/main/java/fr/ign/voxatile/core/models/Voxelizable2d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.voxelization.Voxelizer2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.voxelization.Voxelizer2d; /** * Represents a model that can be transformed into 2d voxels using a voxelizer. diff --git a/src/main/java/com/ignfab/minalac/generator/models/Voxelizable3d.java b/src/main/java/fr/ign/voxatile/core/models/Voxelizable3d.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/models/Voxelizable3d.java rename to src/main/java/fr/ign/voxatile/core/models/Voxelizable3d.java index e16af2ecc..9936e5e2c 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/Voxelizable3d.java +++ b/src/main/java/fr/ign/voxatile/core/models/Voxelizable3d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.voxelization.Voxelizer3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.voxelization.Voxelizer3d; /** * Represents an object that can be transformed into 3d voxels using a voxelizer. diff --git a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometry.java b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometry.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometry.java rename to src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometry.java index 88b8f4907..6932259f8 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometry.java +++ b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometry.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.models.Model; /** * A model filter testing emptiness of geometry. diff --git a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadata.java b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadata.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadata.java rename to src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadata.java index af849adc4..69de95b95 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadata.java +++ b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadata.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model filter testing presence of metadata. diff --git a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValue.java b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValue.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValue.java rename to src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValue.java index cb6bc969c..65b535621 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model filter testing metadata values using a given predicate. diff --git a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValue.java b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValue.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValue.java rename to src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValue.java index 9c32d038d..f67e5a52b 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValue.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.Optional; import java.util.function.DoublePredicate; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.values.ModelValue; /** * A model filter testing a model value using a given predicate. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/AbsentValue.java b/src/main/java/fr/ign/voxatile/core/models/values/AbsentValue.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/models/values/AbsentValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/AbsentValue.java index a8cbee617..5df37671b 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/AbsentValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/AbsentValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value that is always absent. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValue.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValue.java index 16abe7ea4..32566a903 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValue.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; import java.util.function.DoubleBinaryOperator; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value representing an operation on two other model values. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/ConditionalModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/ConditionalModelValue.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/models/values/ConditionalModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/ConditionalModelValue.java index bed07a538..8f4aefa48 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/ConditionalModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/ConditionalModelValue.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Model value returning another model value based on a condition. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/FallbackModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/FallbackModelValue.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/models/values/FallbackModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/FallbackModelValue.java index e0d476b23..d309297ad 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/FallbackModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/FallbackModelValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value that return another model value iff the original value is absent. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/FixedValue.java b/src/main/java/fr/ign/voxatile/core/models/values/FixedValue.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/models/values/FixedValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/FixedValue.java index e6c418698..dbc07f18f 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/FixedValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/FixedValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value that always returns the specified value. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/InverseModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/InverseModelValue.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/models/values/InverseModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/InverseModelValue.java index 7739f7a0d..7bcbd0fab 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/InverseModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/InverseModelValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value representing the mathematical inverse of another model value. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/MetadataValue.java b/src/main/java/fr/ign/voxatile/core/models/values/MetadataValue.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/models/values/MetadataValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/MetadataValue.java index b4887d722..b23e8fbf6 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/MetadataValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/MetadataValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value that returns the specified metadata value from the model. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/ModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/ModelValue.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/models/values/ModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/ModelValue.java index 667ad88d4..8267275c2 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/ModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/ModelValue.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Represents a numeric value that could be read from a {@link Model}. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/RandomUniformModelValue.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/RandomUniformModelValue.java index df076b56d..46227975c 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/RandomUniformModelValue.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.utils.random.Seed; /** * A model value computing a random value following a uniform law between two bounds. diff --git a/src/main/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValue.java b/src/main/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValue.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValue.java rename to src/main/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValue.java index 5cd4f12d1..3f4d0d5d6 100644 --- a/src/main/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValue.java +++ b/src/main/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValue.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; import java.util.function.DoubleUnaryOperator; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A model value representing an operation on another model value. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/GenerationParams.java b/src/main/java/fr/ign/voxatile/core/parameters/GenerationParams.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/parameters/GenerationParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/GenerationParams.java index 1a1a0b8c6..c0c83241a 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/GenerationParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/GenerationParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.beans.ConstructorProperties; import java.io.File; @@ -19,9 +19,9 @@ import org.geotools.referencing.crs.DefaultGeographicCRS; import tools.jackson.databind.JsonNode; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.world.VoxelWorld; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.world.VoxelWorld; /** * GenerationParams represents the parameters used during the generation. @@ -38,7 +38,7 @@ public class GenerationParams { * World name. */ @JsonSetter(nulls = Nulls.SKIP) - public String worldName = "Minalac"; + public String worldName = "Voxatile"; /** * A placeholder for Yaml references than does not go anywhere else. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/HeightmapDeclarationParams.java b/src/main/java/fr/ign/voxatile/core/parameters/HeightmapDeclarationParams.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/parameters/HeightmapDeclarationParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/HeightmapDeclarationParams.java index 14f57c334..acf61e57f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/HeightmapDeclarationParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/HeightmapDeclarationParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.beans.ConstructorProperties; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; /** * Parameters for a {@link HeightmapDeclaration}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserialize.java b/src/main/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserialize.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserialize.java rename to src/main/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserialize.java index c28cd4916..9539c247e 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserialize.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserialize.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -44,7 +44,7 @@ /** * Jackson handler to wrap deserializer of annotated beans with the requested one. - * This is bundled by default with the {@link com.ignfab.minalac.generator.parameters.ParamsParser.VoxatileParserModule}. + * This is bundled by default with the {@link ParamsParser.VoxatileParserModule}. */ class BeanModifier extends ValueDeserializerModifier { @Override diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/JsonWrapper.java b/src/main/java/fr/ign/voxatile/core/parameters/JsonWrapper.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/parameters/JsonWrapper.java rename to src/main/java/fr/ign/voxatile/core/parameters/JsonWrapper.java index 40e3ed561..f05bd83e1 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/JsonWrapper.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/JsonWrapper.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -42,7 +42,7 @@ public @interface JsonWrapper { /** * Jackson handler to set deserializer of annotated beans with the appropriate one. - * This is bundled by default with the {@link com.ignfab.minalac.generator.parameters.ParamsParser.VoxatileParserModule}. + * This is bundled by default with the {@link ParamsParser.VoxatileParserModule}. */ class BeanModifier extends ValueDeserializerModifier { @Override diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/OutputFormat.java b/src/main/java/fr/ign/voxatile/core/parameters/OutputFormat.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/parameters/OutputFormat.java rename to src/main/java/fr/ign/voxatile/core/parameters/OutputFormat.java index 529d71f5e..f83e07dd9 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/OutputFormat.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/OutputFormat.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.io.File; import java.util.HashMap; @@ -15,8 +15,8 @@ import tools.jackson.databind.jsontype.NamedType; import tools.jackson.databind.module.SimpleModule; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.world.VoxelWorld; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.world.VoxelWorld; /** * Output format parameters. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/ParamsParser.java b/src/main/java/fr/ign/voxatile/core/parameters/ParamsParser.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/parameters/ParamsParser.java rename to src/main/java/fr/ign/voxatile/core/parameters/ParamsParser.java index 88f70642f..32afdc75f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/ParamsParser.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/ParamsParser.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import tools.jackson.core.JacksonException; import tools.jackson.core.StreamReadFeature; diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/ParseException.java b/src/main/java/fr/ign/voxatile/core/parameters/ParseException.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/parameters/ParseException.java rename to src/main/java/fr/ign/voxatile/core/parameters/ParseException.java index bffe59743..5237abf57 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/ParseException.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/ParseException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; /** * Exception thrown if a problem occurs during parsing. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/PolymorphicParams.java b/src/main/java/fr/ign/voxatile/core/parameters/PolymorphicParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/parameters/PolymorphicParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/PolymorphicParams.java index c0360fc0c..438addff6 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/PolymorphicParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/PolymorphicParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/ScheduleParams.java b/src/main/java/fr/ign/voxatile/core/parameters/ScheduleParams.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/parameters/ScheduleParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/ScheduleParams.java index 914e5d904..ff50480ca 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/ScheduleParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/ScheduleParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.util.LinkedHashMap; import java.util.Map; @@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.tasks.TaskParams; -import com.ignfab.minalac.generator.utils.execution.Schedule; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.tasks.TaskParams; +import fr.ign.voxatile.core.utils.execution.Schedule; /** * Parameters for a tile task schedule. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/ValueParser.java b/src/main/java/fr/ign/voxatile/core/parameters/ValueParser.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/parameters/ValueParser.java rename to src/main/java/fr/ign/voxatile/core/parameters/ValueParser.java index 01371e488..23db72d45 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/ValueParser.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/ValueParser.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParams.java index a6b0260ba..1f8b71bab 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.UnaryOperationHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.CappedManhattanHeightmapOperator; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.UnaryOperationHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.CappedManhattanHeightmapOperator; /** * Parameters for a {@link CappedManhattanHeightmapOperator} {@link UnaryOperationHeightmapSpec}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParams.java similarity index 70% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParams.java index ff1a5177c..f9993040c 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParams.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.ConstantHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.ConstantHeightmap; /** * Parameters for a {@link ConstantHeightmap}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParams.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParams.java index 0fac43bee..5258d30c3 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.UnaryOperationHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.LocalMinimumHeightmapOperator; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.UnaryOperationHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.LocalMinimumHeightmapOperator; /** * Parameters for a {@link LocalMinimumHeightmapOperator} {@link UnaryOperationHeightmapSpec}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParams.java index b79f7edda..323597c6d 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; import java.util.Iterator; import java.util.List; import java.util.function.IntBinaryOperator; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.BinaryOperationHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.BinaryHeightmapOperator; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.BinaryOperationHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.BinaryHeightmapOperator; /** * Abstract class for applying successive operation on a list of heightmaps. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParams.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParams.java index 0243bd941..ae3f29410 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -8,9 +8,9 @@ import tools.jackson.databind.deser.std.DelegatingDeserializer; import tools.jackson.databind.jsontype.TypeDeserializer; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.parameters.JsonDelegateDeserialize; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.parameters.JsonDelegateDeserialize; /** * Base interface for all {@code ReadableHeightmapSpec} parameters. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParams.java index cbbe58e6d..5286f913f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; import java.util.LinkedHashMap; @@ -11,12 +11,12 @@ import tools.jackson.databind.KeyDeserializer; import tools.jackson.databind.annotation.JsonDeserialize; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.UnaryOperationHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.operators.UnaryHeightmapOperator; -import com.ignfab.minalac.generator.parameters.utils.IntegerIntervalParams; -import com.ignfab.minalac.generator.utils.IntegerInterval; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.UnaryOperationHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.operators.UnaryHeightmapOperator; +import fr.ign.voxatile.core.parameters.utils.IntegerIntervalParams; +import fr.ign.voxatile.core.utils.IntegerInterval; /** * Parameters for a {@link UnaryOperationHeightmapSpec} which remaps all heightmap values to a new one. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/WritableHeightmapParams.java b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/WritableHeightmapParams.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/WritableHeightmapParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/heightmaps/WritableHeightmapParams.java index eddf7c0e9..cc873463c 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/heightmaps/WritableHeightmapParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/heightmaps/WritableHeightmapParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; @@ -10,9 +10,9 @@ import tools.jackson.databind.deser.std.DelegatingDeserializer; import tools.jackson.databind.jsontype.TypeDeserializer; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmapSpec; -import com.ignfab.minalac.generator.parameters.JsonDelegateDeserialize; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmapSpec; +import fr.ign.voxatile.core.parameters.JsonDelegateDeserialize; /** * Parameter class for a {@link WritableHeightmapSpec}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParams.java index 3353a9e34..3747312a8 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.models; +package fr.ign.voxatile.core.parameters.models; import java.util.List; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterAndParams; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterAndParams; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterParams; /** * Parameters for a {@link ModelSelection}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParams.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParams.java index 5de56b514..dd879de71 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.Iterator; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; /** * Parameters for combining filters with "and" operator. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParams.java similarity index 64% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParams.java index 269cb00a7..4659e37b3 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParams.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterEmptyGeometry; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterEmptyGeometry; /** * Parameters for a {@link ModelFilterEmptyGeometry}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParams.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParams.java index 44042a446..5e26479a2 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.Iterator; @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterHasMetadata; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterHasMetadata; /** * Parameters for a {@link ModelFilterHasMetadata}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParams.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParams.java index 23ce2d4b0..c036efc64 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParams.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; /** * Parameters for a filter that selects models where the model value is not absent. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParams.java index 11afc880d..a8e375a51 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnMetadataValue; -import com.ignfab.minalac.generator.parameters.ValueParser; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnMetadataValue; +import fr.ign.voxatile.core.parameters.ValueParser; /** * Parameters for an "equals" operator on metadata value. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParams.java index 350596458..93b44d5fb 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.List; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnMetadataValue; -import com.ignfab.minalac.generator.parameters.ValueParser; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnMetadataValue; +import fr.ign.voxatile.core.parameters.ValueParser; /** * Parameters for filtering models by metadata values. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParams.java index 908ad4925..29ccd4282 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; /** diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParams.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParams.java index b20560f91..0e801daeb 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.Iterator; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; /** * Parameters for combining filters with "or" operator. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterParams.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterParams.java index b8d944df7..a1a8d1be6 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterParams.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.function.Predicate; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; /** * Abstract parameter class for all model filters parameters. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParams.java similarity index 77% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParams.java index 0418c00b9..f30afb2b6 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; /** * Parameters for an "equals" operator on model value. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParams.java index 734567c95..7b5787f20 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; /** * Parameters for a filter that selects models where the model value is greater than a specified threshold. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParams.java index 384fc6fee..88dd504ac 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.beans.ConstructorProperties; import java.util.function.Predicate; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; /** * Parameters for a filter that selects models where the model value is less than a specified threshold. diff --git a/src/main/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParams.java new file mode 100644 index 000000000..e4e2e6881 --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParams.java @@ -0,0 +1,15 @@ +package fr.ign.voxatile.core.parameters.models.values; + +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.AbsentValue; +import fr.ign.voxatile.core.models.values.ModelValue; + +/** + * Parameters for an {@link AbsentValue}. + */ +public class AbsentValueParams extends ModelValueParams { + @Override + public ModelValue create(Generation generation) { + return AbsentValue.INSTANCE; + } +} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParams.java index 4d345ab51..1e056602e 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; @@ -6,13 +6,13 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.ConditionalModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.ConditionalModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterParams; /** - * Parameters for {@link com.ignfab.minalac.generator.models.values.ConditionalModelValue}. + * Parameters for {@link ConditionalModelValue}. */ public class ConditionalModelValueParams extends ModelValueParams { /** diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParams.java index 6cf44090c..830fdea10 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; import java.util.Iterator; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.FallbackModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.FallbackModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Parameters for a {@link FallbackModelValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParams.java similarity index 71% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParams.java index 31acf91b9..fa643c40a 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParams.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.FixedValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.FixedValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Parameters for a {@link FixedValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParams.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParams.java index 92426de4e..2c5e61f5d 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParams.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.InverseModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.InverseModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Parameters for {@link InverseModelValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParams.java index 37a95022f..ab840d737 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParams.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.MetadataValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.MetadataValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Parameters for a {@link MetadataValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParams.java index ed95dafb4..f25408c23 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -8,9 +8,9 @@ import tools.jackson.databind.deser.std.DelegatingDeserializer; import tools.jackson.databind.jsontype.TypeDeserializer; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.JsonDelegateDeserialize; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.JsonDelegateDeserialize; /** * Base interface for all {@link ModelValue} parameters. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParams.java index 6444d3b7d..89f6cd866 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParams.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; import java.util.Iterator; import java.util.List; import java.util.function.DoubleBinaryOperator; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.BinaryOperationModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.BinaryOperationModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Abstract class for applying binary operator on a list of model values. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParams.java index 2247ddfc0..c59c81134 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParams.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.models.values.RandomUniformModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.models.values.RandomUniformModelValue; /** * Parameters for a {@link RandomUniformModelValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParams.java b/src/main/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParams.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParams.java index 857bb5d60..4855dd658 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParams.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.beans.ConstructorProperties; import java.util.function.DoubleUnaryOperator; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.models.values.UnaryOperationModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.models.values.UnaryOperationModelValue; /** * Abstract class for applying unary operator on a model value. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParams.java similarity index 75% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParams.java index b6c4b7b9b..81f7aed62 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.placeables; +package fr.ign.voxatile.core.parameters.placeables; import java.util.List; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.JsonWrapper; -import com.ignfab.minalac.generator.placeables.CombinedPlaceable; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.JsonWrapper; +import fr.ign.voxatile.core.placeables.CombinedPlaceable; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for a {@link CombinedPlaceable}. diff --git a/src/main/java/fr/ign/voxatile/core/parameters/placeables/NothingParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/NothingParams.java new file mode 100644 index 000000000..3a2f30997 --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/NothingParams.java @@ -0,0 +1,15 @@ +package fr.ign.voxatile.core.parameters.placeables; + +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; + +/** + * Places nothing. + */ +public class NothingParams extends PlaceableParams { + @Override + public Placeable create(Seed seed) { + return Nothing.INSTANCE; + } +} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParams.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParams.java index 79aa83c78..d8f3ff277 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.placeables; +package fr.ign.voxatile.core.parameters.placeables; import java.util.Map.Entry; @@ -9,11 +9,11 @@ import tools.jackson.databind.JsonNode; import tools.jackson.databind.ValueDeserializer; -import com.ignfab.minalac.generator.parameters.OutputFormat; -import com.ignfab.minalac.generator.parameters.placeables.patterns.PatternParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.OutputFormat; +import fr.ign.voxatile.core.parameters.placeables.patterns.PatternParams; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; /** * Base class for all placeable parameters (voxels and structures). diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java index 7c3f1fcdb..aa17f1ea8 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/ConcatenateLayoutBuilderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.placeables.layouts; +package fr.ign.voxatile.core.parameters.placeables.layouts; import java.beans.ConstructorProperties; import java.util.List; @@ -14,11 +14,11 @@ import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.node.ObjectNode; -import com.ignfab.minalac.generator.parameters.utils.AxisParams; -import com.ignfab.minalac.generator.placeables.layouts.DefaultLayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.utils.AxisParams; +import fr.ign.voxatile.core.placeables.layouts.DefaultLayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for a {@link LayoutBuilder} that concatenates different layouts along an axis. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/LayoutBuilderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/LayoutBuilderParams.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/LayoutBuilderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/LayoutBuilderParams.java index b7b0fe5f6..683d0a74c 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/LayoutBuilderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/LayoutBuilderParams.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.placeables.layouts; +package fr.ign.voxatile.core.parameters.placeables.layouts; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.random.Seed; /** * Interface for {@link LayoutBuilder} params. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/RepeatLayoutBuilderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/RepeatLayoutBuilderParams.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/RepeatLayoutBuilderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/RepeatLayoutBuilderParams.java index 5d7047ae0..a69fe4892 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/RepeatLayoutBuilderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/RepeatLayoutBuilderParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.placeables.layouts; +package fr.ign.voxatile.core.parameters.placeables.layouts; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.utils.AxisParams; -import com.ignfab.minalac.generator.placeables.layouts.DefaultLayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.utils.AxisParams; +import fr.ign.voxatile.core.placeables.layouts.DefaultLayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for a {@link LayoutBuilder} that repeats a layout along an axis. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/StructureLayoutBuilderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/StructureLayoutBuilderParams.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/StructureLayoutBuilderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/StructureLayoutBuilderParams.java index 0df9c6446..2b3afdfcc 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/layouts/StructureLayoutBuilderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/layouts/StructureLayoutBuilderParams.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.parameters.placeables.layouts; +package fr.ign.voxatile.core.parameters.placeables.layouts; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.StructureLayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.StructureLayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for making a {@link PlaceableStructure} resizable by allowing at most one stretchable band of the structure per axis (e.g. a column at x = 2 and a row at z = 1), effectively making it a Layout Builder. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/PatternParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/PatternParams.java similarity index 64% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/PatternParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/PatternParams.java index d8e6eca34..78b917c85 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/PatternParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/PatternParams.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.placeables.patterns; +package fr.ign.voxatile.core.parameters.placeables.patterns; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.Pattern; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.Pattern; +import fr.ign.voxatile.core.utils.random.Seed; /** * Main parameter class for {@link Pattern}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParams.java index 4ae7e7019..a15c9f909 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.placeables.patterns; +package fr.ign.voxatile.core.parameters.placeables.patterns; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.Pattern; -import com.ignfab.minalac.generator.placeables.patterns.RandomPattern; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.Pattern; +import fr.ign.voxatile.core.placeables.patterns.RandomPattern; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for {@link RandomPattern} placeable. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParams.java index a00ad14c4..5cc37267b 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParams.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.parameters.placeables.patterns; +package fr.ign.voxatile.core.parameters.placeables.patterns; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.Pattern; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.placeables.patterns.RepeatPattern; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.utils.world3d.WorldSize3d; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.Pattern; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.placeables.patterns.RepeatPattern; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldSize3d; /** * Parameters for {@link RepeatPattern} placeable. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintPlaceableStructureParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintPlaceableStructureParams.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintPlaceableStructureParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintPlaceableStructureParams.java index 44ce93051..6caad93fb 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintPlaceableStructureParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintPlaceableStructureParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import java.beans.ConstructorProperties; import java.util.HashMap; @@ -19,12 +19,12 @@ import tools.jackson.databind.ValueDeserializer; import tools.jackson.databind.annotation.JsonDeserialize; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A parameters class variant for {@link PlaceableStructure}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BoxPlaceableStructureParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BoxPlaceableStructureParams.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BoxPlaceableStructureParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BoxPlaceableStructureParams.java index de9d8b840..c78203e04 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/BoxPlaceableStructureParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/BoxPlaceableStructureParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.parameters.utils.WorldBBox3dParams; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.parameters.utils.WorldBBox3dParams; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.random.Seed; /** * A parameters class variant for {@link PlaceableStructure}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParams.java b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParams.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParams.java index 2b25a8009..81c0c0090 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import java.util.List; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.JsonWrapper; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.JsonWrapper; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.random.Seed; /** * Main parameter class for {@link PlaceableStructure}. diff --git a/src/main/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParams.java new file mode 100644 index 000000000..f00f1ff84 --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParams.java @@ -0,0 +1,17 @@ +package fr.ign.voxatile.core.parameters.processors; + +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.models.FloatMatrixModel; +import fr.ign.voxatile.core.processors.FloatMatrixProcessor; +import fr.ign.voxatile.core.processors.Processor; + +/** + * Parameters for float matrix processors. + */ +public class FloatMatrixProcessorParams extends ProcessorParams { + @Override + public Processor create(Generation generation) { + return new FloatMatrixProcessor(generation::makeCoordsConverter); + } +} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParams.java similarity index 54% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParams.java index 2a22fb015..2863377f0 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParams.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; import org.geotools.api.feature.simple.SimpleFeature; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.processors.GeoToolsVectorProcessor; -import com.ignfab.minalac.generator.processors.Processor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.processors.GeoToolsVectorProcessor; +import fr.ign.voxatile.core.processors.Processor; /** * Parameters for GeoTools vector processors. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/OsmProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/OsmProcessorParams.java similarity index 58% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/OsmProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/OsmProcessorParams.java index 469f9e566..2a092e213 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/OsmProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/OsmProcessorParams.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; import org.geotools.api.referencing.FactoryException; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.OsmData; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.processors.OsmProcessor; -import com.ignfab.minalac.generator.processors.Processor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.OsmData; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.processors.OsmProcessor; +import fr.ign.voxatile.core.processors.Processor; /** * Parameters for OSM processor. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/ProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/ProcessorParams.java similarity index 58% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/ProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/ProcessorParams.java index e204a72e4..beb8a2c24 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/ProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/ProcessorParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.PolymorphicParams; -import com.ignfab.minalac.generator.processors.Processor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.PolymorphicParams; +import fr.ign.voxatile.core.processors.Processor; /** * Parameters for {@link Processor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParams.java index bb4c4e042..87fb91889 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; @@ -6,11 +6,11 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterParams; -import com.ignfab.minalac.generator.processors.post.ConditionalPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterParams; +import fr.ign.voxatile.core.processors.post.ConditionalPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link ConditionalPostProcessor}. diff --git a/src/main/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParams.java new file mode 100644 index 000000000..b51999a95 --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParams.java @@ -0,0 +1,15 @@ +package fr.ign.voxatile.core.parameters.processors.post; + +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.processors.post.DiscardPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; + +/** + * Parameters for {@link DiscardPostProcessor}. + */ +public class DiscardPostProcessorParams extends PostProcessorParams { + @Override + public PostProcessor create(Generation generation) { + return DiscardPostProcessor.INSTANCE; + } +} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/FailurePolicyParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/FailurePolicyParams.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/FailurePolicyParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/FailurePolicyParams.java index 7ed6121b7..31646f160 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/FailurePolicyParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/FailurePolicyParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ignfab.minalac.generator.processors.post.FailurePolicy; +import fr.ign.voxatile.core.processors.post.FailurePolicy; /** * Parameters for {@link FailurePolicy}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParams.java similarity index 50% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParams.java index b3eb3b3da..265c9c4ed 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.processors.post.IdentityPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.processors.post.IdentityPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link IdentityPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java index 77b0ba2c5..3dce7d366 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.processors.post.JTSGeometryBufferPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.processors.post.JTSGeometryBufferPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link JTSGeometryBufferPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParams.java index bff12ecae..fcac0321f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.processors.post.MetadataCopyPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.processors.post.MetadataCopyPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link MetadataCopyPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParams.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParams.java index 99b3c4580..dd98538ee 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.parameters.ValueParser; -import com.ignfab.minalac.generator.processors.post.MetadataDefaultPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.parameters.ValueParser; +import fr.ign.voxatile.core.processors.post.MetadataDefaultPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link MetadataDefaultPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParams.java index 669fcc053..0e2899e82 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.parameters.ValueParser; -import com.ignfab.minalac.generator.processors.post.MetadataFunctionPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.parameters.ValueParser; +import fr.ign.voxatile.core.processors.post.MetadataFunctionPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for parsing post processor. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParams.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParams.java index 29245957b..bfc0cc35f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; -import com.ignfab.minalac.generator.processors.post.MetadataSetPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.processors.post.MetadataSetPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link MetadataSetPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParams.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParams.java index 23c32a4b0..4a6f76d5e 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import java.util.function.DoubleFunction; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.processors.post.MetadataFunctionPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.processors.post.MetadataFunctionPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for truncating values. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParams.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParams.java index 39965410e..fb5ffc19b 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.beans.ConstructorProperties; import java.util.HashMap; @@ -11,11 +11,11 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.parameters.ValueParser; -import com.ignfab.minalac.generator.processors.post.MetadataValueMappingPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.parameters.ValueParser; +import fr.ign.voxatile.core.processors.post.MetadataValueMappingPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link MetadataValueMappingPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParams.java index a4a8e25c9..fde83b712 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.util.ArrayList; import java.util.List; @@ -10,10 +10,10 @@ import tools.jackson.databind.deser.std.DelegatingDeserializer; import tools.jackson.databind.jsontype.TypeDeserializer; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.JsonDelegateDeserialize; -import com.ignfab.minalac.generator.parameters.PolymorphicParams; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.JsonDelegateDeserialize; +import fr.ign.voxatile.core.parameters.PolymorphicParams; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * Parameters for {@link PostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParams.java b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParams.java similarity index 74% rename from src/main/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParams.java index 6084fa7f1..bf7ca5b51 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParams.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.util.List; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.processors.post.IdentityPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; -import com.ignfab.minalac.generator.processors.post.SequentialPostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.processors.post.IdentityPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; +import fr.ign.voxatile.core.processors.post.SequentialPostProcessor; /** * Parameters for {@link SequentialPostProcessor}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParams.java index 9ef998ced..bf4a664ac 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; import java.io.File; @@ -10,12 +10,12 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.GeoPackageDataProvider; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.parameters.processors.GeoToolsVectorProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.utils.FileHelpers; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.GeoPackageDataProvider; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.parameters.processors.GeoToolsVectorProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.utils.FileHelpers; /** * Parameters for GeoPackage providers. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParams.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParams.java index 584affe2b..f431098f7 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; import java.io.File; @@ -9,13 +9,13 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.inputs.GeoTiffDataProvider; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.parameters.processors.FloatMatrixProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.utils.FileHelpers; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.inputs.GeoTiffDataProvider; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.parameters.processors.FloatMatrixProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.utils.FileHelpers; /** * Parameters for GeoTiff providers. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParams.java similarity index 73% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParams.java index d895ac399..8215bff8b 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; import java.net.URI; @@ -6,12 +6,12 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.OsmData; -import com.ignfab.minalac.generator.inputs.OverpassProvider; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.parameters.processors.OsmProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.OsmData; +import fr.ign.voxatile.core.inputs.OverpassProvider; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.parameters.processors.OsmProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; /** * Parameters for Overpass provider. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/ProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/ProviderParams.java similarity index 61% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/ProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/ProviderParams.java index fd6c2b3dd..6c1781755 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/ProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/ProviderParams.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.parameters.PolymorphicParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.parameters.PolymorphicParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; /** * Represents the parameters of a type of {@link Provider}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParams.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParams.java index a5372b0a2..6fb68f16f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; import java.io.File; @@ -10,12 +10,12 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.inputs.ShapefileDataProvider; -import com.ignfab.minalac.generator.parameters.processors.GeoToolsVectorProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.utils.FileHelpers; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.inputs.ShapefileDataProvider; +import fr.ign.voxatile.core.parameters.processors.GeoToolsVectorProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.utils.FileHelpers; /** * Parameters for Shapefile providers. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParams.java index 4aadfd866..b9d4ad617 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; @@ -9,11 +9,11 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.inputs.WFS1_1_GML3_1_DataProvider; -import com.ignfab.minalac.generator.parameters.processors.GeoToolsVectorProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.inputs.WFS1_1_GML3_1_DataProvider; +import fr.ign.voxatile.core.parameters.processors.GeoToolsVectorProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; /** * Parameters for WFS providers. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParams.java b/src/main/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParams.java similarity index 77% rename from src/main/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParams.java index 33c402835..5f235937b 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; @@ -6,12 +6,12 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.referencing.CRS; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.inputs.WMSFloatBilDataProvider; -import com.ignfab.minalac.generator.parameters.processors.FloatMatrixProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.inputs.WMSFloatBilDataProvider; +import fr.ign.voxatile.core.parameters.processors.FloatMatrixProcessorParams; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; /** * Parameters for WMS float providers. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/BuildLayoutTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/BuildLayoutTaskParams.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/BuildLayoutTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/BuildLayoutTaskParams.java index 9fc356ab3..d3f3e074a 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/BuildLayoutTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/BuildLayoutTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import java.util.List; @@ -7,13 +7,13 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.placeables.layouts.LayoutBuilderParams; -import com.ignfab.minalac.generator.parameters.placeables.layouts.LayoutBuilderParams.AxisPolicy; -import com.ignfab.minalac.generator.parameters.utils.WorldCoords3dParams; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.tasks.BuildLayoutTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.placeables.layouts.LayoutBuilderParams; +import fr.ign.voxatile.core.parameters.placeables.layouts.LayoutBuilderParams.AxisPolicy; +import fr.ign.voxatile.core.parameters.utils.WorldCoords3dParams; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.tasks.BuildLayoutTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for a {@code BuildLayoutTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/CompositeTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/CompositeTaskParams.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/CompositeTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/CompositeTaskParams.java index 2e24d1f40..eb47d9d0b 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/CompositeTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/CompositeTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.util.HashSet; import java.util.Map; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.utils.execution.Task; /** * Abstract params class for a tasks made of subtasks. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParams.java similarity index 77% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParams.java index d37c04fe8..2a1f8aee8 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.heightmaps.WritableHeightmapParams; -import com.ignfab.minalac.generator.tasks.CopyHeightmapTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.heightmaps.WritableHeightmapParams; +import fr.ign.voxatile.core.tasks.CopyHeightmapTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link CopyHeightmapTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParams.java index f84606890..cfd05b510 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import java.time.Duration; @@ -6,12 +6,12 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.IdentityPostProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.post.PostProcessorParams; -import com.ignfab.minalac.generator.parameters.providers.ProviderParams; -import com.ignfab.minalac.generator.tasks.FetchDataTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.IdentityPostProcessorParams; +import fr.ign.voxatile.core.parameters.processors.post.PostProcessorParams; +import fr.ign.voxatile.core.parameters.providers.ProviderParams; +import fr.ign.voxatile.core.tasks.FetchDataTask; /** * Parameters for creating a {@link FetchDataTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java index cca30c853..425e0ba28 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParams.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.values.ModelValueParams; -import com.ignfab.minalac.generator.parameters.placeables.NothingParams; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.FillBetweenHeightmapAndValueTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.models.values.ModelValueParams; +import fr.ign.voxatile.core.parameters.placeables.NothingParams; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.FillBetweenHeightmapAndValueTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link FillBetweenHeightmapAndValueTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParams.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParams.java index 4c6f86bfd..cc998f7ac 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; @@ -6,11 +6,11 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.tasks.HeightmapStatsTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.tasks.HeightmapStatsTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link HeightmapStatsTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/ModelTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/ModelTaskParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/ModelTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/ModelTaskParams.java index 56066e498..feea3536d 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/ModelTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/ModelTaskParams.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.models.ModelSelectionParams; +import fr.ign.voxatile.core.parameters.models.ModelSelectionParams; /** * Abstract class for {@link TaskParams} having a model selection. diff --git a/src/main/java/fr/ign/voxatile/core/parameters/tasks/NoOperationTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/NoOperationTaskParams.java new file mode 100644 index 000000000..6c47d85ba --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/NoOperationTaskParams.java @@ -0,0 +1,15 @@ +package fr.ign.voxatile.core.parameters.tasks; + +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.tasks.NoOperationTask; +import fr.ign.voxatile.core.utils.execution.Task; + +/** + * Parameters for a {@link NoOperationTask}. + */ +public class NoOperationTaskParams extends TaskParams { + @Override + public Task create(Generation generation) { + return NoOperationTask.INSTANCE; + } +} diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParams.java index 370245099..b55fe5903 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.WritableHeightmapParams; -import com.ignfab.minalac.generator.tasks.PopulateHeightmapTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.WritableHeightmapParams; +import fr.ign.voxatile.core.tasks.PopulateHeightmapTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link PopulateHeightmapTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParams.java index c2b10bc79..4dd70d6f1 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.RenderBuildingsTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.RenderBuildingsTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link RenderBuildingsTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderFacadesTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderFacadesTaskParams.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderFacadesTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderFacadesTaskParams.java index c8b33e558..34a3cc9e6 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderFacadesTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderFacadesTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import java.util.List; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.placeables.layouts.LayoutBuilderParams; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.tasks.RenderFacadesTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.placeables.layouts.LayoutBuilderParams; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.tasks.RenderFacadesTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for a {@link RenderFacadesTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParams.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParams.java index de3dd8c4b..cc494b980 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParams.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.RenderHeightmapTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.RenderHeightmapTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link RenderHeightmapTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParams.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParams.java index f62fd41b3..2d65d0159 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.tasks.RenderLines2dTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.tasks.RenderLines2dTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for {@link RenderLines2dTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParams.java index 233dde167..c24e3d11f 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.tasks.RenderLinesTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.tasks.RenderLinesTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for {@link RenderLinesTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParams.java index 57317bd9c..6ac125750 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.RenderPoints2dTask; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.RenderPoints2dTask; +import fr.ign.voxatile.core.utils.execution.Task; /** * Parameters for {@link RenderPoints2dTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParams.java similarity index 77% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParams.java index e966880a9..f175f40c5 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParams.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.RenderPointsTask; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.RenderPointsTask; +import fr.ign.voxatile.core.utils.execution.Task; /** * Parameters for {@link RenderPointsTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParams.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParams.java index 5f81eda8b..74a44eb45 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.tasks.RenderSurfacesTask; -import com.ignfab.minalac.generator.tasks.TileTask; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.tasks.RenderSurfacesTask; +import fr.ign.voxatile.core.tasks.TileTask; /** * Parameters for creating a {@link RenderSurfacesTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParams.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParams.java index ae54397cd..f1144bee5 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import java.util.LinkedHashMap; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; +import fr.ign.voxatile.core.generation.Generation; /** * Parameters for a task running other tasks, parallelized, with dependencies between them (like in a schedule). diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParams.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParams.java index 20b2da98d..8bb385622 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import java.util.HashMap; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; +import fr.ign.voxatile.core.generation.Generation; /** * Parameters for a task running other tasks one by one in sequence. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParams.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParams.java index f7e8c218f..00c510149 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.heightmaps.ReadableHeightmapParams; -import com.ignfab.minalac.generator.tasks.SetSpawnTask; -import com.ignfab.minalac.generator.tasks.TileTask; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.heightmaps.ReadableHeightmapParams; +import fr.ign.voxatile.core.tasks.SetSpawnTask; +import fr.ign.voxatile.core.tasks.TileTask; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * Parameters for creating a {@link SetSpawnTask}. @@ -22,12 +22,12 @@ public class SetSpawnTaskParams extends TaskParams { public ReadableHeightmapParams heightmap; /** * The spawn x-coordinate (required). - * Must be within the extent {@link com.ignfab.minalac.generator.parameters.GenerationParams#area}. + * Must be within the extent {@link fr.ign.voxatile.core.parameters.GenerationParams#area}. */ public int x; /** * The spawn y-coordinate (required). - * Must be within the extent {@link com.ignfab.minalac.generator.parameters.GenerationParams#area}. + * Must be within the extent {@link fr.ign.voxatile.core.parameters.GenerationParams#area}. */ public int y; diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/TaskParams.java b/src/main/java/fr/ign/voxatile/core/parameters/tasks/TaskParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/parameters/tasks/TaskParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/tasks/TaskParams.java index 543bfa354..c0ead1616 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/tasks/TaskParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/tasks/TaskParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.util.HashSet; import java.util.Map; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.parameters.PolymorphicParams; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.parameters.PolymorphicParams; +import fr.ign.voxatile.core.utils.execution.Task; /** * Parameters for a {@link Task}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/utils/AxisParams.java b/src/main/java/fr/ign/voxatile/core/parameters/utils/AxisParams.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/parameters/utils/AxisParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/utils/AxisParams.java index 0bece5620..ccf32b78e 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/utils/AxisParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/utils/AxisParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ignfab.minalac.generator.utils.axis.Axis; +import fr.ign.voxatile.core.utils.axis.Axis; /** * Parameters for a three dimensional axis. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParams.java b/src/main/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParams.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParams.java index 08a9f106f..0c2664424 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import java.beans.ConstructorProperties; @@ -11,7 +11,7 @@ import tools.jackson.databind.ValueDeserializer; import tools.jackson.databind.annotation.JsonDeserialize; -import com.ignfab.minalac.generator.utils.IntegerInterval; +import fr.ign.voxatile.core.utils.IntegerInterval; /** * A notation for an integer interval. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParams.java b/src/main/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParams.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParams.java index a19d10059..f43a13f84 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParams.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import java.util.List; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.JsonWrapper; -import com.ignfab.minalac.generator.utils.IntegerInterval; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.parameters.JsonWrapper; +import fr.ign.voxatile.core.utils.IntegerInterval; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Parameters describing a {@link WorldBBox3d}. diff --git a/src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldCoords3dParams.java b/src/main/java/fr/ign/voxatile/core/parameters/utils/WorldCoords3dParams.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldCoords3dParams.java rename to src/main/java/fr/ign/voxatile/core/parameters/utils/WorldCoords3dParams.java index 352c48874..0c1c9c788 100644 --- a/src/main/java/com/ignfab/minalac/generator/parameters/utils/WorldCoords3dParams.java +++ b/src/main/java/fr/ign/voxatile/core/parameters/utils/WorldCoords3dParams.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import java.util.List; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.JsonWrapper; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.parameters.JsonWrapper; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * Parameters describing a 3d position as {@link WorldCoords3d}. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/CombinedPlaceable.java b/src/main/java/fr/ign/voxatile/core/placeables/CombinedPlaceable.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/placeables/CombinedPlaceable.java rename to src/main/java/fr/ign/voxatile/core/placeables/CombinedPlaceable.java index 41d0d113c..bbb4ca654 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/CombinedPlaceable.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/CombinedPlaceable.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; import java.util.LinkedList; import java.util.List; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.world.VoxelTile; /** * A placeable that is a combination of placeables. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/LayoutStructure.java b/src/main/java/fr/ign/voxatile/core/placeables/LayoutStructure.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/placeables/LayoutStructure.java rename to src/main/java/fr/ign/voxatile/core/placeables/LayoutStructure.java index 942e95826..be70e1d29 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/LayoutStructure.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/LayoutStructure.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; import java.util.List; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.IdentityAxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.SizesAxisMapper; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.utils.world3d.WorldSize3d; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.IdentityAxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.SizesAxisMapper; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldSize3d; +import fr.ign.voxatile.core.world.VoxelTile; /** * A placeable structure made of several structures. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/Nothing.java b/src/main/java/fr/ign/voxatile/core/placeables/Nothing.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/placeables/Nothing.java rename to src/main/java/fr/ign/voxatile/core/placeables/Nothing.java index 79ae1282d..748318916 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/Nothing.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/Nothing.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.world.VoxelTile; /** * A placeable placing nothing. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/Pattern.java b/src/main/java/fr/ign/voxatile/core/placeables/Pattern.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/placeables/Pattern.java rename to src/main/java/fr/ign/voxatile/core/placeables/Pattern.java index bf1a16125..b569a95ff 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/Pattern.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/Pattern.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.world.VoxelTile; /** * A pattern of placeables. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/Placeable.java b/src/main/java/fr/ign/voxatile/core/placeables/Placeable.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/placeables/Placeable.java rename to src/main/java/fr/ign/voxatile/core/placeables/Placeable.java index 5304fbe53..7f2edf6ad 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/Placeable.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/Placeable.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.VoxelTile; /** * The {@code Placeable} interface represents something placeable in voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/PlaceableStructure.java b/src/main/java/fr/ign/voxatile/core/placeables/PlaceableStructure.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/placeables/PlaceableStructure.java rename to src/main/java/fr/ign/voxatile/core/placeables/PlaceableStructure.java index d2f778458..7aa52bc89 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/PlaceableStructure.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/PlaceableStructure.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; import java.util.HashMap; import java.util.Map; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.VoxelTile; /** * {@code PlaceableStructure} is a {@link Placeable} consisting of placeables at given coordinate offsets. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/Structure.java b/src/main/java/fr/ign/voxatile/core/placeables/Structure.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/placeables/Structure.java rename to src/main/java/fr/ign/voxatile/core/placeables/Structure.java index 895f0c416..9b8cdd692 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/Structure.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/Structure.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * A placeable made of other placeables. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/DefaultLayoutBuilder.java b/src/main/java/fr/ign/voxatile/core/placeables/layouts/DefaultLayoutBuilder.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/placeables/layouts/DefaultLayoutBuilder.java rename to src/main/java/fr/ign/voxatile/core/placeables/layouts/DefaultLayoutBuilder.java index 852829097..7b82d98b5 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/DefaultLayoutBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/layouts/DefaultLayoutBuilder.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.placeables.layouts; - -import com.ignfab.minalac.generator.placeables.LayoutStructure; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.placeables.Structure; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.AdjustAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.AxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.DelegateAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.KeepAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.PriorityRepartitionAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.RepeatAxisMapperBuilder; +package fr.ign.voxatile.core.placeables.layouts; + +import fr.ign.voxatile.core.placeables.LayoutStructure; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.placeables.Structure; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.builders.AdjustAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.AxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.DelegateAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.KeepAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.PriorityRepartitionAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.RepeatAxisMapperBuilder; /** * A versatile implementation of {@link LayoutBuilder} based on a layout builder provider. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/LayoutBuilder.java b/src/main/java/fr/ign/voxatile/core/placeables/layouts/LayoutBuilder.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/placeables/layouts/LayoutBuilder.java rename to src/main/java/fr/ign/voxatile/core/placeables/layouts/LayoutBuilder.java index 80e7d0686..9826e444b 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/LayoutBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/layouts/LayoutBuilder.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.placeables.layouts; +package fr.ign.voxatile.core.placeables.layouts; -import com.ignfab.minalac.generator.placeables.Structure; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.AxisMapperBuilder; +import fr.ign.voxatile.core.placeables.Structure; +import fr.ign.voxatile.core.utils.axis.mappers.builders.AxisMapperBuilder; /** * A structure layout builder based on axis mappers. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/StructureLayoutBuilder.java b/src/main/java/fr/ign/voxatile/core/placeables/layouts/StructureLayoutBuilder.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/placeables/layouts/StructureLayoutBuilder.java rename to src/main/java/fr/ign/voxatile/core/placeables/layouts/StructureLayoutBuilder.java index 2740cf9d5..c15a3bbf6 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/StructureLayoutBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/layouts/StructureLayoutBuilder.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.placeables.layouts; +package fr.ign.voxatile.core.placeables.layouts; -import com.ignfab.minalac.generator.placeables.LayoutStructure; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.placeables.Structure; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.AxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.ConstantAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.DelegateAxisMapperBuilder; -import com.ignfab.minalac.generator.utils.axis.mappers.builders.StretcherAxisMapperBuilder; +import fr.ign.voxatile.core.placeables.LayoutStructure; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.placeables.Structure; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.builders.AxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.ConstantAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.DelegateAxisMapperBuilder; +import fr.ign.voxatile.core.utils.axis.mappers.builders.StretcherAxisMapperBuilder; /** * This makes a {@link PlaceableStructure} resizable by allowing at most one stretchable band of the structure per axis (e.g. a column at x = 2 and a row at z = 1), effectively making it a Layout Builder. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/UnbuildableLayoutException.java b/src/main/java/fr/ign/voxatile/core/placeables/layouts/UnbuildableLayoutException.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/placeables/layouts/UnbuildableLayoutException.java rename to src/main/java/fr/ign/voxatile/core/placeables/layouts/UnbuildableLayoutException.java index 60c38d42c..b4a0edb61 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/layouts/UnbuildableLayoutException.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/layouts/UnbuildableLayoutException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.placeables.layouts; +package fr.ign.voxatile.core.placeables.layouts; /** * An exception thrown when a layout builder cannot build. diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/patterns/RandomPattern.java b/src/main/java/fr/ign/voxatile/core/placeables/patterns/RandomPattern.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/placeables/patterns/RandomPattern.java rename to src/main/java/fr/ign/voxatile/core/placeables/patterns/RandomPattern.java index 4ff730c07..5643f768d 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/patterns/RandomPattern.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/patterns/RandomPattern.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.placeables.patterns; +package fr.ign.voxatile.core.placeables.patterns; -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.Pattern; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Random; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.Pattern; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Random; +import fr.ign.voxatile.core.utils.random.Seed; /** * A pattern placing something or not according to a simple "dice roll". diff --git a/src/main/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPattern.java b/src/main/java/fr/ign/voxatile/core/placeables/patterns/RepeatPattern.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPattern.java rename to src/main/java/fr/ign/voxatile/core/placeables/patterns/RepeatPattern.java index 592991f62..6130636b7 100644 --- a/src/main/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPattern.java +++ b/src/main/java/fr/ign/voxatile/core/placeables/patterns/RepeatPattern.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.placeables.patterns; +package fr.ign.voxatile.core.placeables.patterns; -import com.ignfab.minalac.generator.placeables.Pattern; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.utils.world3d.WorldSize3d; +import fr.ign.voxatile.core.placeables.Pattern; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldSize3d; /** * A pattern that repeats a {@link PlaceableStructure}. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/ConvertingProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/ConvertingProcessor.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/processors/ConvertingProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/ConvertingProcessor.java index 257348834..af166036f 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/ConvertingProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/ConvertingProcessor.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.utils.coordinates.CoordsConverterProvider; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.utils.coordinates.CoordsConverterProvider; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; /** * Base processor implementation to provide coordinates conversion logic. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/FloatMatrixProcessor.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/FloatMatrixProcessor.java index cf2125513..63d0e6052 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/FloatMatrixProcessor.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.models.FloatMatrixModel; -import com.ignfab.minalac.generator.utils.coordinates.CoordsConverterProvider; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.models.FloatMatrixModel; +import fr.ign.voxatile.core.utils.coordinates.CoordsConverterProvider; /** * Processor transforming {@link FloatGeographicDataMatrix2d} into a diff --git a/src/main/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessor.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessor.java index 49a42b44e..44d8c932b 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessor.java @@ -1,20 +1,20 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import org.geotools.api.feature.Property; import org.geotools.api.feature.simple.SimpleFeature; import org.locationtech.jts.geom.Geometry; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.utils.coordinates.CoordsConverterProvider; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.utils.coordinates.CoordsConverterProvider; /** * Processor transforming {@link SimpleFeature} GeoTools object * into {@link JTSGeometryModel}. * It also copies feature's properties inside model's metadata. *

- * This processor pairs well with {@link com.ignfab.minalac.generator.inputs.WFS1_1_GML3_1_DataProvider}. + * This processor pairs well with {@link fr.ign.voxatile.core.inputs.WFS1_1_GML3_1_DataProvider}. */ public class GeoToolsVectorProcessor extends ConvertingProcessor { /** diff --git a/src/main/java/com/ignfab/minalac/generator/processors/OsmProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/OsmProcessor.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/processors/OsmProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/OsmProcessor.java index f90cd4316..43483711d 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/OsmProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/OsmProcessor.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import de.topobyte.osm4j.core.model.iface.OsmEntity; import de.topobyte.osm4j.core.model.iface.OsmNode; @@ -11,17 +11,17 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.inputs.OsmData; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.inputs.OsmData; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; /** * Processor transforming {@code OsmData} into {@link JTSGeometryModel}. * It also copies OSM element tags into model's metadata. *

- * This processor pairs well with {@link com.ignfab.minalac.generator.inputs.OverpassProvider}. + * This processor pairs well with {@link fr.ign.voxatile.core.inputs.OverpassProvider}. */ public class OsmProcessor implements Processor { private final MapToWorldConverter converter; diff --git a/src/main/java/com/ignfab/minalac/generator/processors/Processor.java b/src/main/java/fr/ign/voxatile/core/processors/Processor.java similarity index 84% rename from src/main/java/com/ignfab/minalac/generator/processors/Processor.java rename to src/main/java/fr/ign/voxatile/core/processors/Processor.java index d89e22d74..ac430e82c 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/Processor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/Processor.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * A processor is responsible for transforming elements coming from - * a {@link com.ignfab.minalac.generator.inputs.Provider provider} + * a {@link fr.ign.voxatile.core.inputs.Provider provider} * into a model. *

* Its main method is {@link #process(Object)}, which take one diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessor.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessor.java index 2be6bd5ca..135d304a9 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessor.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.LinkedList; import java.util.Queue; import java.util.function.Predicate; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * Post-processor applying another post-processor based on a condition. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessor.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessor.java index e1cd2177e..000e38a28 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessor.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Post-processor discarding everything. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/FailurePolicy.java b/src/main/java/fr/ign/voxatile/core/processors/post/FailurePolicy.java similarity index 70% rename from src/main/java/com/ignfab/minalac/generator/processors/post/FailurePolicy.java rename to src/main/java/fr/ign/voxatile/core/processors/post/FailurePolicy.java index 9afc03894..8094d31b9 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/FailurePolicy.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/FailurePolicy.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; /** * Policies about how to handle failure. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessor.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessor.java index 6a47b6551..e8aa9b6a8 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessor.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Post-processor doing nothing. Can be convenient as a default value when not needed. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessor.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessor.java index ed71cbc13..dbcc20054 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessor.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.JTSGeometryModel; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.JTSGeometryModel; /** * Post-processor working on {@link JTSGeometryModel}s diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessor.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessor.java index 9f5b0c811..3c6f5dbea 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessor.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Post-processor copying a metadata into another, effectively diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessor.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessor.java index 1fccb2c0d..38ffe466f 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessor.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * Post-processor that applies a default value for a specified metadata. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessor.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessor.java index 68e756417..323de2fa0 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessor.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.function.Function; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * Post-processor parsing a metadata value in-place. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessor.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessor.java index 5bd07ca6f..7e914f8a4 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessor.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.values.ModelValue; /** * Post-processor defining a metadata from a {@link ModelValue}. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessor.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessor.java index 4389ea67c..d60f2de80 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessor.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * Post-processor to remap a metadata value to another value. diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/PostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/PostProcessor.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/processors/post/PostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/PostProcessor.java index 11968434d..982b509bc 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/PostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/PostProcessor.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * A post-processor is responsible for altering models diff --git a/src/main/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessor.java b/src/main/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessor.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessor.java rename to src/main/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessor.java index 56ae0299b..decd59cec 100644 --- a/src/main/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessor.java +++ b/src/main/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessor.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.ArrayList; import java.util.List; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; /** * Post-processor applying other post-processors in sequence. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/BuildLayoutTask.java b/src/main/java/fr/ign/voxatile/core/tasks/BuildLayoutTask.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/tasks/BuildLayoutTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/BuildLayoutTask.java index 5dc4239f8..51f6e0622 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/BuildLayoutTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/BuildLayoutTask.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.placeables.Structure; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.placeables.Structure; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A task building a structure from a layout builder and placing it in the world. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTask.java b/src/main/java/fr/ign/voxatile/core/tasks/CopyHeightmapTask.java similarity index 63% rename from src/main/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/CopyHeightmapTask.java index a29c155c8..01984b093 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/CopyHeightmapTask.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Shape2dVoxelizer; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Shape2dVoxelizer; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; /** * A {@link TileTask} copying values of a heightmap to another at all coordinates within the model's shape. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/FetchDataTask.java b/src/main/java/fr/ign/voxatile/core/tasks/FetchDataTask.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/tasks/FetchDataTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/FetchDataTask.java index c046aeeaf..3c2d4489e 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/FetchDataTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/FetchDataTask.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.time.Duration; import java.util.LinkedList; import java.util.List; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.processors.Processor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.processors.Processor; +import fr.ign.voxatile.core.processors.post.PostProcessor; /** * A {@link TileTask} fetching data from a provider, processing models with a processor applying a post-processor to each model. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTask.java b/src/main/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTask.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTask.java index 0bd1b9645..166f42206 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTask.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Shape2dVoxelizer; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Shape2dVoxelizer; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; /** * A {@link TileTask} which, for each model in {@link ModelSelection}, diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTask.java b/src/main/java/fr/ign/voxatile/core/tasks/HeightmapStatsTask.java similarity index 74% rename from src/main/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/HeightmapStatsTask.java index 361914a20..c12bde9f2 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/HeightmapStatsTask.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.tasks; - -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Shape2dVoxelizer; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; +package fr.ign.voxatile.core.tasks; + +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Shape2dVoxelizer; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; /** * A {@link TileTask} which computes heightmap statistics over a model surface and adds the results as a metadata. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/ModelTask.java b/src/main/java/fr/ign/voxatile/core/tasks/ModelTask.java similarity index 77% rename from src/main/java/com/ignfab/minalac/generator/tasks/ModelTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/ModelTask.java index 7ae70b457..de9045ae5 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/ModelTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/ModelTask.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.ModelSelection; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.ModelSelection; /** * A {@link TileTask} running on a {@link ModelSelection}. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/NoOperationTask.java b/src/main/java/fr/ign/voxatile/core/tasks/NoOperationTask.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/tasks/NoOperationTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/NoOperationTask.java index 0932a9f29..7cffc94e2 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/NoOperationTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/NoOperationTask.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.utils.execution.Task; /** * A task doing absolutely nothing (because nothing is important). diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTask.java b/src/main/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTask.java similarity index 72% rename from src/main/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTask.java index 28ab1a768..af7fa5bf9 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTask.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmapSpec; -import com.ignfab.minalac.generator.models.FloatMatrixModel; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.Matrix2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmapSpec; +import fr.ign.voxatile.core.models.FloatMatrixModel; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.Matrix2d; /** * A {@link TileTask} copying data from a {@link ModelSelection} to a heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderBuildingsTask.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderBuildingsTask.java index e0b197478..004bf6f14 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderBuildingsTask.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Shape2dVoxelizer; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.ThinLinearVoxelizer2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Shape2dVoxelizer; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.ThinLinearVoxelizer2d; /** * A {@link TileTask} rendering a {@link ModelSelection} as buildings. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderFacadesTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderFacadesTask.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderFacadesTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderFacadesTask.java index b8feb76b7..4eb688003 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderFacadesTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderFacadesTask.java @@ -1,20 +1,20 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.LinkedList; import java.util.List; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.placeables.LayoutStructure; -import com.ignfab.minalac.generator.placeables.Structure; -import com.ignfab.minalac.generator.placeables.layouts.LayoutBuilder; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.IndexedPosition2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.ThickLinearIndexedVoxelizer2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.placeables.LayoutStructure; +import fr.ign.voxatile.core.placeables.Structure; +import fr.ign.voxatile.core.placeables.layouts.LayoutBuilder; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.IndexedPosition2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.ThickLinearIndexedVoxelizer2d; /** * A {@link ModelTask} rendering facades from 2d shapes, using {@link LayoutBuilder}s. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderHeightmapTask.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderHeightmapTask.java index 61f4f4b6d..92ebef950 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderHeightmapTask.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A {@link TileTask} placing things between a minimum and maximum heightmap. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderLines2dTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderLines2dTask.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderLines2dTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderLines2dTask.java index de2d8efbd..8207f9e91 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderLines2dTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderLines2dTask.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.IndexedPosition2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.ThickLinearIndexedVoxelizer2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.IndexedPosition2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.ThickLinearIndexedVoxelizer2d; /** * A task rendering lines by placing structure along them. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderLinesTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderLinesTask.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderLinesTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderLinesTask.java index 36a398793..2cadecdb7 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderLinesTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderLinesTask.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.computed.ConstantHeightmap; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape3dConvertibleModel; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.voxelization.shape3d.iterator.IndexedPosition3d; -import com.ignfab.minalac.generator.voxelization.shape3d.voxelizer.ThickLinearIndexedVoxelizer2d5; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.computed.ConstantHeightmap; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape3dConvertibleModel; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.voxelization.shape3d.iterator.IndexedPosition3d; +import fr.ign.voxatile.core.voxelization.shape3d.voxelizer.ThickLinearIndexedVoxelizer2d5; /** * A task rendering lines by placing structure along them. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderPoints2dTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderPoints2dTask.java similarity index 64% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderPoints2dTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderPoints2dTask.java index a93ea3cde..4f32b2772 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderPoints2dTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderPoints2dTask.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Point2dVoxelizer; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Point2dVoxelizer; /** * A task rendering points by placing placeables at them. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderPointsTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderPointsTask.java similarity index 66% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderPointsTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderPointsTask.java index 8af23dd75..902d02909 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderPointsTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderPointsTask.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape3dConvertibleModel; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape3d.voxelizer.Point3dVoxelizer; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape3dConvertibleModel; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape3d.voxelizer.Point3dVoxelizer; /** * A task rendering points by placing placeables at them. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTask.java b/src/main/java/fr/ign/voxatile/core/tasks/RenderSurfacesTask.java similarity index 62% rename from src/main/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/RenderSurfacesTask.java index eaa9ed041..3297b55c1 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/RenderSurfacesTask.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.Shape2dConvertibleModel; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.Shape2dVoxelizer; -import com.ignfab.minalac.generator.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.Shape2dConvertibleModel; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.Shape2dVoxelizer; +import fr.ign.voxatile.core.voxelization.shape2d.voxelizer.SurfaceVoxelizer2d; /** * A {@link TileTask} placing things on a 2d surface shape at heighmap height. diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/SetSpawnTask.java b/src/main/java/fr/ign/voxatile/core/tasks/SetSpawnTask.java similarity index 71% rename from src/main/java/com/ignfab/minalac/generator/tasks/SetSpawnTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/SetSpawnTask.java index 2d7c32d03..fc916c6af 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/SetSpawnTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/SetSpawnTask.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** - * This task sets {@link com.ignfab.minalac.generator.world.VoxelWorldMetadata} spawn position. + * This task sets {@link fr.ign.voxatile.core.world.VoxelWorldMetadata} spawn position. * It queries the heightmap to determine the altitude of the spawn point. * */ public class SetSpawnTask implements TileTask { diff --git a/src/main/java/com/ignfab/minalac/generator/tasks/TileTask.java b/src/main/java/fr/ign/voxatile/core/tasks/TileTask.java similarity index 70% rename from src/main/java/com/ignfab/minalac/generator/tasks/TileTask.java rename to src/main/java/fr/ign/voxatile/core/tasks/TileTask.java index 42b980e77..7bc36d484 100644 --- a/src/main/java/com/ignfab/minalac/generator/tasks/TileTask.java +++ b/src/main/java/fr/ign/voxatile/core/tasks/TileTask.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.utils.execution.Task; /** * A task running on a generation tile. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/FileHelpers.java b/src/main/java/fr/ign/voxatile/core/utils/FileHelpers.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/utils/FileHelpers.java rename to src/main/java/fr/ign/voxatile/core/utils/FileHelpers.java index 9aeaf4453..b63689ed6 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/FileHelpers.java +++ b/src/main/java/fr/ign/voxatile/core/utils/FileHelpers.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils; +package fr.ign.voxatile.core.utils; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/IntegerInterval.java b/src/main/java/fr/ign/voxatile/core/utils/IntegerInterval.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/IntegerInterval.java rename to src/main/java/fr/ign/voxatile/core/utils/IntegerInterval.java index 25ea86fd5..15fec11d5 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/IntegerInterval.java +++ b/src/main/java/fr/ign/voxatile/core/utils/IntegerInterval.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils; +package fr.ign.voxatile.core.utils; /** * An interval between two integers. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/Rounding.java b/src/main/java/fr/ign/voxatile/core/utils/Rounding.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/utils/Rounding.java rename to src/main/java/fr/ign/voxatile/core/utils/Rounding.java index 67351adf8..1ab1ad684 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/Rounding.java +++ b/src/main/java/fr/ign/voxatile/core/utils/Rounding.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils; +package fr.ign.voxatile.core.utils; /** * Some advanced rounding helpers. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/Axis.java b/src/main/java/fr/ign/voxatile/core/utils/axis/Axis.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/Axis.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/Axis.java index 62065a2ed..30af82da3 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/Axis.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/Axis.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis; +package fr.ign.voxatile.core.utils.axis; /** * Existing axes in 3 dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/AxisMapper.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/AxisMapper.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/AxisMapper.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/AxisMapper.java index 3bb096a87..bb2ed6a2f 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/AxisMapper.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/AxisMapper.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; /** * An axis mapper maps a mono dimensional position in a composite structure into a substructure index and position in substructure. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapper.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapper.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapper.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapper.java index 00c3df79d..f90f0f3b4 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapper.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapper.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; /** * An {@link AxisMapper} that does an identity mapping. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapper.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapper.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapper.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapper.java index 3f9b48ca7..2336290e2 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapper.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapper.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; /** * An {@link AxisMapper} that maps a position into a concatenation of intervals with given sizes. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapper.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapper.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapper.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapper.java index 4326e82ec..d4edaccce 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapper.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapper.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; /** * An {@link AxisMapper} that maps position into one stretched interval. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java index c6ef4c067..d49277137 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilder.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.IdentityAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.IdentityAxisMapper; /** * An {@link AxisMapperBuilder} made of multiple {@link AxisMapperBuilder}s having the same dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AxisMapperBuilder.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AxisMapperBuilder.java index 185642cf2..34da9b5e2 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AxisMapperBuilder.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; /** * A builder for {@link AxisMapper}s. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java index ff70c5016..272bb9563 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilder.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.IdentityAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.IdentityAxisMapper; /** * An {@link AxisMapperBuilder} for a constant size. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java index f6ba923a4..379647924 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/DelegateAxisMapperBuilder.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.IdentityAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.IdentityAxisMapper; /** * An {@link AxisMapperBuilder} inheriting size constraints from another {@link AxisMapperBuilder}. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilder.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilder.java index 8e8d50aa0..940561ed1 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilder.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.IdentityAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.IdentityAxisMapper; /** * An {@link AxisMapperBuilder} made of multiple unchanged and overlayed {@link AxisMapperBuilder}s. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java index 6e813dc49..29adb3ff5 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilder.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import java.util.ArrayList; import java.util.Collections; @@ -8,9 +8,9 @@ import java.util.Map; import java.util.TreeMap; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.SizesAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.SizesAxisMapper; /** * An {@link AxisMapperBuilder} that distributes space to undelying {@link AxisMapperBuilder} with priorities. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java index b077f5603..4e7655f82 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilder.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import java.util.Arrays; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.SizesAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.SizesAxisMapper; /** * An {@link AxisMapperBuilder} that repeats underlying {@link AxisMapperBuilder} as many times as possible. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java rename to src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java index 305fddaaa..143e9b447 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java +++ b/src/main/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilder.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; -import com.ignfab.minalac.generator.utils.axis.mappers.StretcherAxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.StretcherAxisMapper; /** * Builder for an {@link AxisMapper} that stretches an interval at a given coordinate. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/Converter.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/Converter.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/Converter.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/Converter.java index a5662f010..381eacd5e 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/Converter.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/Converter.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.geometry.MismatchedDimensionException; import org.geotools.api.geometry.Position; @@ -12,7 +12,7 @@ import org.locationtech.jts.geom.util.AffineTransformation; import org.locationtech.jts.geom.util.NoninvertibleTransformationException; -import com.ignfab.minalac.generator.exceptions.TransformException; +import fr.ign.voxatile.core.exceptions.TransformException; /** * Converts coordinates from a CRS to world coordinates. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/CoordsConverterProvider.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/CoordsConverterProvider.java similarity index 80% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/CoordsConverterProvider.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/CoordsConverterProvider.java index dfc93b296..e4ac971e4 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/CoordsConverterProvider.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/CoordsConverterProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; @@ -14,7 +14,7 @@ public interface CoordsConverterProvider { * Computes and returns the coords converter from the given CRS. * @param fromCrs the source CRS of the conversion * @return the resulting converter - * @see com.ignfab.minalac.generator.generation.Generation#makeCoordsConverter(CoordinateReferenceSystem) + * @see fr.ign.voxatile.core.generation.Generation#makeCoordsConverter(CoordinateReferenceSystem) */ MapToWorldConverter computeForCRS(CoordinateReferenceSystem fromCrs) throws FactoryException; } diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/EnvelopeProvider.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/EnvelopeProvider.java similarity index 73% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/EnvelopeProvider.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/EnvelopeProvider.java index e4905d6e7..d461ace6e 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/EnvelopeProvider.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/EnvelopeProvider.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.geometry.jts.ReferencedEnvelope; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * An {@code EnvelopeProvider} computes envelope in a given CRS. @@ -19,7 +19,7 @@ public interface EnvelopeProvider { * @param crs the CRS to encode coordinates in * @param bbox bounding box (in world coordinates) to create envelope for * @return the resulting envelope - * @see com.ignfab.minalac.generator.generation.Generation#getEnvelopeForCRS(CoordinateReferenceSystem, WorldBBox3d) + * @see fr.ign.voxatile.core.generation.Generation#getEnvelopeForCRS(CoordinateReferenceSystem, WorldBBox3d) */ ReferencedEnvelope computeForCRS(CoordinateReferenceSystem crs, WorldBBox3d bbox) throws FactoryException, TransformException; } diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapCoordinates.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/MapCoordinates.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapCoordinates.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/MapCoordinates.java index 0d8790d25..cdcee1c74 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapCoordinates.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/MapCoordinates.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.geometry.MismatchedDimensionException; import org.geotools.api.geometry.Position; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapToWorldConverter.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/MapToWorldConverter.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapToWorldConverter.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/MapToWorldConverter.java index b23d95024..1489b41d3 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/MapToWorldConverter.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/MapToWorldConverter.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.referencing.operation.MathTransform; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.util.AffineTransformation; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A map (real) to world (game) coordinates converter. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/WorldToMapConverter.java b/src/main/java/fr/ign/voxatile/core/utils/coordinates/WorldToMapConverter.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/utils/coordinates/WorldToMapConverter.java rename to src/main/java/fr/ign/voxatile/core/utils/coordinates/WorldToMapConverter.java index c99fb75dd..4067fb7a3 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/coordinates/WorldToMapConverter.java +++ b/src/main/java/fr/ign/voxatile/core/utils/coordinates/WorldToMapConverter.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.locationtech.jts.geom.Geometry; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A world (game) to map (real) coordinates converter. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/Schedule.java b/src/main/java/fr/ign/voxatile/core/utils/execution/Schedule.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/utils/execution/Schedule.java rename to src/main/java/fr/ign/voxatile/core/utils/execution/Schedule.java index 7c1917cd5..4bc524f23 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/Schedule.java +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/Schedule.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; /** * A schedule that contains tasks and dependencies. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTask.java b/src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTask.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTask.java rename to src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTask.java index 42bfd5ddd..222d06302 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTask.java +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTask.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTaskState.java b/src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTaskState.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTaskState.java rename to src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTaskState.java index 9221a621c..03522215d 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/ScheduledTaskState.java +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/ScheduledTaskState.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; /** * The state of a {@link ScheduledTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/Scheduler.java b/src/main/java/fr/ign/voxatile/core/utils/execution/Scheduler.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/execution/Scheduler.java rename to src/main/java/fr/ign/voxatile/core/utils/execution/Scheduler.java index 09c507fca..5f888ea7a 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/Scheduler.java +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/Scheduler.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; import java.util.HashMap; import java.util.Map; @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; /** * A scheduler is a service managing execution of tasks. diff --git a/src/main/java/fr/ign/voxatile/core/utils/execution/Task.java b/src/main/java/fr/ign/voxatile/core/utils/execution/Task.java new file mode 100644 index 000000000..de49bc171 --- /dev/null +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/Task.java @@ -0,0 +1,7 @@ +package fr.ign.voxatile.core.utils.execution; + +/** + * A convenience interface to represent a runnable task. + */ +public interface Task extends Runnable { +} diff --git a/src/main/java/com/ignfab/minalac/generator/utils/execution/TaskFailedException.java b/src/main/java/fr/ign/voxatile/core/utils/execution/TaskFailedException.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/utils/execution/TaskFailedException.java rename to src/main/java/fr/ign/voxatile/core/utils/execution/TaskFailedException.java index 97fb374e5..a53cea043 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/execution/TaskFailedException.java +++ b/src/main/java/fr/ign/voxatile/core/utils/execution/TaskFailedException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; /** * Exception thrown when an exception occurs in a {@link ScheduledTask}. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterables.java b/src/main/java/fr/ign/voxatile/core/utils/iterator/Iterables.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterables.java rename to src/main/java/fr/ign/voxatile/core/utils/iterator/Iterables.java index fb623c55b..378eff5ff 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterables.java +++ b/src/main/java/fr/ign/voxatile/core/utils/iterator/Iterables.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.Iterator; import java.util.function.Function; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterators.java b/src/main/java/fr/ign/voxatile/core/utils/iterator/Iterators.java similarity index 99% rename from src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterators.java rename to src/main/java/fr/ign/voxatile/core/utils/iterator/Iterators.java index 920bf0deb..a82ed0c69 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/iterator/Iterators.java +++ b/src/main/java/fr/ign/voxatile/core/utils/iterator/Iterators.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/modules/JarModule.java b/src/main/java/fr/ign/voxatile/core/utils/modules/JarModule.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/utils/modules/JarModule.java rename to src/main/java/fr/ign/voxatile/core/utils/modules/JarModule.java index 885bf21a7..7d7c13a48 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/modules/JarModule.java +++ b/src/main/java/fr/ign/voxatile/core/utils/modules/JarModule.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.modules; +package fr.ign.voxatile.core.utils.modules; import java.io.File; import java.io.IOException; @@ -7,7 +7,7 @@ import java.net.URLClassLoader; import java.util.Properties; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; /** * Representation of a module jar file. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/modules/Module.java b/src/main/java/fr/ign/voxatile/core/utils/modules/Module.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/utils/modules/Module.java rename to src/main/java/fr/ign/voxatile/core/utils/modules/Module.java index d446d4201..a55e80806 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/modules/Module.java +++ b/src/main/java/fr/ign/voxatile/core/utils/modules/Module.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.utils.modules; +package fr.ign.voxatile.core.utils.modules; -import com.ignfab.minalac.generator.parameters.ParamsParser; +import fr.ign.voxatile.core.parameters.ParamsParser; /** * Main module class parent. @@ -15,7 +15,7 @@ public abstract class Module implements ModuleCreator { /** * Registers parameters for the module. - * This will be called before generator reads parameters. This is the place to register new parameter classes into parser. + * This will be called before Voxatile reads parameters. This is the place to register new parameter classes into parser. * * @param parser Parameter parser to use */ diff --git a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModuleCreator.java b/src/main/java/fr/ign/voxatile/core/utils/modules/ModuleCreator.java similarity index 65% rename from src/main/java/com/ignfab/minalac/generator/utils/modules/ModuleCreator.java rename to src/main/java/fr/ign/voxatile/core/utils/modules/ModuleCreator.java index 337fe730d..d221bc74f 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModuleCreator.java +++ b/src/main/java/fr/ign/voxatile/core/utils/modules/ModuleCreator.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.utils.modules; +package fr.ign.voxatile.core.utils.modules; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; /** * Interface for all classes capable of creating a module. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesLoader.java b/src/main/java/fr/ign/voxatile/core/utils/modules/ModulesLoader.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesLoader.java rename to src/main/java/fr/ign/voxatile/core/utils/modules/ModulesLoader.java index 0a8091000..13de08640 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesLoader.java +++ b/src/main/java/fr/ign/voxatile/core/utils/modules/ModulesLoader.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.utils.modules; +package fr.ign.voxatile.core.utils.modules; import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; /** * A module loader that can load modules and create a module manager out of them. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesManager.java b/src/main/java/fr/ign/voxatile/core/utils/modules/ModulesManager.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesManager.java rename to src/main/java/fr/ign/voxatile/core/utils/modules/ModulesManager.java index 5f300da52..34e57e677 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/modules/ModulesManager.java +++ b/src/main/java/fr/ign/voxatile/core/utils/modules/ModulesManager.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.modules; +package fr.ign.voxatile.core.utils.modules; import java.util.List; -import com.ignfab.minalac.generator.parameters.ParamsParser; +import fr.ign.voxatile.core.parameters.ParamsParser; /** * A manager for modules. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/network/HttpTrustAllSSL.java b/src/main/java/fr/ign/voxatile/core/utils/network/HttpTrustAllSSL.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/network/HttpTrustAllSSL.java rename to src/main/java/fr/ign/voxatile/core/utils/network/HttpTrustAllSSL.java index 13255ca18..0efe07022 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/network/HttpTrustAllSSL.java +++ b/src/main/java/fr/ign/voxatile/core/utils/network/HttpTrustAllSSL.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.network; +package fr.ign.voxatile.core.utils.network; import java.net.Socket; import java.security.KeyManagementException; diff --git a/src/main/java/com/ignfab/minalac/generator/utils/random/Random.java b/src/main/java/fr/ign/voxatile/core/utils/random/Random.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/random/Random.java rename to src/main/java/fr/ign/voxatile/core/utils/random/Random.java index bbda903ac..8f57fd7b4 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/random/Random.java +++ b/src/main/java/fr/ign/voxatile/core/utils/random/Random.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; /** * A random number generator for map generation. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/random/Salting.java b/src/main/java/fr/ign/voxatile/core/utils/random/Salting.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/utils/random/Salting.java rename to src/main/java/fr/ign/voxatile/core/utils/random/Salting.java index ad7e95737..0b1be93c0 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/random/Salting.java +++ b/src/main/java/fr/ign/voxatile/core/utils/random/Salting.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; /** * An object capable of salting a {@link Seed}. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/random/Seed.java b/src/main/java/fr/ign/voxatile/core/utils/random/Seed.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/random/Seed.java rename to src/main/java/fr/ign/voxatile/core/utils/random/Seed.java index 8e7752f9f..20ae15c39 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/random/Seed.java +++ b/src/main/java/fr/ign/voxatile/core/utils/random/Seed.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; /** * A seed for a sequence of random numbers. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Bounded2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/Bounded2d.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/Bounded2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/Bounded2d.java index 35ba08f94..946f3a630 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Bounded2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/Bounded2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; /** * Object having 2-dimensions boundaries in voxel World. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Positioned2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/Positioned2d.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/Positioned2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/Positioned2d.java index 1e5427b68..130251990 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Positioned2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/Positioned2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; /** * Object having a 2-dimensions position in voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Vector2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/Vector2d.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/Vector2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/Vector2d.java index fb07dcb30..cc1562728 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/Vector2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/Vector2d.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; -import com.ignfab.minalac.generator.utils.world3d.Vector3d; +import fr.ign.voxatile.core.utils.world3d.Vector3d; /** * A vector in 2 dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2d.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2d.java index 69ff9c171..1b15dbb3c 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2d.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world2d.iterator.WorldBBox2dIterator; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world2d.iterator.WorldBBox2dIterator; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * The {@code WorldBBox2d} class represents a two-dimensional bounding box that surrounds an area on the surface (xy-plane) of the voxel world. * This BBOX is defined by a minimum point and a maximum point. These points are included in the bounding box. - * An explanation of the voxel world coordinates system can be found on {@link com.ignfab.minalac.generator.utils.world2d.WorldCoords2d}. + * An explanation of the voxel world coordinates system can be found on {@link WorldCoords2d}. * * @see WorldCoords2d */ diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldCoords2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldCoords2d.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldCoords2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/WorldCoords2d.java index 80b1c4491..d48e0f76d 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldCoords2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldCoords2d.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * The {@code WorldCoords2d} class represents a component on the surface (xy-plane) in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldSize2d.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldSize2d.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldSize2d.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/WorldSize2d.java index a683d348f..7d9fe0e39 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/WorldSize2d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/WorldSize2d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.world3d.WorldSize3d; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.world3d.WorldSize3d; /** * The {@code WorldSize2d} subclass represents the size along the x-axis and the y-axis in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIterator.java b/src/main/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIterator.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIterator.java rename to src/main/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIterator.java index 048ddf041..e4e44782d 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIterator.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.utils.world2d.iterator; +package fr.ign.voxatile.core.utils.world2d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * An iterator over all coordinates in a {@code WorldBBox2d}. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Bounded3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/Bounded3d.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/Bounded3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/Bounded3d.java index 65a058688..f1b98e1c8 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Bounded3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/Bounded3d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; /** * Object having 3-dimensions boundaries in voxel World. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Positioned3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/Positioned3d.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/Positioned3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/Positioned3d.java index d5975e627..96110c194 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Positioned3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/Positioned3d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; /** * Object having a 3-dimensions position in voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Vector3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/Vector3d.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/Vector3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/Vector3d.java index 4b71081ff..e081bb45d 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/Vector3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/Vector3d.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; /** * A vector in 3 dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3d.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3d.java index 90e74cb73..5cbd8811e 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.iterator.WorldBBox3dIterator; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.iterator.WorldBBox3dIterator; /** * The {@code WorldBBox3d} class represents a three-dimensional bounding box that surrounds an area of the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldCoords3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldCoords3d.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldCoords3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/WorldCoords3d.java index 260f4132e..41d17e77f 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldCoords3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldCoords3d.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * The {@code WorldCoords3d} class represents a component in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldSize3d.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldSize3d.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldSize3d.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/WorldSize3d.java index 20a80621e..c8607043f 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/WorldSize3d.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/WorldSize3d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; -import com.ignfab.minalac.generator.utils.axis.Axis; -import com.ignfab.minalac.generator.utils.world2d.WorldSize2d; +import fr.ign.voxatile.core.utils.axis.Axis; +import fr.ign.voxatile.core.utils.world2d.WorldSize2d; /** * The {@code WorldSize3d} subclass represents the size along the three axes in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIterator.java b/src/main/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIterator.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIterator.java rename to src/main/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIterator.java index 96842a883..d6788bfa3 100644 --- a/src/main/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIterator.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.utils.world3d.iterator; +package fr.ign.voxatile.core.utils.world3d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * An iterator over all coordinates in a {@link WorldBBox3d}. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/Matrix2d.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/Matrix2d.java index ce05bcc8c..9c3f79093 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/Matrix2d.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.voxelization; +package fr.ign.voxatile.core.voxelization; -import com.ignfab.minalac.generator.utils.world2d.Bounded2d; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.Bounded2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * An iterable 2d voxel matrix that eventually holds generic typed values. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2dIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/Matrix2dIterator.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2dIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/Matrix2dIterator.java index cc8f30a0c..4242e9498 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/Matrix2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/Matrix2dIterator.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.voxelization; +package fr.ign.voxatile.core.voxelization; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * An iterator over a Matrix2d that skips voxels without value. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer2d.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer2d.java index f4a7de2c5..e338c8b82 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer2d.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.voxelization; +package fr.ign.voxatile.core.voxelization; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; /** * A 2d voxelizer provides a way to iterate over 2d voxels. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer3d.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer3d.java index 9e25abcc1..433c2f855 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/Voxelizer3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/Voxelizer3d.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.voxelization; +package fr.ign.voxatile.core.voxelization; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; /** * A 3d voxelizer provides a way to iterate over 3d voxels. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2d.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2d.java index 28138e81a..54f86a4ab 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.ArrayList; import java.util.Arrays; @@ -7,8 +7,8 @@ import java.util.List; import java.util.Set; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A succession of line segments connected to each other forming a string. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2d.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2d.java index 8eb29c0f3..b55813eb8 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import java.util.ListIterator; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A {@link LineString2d} that forms a ring. Last segment end is connected to first one start. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/MultiShape2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/MultiShape2d.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/MultiShape2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/MultiShape2d.java index 1bf24f0e7..454046743 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/MultiShape2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/MultiShape2d.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A composite 2 dimensional shape made of other shapes. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Point2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Point2d.java similarity index 78% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Point2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Point2d.java index c4bb0ebe3..56af7e052 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Point2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Point2d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.Collections; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * Represents a 2d point in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2d.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2d.java index 3e713259b..988830be7 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2d.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A 2d polygon with holes in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2d.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2d.java index 63776722c..f3f179fb8 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; -import com.ignfab.minalac.generator.utils.world2d.Bounded2d; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.Bounded2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * Represents a 2d line segment in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2d.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2d.java index 087360a6e..1d767a0d8 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2d.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; -import com.ignfab.minalac.generator.utils.world2d.Bounded2d; +import fr.ign.voxatile.core.utils.world2d.Bounded2d; /** * Interface for voxel shapes in 2 dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2dConvertible.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2dConvertible.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2dConvertible.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2dConvertible.java index efe498093..6b19d1053 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/Shape2dConvertible.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/Shape2dConvertible.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; /** * Something that can be converted to a {@link Shape2d}. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/IndexedPosition2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/IndexedPosition2d.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/IndexedPosition2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/IndexedPosition2d.java index 91400694f..b79766158 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/IndexedPosition2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/IndexedPosition2d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; /** * A 2d voxel position (in world) with geometry indexes and distances. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIterator.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIterator.java index b13a8225c..0239fcd72 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIterator.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.ArrayList; import java.util.Collections; @@ -6,11 +6,11 @@ import java.util.List; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Polygon2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.Polygon2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * An iterator returning voxels of each position inside a 2d polygon. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java similarity index 86% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java index cf69c54a3..26cbf8237 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIndexedIterator.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * An iterator returning voxels along a {@link LineString2d} with a given thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIterator.java similarity index 87% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIterator.java index ddcefa174..4982bb695 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickLineString2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickLineString2dIterator.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * An iterator returning voxels along a {@link LineString2d} with a given thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIterator.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIterator.java index bc81276b0..7288a3105 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIterator.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * An iterator returning voxels along a {@link Segment2d} with a given thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIterator.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIterator.java index 9e421967b..28da5cf91 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIterator.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * An iterator returning voxels of each position on a 2d segment. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Point2dVoxelizer.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Point2dVoxelizer.java similarity index 57% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Point2dVoxelizer.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Point2dVoxelizer.java index 95b1342a0..7b7a7a4ef 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Point2dVoxelizer.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Point2dVoxelizer.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape2d.voxelizer; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; /** * A voxelizer that returns the points of a 2D shape. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java similarity index 69% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java index 736b0a48a..c3b842d62 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/Shape2dVoxelizer.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape2d.voxelizer; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; /** * Interface for voxelizers able to voxelize {@link Shape2dConvertible} into {@link Positioned2d}. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java similarity index 57% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java index 91443746b..5ed4c0cf7 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/SurfaceVoxelizer2d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape2d.voxelizer; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Polygon2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.Polygon2dIterator; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.Polygon2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.Polygon2dIterator; /** * A voxelizer for surfacic shapes. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java similarity index 73% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java index a926cf20f..5a007fd6e 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThickLinearIndexedVoxelizer2d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape2d.voxelizer; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.IndexedPosition2d; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.ThickLineString2dIndexedIterator; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.IndexedPosition2d; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.ThickLineString2dIndexedIterator; /** * A voxelizer for linear shapes, with thickness and indexed results. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java similarity index 63% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java index 3bf28880a..5b8ec1457 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape2d/voxelizer/ThinLinearVoxelizer2d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape2d.voxelizer; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2dConvertible; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.ThinSegment2dIterator; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2dConvertible; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.ThinSegment2dIterator; /** * A voxelizer for linear shapes, with no thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3d.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3d.java index f57852594..4af2d1a1a 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.ArrayList; import java.util.Arrays; @@ -7,8 +7,8 @@ import java.util.List; import java.util.Set; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A succession of line segments connected to each other forming a string. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3d.java similarity index 96% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3d.java index c1f1f327f..266783808 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3d.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import java.util.ListIterator; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A {@link LineString3d} that forms a ring. Last segment end is connected to first one start. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/MultiShape3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/MultiShape3d.java similarity index 85% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/MultiShape3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/MultiShape3d.java index ece69d87c..6eec7b2bf 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/MultiShape3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/MultiShape3d.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * A composite 3 dimensional shape made of other shapes. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Point3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Point3d.java similarity index 79% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Point3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Point3d.java index aa5c46cbd..e704d6d57 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Point3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Point3d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.Collections; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * Represents a 3d point in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3d.java similarity index 91% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3d.java index a37cce031..24c72f273 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3d.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * Represents a 3d polygon with holes in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3d.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3d.java index b4006a3df..f320359c6 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3d.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; -import com.ignfab.minalac.generator.utils.world3d.Bounded3d; -import com.ignfab.minalac.generator.utils.world3d.Vector3d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world3d.Bounded3d; +import fr.ign.voxatile.core.utils.world3d.Vector3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; /** * Represents a 3d line segment in the voxel world. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3d.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3d.java index bf1be4eb0..acc6c81e5 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3d.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; -import com.ignfab.minalac.generator.utils.world3d.Bounded3d; +import fr.ign.voxatile.core.utils.world3d.Bounded3d; /** * Interface for voxel shapes in 3 dimensions. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3dConvertible.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3dConvertible.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3dConvertible.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3dConvertible.java index 1c30cfe25..b4de15ef1 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/Shape3dConvertible.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/Shape3dConvertible.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; /** * Something that can be converted to a {@link Shape3d}. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/IndexedPosition3d.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/IndexedPosition3d.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/IndexedPosition3d.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/IndexedPosition3d.java index 95b5be3b9..9fd42e2c8 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/IndexedPosition3d.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/IndexedPosition3d.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.iterator; +package fr.ign.voxatile.core.voxelization.shape3d.iterator; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A 3d voxel position (in world) with 2d projected geometry indexes and distances. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java similarity index 82% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java index 30c5bc857..699a09a35 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5IndexedIterator.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.iterator; +package fr.ign.voxatile.core.voxelization.shape3d.iterator; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; -import com.ignfab.minalac.generator.voxelization.shape3d.LineString3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Segment3d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.voxelization.shape3d.LineString3d; +import fr.ign.voxatile.core.voxelization.shape3d.Segment3d; /** * An iterator over voxels of a {@link LineString3d} with thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java similarity index 88% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java index ee2d88ffb..46a45a997 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickLineString2d5Iterator.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.iterator; +package fr.ign.voxatile.core.voxelization.shape3d.iterator; import java.util.Iterator; import java.util.NoSuchElementException; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape3d.LineString3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Segment3d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape3d.LineString3d; +import fr.ign.voxatile.core.voxelization.shape3d.Segment3d; /** * An iterator over voxels of a {@link LineString3d} with thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java index b27c6ac99..8d1e5efd5 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/iterator/ThickSegment2d5Iterator.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.iterator; +package fr.ign.voxatile.core.voxelization.shape3d.iterator; import java.util.Iterator; -import com.ignfab.minalac.generator.utils.iterator.Iterators; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; -import com.ignfab.minalac.generator.voxelization.shape2d.iterator.ThickSegment2dIterator; -import com.ignfab.minalac.generator.voxelization.shape3d.Segment3d; +import fr.ign.voxatile.core.utils.iterator.Iterators; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.voxelization.shape2d.iterator.ThickSegment2dIterator; +import fr.ign.voxatile.core.voxelization.shape3d.Segment3d; /** * An iterator over voxels of a {@link Segment3d} with a given horizontal thickness. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Point3dVoxelizer.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Point3dVoxelizer.java similarity index 57% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Point3dVoxelizer.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Point3dVoxelizer.java index 0be3ddaf0..60d564938 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Point3dVoxelizer.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Point3dVoxelizer.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape3d.voxelizer; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3dConvertible; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3dConvertible; /** * A voxelizer that returns the points of a 3D shape. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java similarity index 69% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java index e0510630f..3ba34bf5c 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/Shape3dVoxelizer.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape3d.voxelizer; -import com.ignfab.minalac.generator.utils.world3d.Positioned3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3dConvertible; +import fr.ign.voxatile.core.utils.world3d.Positioned3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3dConvertible; /** * Interface for voxelizers able to voxelize {@link Shape3dConvertible} into {@link Positioned3d}. diff --git a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java similarity index 76% rename from src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java rename to src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java index 8b2d01f69..66ccfe5a4 100644 --- a/src/main/java/com/ignfab/minalac/generator/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java +++ b/src/main/java/fr/ign/voxatile/core/voxelization/shape3d/voxelizer/ThickLinearIndexedVoxelizer2d5.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape3d.voxelizer; +package fr.ign.voxatile.core.voxelization.shape3d.voxelizer; -import com.ignfab.minalac.generator.utils.iterator.Iterables; -import com.ignfab.minalac.generator.voxelization.shape3d.LineString3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3dConvertible; -import com.ignfab.minalac.generator.voxelization.shape3d.iterator.IndexedPosition3d; -import com.ignfab.minalac.generator.voxelization.shape3d.iterator.ThickLineString2d5IndexedIterator; +import fr.ign.voxatile.core.utils.iterator.Iterables; +import fr.ign.voxatile.core.voxelization.shape3d.LineString3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3dConvertible; +import fr.ign.voxatile.core.voxelization.shape3d.iterator.IndexedPosition3d; +import fr.ign.voxatile.core.voxelization.shape3d.iterator.ThickLineString2d5IndexedIterator; /** * A voxelizer for linear shapes, with thickness and indexed results. diff --git a/src/main/java/com/ignfab/minalac/generator/world/MapWriteException.java b/src/main/java/fr/ign/voxatile/core/world/MapWriteException.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/world/MapWriteException.java rename to src/main/java/fr/ign/voxatile/core/world/MapWriteException.java index 315ae0389..c8c5c49cf 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/MapWriteException.java +++ b/src/main/java/fr/ign/voxatile/core/world/MapWriteException.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; /** * Exception thrown if a problem occurs when initializing or finalizing a {@link VoxelWorld} or saving a {@link VoxelTile}. diff --git a/src/main/java/com/ignfab/minalac/generator/world/PlacedVoxel.java b/src/main/java/fr/ign/voxatile/core/world/PlacedVoxel.java similarity index 61% rename from src/main/java/com/ignfab/minalac/generator/world/PlacedVoxel.java rename to src/main/java/fr/ign/voxatile/core/world/PlacedVoxel.java index c44ba8df7..bb1e2d2b7 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/PlacedVoxel.java +++ b/src/main/java/fr/ign/voxatile/core/world/PlacedVoxel.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * Represents a voxel placed in the world along its coordinates. diff --git a/src/main/java/com/ignfab/minalac/generator/world/VoxelColumnIterator.java b/src/main/java/fr/ign/voxatile/core/world/VoxelColumnIterator.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/world/VoxelColumnIterator.java rename to src/main/java/fr/ign/voxatile/core/world/VoxelColumnIterator.java index e4fd4ad9c..3593bb7e8 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/VoxelColumnIterator.java +++ b/src/main/java/fr/ign/voxatile/core/world/VoxelColumnIterator.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Iterator; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * A descending iterator over the voxels and associated coordinates of a tile's column. diff --git a/src/main/java/com/ignfab/minalac/generator/world/VoxelTile.java b/src/main/java/fr/ign/voxatile/core/world/VoxelTile.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/world/VoxelTile.java rename to src/main/java/fr/ign/voxatile/core/world/VoxelTile.java index df2bc2179..be7bd3505 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/VoxelTile.java +++ b/src/main/java/fr/ign/voxatile/core/world/VoxelTile.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Collections; import java.util.Iterator; -import com.ignfab.minalac.generator.generation.heightmaps.Heightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.heightmaps.Heightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * {@code VoxelTile} represents a part of a {@link VoxelWorld} to be generated. diff --git a/src/main/java/com/ignfab/minalac/generator/world/VoxelWorld.java b/src/main/java/fr/ign/voxatile/core/world/VoxelWorld.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/world/VoxelWorld.java rename to src/main/java/fr/ign/voxatile/core/world/VoxelWorld.java index 34ac0cf65..cd18496a2 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/VoxelWorld.java +++ b/src/main/java/fr/ign/voxatile/core/world/VoxelWorld.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Collection; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; /** * A three-dimensional world with voxels as the fundamental unit. diff --git a/src/main/java/com/ignfab/minalac/generator/world/VoxelWorldMetadata.java b/src/main/java/fr/ign/voxatile/core/world/VoxelWorldMetadata.java similarity index 90% rename from src/main/java/com/ignfab/minalac/generator/world/VoxelWorldMetadata.java rename to src/main/java/fr/ign/voxatile/core/world/VoxelWorldMetadata.java index 542010afd..d71f23ebb 100644 --- a/src/main/java/com/ignfab/minalac/generator/world/VoxelWorldMetadata.java +++ b/src/main/java/fr/ign/voxatile/core/world/VoxelWorldMetadata.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * The {@code VoxelWorldMetadata} class contains the different metadata for a {@link VoxelWorld}. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/Block.java b/src/main/java/fr/ign/voxatile/modules/luanti/Block.java similarity index 98% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/Block.java rename to src/main/java/fr/ign/voxatile/modules/luanti/Block.java index 7f74ac208..c403ede5f 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/Block.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/Block.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import java.util.HashMap; diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiOutputModule.java b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiOutputModule.java similarity index 56% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiOutputModule.java rename to src/main/java/fr/ign/voxatile/modules/luanti/LuantiOutputModule.java index 12b5bef8f..c71a2f8b5 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiOutputModule.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiOutputModule.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; -import com.ignfab.minalac.generator.parameters.OutputFormat; -import com.ignfab.minalac.generator.parameters.ParamsParser; -import com.ignfab.minalac.generator.utils.modules.Module; +import fr.ign.voxatile.core.parameters.OutputFormat; +import fr.ign.voxatile.core.parameters.ParamsParser; +import fr.ign.voxatile.core.utils.modules.Module; /** * A module for Luanti format output. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxel.java b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxel.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxel.java rename to src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxel.java index 9f44b70c1..9c951d9dc 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxel.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxel.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import java.util.Objects; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.world.VoxelTile; /** * {@code LuantiVoxel} class implements a {@link Placeable} voxel for Luanti. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParams.java b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParams.java similarity index 81% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParams.java rename to src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParams.java index b246a185d..e5e592350 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParams.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParams.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for Luanti voxels with only node name. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTile.java b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTile.java similarity index 89% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTile.java rename to src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTile.java index 40ac8a3c3..210614f05 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTile.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTile.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMaps; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import com.ignfab.minalac.generator.modules.luanti.utils.SQLiteMapWriter; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.MapWriteException; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.core.world.VoxelTile; +import fr.ign.voxatile.modules.luanti.utils.SQLiteMapWriter; /** * Implementation of {@link VoxelTile} for Luanti. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelWorld.java b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelWorld.java similarity index 83% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelWorld.java rename to src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelWorld.java index 84530c384..bf0612c04 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelWorld.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/LuantiVoxelWorld.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import java.io.File; import java.util.Collection; -import com.ignfab.minalac.generator.generation.SquareUnitsTileGenerator; -import com.ignfab.minalac.generator.modules.luanti.utils.SQLiteMapWriter; -import com.ignfab.minalac.generator.utils.FileHelpers; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.MapWriteException; -import com.ignfab.minalac.generator.world.VoxelWorld; -import com.ignfab.minalac.generator.world.VoxelWorldMetadata; +import fr.ign.voxatile.core.generation.SquareUnitsTileGenerator; +import fr.ign.voxatile.core.utils.FileHelpers; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.core.world.VoxelWorld; +import fr.ign.voxatile.core.world.VoxelWorldMetadata; +import fr.ign.voxatile.modules.luanti.utils.SQLiteMapWriter; /** * Implementation of {@link VoxelWorld} that creates a playable world specifically for Luanti. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/SQLiteMapWriter.java b/src/main/java/fr/ign/voxatile/modules/luanti/utils/SQLiteMapWriter.java similarity index 93% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/SQLiteMapWriter.java rename to src/main/java/fr/ign/voxatile/modules/luanti/utils/SQLiteMapWriter.java index 7d3e0c53b..6c9e6c94a 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/SQLiteMapWriter.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/utils/SQLiteMapWriter.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.luanti.utils; +package fr.ign.voxatile.modules.luanti.utils; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import java.sql.SQLException; import java.sql.Statement; -import com.ignfab.minalac.generator.modules.luanti.Block; -import com.ignfab.minalac.generator.world.MapWriteException; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.modules.luanti.Block; /** * {@code SQLiteMapWriter} is responsible for creating and updating the {@code map.sqlite} file, diff --git a/src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/Serializer.java b/src/main/java/fr/ign/voxatile/modules/luanti/utils/Serializer.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/Serializer.java rename to src/main/java/fr/ign/voxatile/modules/luanti/utils/Serializer.java index bc357df88..45c41d556 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/luanti/utils/Serializer.java +++ b/src/main/java/fr/ign/voxatile/modules/luanti/utils/Serializer.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.luanti.utils; +package fr.ign.voxatile.modules.luanti.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -13,12 +13,12 @@ import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.commons.pool2.impl.SoftReferenceObjectPool; -import com.ignfab.minalac.generator.modules.luanti.Block; +import fr.ign.voxatile.modules.luanti.Block; /** * This class is responsible for providing the serialized {@code Block} needed by the {@code map.sqlite} file. * @see SQLiteMapWriter - * @see com.ignfab.minalac.generator.modules.luanti.LuantiVoxelTile#save() + * @see fr.ign.voxatile.modules.luanti.LuantiVoxelTile#save() */ public class Serializer implements AutoCloseable { // Shared pool of internal state objects to minimize memory allocations. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxel.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxel.java similarity index 99% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxel.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxel.java index d1b6f0bef..ac43458c4 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxel.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxel.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParams.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParams.java similarity index 94% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParams.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParams.java index 575b869fc..4ad386930 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParams.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.beans.ConstructorProperties; import java.io.IOException; @@ -8,7 +8,7 @@ import io.github.ensgijs.nbt.io.TextNbtHelpers; import io.github.ensgijs.nbt.tag.CompoundTag; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for Minecraft block entity voxel. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpers.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpers.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpers.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpers.java index 4359e48fc..bdbb4d788 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpers.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpers.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import io.github.ensgijs.nbt.tag.CompoundTag; diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftOutputModule.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftOutputModule.java similarity index 57% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftOutputModule.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftOutputModule.java index ee0bf2642..5c72ca53e 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftOutputModule.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftOutputModule.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; -import com.ignfab.minalac.generator.parameters.OutputFormat; -import com.ignfab.minalac.generator.parameters.ParamsParser; -import com.ignfab.minalac.generator.utils.modules.Module; +import fr.ign.voxatile.core.parameters.OutputFormat; +import fr.ign.voxatile.core.parameters.ParamsParser; +import fr.ign.voxatile.core.utils.modules.Module; /** * A module for Minecraft format output. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxel.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxel.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxel.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxel.java index 06e37d5ca..3e1d9bfd0 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxel.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxel.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.HashMap; import java.util.Map; @@ -7,8 +7,8 @@ import io.github.ensgijs.nbt.tag.CompoundTag; import io.github.ensgijs.nbt.tag.StringTag; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.world.VoxelTile; /** * {@code MinecraftVoxel} class implements a {@link Placeable} voxel for Minecraft. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParams.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParams.java similarity index 92% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParams.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParams.java index 2a3a7884f..fd064dfeb 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParams.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.beans.ConstructorProperties; import java.util.Map; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.utils.random.Seed; /** * Parameters for simple Minecraft voxel with only block type name. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTile.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTile.java similarity index 95% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTile.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTile.java index 785519b42..583fae1f4 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTile.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTile.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.File; import java.io.IOException; @@ -11,10 +11,10 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.MapWriteException; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.core.world.VoxelTile; /** * Implementation of {@link VoxelTile} for Minecraft. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorld.java b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorld.java similarity index 97% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorld.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorld.java index 2b9acaecb..d255088a0 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorld.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorld.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.File; import java.io.IOException; @@ -16,14 +16,14 @@ import io.github.ensgijs.nbt.tag.ListTag; import io.github.ensgijs.nbt.tag.StringTag; -import com.ignfab.minalac.generator.generation.SquareUnitsTileGenerator; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.utils.world3d.WorldSize3d; -import com.ignfab.minalac.generator.world.MapWriteException; -import com.ignfab.minalac.generator.world.VoxelWorld; -import com.ignfab.minalac.generator.world.VoxelWorldMetadata; +import fr.ign.voxatile.core.generation.SquareUnitsTileGenerator; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldSize3d; +import fr.ign.voxatile.core.world.MapWriteException; +import fr.ign.voxatile.core.world.VoxelWorld; +import fr.ign.voxatile.core.world.VoxelWorldMetadata; /** * Implementation of {@link VoxelWorld} that creates a playable world specifically for Minecraft. diff --git a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/Region.java b/src/main/java/fr/ign/voxatile/modules/minecraft/Region.java similarity index 99% rename from src/main/java/com/ignfab/minalac/generator/modules/minecraft/Region.java rename to src/main/java/fr/ign/voxatile/modules/minecraft/Region.java index f31adae17..57aa9ea9c 100644 --- a/src/main/java/com/ignfab/minalac/generator/modules/minecraft/Region.java +++ b/src/main/java/fr/ign/voxatile/modules/minecraft/Region.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/GenerationTest.java b/src/test/java/fr/ign/voxatile/core/generation/GenerationTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/generation/GenerationTest.java rename to src/test/java/fr/ign/voxatile/core/generation/GenerationTest.java index ee0d3ac3e..1c789e16d 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/GenerationTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/GenerationTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import java.util.Collection; import java.util.Collections; @@ -13,14 +13,14 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.VoxelTile; -import com.ignfab.minalac.generator.world.VoxelWorld; -import com.ignfab.minalac.generator.world.VoxelWorldMetadata; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.VoxelTile; +import fr.ign.voxatile.core.world.VoxelWorld; +import fr.ign.voxatile.core.world.VoxelWorldMetadata; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/HeightmapDeclarationStoreTest.java b/src/test/java/fr/ign/voxatile/core/generation/HeightmapDeclarationStoreTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/generation/HeightmapDeclarationStoreTest.java rename to src/test/java/fr/ign/voxatile/core/generation/HeightmapDeclarationStoreTest.java index 681accf36..13b357725 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/HeightmapDeclarationStoreTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/HeightmapDeclarationStoreTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import java.util.List; import java.util.NoSuchElementException; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class HeightmapDeclarationStoreTest { diff --git a/src/test/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGeneratorTest.java b/src/test/java/fr/ign/voxatile/core/generation/SquareUnitsTileGeneratorTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGeneratorTest.java rename to src/test/java/fr/ign/voxatile/core/generation/SquareUnitsTileGeneratorTest.java index 6702f2b85..b5b3a224c 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/SquareUnitsTileGeneratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/SquareUnitsTileGeneratorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import java.util.Collections; import java.util.LinkedList; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/TestingGeneration.java b/src/test/java/fr/ign/voxatile/core/generation/TestingGeneration.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/generation/TestingGeneration.java rename to src/test/java/fr/ign/voxatile/core/generation/TestingGeneration.java index fc8be5479..1d9cfe4b0 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/TestingGeneration.java +++ b/src/test/java/fr/ign/voxatile/core/generation/TestingGeneration.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.utils.random.TestingSeed; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.TestingVoxelWorld; +import fr.ign.voxatile.core.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.TestingVoxelWorld; /** * A fake Generation over a {@link TestingVoxelWorld}. diff --git a/src/test/java/com/ignfab/minalac/generator/generation/TestingGenerationTile.java b/src/test/java/fr/ign/voxatile/core/generation/TestingGenerationTile.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/generation/TestingGenerationTile.java rename to src/test/java/fr/ign/voxatile/core/generation/TestingGenerationTile.java index 13986a3ac..44578ee2c 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/TestingGenerationTile.java +++ b/src/test/java/fr/ign/voxatile/core/generation/TestingGenerationTile.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.generation; +package fr.ign.voxatile.core.generation; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclarationStore; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapStore; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclarationStore; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapStore; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; /** * A fake GenerationTile over a {@link TestingGeneration}. diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapTest.java index 9bfbb26c3..90dc23489 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/HeightmapTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/HeightmapTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/TestingHeightmap.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/TestingHeightmap.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/TestingHeightmap.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/TestingHeightmap.java index fdd20b297..ad5a1900e 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/TestingHeightmap.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/TestingHeightmap.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.generation.heightmaps; +package fr.ign.voxatile.core.generation.heightmaps; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; /** * A fake heightmap for testing. diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmapTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmapTest.java similarity index 72% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmapTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmapTest.java index f230b9b18..2e8d02890 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/ConstantHeightmapTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/ConstantHeightmapTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed; +package fr.ign.voxatile.core.generation.heightmaps.computed; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java index 610a723a0..8f38779af 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/CappedManhattanHeightmapOperatorTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.Heightmap; +import fr.ign.voxatile.core.generation.heightmaps.Heightmap; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java index b84ea0940..6e92d10e4 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/LocalMinimumHeightmapTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.Heightmap; +import fr.ign.voxatile.core.generation.heightmaps.Heightmap; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java similarity index 81% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java index dc38ee747..2636cddcf 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/SimpleBinaryOperatorHeightmapTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.Heightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.Heightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java similarity index 80% rename from src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java rename to src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java index b44fdc337..be5cec18b 100644 --- a/src/test/java/com/ignfab/minalac/generator/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java +++ b/src/test/java/fr/ign/voxatile/core/generation/heightmaps/computed/operators/UnaryOperatorHeightmapTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.generation.heightmaps.computed.operators; +package fr.ign.voxatile.core.generation.heightmaps.computed.operators; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.heightmaps.Heightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.generation.heightmaps.Heightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/inputs/ParameterizedURLTest.java b/src/test/java/fr/ign/voxatile/core/inputs/ParameterizedURLTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/inputs/ParameterizedURLTest.java rename to src/test/java/fr/ign/voxatile/core/inputs/ParameterizedURLTest.java index 48c022681..1330f9588 100644 --- a/src/test/java/com/ignfab/minalac/generator/inputs/ParameterizedURLTest.java +++ b/src/test/java/fr/ign/voxatile/core/inputs/ParameterizedURLTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/inputs/TestingProvider.java b/src/test/java/fr/ign/voxatile/core/inputs/TestingProvider.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/inputs/TestingProvider.java rename to src/test/java/fr/ign/voxatile/core/inputs/TestingProvider.java index 53439364c..3e2d34b48 100644 --- a/src/test/java/com/ignfab/minalac/generator/inputs/TestingProvider.java +++ b/src/test/java/fr/ign/voxatile/core/inputs/TestingProvider.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; public class TestingProvider implements Provider { private final CoordinateReferenceSystem crs; diff --git a/src/test/java/com/ignfab/minalac/generator/inputs/TestingProviderTest.java b/src/test/java/fr/ign/voxatile/core/inputs/TestingProviderTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/inputs/TestingProviderTest.java rename to src/test/java/fr/ign/voxatile/core/inputs/TestingProviderTest.java index ab0c4a3d9..8c11c3134 100644 --- a/src/test/java/com/ignfab/minalac/generator/inputs/TestingProviderTest.java +++ b/src/test/java/fr/ign/voxatile/core/inputs/TestingProviderTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.inputs; +package fr.ign.voxatile.core.inputs; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.exceptions.RetryableException; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.RetryableException; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/FloatMatrixModelTest.java b/src/test/java/fr/ign/voxatile/core/models/FloatMatrixModelTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/models/FloatMatrixModelTest.java rename to src/test/java/fr/ign/voxatile/core/models/FloatMatrixModelTest.java index 8d499ee6e..948ed9864 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/FloatMatrixModelTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/FloatMatrixModelTest.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import org.geotools.referencing.operation.transform.IdentityTransform; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.util.AffineTransformation; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.inputs.FloatArrayGeographicDataMatrix2d; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.inputs.FloatArrayGeographicDataMatrix2d; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/ModelSelectionTest.java b/src/test/java/fr/ign/voxatile/core/models/ModelSelectionTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/models/ModelSelectionTest.java rename to src/test/java/fr/ign/voxatile/core/models/ModelSelectionTest.java index 0485b3644..13066f1ce 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/ModelSelectionTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/ModelSelectionTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.Arrays; import java.util.List; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.models.filters.ModelFilterHasMetadata; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.models.filters.ModelFilterHasMetadata; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; public class ModelSelectionTest { diff --git a/src/test/java/com/ignfab/minalac/generator/models/ModelStoreTest.java b/src/test/java/fr/ign/voxatile/core/models/ModelStoreTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/models/ModelStoreTest.java rename to src/test/java/fr/ign/voxatile/core/models/ModelStoreTest.java index 7e8934693..1c6ece25f 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/ModelStoreTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/ModelStoreTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.List; diff --git a/src/test/java/com/ignfab/minalac/generator/models/ModelTest.java b/src/test/java/fr/ign/voxatile/core/models/ModelTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/models/ModelTest.java rename to src/test/java/fr/ign/voxatile/core/models/ModelTest.java index d11ea6641..48a137f77 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/ModelTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/ModelTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/ignfab/minalac/generator/models/TestingModel.java b/src/test/java/fr/ign/voxatile/core/models/TestingModel.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/models/TestingModel.java rename to src/test/java/fr/ign/voxatile/core/models/TestingModel.java index 2d33a842c..6256c26de 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/TestingModel.java +++ b/src/test/java/fr/ign/voxatile/core/models/TestingModel.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; import java.util.Map; diff --git a/src/test/java/com/ignfab/minalac/generator/models/TestingRectangleShape2dModel.java b/src/test/java/fr/ign/voxatile/core/models/TestingRectangleShape2dModel.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/models/TestingRectangleShape2dModel.java rename to src/test/java/fr/ign/voxatile/core/models/TestingRectangleShape2dModel.java index 9c1093ee0..e25d3797e 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/TestingRectangleShape2dModel.java +++ b/src/test/java/fr/ign/voxatile/core/models/TestingRectangleShape2dModel.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LinearRing2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Polygon2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.LinearRing2d; +import fr.ign.voxatile.core.voxelization.shape2d.Polygon2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2d; /** * A model voxelizable in 2d consisting of a simple rectangle. diff --git a/src/test/java/com/ignfab/minalac/generator/models/TestingShape2dModel.java b/src/test/java/fr/ign/voxatile/core/models/TestingShape2dModel.java similarity index 83% rename from src/test/java/com/ignfab/minalac/generator/models/TestingShape2dModel.java rename to src/test/java/fr/ign/voxatile/core/models/TestingShape2dModel.java index 9ac192aec..82df5a5fe 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/TestingShape2dModel.java +++ b/src/test/java/fr/ign/voxatile/core/models/TestingShape2dModel.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2d; /** * A Shape2d convertible model out of a {@link Shape2d} for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/models/TestingShape3dModel.java b/src/test/java/fr/ign/voxatile/core/models/TestingShape3dModel.java similarity index 83% rename from src/test/java/com/ignfab/minalac/generator/models/TestingShape3dModel.java rename to src/test/java/fr/ign/voxatile/core/models/TestingShape3dModel.java index abe86fde4..e6e75faf5 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/TestingShape3dModel.java +++ b/src/test/java/fr/ign/voxatile/core/models/TestingShape3dModel.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.models; +package fr.ign.voxatile.core.models; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3d; /** * A shape3d convertible model out of a {@link Shape3d} for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometryTest.java b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometryTest.java similarity index 75% rename from src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometryTest.java rename to src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometryTest.java index 485a8ce0d..6ef5f51ba 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterEmptyGeometryTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterEmptyGeometryTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.function.Predicate; @@ -6,11 +6,11 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.utils.coordinates.TestingConverter; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.utils.coordinates.TestingConverter; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadataTest.java b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadataTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadataTest.java rename to src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadataTest.java index baa9b6404..4c2e8c0bb 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterHasMetadataTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterHasMetadataTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.Map; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValueTest.java b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValueTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValueTest.java index 49f73878e..fe10074ae 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnMetadataValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnMetadataValueTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.Map; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValueTest.java b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValueTest.java similarity index 73% rename from src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValueTest.java index 9451f73bc..53492f772 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/filters/ModelFilterOnValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/filters/ModelFilterOnValueTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.Map; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.values.MetadataValue; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.values.MetadataValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/filters/TestingModelFilter.java b/src/test/java/fr/ign/voxatile/core/models/filters/TestingModelFilter.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/models/filters/TestingModelFilter.java rename to src/test/java/fr/ign/voxatile/core/models/filters/TestingModelFilter.java index a1eb47dfb..4ff3414d5 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/filters/TestingModelFilter.java +++ b/src/test/java/fr/ign/voxatile/core/models/filters/TestingModelFilter.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.filters; +package fr.ign.voxatile.core.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; /** * A mock filter that responds true if tested model is equals to model given to constructor. */ diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/AbsentValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/AbsentValueTest.java similarity index 56% rename from src/test/java/com/ignfab/minalac/generator/models/values/AbsentValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/AbsentValueTest.java index c33e82792..6138f36c3 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/AbsentValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/AbsentValueTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class AbsentValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValueTest.java similarity index 82% rename from src/test/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValueTest.java index 09fa6f80c..0b6d5651f 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/BinaryOperationModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/BinaryOperationModelValueTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class BinaryOperationModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/ConditionalModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/ConditionalModelValueTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/models/values/ConditionalModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/ConditionalModelValueTest.java index 6d8bfe946..19c1f92d4 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/ConditionalModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/ConditionalModelValueTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.filters.TestingModelFilter; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.filters.TestingModelFilter; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class ConditionalModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/FallbackModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/FallbackModelValueTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/models/values/FallbackModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/FallbackModelValueTest.java index 1256b788e..1b15d0ff6 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/FallbackModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/FallbackModelValueTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class FallbackModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/FixedValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/FixedValueTest.java similarity index 67% rename from src/test/java/com/ignfab/minalac/generator/models/values/FixedValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/FixedValueTest.java index ced051eb0..46e6dda50 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/FixedValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/FixedValueTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class FixedValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/InverseModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/InverseModelValueTest.java similarity index 60% rename from src/test/java/com/ignfab/minalac/generator/models/values/InverseModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/InverseModelValueTest.java index 591d137df..f45ae44bc 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/InverseModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/InverseModelValueTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.assertModelValueAbsent; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.assertModelValueAbsent; public class InverseModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/MetadataValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/MetadataValueTest.java similarity index 74% rename from src/test/java/com/ignfab/minalac/generator/models/values/MetadataValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/MetadataValueTest.java index e8254a7c1..342d5bd8e 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/MetadataValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/MetadataValueTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Map; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.TestingModel; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class MetadataValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/ModelValueTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/ModelValueTest.java index 42a98660f..ad4e2f15b 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/ModelValueTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTester.java b/src/test/java/fr/ign/voxatile/core/models/values/ModelValueTester.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTester.java rename to src/test/java/fr/ign/voxatile/core/models/values/ModelValueTester.java index 915e4dd3c..4c1fad5f4 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/ModelValueTester.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/ModelValueTester.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import java.util.Optional; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/RandomUniformModelValueTest.java similarity index 76% rename from src/test/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/RandomUniformModelValueTest.java index dd27676eb..07a1fc74f 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/RandomUniformModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/RandomUniformModelValueTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.utils.random.TestingSeed; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.utils.random.TestingSeed; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class RandomUniformModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValueTest.java b/src/test/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValueTest.java similarity index 70% rename from src/test/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValueTest.java rename to src/test/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValueTest.java index 20066274c..d1ab412f4 100644 --- a/src/test/java/com/ignfab/minalac/generator/models/values/UnaryOperationModelValueTest.java +++ b/src/test/java/fr/ign/voxatile/core/models/values/UnaryOperationModelValueTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.models.values; +package fr.ign.voxatile.core.models.values; import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; public class UnaryOperationModelValueTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/GenerationParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/GenerationParamsTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/parameters/GenerationParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/GenerationParamsTest.java index 8e85866d9..e6d9341a5 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/GenerationParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/GenerationParamsTest.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; -import com.ignfab.minalac.generator.parameters.providers.TestingProviderParams; -import com.ignfab.minalac.generator.parameters.tasks.FetchDataTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.NoOperationTaskParams; -import com.ignfab.minalac.generator.parameters.tasks.RenderBuildingsTaskParams; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.world.TestingVoxelWorld; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.providers.TestingProviderParams; +import fr.ign.voxatile.core.parameters.tasks.FetchDataTaskParams; +import fr.ign.voxatile.core.parameters.tasks.NoOperationTaskParams; +import fr.ign.voxatile.core.parameters.tasks.RenderBuildingsTaskParams; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.world.TestingVoxelWorld; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserializeTest.java b/src/test/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserializeTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserializeTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserializeTest.java index 4c29d2f2f..00ebc2ba8 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/JsonDelegateDeserializeTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/JsonDelegateDeserializeTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/JsonWrapperTest.java b/src/test/java/fr/ign/voxatile/core/parameters/JsonWrapperTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/parameters/JsonWrapperTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/JsonWrapperTest.java index 3ec94c483..8524cdb7f 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/JsonWrapperTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/JsonWrapperTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.beans.ConstructorProperties; import java.util.List; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/OutputFormatTest.java b/src/test/java/fr/ign/voxatile/core/parameters/OutputFormatTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/parameters/OutputFormatTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/OutputFormatTest.java index 73849702e..a71e0a62a 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/OutputFormatTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/OutputFormatTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -8,8 +8,8 @@ import tools.jackson.databind.cfg.MapperBuilder; import tools.jackson.dataformat.yaml.YAMLMapper; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/ParamsParserTest.java b/src/test/java/fr/ign/voxatile/core/parameters/ParamsParserTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/parameters/ParamsParserTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/ParamsParserTest.java index 640abb206..95b187374 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/ParamsParserTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/ParamsParserTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import java.util.Collections; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; -import com.ignfab.minalac.generator.parameters.tasks.TestingTaskParams; -import com.ignfab.minalac.generator.world.TestingVoxelWorld; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.tasks.TestingTaskParams; +import fr.ign.voxatile.core.world.TestingVoxelWorld; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/ParamsTester.java b/src/test/java/fr/ign/voxatile/core/parameters/ParamsTester.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/parameters/ParamsTester.java rename to src/test/java/fr/ign/voxatile/core/parameters/ParamsTester.java index c051b2c2a..96bfb79f7 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/ParamsTester.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/ParamsTester.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import tools.jackson.core.JacksonException; import tools.jackson.core.StreamReadFeature; @@ -9,7 +9,7 @@ import tools.jackson.databind.jsontype.NamedType; import tools.jackson.dataformat.yaml.YAMLMapper; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; /** * A utility class for testing deserialization. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/ValueParserTest.java b/src/test/java/fr/ign/voxatile/core/parameters/ValueParserTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/parameters/ValueParserTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/ValueParserTest.java index 22392adb6..65f8cebde 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/ValueParserTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/ValueParserTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters; +package fr.ign.voxatile.core.parameters; import org.junit.jupiter.api.Test; import tools.jackson.databind.DatabindException; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java index efd579b54..11a813687 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/CappedManhattanHeightmapParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParamsTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParamsTest.java index 4d4c97ef1..46db2892b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ConstantHeightmapParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ConstantHeightmapParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java index 483965972..d460a926b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/LocalMinimumHeightmapParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java similarity index 83% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java index bb19db7f2..a8fd9bd9a 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/MultiOperandsHeightmapParamsTest.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmap; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmap; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java index 578a91185..9951ccdce 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/ReadableHeightmapParamsDeserializerTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParamsTest.java index 7334214d5..87ec7654c 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/RemapHeightmapParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/RemapHeightmapParamsTest.java @@ -1,20 +1,20 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.util.LinkedHashMap; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmapSpec; -import com.ignfab.minalac.generator.generation.heightmaps.WritableHeightmap; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.utils.IntegerIntervalParams; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmapSpec; +import fr.ign.voxatile.core.generation.heightmaps.WritableHeightmap; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.utils.IntegerIntervalParams; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/TestingHeightmapParams.java b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/TestingHeightmapParams.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/TestingHeightmapParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/heightmaps/TestingHeightmapParams.java index 7252161e9..dc7724ecb 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/heightmaps/TestingHeightmapParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/heightmaps/TestingHeightmapParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.heightmaps; +package fr.ign.voxatile.core.parameters.heightmaps; import java.beans.ConstructorProperties; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParamsTest.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParamsTest.java index 20a1b0f39..e8dc37f6b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/ModelSelectionParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/ModelSelectionParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models; +package fr.ign.voxatile.core.parameters.models; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterAndParams; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterEmptyGeometryParams; -import com.ignfab.minalac.generator.parameters.models.filters.TestingModelFilterParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterAndParams; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterEmptyGeometryParams; +import fr.ign.voxatile.core.parameters.models.filters.TestingModelFilterParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/TestingModelSelectionParams.java b/src/test/java/fr/ign/voxatile/core/parameters/models/TestingModelSelectionParams.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/TestingModelSelectionParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/TestingModelSelectionParams.java index b24fde7c4..9d7ccf30b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/TestingModelSelectionParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/TestingModelSelectionParams.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.parameters.models; +package fr.ign.voxatile.core.parameters.models; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.ModelSelection; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.ModelSelection; /** * A {@code ModelSelectionParams} for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParamsTest.java index bed43b047..55c6e5286 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterAndParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterAndParamsTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.List; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java similarity index 60% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java index 468d74eca..c7e26182c 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterEmptyGeometryParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterEmptyGeometry; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterEmptyGeometry; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParamsTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParamsTest.java index de7dbc4a4..b06def5cb 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasMetadataParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasMetadataParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParamsTest.java similarity index 72% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParamsTest.java index 2bd07fb5f..2388dd948 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterHasValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterHasValueParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.models.values.FixedValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.models.values.FixedValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java index 17902595b..f7d50ea99 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataEqualsParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnMetadataValue; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterOnMetadataValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParamsTest.java index a38934361..aec920401 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterMetadataInParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterMetadataInParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnMetadataValue; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterOnMetadataValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParamsTest.java similarity index 82% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParamsTest.java index 58a50782e..2ee662ee9 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterNotParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterNotParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParamsTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParamsTest.java index a038cba3d..dd4e07f0f 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterOrParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterOrParamsTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.List; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParamsTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParamsTest.java index b223b1df1..df11b3031 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueEqualsParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueEqualsParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.FixedValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.FixedValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java index 5aaf28494..672a4c56e 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueGreaterThanParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.MetadataValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.MetadataValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java index fb6aa8a30..5df80607b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/ModelFilterValueLowerThanParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.filters.ModelFilterOnValue; -import com.ignfab.minalac.generator.parameters.models.values.MetadataValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.filters.ModelFilterOnValue; +import fr.ign.voxatile.core.parameters.models.values.MetadataValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/TestingModelFilterParams.java b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/TestingModelFilterParams.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/filters/TestingModelFilterParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/filters/TestingModelFilterParams.java index 08b711356..a8418a608 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/filters/TestingModelFilterParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/filters/TestingModelFilterParams.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.models.filters; +package fr.ign.voxatile.core.parameters.models.filters; import java.util.function.Predicate; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.filters.TestingModelFilter; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.filters.TestingModelFilter; /** * A mock filter params that can be valid or not and use TestingModelFilter as diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParamsTest.java similarity index 58% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParamsTest.java index 4e5172ad3..8bd82fa79 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/AbsentValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/AbsentValueParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.AbsentValue; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.AbsentValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParamsTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParamsTest.java index d69a6e042..0f7afe337 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/ConditionalModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/ConditionalModelValueParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.ConditionalModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterHasMetadataParams; -import com.ignfab.minalac.generator.parameters.models.filters.TestingModelFilterParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.ConditionalModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterHasMetadataParams; +import fr.ign.voxatile.core.parameters.models.filters.TestingModelFilterParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParamsTest.java similarity index 83% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParamsTest.java index 8290c2361..709b300cb 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/FirstOfModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/FirstOfModelValueParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.util.List; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.FallbackModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.FallbackModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParamsTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParamsTest.java index 7c9735cba..3fa3fa0ea 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/FixedValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/FixedValueParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.FixedValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.FixedValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParamsTest.java index 9f37f655d..c8a9bb68b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/InverseModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/InverseModelValueParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.InverseModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.InverseModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParamsTest.java similarity index 76% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParamsTest.java index 45003571b..64ee54c79 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/MetadataValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/MetadataValueParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.MetadataValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.MetadataValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParamsDeserializerTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParamsDeserializerTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParamsDeserializerTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParamsDeserializerTest.java index 30da7f15b..2cf6a7577 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/ModelValueParamsDeserializerTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/ModelValueParamsDeserializerTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParamsTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParamsTest.java index 445983bf2..152745b56 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/MultiOperandsModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/MultiOperandsModelValueParamsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.util.Collections; import java.util.List; @@ -6,13 +6,13 @@ import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.values.BinaryOperationModelValue; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.values.BinaryOperationModelValue; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; import static org.junit.jupiter.api.Assertions.*; public class MultiOperandsModelValueParamsTest { diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParamsTest.java index f501da6e9..886b9a4cc 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/RandomUniformModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/RandomUniformModelValueParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.models.values.RandomUniformModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.models.values.RandomUniformModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParamsTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParamsTest.java index f147ef723..9e2768393 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/SingleOperandModelValueParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/SingleOperandModelValueParamsTest.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; import java.util.Map; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.values.ModelValue; -import com.ignfab.minalac.generator.models.values.UnaryOperationModelValue; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.values.ModelValue; +import fr.ign.voxatile.core.models.values.UnaryOperationModelValue; +import fr.ign.voxatile.core.parameters.ParamsTester; -import static com.ignfab.minalac.generator.models.values.ModelValueTester.*; +import static fr.ign.voxatile.core.models.values.ModelValueTester.*; import static org.junit.jupiter.api.Assertions.*; public class SingleOperandModelValueParamsTest { diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/TestingModelValueParams.java b/src/test/java/fr/ign/voxatile/core/parameters/models/values/TestingModelValueParams.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/models/values/TestingModelValueParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/models/values/TestingModelValueParams.java index fa067e2a8..cdd98248b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/models/values/TestingModelValueParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/models/values/TestingModelValueParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.models.values; +package fr.ign.voxatile.core.parameters.models.values; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.models.values.AbsentValue; -import com.ignfab.minalac.generator.models.values.ModelValue; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.models.values.AbsentValue; +import fr.ign.voxatile.core.models.values.ModelValue; /** * A {@code ModelValueParams} for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParamsTest.java similarity index 76% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParamsTest.java index a927b8868..631558005 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/CombinedPlaceableParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/CombinedPlaceableParamsTest.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.placeables; +package fr.ign.voxatile.core.parameters.placeables; import java.util.List; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; -import com.ignfab.minalac.generator.placeables.CombinedPlaceable; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.placeables.TestingPlaceable; -import com.ignfab.minalac.generator.utils.random.TestingSeed; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.placeables.CombinedPlaceable; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.placeables.TestingPlaceable; +import fr.ign.voxatile.core.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParamsTest.java index 14c9809e7..5b32914da 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/PlaceableParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/PlaceableParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.placeables; +package fr.ign.voxatile.core.parameters.placeables; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.DatabindException; -import com.ignfab.minalac.generator.parameters.OutputFormat; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.placeables.structures.PlaceableStructureParams; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.OutputFormat; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.placeables.structures.PlaceableStructureParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/TestingPlaceableParams.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/TestingPlaceableParams.java similarity index 80% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/TestingPlaceableParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/TestingPlaceableParams.java index e2bb19f5f..79d494bf0 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/TestingPlaceableParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/TestingPlaceableParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.placeables; +package fr.ign.voxatile.core.parameters.placeables; -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; /** * Class for testing placeable params. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParamsTest.java index 13180f7f7..e85214d9b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RandomPatternParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RandomPatternParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.placeables.patterns; +package fr.ign.voxatile.core.parameters.placeables.patterns; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.placeables.TestingPlaceableParams; -import com.ignfab.minalac.generator.placeables.TestingPlaceable; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.placeables.TestingPlaceableParams; +import fr.ign.voxatile.core.placeables.TestingPlaceable; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParamsTest.java index 4cf1e2087..f94673434 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/patterns/RepeatPatternParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/patterns/RepeatPatternParamsTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.placeables.patterns; +package fr.ign.voxatile.core.parameters.placeables.patterns; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintStructureParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintStructureParamsTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintStructureParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintStructureParamsTest.java index 5f23a1299..07cb1f9bc 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/BlueprintStructureParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/BlueprintStructureParamsTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParamsTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParamsTest.java index be85077ca..6bc5f75c3 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/PlaceableStructureParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/PlaceableStructureParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.exc.InvalidTypeIdException; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/TestingPlaceableStructureParams.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/TestingPlaceableStructureParams.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/TestingPlaceableStructureParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/TestingPlaceableStructureParams.java index f8e38db1c..6a4b22e21 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/structures/TestingPlaceableStructureParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/structures/TestingPlaceableStructureParams.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.placeables.structures; +package fr.ign.voxatile.core.parameters.placeables.structures; import java.util.List; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.random.Seed; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.random.Seed; /** * Class providing valid and invalid {@link PlaceableStructureParams} for tests. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/voxels/TestingVoxelParams.java b/src/test/java/fr/ign/voxatile/core/parameters/placeables/voxels/TestingVoxelParams.java similarity index 76% rename from src/test/java/com/ignfab/minalac/generator/parameters/placeables/voxels/TestingVoxelParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/placeables/voxels/TestingVoxelParams.java index c33b93a1a..6671ae369 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/placeables/voxels/TestingVoxelParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/placeables/voxels/TestingVoxelParams.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.placeables.voxels; +package fr.ign.voxatile.core.parameters.placeables.voxels; import java.beans.ConstructorProperties; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.parameters.placeables.PlaceableParams; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.Seed; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.parameters.placeables.PlaceableParams; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.Seed; +import fr.ign.voxatile.core.world.TestingVoxel; /** * Voxel parameters for testing with name only. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParamsTest.java similarity index 74% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParamsTest.java index 0283b260d..e5b73b3db 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/FloatMatrixProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/FloatMatrixProcessorParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; import org.geotools.api.referencing.FactoryException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParamsTest.java similarity index 75% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParamsTest.java index edf8a34e2..80a30f35d 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/GeoToolsVectorProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/GeoToolsVectorProcessorParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; import org.geotools.api.referencing.FactoryException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/OsmVectorProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/OsmVectorProcessorParamsTest.java similarity index 74% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/OsmVectorProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/OsmVectorProcessorParamsTest.java index 695387112..20149b7b0 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/OsmVectorProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/OsmVectorProcessorParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; import org.geotools.api.referencing.FactoryException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/TestingProcessorParams.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/TestingProcessorParams.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/TestingProcessorParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/TestingProcessorParams.java index 0777d9ef2..2fda0db54 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/TestingProcessorParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/TestingProcessorParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.processors; +package fr.ign.voxatile.core.parameters.processors; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.processors.Processor; -import com.ignfab.minalac.generator.processors.TestingProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.processors.Processor; +import fr.ign.voxatile.core.processors.TestingProcessor; public class TestingProcessorParams extends ProcessorParams { /** diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParamsTest.java index 7f0401812..dd8c4021a 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/ConditionalPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/ConditionalPostProcessorParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.parameters.models.filters.TestingModelFilterParams; -import com.ignfab.minalac.generator.processors.post.ConditionalPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.parameters.models.filters.TestingModelFilterParams; +import fr.ign.voxatile.core.processors.post.ConditionalPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParamsTest.java similarity index 59% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParamsTest.java index a5858e30f..871bf0a35 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/DiscardPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/DiscardPostProcessorParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.processors.post.DiscardPostProcessor; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.processors.post.DiscardPostProcessor; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParamsTest.java similarity index 59% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParamsTest.java index 9ed48277c..8a057c4ff 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/IdentityPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/IdentityPostProcessorParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.processors.post.IdentityPostProcessor; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.processors.post.IdentityPostProcessor; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java similarity index 81% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java index 5c6334347..9af598ded 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/JTSGeometryBufferPostProcessorParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.processors.post.JTSGeometryBufferPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.processors.post.JTSGeometryBufferPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java index 3a12f9c94..302399ce0 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataCopyPostProcessorParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; import tools.jackson.databind.ObjectMapper; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java similarity index 82% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java index e0e05081c..be03de7ce 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataDefaultPostProcessorParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ValueParser; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ValueParser; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParamsTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParamsTest.java index 82bace512..ef8bb1f8a 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataParsePostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataParsePostProcessorParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.ObjectMapper; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.ValueParser; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ValueParser; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParamsTest.java similarity index 83% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParamsTest.java index d1e0e7c46..1eb2beeda 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataSetPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataSetPostProcessorParamsTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; import tools.jackson.dataformat.yaml.YAMLMapper; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.models.values.AbsentValueParams; -import com.ignfab.minalac.generator.parameters.models.values.FixedValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.models.values.AbsentValueParams; +import fr.ign.voxatile.core.parameters.models.values.FixedValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java index d9315dbe3..6438a5291 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataTruncatePostProcessorParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.ObjectMapper; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.processors.post.MetadataTruncatePostProcessorParams.TruncationMethodParams; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.processors.post.MetadataTruncatePostProcessorParams.TruncationMethodParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java index 81e61b5d4..19b8cd690 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/MetadataValueMappingPostProcessorParamsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.util.HashMap; import java.util.Map; @@ -8,8 +8,8 @@ import tools.jackson.core.JacksonException; import tools.jackson.databind.ObjectMapper; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParamsDeserializerTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParamsDeserializerTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParamsDeserializerTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParamsDeserializerTest.java index e78c2bc0f..09ed3e219 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/PostProcessorParamsDeserializerTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/PostProcessorParamsDeserializerTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.ParamsTester; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParamsTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParamsTest.java index 31dda268d..f153d5043 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/SequentialPostProcessorParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/SequentialPostProcessorParamsTest.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.processors.post.IdentityPostProcessor; -import com.ignfab.minalac.generator.processors.post.PostProcessor; -import com.ignfab.minalac.generator.processors.post.SequentialPostProcessor; -import com.ignfab.minalac.generator.processors.post.TestingPostProcessor; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.processors.post.IdentityPostProcessor; +import fr.ign.voxatile.core.processors.post.PostProcessor; +import fr.ign.voxatile.core.processors.post.SequentialPostProcessor; +import fr.ign.voxatile.core.processors.post.TestingPostProcessor; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/TestingPostProcessorParams.java b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/TestingPostProcessorParams.java similarity index 81% rename from src/test/java/com/ignfab/minalac/generator/parameters/processors/post/TestingPostProcessorParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/processors/post/TestingPostProcessorParams.java index a7baf4934..b41e59cfd 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/processors/post/TestingPostProcessorParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/processors/post/TestingPostProcessorParams.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.parameters.processors.post; +package fr.ign.voxatile.core.parameters.processors.post; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.processors.post.PostProcessor; -import com.ignfab.minalac.generator.processors.post.TestingPostProcessor; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.processors.post.PostProcessor; +import fr.ign.voxatile.core.processors.post.TestingPostProcessor; /** * A {@code PostProcessorParams} for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParamsTest.java index 5235e7480..fe3585b81 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoPackageProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/GeoPackageProviderParamsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParamsTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParamsTest.java index 4e0eb65df..860957546 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/GeoTiffProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/GeoTiffProviderParamsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParamsTest.java index 4e70e0042..c189ada01 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/OverpassProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/OverpassProviderParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.NoSuchAuthorityCodeException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParamsTest.java index ea6743375..9864609c4 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/ShapefileProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/ShapefileProviderParamsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/TestingProviderParams.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/TestingProviderParams.java similarity index 71% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/TestingProviderParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/TestingProviderParams.java index 8bb4c7356..b9b05e2b6 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/TestingProviderParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/TestingProviderParams.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.inputs.TestingProvider; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.TestingProcessorParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.inputs.TestingProvider; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.parameters.processors.TestingProcessorParams; public class TestingProviderParams extends ProviderParams { /** diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParamsTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParamsTest.java index db0b87f9d..55e2ef73a 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/WFSProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/WFSProviderParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import org.geotools.api.referencing.FactoryException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParamsTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParamsTest.java index 56adfb2d9..100adcf76 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/providers/WMSFloatBilProviderParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/providers/WMSFloatBilProviderParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.providers; +package fr.ign.voxatile.core.parameters.providers; import org.geotools.api.referencing.FactoryException; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParamsTest.java similarity index 82% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParamsTest.java index 158385887..1a1bd8eda 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/CopyHeightmapTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/CopyHeightmapTaskParamsTest.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.heightmaps.WritableHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.ModelSelectionParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.heightmaps.WritableHeightmapParams; +import fr.ign.voxatile.core.parameters.models.ModelSelectionParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParamsTest.java index 904cda0fc..104e793bc 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/FetchDataTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/FetchDataTaskParamsTest.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; import tools.jackson.databind.jsontype.NamedType; import tools.jackson.dataformat.yaml.YAMLMapper; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.inputs.Provider; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.processors.ProcessorParams; -import com.ignfab.minalac.generator.parameters.processors.TestingProcessorParams; -import com.ignfab.minalac.generator.parameters.providers.ProviderParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.inputs.Provider; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.processors.ProcessorParams; +import fr.ign.voxatile.core.parameters.processors.TestingProcessorParams; +import fr.ign.voxatile.core.parameters.providers.ProviderParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java index 2deec334c..3f40b1ab6 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/FillBetweenHeightmapAndValueTaskParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.models.values.MetadataValueParams; -import com.ignfab.minalac.generator.parameters.models.values.TestingModelValueParams; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.models.values.MetadataValueParams; +import fr.ign.voxatile.core.parameters.models.values.TestingModelValueParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParamsTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParamsTest.java index 872125948..fb0786ecd 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/HeightmapStatsTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/HeightmapStatsTaskParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParamsTest.java index 38033c4d8..c6b1f8060 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/PopulateHeightmapTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/PopulateHeightmapTaskParamsTest.java @@ -1,15 +1,15 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.core.JacksonException; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.ModelSelectionParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.ModelSelectionParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParamsTest.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParamsTest.java index 7436bcf9e..7ed151602 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderBuildingsTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderBuildingsTaskParamsTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; import tools.jackson.databind.exc.InvalidNullException; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParamsTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParamsTest.java index b6648f5ae..0a149d585 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderHeightmapTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderHeightmapTaskParamsTest.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.TestingGeneration; -import com.ignfab.minalac.generator.generation.heightmaps.HeightmapDeclaration; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.heightmaps.WritableHeightmapParams; -import com.ignfab.minalac.generator.parameters.placeables.TestingPlaceableParams; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.TestingGeneration; +import fr.ign.voxatile.core.generation.heightmaps.HeightmapDeclaration; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.heightmaps.WritableHeightmapParams; +import fr.ign.voxatile.core.parameters.placeables.TestingPlaceableParams; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParamsTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParamsTest.java index a8ffd3a89..5208e7b28 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLines2dTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLines2dTaskParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.TestingPlaceableStructureParams; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.structures.TestingPlaceableStructureParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParamsTest.java index eee9ece23..5f27c6a45 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderLinesTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderLinesTaskParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.TestingPlaceableStructureParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.structures.TestingPlaceableStructureParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParamsTest.java index 51b6747f9..fe4a60aa2 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPoints2dTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPoints2dTaskParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.TestingPlaceableStructureParams; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.structures.TestingPlaceableStructureParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParamsTest.java index 9b5f1a194..c4837fa8f 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderPointsTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderPointsTaskParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.structures.TestingPlaceableStructureParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.structures.TestingPlaceableStructureParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParamsTest.java similarity index 77% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParamsTest.java index fc218258a..fe5bbb06f 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/RenderSurfacesTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/RenderSurfacesTaskParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.placeables.TestingPlaceableParams; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.placeables.TestingPlaceableParams; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleParamsTester.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleParamsTester.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleParamsTester.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleParamsTester.java index 4571fbd28..1b2645d36 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleParamsTester.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleParamsTester.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.util.LinkedList; import java.util.List; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParamsTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParamsTest.java index 05d0d8d59..cbbe12a5b 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/ScheduleTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/ScheduleTaskParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.util.Map; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterEmptyGeometryParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterEmptyGeometryParams; -import static com.ignfab.minalac.generator.parameters.tasks.ScheduleParamsTester.*; +import static fr.ign.voxatile.core.parameters.tasks.ScheduleParamsTester.*; import static org.junit.jupiter.api.Assertions.*; public class ScheduleTaskParamsTest { diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParamsTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParamsTest.java index 296dd6bd2..bb5c54f13 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/SequenceTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/SequenceTaskParamsTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.models.TestingModelSelectionParams; -import com.ignfab.minalac.generator.parameters.models.filters.ModelFilterEmptyGeometryParams; +import fr.ign.voxatile.core.parameters.models.TestingModelSelectionParams; +import fr.ign.voxatile.core.parameters.models.filters.ModelFilterEmptyGeometryParams; -import static com.ignfab.minalac.generator.parameters.tasks.ScheduleParamsTester.*; +import static fr.ign.voxatile.core.parameters.tasks.ScheduleParamsTester.*; import static org.junit.jupiter.api.Assertions.*; public class SequenceTaskParamsTest { diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParamsTest.java similarity index 80% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParamsTest.java index e2a507710..aa5104343 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/SetSpawnTaskParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/SetSpawnTaskParamsTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import org.junit.jupiter.api.Test; import tools.jackson.databind.cfg.MapperBuilder; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.parameters.heightmaps.TestingHeightmapParams; -import com.ignfab.minalac.generator.parameters.heightmaps.WritableHeightmapParams; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.parameters.heightmaps.TestingHeightmapParams; +import fr.ign.voxatile.core.parameters.heightmaps.WritableHeightmapParams; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/TestingTaskParams.java b/src/test/java/fr/ign/voxatile/core/parameters/tasks/TestingTaskParams.java similarity index 82% rename from src/test/java/com/ignfab/minalac/generator/parameters/tasks/TestingTaskParams.java rename to src/test/java/fr/ign/voxatile/core/parameters/tasks/TestingTaskParams.java index 04bc5f6c1..76ecdf5bf 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/tasks/TestingTaskParams.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/tasks/TestingTaskParams.java @@ -1,16 +1,16 @@ -package com.ignfab.minalac.generator.parameters.tasks; +package fr.ign.voxatile.core.parameters.tasks; import java.beans.ConstructorProperties; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import com.ignfab.minalac.generator.generation.Generation; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.tasks.ModelTask; -import com.ignfab.minalac.generator.utils.execution.Task; +import fr.ign.voxatile.core.generation.Generation; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.tasks.ModelTask; +import fr.ign.voxatile.core.utils.execution.Task; /** * A TileTaskParams class for testing purposes. diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParamsTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParamsTest.java index 71f808830..b035d538f 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/utils/IntegerIntervalParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/utils/IntegerIntervalParamsTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import org.junit.jupiter.api.Test; import tools.jackson.databind.ObjectReader; import tools.jackson.dataformat.yaml.YAMLMapper; -import com.ignfab.minalac.generator.utils.IntegerInterval; +import fr.ign.voxatile.core.utils.IntegerInterval; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParamsTest.java b/src/test/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParamsTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParamsTest.java rename to src/test/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParamsTest.java index f6646bf0d..8edaf1013 100644 --- a/src/test/java/com/ignfab/minalac/generator/parameters/utils/WorldBBox3dParamsTest.java +++ b/src/test/java/fr/ign/voxatile/core/parameters/utils/WorldBBox3dParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.parameters.utils; +package fr.ign.voxatile.core.parameters.utils; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.parameters.ParamsTester; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.parameters.ParamsTester; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/placeables/CombinedPlaceableTest.java b/src/test/java/fr/ign/voxatile/core/placeables/CombinedPlaceableTest.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/placeables/CombinedPlaceableTest.java rename to src/test/java/fr/ign/voxatile/core/placeables/CombinedPlaceableTest.java index ec6c1166c..00cd6333a 100644 --- a/src/test/java/com/ignfab/minalac/generator/placeables/CombinedPlaceableTest.java +++ b/src/test/java/fr/ign/voxatile/core/placeables/CombinedPlaceableTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/placeables/PlaceableStructureTest.java b/src/test/java/fr/ign/voxatile/core/placeables/PlaceableStructureTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/placeables/PlaceableStructureTest.java rename to src/test/java/fr/ign/voxatile/core/placeables/PlaceableStructureTest.java index 95b1ee8a3..32f057426 100644 --- a/src/test/java/com/ignfab/minalac/generator/placeables/PlaceableStructureTest.java +++ b/src/test/java/fr/ign/voxatile/core/placeables/PlaceableStructureTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.TestingVoxel; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.TestingVoxel; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/placeables/TestingPlaceable.java b/src/test/java/fr/ign/voxatile/core/placeables/TestingPlaceable.java similarity index 72% rename from src/test/java/com/ignfab/minalac/generator/placeables/TestingPlaceable.java rename to src/test/java/fr/ign/voxatile/core/placeables/TestingPlaceable.java index 7757441d8..fe2ece1ae 100644 --- a/src/test/java/com/ignfab/minalac/generator/placeables/TestingPlaceable.java +++ b/src/test/java/fr/ign/voxatile/core/placeables/TestingPlaceable.java @@ -1,7 +1,7 @@ -package com.ignfab.minalac.generator.placeables; +package fr.ign.voxatile.core.placeables; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.VoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.VoxelTile; public class TestingPlaceable implements Placeable { diff --git a/src/test/java/com/ignfab/minalac/generator/placeables/patterns/RandomPatternTest.java b/src/test/java/fr/ign/voxatile/core/placeables/patterns/RandomPatternTest.java similarity index 70% rename from src/test/java/com/ignfab/minalac/generator/placeables/patterns/RandomPatternTest.java rename to src/test/java/fr/ign/voxatile/core/placeables/patterns/RandomPatternTest.java index 9e9cea08a..9925e7e33 100644 --- a/src/test/java/com/ignfab/minalac/generator/placeables/patterns/RandomPatternTest.java +++ b/src/test/java/fr/ign/voxatile/core/placeables/patterns/RandomPatternTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.placeables.patterns; +package fr.ign.voxatile.core.placeables.patterns; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.placeables.TestingPlaceable; -import com.ignfab.minalac.generator.utils.random.TestingRandom; -import com.ignfab.minalac.generator.utils.random.TestingSeed; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.placeables.TestingPlaceable; +import fr.ign.voxatile.core.utils.random.TestingRandom; +import fr.ign.voxatile.core.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPatternTest.java b/src/test/java/fr/ign/voxatile/core/placeables/patterns/RepeatPatternTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPatternTest.java rename to src/test/java/fr/ign/voxatile/core/placeables/patterns/RepeatPatternTest.java index 4b666c77b..c30e349fb 100644 --- a/src/test/java/com/ignfab/minalac/generator/placeables/patterns/RepeatPatternTest.java +++ b/src/test/java/fr/ign/voxatile/core/placeables/patterns/RepeatPatternTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.placeables.patterns; +package fr.ign.voxatile.core.placeables.patterns; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.Nothing; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.placeables.Nothing; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/FloatMatrixProcessorTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/FloatMatrixProcessorTest.java index 1834b88e7..dad9bc4fd 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/FloatMatrixProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/FloatMatrixProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import java.util.concurrent.atomic.AtomicBoolean; @@ -7,10 +7,10 @@ import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.models.FloatMatrixModel; -import com.ignfab.minalac.generator.utils.coordinates.TestingConverter; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.models.FloatMatrixModel; +import fr.ign.voxatile.core.utils.coordinates.TestingConverter; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessorTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessorTest.java index 8d4cda1be..1dde0e094 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/GeoToolsVectorProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/GeoToolsVectorProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import java.util.concurrent.atomic.AtomicBoolean; @@ -11,8 +11,8 @@ import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.utils.coordinates.TestingConverter; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.utils.coordinates.TestingConverter; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/OsmProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/OsmProcessorTest.java similarity index 79% rename from src/test/java/com/ignfab/minalac/generator/processors/OsmProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/OsmProcessorTest.java index 06cdd0828..319498726 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/OsmProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/OsmProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import java.util.List; @@ -11,14 +11,14 @@ import org.geotools.referencing.CRS; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.inputs.OsmData; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.utils.coordinates.TestingConverter; -import com.ignfab.minalac.generator.voxelization.shape2d.Point2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Shape2d; -import com.ignfab.minalac.generator.voxelization.shape3d.Point3d; -import com.ignfab.minalac.generator.voxelization.shape3d.Shape3d; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.inputs.OsmData; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.utils.coordinates.TestingConverter; +import fr.ign.voxatile.core.voxelization.shape2d.Point2d; +import fr.ign.voxatile.core.voxelization.shape2d.Shape2d; +import fr.ign.voxatile.core.voxelization.shape3d.Point3d; +import fr.ign.voxatile.core.voxelization.shape3d.Shape3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/TestingProcessor.java b/src/test/java/fr/ign/voxatile/core/processors/TestingProcessor.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/processors/TestingProcessor.java rename to src/test/java/fr/ign/voxatile/core/processors/TestingProcessor.java index 357cd8fca..e0a2c2954 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/TestingProcessor.java +++ b/src/test/java/fr/ign/voxatile/core/processors/TestingProcessor.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.processors; +package fr.ign.voxatile.core.processors; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.TestingModel; public class TestingProcessor implements Processor { private int processed = 0; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessorTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessorTest.java index 0c778ddc1..0c90be8a4 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/ConditionalPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/ConditionalPostProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; @@ -6,9 +6,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.filters.TestingModelFilter; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.filters.TestingModelFilter; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessorTest.java similarity index 64% rename from src/test/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessorTest.java index b8700e0f1..54a7688eb 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/DiscardPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/DiscardPostProcessorTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessorTest.java similarity index 64% rename from src/test/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessorTest.java index 8bb17d4ac..4d2f185a1 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/IdentityPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/IdentityPostProcessorTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessorTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessorTest.java index cab0e4d69..7ce9c8d1b 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/JTSGeometryBufferPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/JTSGeometryBufferPostProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -7,9 +7,9 @@ import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.models.JTSGeometryModel; -import com.ignfab.minalac.generator.utils.coordinates.TestingConverter; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.models.JTSGeometryModel; +import fr.ign.voxatile.core.utils.coordinates.TestingConverter; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessorTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessorTest.java index 681fb5041..3c44728a0 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataCopyPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataCopyPostProcessorTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessorTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessorTest.java index 4c3cb1cb3..b328f4564 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataDefaultPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataDefaultPostProcessorTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessorTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessorTest.java index 0b69ae267..b12f7d3e2 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataFunctionPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataFunctionPostProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; import java.util.Objects; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessorTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessorTest.java index e49eac856..5c6bbecea 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataSetPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataSetPostProcessorTest.java @@ -1,14 +1,14 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; -import com.ignfab.minalac.generator.models.values.AbsentValue; -import com.ignfab.minalac.generator.models.values.FixedValue; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; +import fr.ign.voxatile.core.models.values.AbsentValue; +import fr.ign.voxatile.core.models.values.FixedValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessorTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessorTest.java index bb2cd0d35..effcab24d 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/MetadataValueMappingPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/MetadataValueMappingPostProcessorTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.Map; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.exceptions.GenerationFailedException; -import com.ignfab.minalac.generator.exceptions.IgnorableException; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.exceptions.GenerationFailedException; +import fr.ign.voxatile.core.exceptions.IgnorableException; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/PostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/PostProcessorTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/processors/post/PostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/PostProcessorTest.java index 6f1631d10..abd759ade 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/PostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/PostProcessorTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessorTest.java b/src/test/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessorTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessorTest.java rename to src/test/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessorTest.java index 75d9898eb..41093e612 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/SequentialPostProcessorTest.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/SequentialPostProcessorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.List; @@ -6,8 +6,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.TestingModel; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.TestingModel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/processors/post/TestingPostProcessor.java b/src/test/java/fr/ign/voxatile/core/processors/post/TestingPostProcessor.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/processors/post/TestingPostProcessor.java rename to src/test/java/fr/ign/voxatile/core/processors/post/TestingPostProcessor.java index 462343a41..48a99ef6f 100644 --- a/src/test/java/com/ignfab/minalac/generator/processors/post/TestingPostProcessor.java +++ b/src/test/java/fr/ign/voxatile/core/processors/post/TestingPostProcessor.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.processors.post; +package fr.ign.voxatile.core.processors.post; import java.util.concurrent.atomic.AtomicInteger; -import com.ignfab.minalac.generator.models.Model; +import fr.ign.voxatile.core.models.Model; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/CopyHeightmapTaskTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/CopyHeightmapTaskTest.java index 046cc79ec..7a971c165 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/CopyHeightmapTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/CopyHeightmapTaskTest.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingRectangleShape2dModel; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingRectangleShape2dModel; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/FetchDataTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/FetchDataTaskTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/tasks/FetchDataTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/FetchDataTaskTest.java index 52c999dd0..e7be6f149 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/FetchDataTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/FetchDataTaskTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.time.Duration; import java.util.List; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.inputs.TestingProvider; -import com.ignfab.minalac.generator.processors.TestingProcessor; -import com.ignfab.minalac.generator.processors.post.IdentityPostProcessor; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.inputs.TestingProvider; +import fr.ign.voxatile.core.processors.TestingProcessor; +import fr.ign.voxatile.core.processors.post.IdentityPostProcessor; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTaskTest.java similarity index 68% rename from src/test/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTaskTest.java index ddead19a6..40d2ded48 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/FillBetweenHeightmapAndValueTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/FillBetweenHeightmapAndValueTaskTest.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingRectangleShape2dModel; -import com.ignfab.minalac.generator.models.values.MetadataValue; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingRectangleShape2dModel; +import fr.ign.voxatile.core.models.values.MetadataValue; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/HeightmapStatsTaskTest.java similarity index 78% rename from src/test/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/HeightmapStatsTaskTest.java index 25ce7ebed..99fb383fd 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/HeightmapStatsTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/HeightmapStatsTaskTest.java @@ -1,17 +1,17 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingRectangleShape2dModel; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingRectangleShape2dModel; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/ModelTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/ModelTaskTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/tasks/ModelTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/ModelTaskTest.java index e9112a841..3a734f74c 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/ModelTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/ModelTaskTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.ArrayList; import java.util.Collections; @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.GenerationTile; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.models.ModelImpl; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.generation.GenerationTile; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.models.ModelImpl; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTaskTest.java similarity index 71% rename from src/test/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTaskTest.java index e7ae183cc..c5010edcd 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/PopulateHeightmapTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/PopulateHeightmapTaskTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; @@ -6,16 +6,16 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.util.AffineTransformation; -import com.ignfab.minalac.generator.exceptions.TransformException; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.ReadableHeightmap; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.inputs.FloatArrayGeographicDataMatrix2d; -import com.ignfab.minalac.generator.inputs.FloatGeographicDataMatrix2d; -import com.ignfab.minalac.generator.models.FloatMatrixModel; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.utils.coordinates.MapToWorldConverter; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.exceptions.TransformException; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.ReadableHeightmap; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.inputs.FloatArrayGeographicDataMatrix2d; +import fr.ign.voxatile.core.inputs.FloatGeographicDataMatrix2d; +import fr.ign.voxatile.core.models.FloatMatrixModel; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.utils.coordinates.MapToWorldConverter; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/RenderBuildingsTaskTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/RenderBuildingsTaskTest.java index 47d8220eb..8308725ea 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/RenderBuildingsTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/RenderBuildingsTaskTest.java @@ -1,21 +1,21 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.models.Model; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingRectangleShape2dModel; -import com.ignfab.minalac.generator.models.filters.ModelFilterHasMetadata; -import com.ignfab.minalac.generator.parameters.placeables.voxels.TestingVoxelParams; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.random.TestingSeed; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.models.Model; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingRectangleShape2dModel; +import fr.ign.voxatile.core.models.filters.ModelFilterHasMetadata; +import fr.ign.voxatile.core.parameters.placeables.voxels.TestingVoxelParams; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/RenderHeightmapTaskTest.java similarity index 87% rename from src/test/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/RenderHeightmapTaskTest.java index 1d21c8b32..ddb6737cc 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/RenderHeightmapTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/RenderHeightmapTaskTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.world.TestingVoxel; public class RenderHeightmapTaskTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/RenderLines2dTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/RenderLines2dTaskTest.java similarity index 76% rename from src/test/java/com/ignfab/minalac/generator/tasks/RenderLines2dTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/RenderLines2dTaskTest.java index 0572ba01a..1beed85c6 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/RenderLines2dTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/RenderLines2dTaskTest.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.computed.ConstantHeightmap; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingShape2dModel; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.voxelization.shape2d.LineString2d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.computed.ConstantHeightmap; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingShape2dModel; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.voxelization.shape2d.LineString2d; +import fr.ign.voxatile.core.world.TestingVoxel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/RenderLinesTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/RenderLinesTaskTest.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/tasks/RenderLinesTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/RenderLinesTaskTest.java index 720a17c33..9e5180763 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/RenderLinesTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/RenderLinesTaskTest.java @@ -1,19 +1,19 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.computed.ConstantHeightmap; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingShape3dModel; -import com.ignfab.minalac.generator.placeables.PlaceableStructure; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.voxelization.shape3d.LineString3d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.computed.ConstantHeightmap; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingShape3dModel; +import fr.ign.voxatile.core.placeables.PlaceableStructure; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.voxelization.shape3d.LineString3d; +import fr.ign.voxatile.core.world.TestingVoxel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/RenderSurfacesTaskTest.java similarity index 85% rename from src/test/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/RenderSurfacesTaskTest.java index 0e899e728..2ac0e7429 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/RenderSurfacesTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/RenderSurfacesTaskTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import java.util.List; @@ -6,15 +6,15 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.models.ModelSelection; -import com.ignfab.minalac.generator.models.TestingRectangleShape2dModel; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxel; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.models.ModelSelection; +import fr.ign.voxatile.core.models.TestingRectangleShape2dModel; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxel; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/tasks/SetSpawnTaskTest.java b/src/test/java/fr/ign/voxatile/core/tasks/SetSpawnTaskTest.java similarity index 70% rename from src/test/java/com/ignfab/minalac/generator/tasks/SetSpawnTaskTest.java rename to src/test/java/fr/ign/voxatile/core/tasks/SetSpawnTaskTest.java index 3663994aa..1a8204cb2 100644 --- a/src/test/java/com/ignfab/minalac/generator/tasks/SetSpawnTaskTest.java +++ b/src/test/java/fr/ign/voxatile/core/tasks/SetSpawnTaskTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.tasks; +package fr.ign.voxatile.core.tasks; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.generation.TestingGenerationTile; -import com.ignfab.minalac.generator.generation.heightmaps.TestingHeightmap; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.generation.TestingGenerationTile; +import fr.ign.voxatile.core.generation.heightmaps.TestingHeightmap; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/FileHelpersTest.java b/src/test/java/fr/ign/voxatile/core/utils/FileHelpersTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/FileHelpersTest.java rename to src/test/java/fr/ign/voxatile/core/utils/FileHelpersTest.java index 744ddc099..c992ac3d9 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/FileHelpersTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/FileHelpersTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils; +package fr.ign.voxatile.core.utils; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapperTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapperTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapperTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapperTest.java index f9ee47867..5288d4e63 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/IdentityAxisMapperTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/IdentityAxisMapperTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapperTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapperTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapperTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapperTest.java index e659365a0..20f384633 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/SizesAxisMapperTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/SizesAxisMapperTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapperTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapperTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapperTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapperTest.java index e31468333..9334e73cd 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/StretcherAxisMapperTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/StretcherAxisMapperTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers; +package fr.ign.voxatile.core.utils.axis.mappers; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java index 28e4f82cf..0c921588d 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AdjustAxisMapperBuilderTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java index a40afccd8..adefe974d 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilder.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import java.util.Arrays; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; /** * A testing AxisMapperBuilder that only allows given sizes. diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java index 612cd2531..87e6bb49d 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/AllowlistTestingAxisMapperBuilderTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java index d5f06c816..c7678058a 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/ConstantAxisMapperBuilderTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java index 1c4446a38..5746bdfcc 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/KeepAxisMapperBuilderTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java index 44a176288..0753c958c 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/PriorityRepartitionAxisMapperBuilderTest.java @@ -1,19 +1,15 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.assertBrowsesAllOnce; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; +import static org.junit.jupiter.api.Assertions.*; public class PriorityRepartitionAxisMapperBuilderTest { diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java index 1f2a37327..65d96d438 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilder.java @@ -1,6 +1,6 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; -import com.ignfab.minalac.generator.utils.axis.mappers.AxisMapper; +import fr.ign.voxatile.core.utils.axis.mappers.AxisMapper; public class RangeTestingAxisMapperBuilder implements AxisMapperBuilder { private final int min; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java index af93402b6..c814a1c8f 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RangeTestingAxisMapperBuilderTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java index d31110e3f..e83599671 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/RepeatAxisMapperBuilderTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java rename to src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java index eb1c8842b..48cdb24d1 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/axis/mappers/builders/StretcherAxisMapperBuilderTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.axis.mappers.builders; +package fr.ign.voxatile.core.utils.axis.mappers.builders; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.layouts.UnbuildableLayoutException; +import fr.ign.voxatile.core.placeables.layouts.UnbuildableLayoutException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/coordinates/MapToMapConverterTest.java b/src/test/java/fr/ign/voxatile/core/utils/coordinates/MapToMapConverterTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/coordinates/MapToMapConverterTest.java rename to src/test/java/fr/ign/voxatile/core/utils/coordinates/MapToMapConverterTest.java index 21fcdef78..fcf16c537 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/coordinates/MapToMapConverterTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/coordinates/MapToMapConverterTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.operation.MathTransform; @@ -11,7 +11,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.util.AffineTransformation; -import com.ignfab.minalac.generator.exceptions.TransformException; +import fr.ign.voxatile.core.exceptions.TransformException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/coordinates/TestingConverter.java b/src/test/java/fr/ign/voxatile/core/utils/coordinates/TestingConverter.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/utils/coordinates/TestingConverter.java rename to src/test/java/fr/ign/voxatile/core/utils/coordinates/TestingConverter.java index 3af34bf9f..925bd876f 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/coordinates/TestingConverter.java +++ b/src/test/java/fr/ign/voxatile/core/utils/coordinates/TestingConverter.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.coordinates; +package fr.ign.voxatile.core.utils.coordinates; import org.geotools.api.referencing.operation.MathTransform; import org.geotools.referencing.operation.transform.IdentityTransform; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/execution/SchedulerTest.java b/src/test/java/fr/ign/voxatile/core/utils/execution/SchedulerTest.java similarity index 99% rename from src/test/java/com/ignfab/minalac/generator/utils/execution/SchedulerTest.java rename to src/test/java/fr/ign/voxatile/core/utils/execution/SchedulerTest.java index e7d42814d..5d5275576 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/execution/SchedulerTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/execution/SchedulerTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.execution; +package fr.ign.voxatile.core.utils.execution; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IterablesTest.java b/src/test/java/fr/ign/voxatile/core/utils/iterator/IterablesTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/utils/iterator/IterablesTest.java rename to src/test/java/fr/ign/voxatile/core/utils/iterator/IterablesTest.java index 91cd3d1bb..6d618d9c2 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IterablesTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/iterator/IterablesTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; public class IterablesTest { diff --git a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTester.java b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTester.java similarity index 99% rename from src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTester.java rename to src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTester.java index 0e9b012f2..9a6568672 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTester.java +++ b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTester.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.ArrayList; import java.util.Collection; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTesterTest.java b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTesterTest.java similarity index 99% rename from src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTesterTest.java rename to src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTesterTest.java index efe08f9d9..da34dc39c 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorTesterTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorTesterTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorsTest.java b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorsTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorsTest.java rename to src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorsTest.java index 90e8e1fb7..025e5f7c3 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/iterator/IteratorsTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/iterator/IteratorsTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.iterator; +package fr.ign.voxatile.core.utils.iterator; import java.util.ArrayList; import java.util.Arrays; @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; public class IteratorsTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/utils/random/RandomTest.java b/src/test/java/fr/ign/voxatile/core/utils/random/RandomTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/utils/random/RandomTest.java rename to src/test/java/fr/ign/voxatile/core/utils/random/RandomTest.java index e278dc4cb..b4c401773 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/random/RandomTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/random/RandomTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; import java.util.Arrays; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/random/SeedTest.java b/src/test/java/fr/ign/voxatile/core/utils/random/SeedTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/random/SeedTest.java rename to src/test/java/fr/ign/voxatile/core/utils/random/SeedTest.java index a1250d7ea..5e77c4948 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/random/SeedTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/random/SeedTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; import java.util.Arrays; import java.util.Random; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingRandom.java b/src/test/java/fr/ign/voxatile/core/utils/random/TestingRandom.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/utils/random/TestingRandom.java rename to src/test/java/fr/ign/voxatile/core/utils/random/TestingRandom.java index d8c175bf7..d6c732359 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingRandom.java +++ b/src/test/java/fr/ign/voxatile/core/utils/random/TestingRandom.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; /** * A testing class faking Random and returning the same value last set by setNextXXX() methods. diff --git a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeed.java b/src/test/java/fr/ign/voxatile/core/utils/random/TestingSeed.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeed.java rename to src/test/java/fr/ign/voxatile/core/utils/random/TestingSeed.java index 78bcf3da0..658f2a78d 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeed.java +++ b/src/test/java/fr/ign/voxatile/core/utils/random/TestingSeed.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; /** * A testing seed class derived from Seed but with some mock and probe methods. diff --git a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeedTest.java b/src/test/java/fr/ign/voxatile/core/utils/random/TestingSeedTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeedTest.java rename to src/test/java/fr/ign/voxatile/core/utils/random/TestingSeedTest.java index adbcbbc40..89bee9975 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/random/TestingSeedTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/random/TestingSeedTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.random; +package fr.ign.voxatile.core.utils.random; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world2d/Vector2dTest.java b/src/test/java/fr/ign/voxatile/core/utils/world2d/Vector2dTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/utils/world2d/Vector2dTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world2d/Vector2dTest.java index d4983c1d1..7afd43bbb 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world2d/Vector2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world2d/Vector2dTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.Vector3d; +import fr.ign.voxatile.core.utils.world3d.Vector3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2dTest.java b/src/test/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2dTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2dTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2dTest.java index 4e2dfaa10..285cea4f8 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world2d/WorldBBox2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world2d/WorldBBox2dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world2d; +package fr.ign.voxatile.core.utils.world2d; import java.util.Arrays; import java.util.Collections; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class WorldBBox2dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIteratorTest.java b/src/test/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIteratorTest.java similarity index 89% rename from src/test/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIteratorTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIteratorTest.java index e6d3290a8..8b7dc6c3e 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world2d/iterator/WorldBBox2dIteratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world2d/iterator/WorldBBox2dIteratorTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.utils.world2d.iterator; +package fr.ign.voxatile.core.utils.world2d.iterator; import java.util.NoSuchElementException; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world3d/Vector3dTest.java b/src/test/java/fr/ign/voxatile/core/utils/world3d/Vector3dTest.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/utils/world3d/Vector3dTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world3d/Vector3dTest.java index 0732d8b81..2b268096d 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world3d/Vector3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world3d/Vector3dTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3dTest.java b/src/test/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3dTest.java similarity index 98% rename from src/test/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3dTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3dTest.java index d89e9a6f9..454310500 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world3d/WorldBBox3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world3d/WorldBBox3dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.utils.world3d; +package fr.ign.voxatile.core.utils.world3d; import java.util.Arrays; import java.util.Collections; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class WorldBBox3dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIteratorTest.java b/src/test/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIteratorTest.java similarity index 90% rename from src/test/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIteratorTest.java rename to src/test/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIteratorTest.java index c222bc843..507097031 100644 --- a/src/test/java/com/ignfab/minalac/generator/utils/world3d/iterator/WorldBBox3dIteratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/utils/world3d/iterator/WorldBBox3dIteratorTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.utils.world3d.iterator; +package fr.ign.voxatile.core.utils.world3d.iterator; import java.util.NoSuchElementException; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2dTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2dTest.java index 2f5792465..44e8a4d73 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LineString2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LineString2dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.Iterator; import java.util.List; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class LineString2dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2dTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2dTest.java index 80a78d448..56c70372e 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/LinearRing2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/LinearRing2dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.Iterator; import java.util.List; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class LinearRing2dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2dTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2dTest.java index ca87a2b21..7fc2525c9 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Polygon2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Polygon2dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import java.util.Iterator; import java.util.List; @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class Polygon2dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2dTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2dTest.java index 4ee9d05e2..300bf479f 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/Segment2dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/Segment2dTest.java @@ -1,10 +1,10 @@ -package com.ignfab.minalac.generator.voxelization.shape2d; +package fr.ign.voxatile.core.voxelization.shape2d; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.Vector2d; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world2d.Vector2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIteratorTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIteratorTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIteratorTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIteratorTest.java index fac24804e..d1002d929 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/Polygon2dIteratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/Polygon2dIteratorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Collection; import java.util.Collections; @@ -7,14 +7,14 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.LinearRing2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Polygon2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.LinearRing2d; +import fr.ign.voxatile.core.voxelization.shape2d.Polygon2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class Polygon2dIteratorTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java index 1d537c5e6..3091ac1da 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThickSegment2dIteratorTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Iterator; import java.util.List; @@ -6,9 +6,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.Positioned2d; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.Positioned2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java similarity index 70% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java index 3a2eb8282..90a7bc7e0 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape2d/iterator/ThinSegment2dIteratorTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.voxelization.shape2d.iterator; +package fr.ign.voxatile.core.voxelization.shape2d.iterator; import java.util.Arrays; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; public class ThinSegment2dIteratorTest { @Test diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3dTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3dTest.java index 11682f574..d23aee9a6 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LineString3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LineString3dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.Iterator; import java.util.List; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class LineString3dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3dTest.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3dTest.java index 28330a3b7..87928dd57 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/LinearRing3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/LinearRing3dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.Iterator; import java.util.List; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class LinearRing3dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3dTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3dTest.java index 167bce5bb..390dbb874 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Polygon3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Polygon3dTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import java.util.Iterator; import java.util.List; @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; -import static com.ignfab.minalac.generator.utils.iterator.IteratorTester.*; +import static fr.ign.voxatile.core.utils.iterator.IteratorTester.*; import static org.junit.jupiter.api.Assertions.*; public class Polygon3dTest { diff --git a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3dTest.java b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3dTest.java similarity index 88% rename from src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3dTest.java rename to src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3dTest.java index a213b9b22..a6ba5c99a 100644 --- a/src/test/java/com/ignfab/minalac/generator/voxelization/shape3d/Segment3dTest.java +++ b/src/test/java/fr/ign/voxatile/core/voxelization/shape3d/Segment3dTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.voxelization.shape3d; +package fr.ign.voxatile.core.voxelization.shape3d; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world2d.WorldCoords2d; -import com.ignfab.minalac.generator.utils.world3d.Vector3d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.voxelization.shape2d.Segment2d; +import fr.ign.voxatile.core.utils.world2d.WorldCoords2d; +import fr.ign.voxatile.core.utils.world3d.Vector3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.voxelization.shape2d.Segment2d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxel.java b/src/test/java/fr/ign/voxatile/core/world/TestingVoxel.java similarity index 93% rename from src/test/java/com/ignfab/minalac/generator/world/TestingVoxel.java rename to src/test/java/fr/ign/voxatile/core/world/TestingVoxel.java index 70f4cb2b8..4619b8382 100644 --- a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxel.java +++ b/src/test/java/fr/ign/voxatile/core/world/TestingVoxel.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Objects; -import com.ignfab.minalac.generator.placeables.Placeable; +import fr.ign.voxatile.core.placeables.Placeable; /** * A dummy voxel for {@code TestingVoxelWorld} and {@code TestingVoxelTile}. diff --git a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTile.java b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelTile.java similarity index 96% rename from src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTile.java rename to src/test/java/fr/ign/voxatile/core/world/TestingVoxelTile.java index 92dc481e0..6c9cd63b5 100644 --- a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTile.java +++ b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelTile.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTileTest.java b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelTileTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTileTest.java rename to src/test/java/fr/ign/voxatile/core/world/TestingVoxelTileTest.java index eee2b90e0..0bebf0bd1 100644 --- a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelTileTest.java +++ b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelTileTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelWorld.java b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelWorld.java similarity index 84% rename from src/test/java/com/ignfab/minalac/generator/world/TestingVoxelWorld.java rename to src/test/java/fr/ign/voxatile/core/world/TestingVoxelWorld.java index 8e26c65ed..d4199bf7f 100644 --- a/src/test/java/com/ignfab/minalac/generator/world/TestingVoxelWorld.java +++ b/src/test/java/fr/ign/voxatile/core/world/TestingVoxelWorld.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Collection; import java.util.Collections; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; /** * Testing purpose {@link VoxelWorld} intended to be used in unit tests. diff --git a/src/test/java/com/ignfab/minalac/generator/world/VoxelWorldTest.java b/src/test/java/fr/ign/voxatile/core/world/VoxelWorldTest.java similarity index 91% rename from src/test/java/com/ignfab/minalac/generator/world/VoxelWorldTest.java rename to src/test/java/fr/ign/voxatile/core/world/VoxelWorldTest.java index e2795b5be..b1ab2d4f7 100644 --- a/src/test/java/com/ignfab/minalac/generator/world/VoxelWorldTest.java +++ b/src/test/java/fr/ign/voxatile/core/world/VoxelWorldTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.world; +package fr.ign.voxatile.core.world; import java.util.Collection; import java.util.Collections; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.placeables.Placeable; -import com.ignfab.minalac.generator.utils.world2d.WorldBBox2d; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.placeables.Placeable; +import fr.ign.voxatile.core.utils.world2d.WorldBBox2d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParamsTest.java b/src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParamsTest.java similarity index 86% rename from src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParamsTest.java rename to src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParamsTest.java index bdd0154f3..4f1004985 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelParamsTest.java +++ b/src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelParamsTest.java @@ -1,8 +1,8 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.random.TestingSeed; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTileTest.java b/src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTileTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTileTest.java rename to src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTileTest.java index 72662ca3e..c64ea2e1c 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/luanti/LuantiVoxelTileTest.java +++ b/src/test/java/fr/ign/voxatile/modules/luanti/LuantiVoxelTileTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.modules.luanti; +package fr.ign.voxatile.modules.luanti; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java index 980af82b3..64adc9d66 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelParamsTest.java @@ -1,9 +1,9 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.random.TestingSeed; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelTest.java index e484dc0cd..5e49c2d84 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftBlockEntityVoxelTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftBlockEntityVoxelTest.java @@ -1,13 +1,13 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.Map; import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpersTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpersTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpersTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpersTest.java index cb366b901..5c1baf95f 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftHelpersTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftHelpersTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParamsTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParamsTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParamsTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParamsTest.java index 9ae4db642..d89c02373 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelParamsTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelParamsTest.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.Map; import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.random.TestingSeed; +import fr.ign.voxatile.core.utils.random.TestingSeed; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTest.java similarity index 94% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTest.java index 89224a020..3c48b9cd2 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.HashMap; import java.util.Map; @@ -6,9 +6,9 @@ import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.TestingVoxelTile; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.TestingVoxelTile; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileMock.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileMock.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileMock.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileMock.java index ef9af0cba..a110d871c 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileMock.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileMock.java @@ -1,11 +1,11 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.HashMap; import java.util.Map; import io.github.ensgijs.nbt.tag.CompoundTag; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileTest.java similarity index 95% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileTest.java index 8963aa5fd..40d40db4d 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelTileTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelTileTest.java @@ -1,12 +1,12 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.util.Map; import io.github.ensgijs.nbt.tag.CompoundTag; import org.junit.jupiter.api.Test; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorldTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorldTest.java similarity index 92% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorldTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorldTest.java index 0a8e24e43..8407a107a 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/MinecraftVoxelWorldTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/MinecraftVoxelWorldTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.File; import java.io.IOException; @@ -9,9 +9,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import com.ignfab.minalac.generator.utils.world3d.WorldBBox3d; -import com.ignfab.minalac.generator.utils.world3d.WorldCoords3d; -import com.ignfab.minalac.generator.world.MapWriteException; +import fr.ign.voxatile.core.utils.world3d.WorldBBox3d; +import fr.ign.voxatile.core.utils.world3d.WorldCoords3d; +import fr.ign.voxatile.core.world.MapWriteException; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/RegionTest.java b/src/test/java/fr/ign/voxatile/modules/minecraft/RegionTest.java similarity index 97% rename from src/test/java/com/ignfab/minalac/generator/modules/minecraft/RegionTest.java rename to src/test/java/fr/ign/voxatile/modules/minecraft/RegionTest.java index 388d1fde3..76ca5562c 100644 --- a/src/test/java/com/ignfab/minalac/generator/modules/minecraft/RegionTest.java +++ b/src/test/java/fr/ign/voxatile/modules/minecraft/RegionTest.java @@ -1,4 +1,4 @@ -package com.ignfab.minalac.generator.modules.minecraft; +package fr.ign.voxatile.modules.minecraft; import java.io.File; import java.util.HashSet; diff --git a/suppressions.xml b/suppressions.xml index 301ce71c5..8c9e98485 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -11,5 +11,5 @@ Disable VisibilityModifier check for params classes. Attributes in those classes are purposely kept public to be deserialized by Jackson --> - +