Merge pull request #10 from ElmarJ/Issue9

Move geojson + json classes to Editor assembly. Closes #9.
ElmarJ · Aug 9, 2020 · 516a999 · 516a999
2 parents fa40181 + a67c95f
commit 516a999
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Data/External/JSONObject"]
-	path = Data/External/JSONObject
-	url = https://github.com/mtschoen/JSONObject
+[submodule "Editor/External/JSONObject"]
+	path = Editor/External/JSONObject
+	url = https://github.com/mtschoen/JSONObject.git
diff --git a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef b/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef
diff --git a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef.meta b/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef.meta
diff --git a/Editor/Builders/BlocksFromGeoJsonBuilder.cs b/Editor/Builders/BlocksFromGeoJsonBuilder.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using System.Linq;
+using GeoJsonCityBuilder.Data;
 using GeoJsonCityBuilder.Data.GeoJSON;
 using UnityEngine;
 using UnityEngine.ProBuilder;

diff --git a/Editor/Builders/PrefabsFromGeoJsonBuilder.cs b/Editor/Builders/PrefabsFromGeoJsonBuilder.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using System.Linq;
+using GeoJsonCityBuilder.Data;
 using GeoJsonCityBuilder.Data.GeoJSON;
 using UnityEditor;
 using UnityEngine;

diff --git a/Data/External.meta → Editor/External.meta b/Data/External.meta → Editor/External.meta
diff --git a/Data/External/JSONObject → Editor/External/JSONObject b/Data/External/JSONObject → Editor/External/JSONObject
diff --git a/Data/External/JSONObject.meta → Editor/External/JSONObject.meta b/Data/External/JSONObject.meta → Editor/External/JSONObject.meta
diff --git a/Data/GeoJSON.meta → Editor/GeoJSON.meta b/Data/GeoJSON.meta → Editor/GeoJSON.meta
diff --git a/Data/GeoJSON/Feature.cs → Editor/GeoJSON/Feature.cs b/Data/GeoJSON/Feature.cs → Editor/GeoJSON/Feature.cs
diff --git a/Data/GeoJSON/Feature.cs.meta → Editor/GeoJSON/Feature.cs.meta b/Data/GeoJSON/Feature.cs.meta → Editor/GeoJSON/Feature.cs.meta
diff --git a/Data/GeoJSON/FeatureCollection.cs → Editor/GeoJSON/FeatureCollection.cs b/Data/GeoJSON/FeatureCollection.cs → Editor/GeoJSON/FeatureCollection.cs
diff --git a/Data/GeoJSON/FeatureCollection.cs.meta → Editor/GeoJSON/FeatureCollection.cs.meta b/Data/GeoJSON/FeatureCollection.cs.meta → Editor/GeoJSON/FeatureCollection.cs.meta
diff --git a/Data/GeoJSON/GeoJSONObject.cs → Editor/GeoJSON/GeoJSONObject.cs b/Data/GeoJSON/GeoJSONObject.cs → Editor/GeoJSON/GeoJSONObject.cs
diff --git a/Data/GeoJSON/GeoJSONObject.cs.meta → Editor/GeoJSON/GeoJSONObject.cs.meta b/Data/GeoJSON/GeoJSONObject.cs.meta → Editor/GeoJSON/GeoJSONObject.cs.meta
diff --git a/Data/GeoJSON/Geometry.cs → Editor/GeoJSON/Geometry.cs b/Data/GeoJSON/Geometry.cs → Editor/GeoJSON/Geometry.cs
diff --git a/Data/GeoJSON/Geometry.cs.meta → Editor/GeoJSON/Geometry.cs.meta b/Data/GeoJSON/Geometry.cs.meta → Editor/GeoJSON/Geometry.cs.meta
diff --git a/Data/GeoJSON/MultiPolygonGeometry.cs → Editor/GeoJSON/MultiPolygonGeometry.cs b/Data/GeoJSON/MultiPolygonGeometry.cs → Editor/GeoJSON/MultiPolygonGeometry.cs
diff --git a/Data/GeoJSON/MultiPolygonGeometry.cs.meta → Editor/GeoJSON/MultiPolygonGeometry.cs.meta b/Data/GeoJSON/MultiPolygonGeometry.cs.meta → Editor/GeoJSON/MultiPolygonGeometry.cs.meta
diff --git a/Data/GeoJSON/PointGeometry.cs → Editor/GeoJSON/PointGeometry.cs b/Data/GeoJSON/PointGeometry.cs → Editor/GeoJSON/PointGeometry.cs
diff --git a/Data/GeoJSON/PointGeometry.cs.meta → Editor/GeoJSON/PointGeometry.cs.meta b/Data/GeoJSON/PointGeometry.cs.meta → Editor/GeoJSON/PointGeometry.cs.meta
diff --git a/Data/GeoJSON/PolygonGeometry.cs → Editor/GeoJSON/PolygonGeometry.cs b/Data/GeoJSON/PolygonGeometry.cs → Editor/GeoJSON/PolygonGeometry.cs
diff --git a/Data/GeoJSON/PolygonGeometry.cs.meta → Editor/GeoJSON/PolygonGeometry.cs.meta b/Data/GeoJSON/PolygonGeometry.cs.meta → Editor/GeoJSON/PolygonGeometry.cs.meta
diff --git a/Data/GeoJSON/Properties.cs → Editor/GeoJSON/Properties.cs b/Data/GeoJSON/Properties.cs → Editor/GeoJSON/Properties.cs
diff --git a/Data/GeoJSON/Properties.cs.meta → Editor/GeoJSON/Properties.cs.meta b/Data/GeoJSON/Properties.cs.meta → Editor/GeoJSON/Properties.cs.meta
diff --git a/Runtime/Components/BlocksFromGeoJson.cs b/Runtime/Components/BlocksFromGeoJson.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
 using System.Linq;
-using GeoJsonCityBuilder.Data.GeoJSON;
+using GeoJsonCityBuilder.Data;
 using UnityEngine;
 using UnityEngine.ProBuilder;
 

diff --git a/Runtime/Components/PositionOnWorldCoordinates.cs b/Runtime/Components/PositionOnWorldCoordinates.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
-using GeoJsonCityBuilder.Data.GeoJSON;
+using GeoJsonCityBuilder.Data;
 using UnityEngine;
 
 namespace GeoJsonCityBuilder

diff --git a/Runtime/Components/PrefabsFromGeoJson.cs b/Runtime/Components/PrefabsFromGeoJson.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
 using System.Linq;
-using GeoJsonCityBuilder.Data.GeoJSON;
+using GeoJsonCityBuilder.Data;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.ProBuilder;

diff --git a/Data.meta → Runtime/Data.meta b/Data.meta → Runtime/Data.meta
diff --git a/Data/GeoJSON/Coordinate.cs → Runtime/Data/Coordinate.cs b/Data/GeoJSON/Coordinate.cs → Runtime/Data/Coordinate.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace GeoJsonCityBuilder.Data.GeoJSON {
+namespace GeoJsonCityBuilder.Data {
     [Serializable]
     public class Coordinate
     {

diff --git a/Data/GeoJSON/Coordinate.cs.meta → Runtime/Data/Coordinate.cs.meta b/Data/GeoJSON/Coordinate.cs.meta → Runtime/Data/Coordinate.cs.meta