From 3bba870c90f231f47d3be7f15c74eafbe9c52751 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 5 Sep 2018 14:50:54 +0300
Subject: [PATCH] vtm-models module, fix #580

---
 settings.gradle                                |   1 +
 vtm-models/build.gradle                        |  17 +++++++++++++++++
 .../resources/assets/models/natural/tree.png   | Bin
 .../resources/assets/models/natural/treeA.g3dj |   0
 .../src/org/oscim/model}/VtmModels.java        |   2 +-
 vtm-playground/build.gradle                    |   1 +
 .../org/oscim/test/gdx/poi3d/Poi3DLayer.java   |   2 +-
 7 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 vtm-models/build.gradle
 rename {vtm-themes => vtm-models}/resources/assets/models/natural/tree.png (100%)
 rename {vtm-themes => vtm-models}/resources/assets/models/natural/treeA.g3dj (100%)
 rename {vtm-themes/src/org/oscim/theme => vtm-models/src/org/oscim/model}/VtmModels.java (98%)

diff --git a/settings.gradle b/settings.gradle
index 673f8532..c737e310 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,7 @@ include ':vtm-ios-example'
 include ':vtm-jeo'
 include ':vtm-json'
 include ':vtm-jts'
+include ':vtm-models'
 include ':vtm-mvt'
 include ':vtm-playground'
 include ':vtm-tests'
diff --git a/vtm-models/build.gradle b/vtm-models/build.gradle
new file mode 100644
index 00000000..7cb5c61f
--- /dev/null
+++ b/vtm-models/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'java-library'
+apply plugin: 'maven'
+
+dependencies {
+    api project(':vtm')
+}
+
+sourceSets {
+    main.java.srcDirs = ['src']
+    main.resources.srcDirs = ['resources']
+}
+
+if (project.hasProperty("SONATYPE_USERNAME")) {
+    afterEvaluate {
+        project.apply from: "${rootProject.projectDir}/deploy.gradle"
+    }
+}
diff --git a/vtm-themes/resources/assets/models/natural/tree.png b/vtm-models/resources/assets/models/natural/tree.png
similarity index 100%
rename from vtm-themes/resources/assets/models/natural/tree.png
rename to vtm-models/resources/assets/models/natural/tree.png
diff --git a/vtm-themes/resources/assets/models/natural/treeA.g3dj b/vtm-models/resources/assets/models/natural/treeA.g3dj
similarity index 100%
rename from vtm-themes/resources/assets/models/natural/treeA.g3dj
rename to vtm-models/resources/assets/models/natural/treeA.g3dj
diff --git a/vtm-themes/src/org/oscim/theme/VtmModels.java b/vtm-models/src/org/oscim/model/VtmModels.java
similarity index 98%
rename from vtm-themes/src/org/oscim/theme/VtmModels.java
rename to vtm-models/src/org/oscim/model/VtmModels.java
index 3de3055b..81cc0528 100644
--- a/vtm-themes/src/org/oscim/theme/VtmModels.java
+++ b/vtm-models/src/org/oscim/model/VtmModels.java
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.oscim.theme;
+package org.oscim.model;
 
 import org.oscim.backend.AssetAdapter;
 
diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
index 34d42e2d..5b2a6ef8 100644
--- a/vtm-playground/build.gradle
+++ b/vtm-playground/build.gradle
@@ -9,6 +9,7 @@ dependencies {
     implementation project(':vtm-jeo')
     implementation project(':vtm-json')
     implementation project(':vtm-jts')
+    implementation project(':vtm-models')
     implementation project(':vtm-mvt')
     implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
     implementation "org.slf4j:slf4j-jdk14:$slf4jVersion"
diff --git a/vtm-playground/src/org/oscim/test/gdx/poi3d/Poi3DLayer.java b/vtm-playground/src/org/oscim/test/gdx/poi3d/Poi3DLayer.java
index cfa01c7c..74d8fde3 100644
--- a/vtm-playground/src/org/oscim/test/gdx/poi3d/Poi3DLayer.java
+++ b/vtm-playground/src/org/oscim/test/gdx/poi3d/Poi3DLayer.java
@@ -20,9 +20,9 @@ import org.oscim.layers.tile.TileSet;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer.TileLoaderProcessHook;
 import org.oscim.map.Map;
+import org.oscim.model.VtmModels;
 import org.oscim.renderer.bucket.RenderBuckets;
 import org.oscim.renderer.bucket.SymbolItem;
-import org.oscim.theme.VtmModels;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;