Merge pull request #262 from stempler/feature/invert-grid-param

deactivate arc interpolation
halestudio · Dec 19, 2016 · c740aa1 · c740aa1
2 parents 4b941f8 + e896e7a
commit c740aa1
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 70 deletions.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml
@@ -13,7 +13,9 @@
 
 	<ul>
 		<li>Read and write Microsoft SQL Server databases</li>
+		<!-- 
 		<li>Read interpolated Arc geometries from GML</li>
+		-->
 		<li>Use code lists available as SKOS</li>
 		<li>Validate against code lists</li>
 		<li>View instance counts for condition contexts instantly</li>
@@ -51,6 +53,7 @@
 				</td>
 			</tr>
 
+			<!-- 
 			<tr id="arcs">
 				<td class="title">Arc geometries</td>
 				<td class="content">
@@ -70,6 +73,7 @@
 					</p>
 				</td>
 			</tr>
+			-->
 
 			<tr id="skos">
 				<td class="title">SKOS code lists</td>

diff --git a/...c/eu/esdihumboldt/hale/io/gml/geometry/handler/compositeGeometries/CurveGeometryTest.java b/...c/eu/esdihumboldt/hale/io/gml/geometry/handler/compositeGeometries/CurveGeometryTest.java
@@ -245,7 +245,7 @@ public void testCurveGml3() throws Exception {
 			assertTrue("Second sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
 
 			// 3. segments with ArcByBulge defined through coordinates
 			assertTrue("Third sample feature missing", it.hasNext());
@@ -255,12 +255,12 @@ public void testCurveGml3() throws Exception {
 			// 4. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
 
 			// 5. segments with ArcString defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
 
 			// 6. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
@@ -280,12 +280,12 @@ public void testCurveGml3() throws Exception {
 			// 9. segments with Circle defined through coordinates
 			assertTrue("Nineth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
 
 			// 10. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
 
 			// 11. segments with CubicSpline defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
@@ -324,7 +324,7 @@ public void testCurveGml31() throws Exception {
 			assertTrue("Third sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
 
 			// 4. segments with ArcByBulge defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
@@ -334,12 +334,12 @@ public void testCurveGml31() throws Exception {
 			// 5. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
 
 			// 6. segments with ArcString defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
 
 			// 7. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Seventh sample feature missing", it.hasNext());
@@ -359,12 +359,12 @@ public void testCurveGml31() throws Exception {
 			// 10. segments with Circle defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
 
 			// 11. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
 
 			// 12. segments with CubicSpline defined through coordinates
 			assertTrue("Twelveth sample feature missing", it.hasNext());
@@ -413,7 +413,7 @@ public void testCurveGml32() throws Exception {
 			assertTrue("Third sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, true);
 
 			// 4. segments with ArcByBulge defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
@@ -423,12 +423,12 @@ public void testCurveGml32() throws Exception {
 			// 5. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, true);
 
 			// 6. segments with ArcString defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, true);
 
 			// 7. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Seventh sample feature missing", it.hasNext());
@@ -448,12 +448,12 @@ public void testCurveGml32() throws Exception {
 			// 10. segments with Circle defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, true);
 
 			// 11. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, true);
 
 			// 12. segments with CubicSpline defined through coordinates
 			assertTrue("Twelveth sample feature missing", it.hasNext());
@@ -498,7 +498,7 @@ public void testCurveGml3_Grid() throws Exception {
 			assertTrue("Second sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
 
 			// 3. segments with ArcByBulge defined through coordinates
 			assertTrue("Third sample feature missing", it.hasNext());
@@ -508,12 +508,12 @@ public void testCurveGml3_Grid() throws Exception {
 			// 4. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
 
 			// 5. segments with ArcString defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
 
 			// 6. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
@@ -533,12 +533,12 @@ public void testCurveGml3_Grid() throws Exception {
 			// 9. segments with Circle defined through coordinates
 			assertTrue("Nineth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
 
 			// 10. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
 
 			// 11. segments with CubicSpline defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
@@ -578,7 +578,7 @@ public void testCurveGml31_Grid() throws Exception {
 			assertTrue("Third sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
 
 			// 4. segments with ArcByBulge defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
@@ -588,12 +588,12 @@ public void testCurveGml31_Grid() throws Exception {
 			// 5. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
 
 			// 6. segments with ArcString defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
 
 			// 7. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Seventh sample feature missing", it.hasNext());
@@ -613,12 +613,12 @@ public void testCurveGml31_Grid() throws Exception {
 			// 10. segments with Circle defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
 
 			// 11. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
 
 			// 12. segments with CubicSpline defined through coordinates
 			assertTrue("Twelveth sample feature missing", it.hasNext());
@@ -668,7 +668,7 @@ public void testCurveGml32_Grid() throws Exception {
 			assertTrue("Third sample feature missing", it.hasNext());
 			instance = it.next();
 			// Arc handler added
-			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Arc, false);
 
 			// 4. segments with ArcByBulge defined through coordinates
 			assertTrue("Fourth sample feature missing", it.hasNext());
@@ -678,12 +678,12 @@ public void testCurveGml32_Grid() throws Exception {
 			// 5. segments with ArcByCenterPoint defined through coordinates
 			assertTrue("Fifth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcByCenterPoint, false);
 
 			// 6. segments with ArcString defined through coordinates
 			assertTrue("Sixth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
+//			checkCurvePropertyInstance(instance, GeometryType.ArcString, false);
 
 			// 7. segments with ArcStringByBulge defined through coordinates
 			assertTrue("Seventh sample feature missing", it.hasNext());
@@ -703,12 +703,12 @@ public void testCurveGml32_Grid() throws Exception {
 			// 10. segments with Circle defined through coordinates
 			assertTrue("Tenth sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
+//			checkCurvePropertyInstance(instance, GeometryType.Circle, false);
 
 			// 11. segments with CircleByCenterPoint defined through coordinates
 			assertTrue("Eleventh sample feature missing", it.hasNext());
 			instance = it.next();
-			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
+//			checkCurvePropertyInstance(instance, GeometryType.CircleByCenterPoint, false);
 
 			// 12. segments with CubicSpline defined through coordinates
 			assertTrue("Twelveth sample feature missing", it.hasNext());

diff --git a/...etry/handler/ArcByCenterPointHandler.java → ...led_handler_/ArcByCenterPointHandler.java b/...etry/handler/ArcByCenterPointHandler.java → ...led_handler_/ArcByCenterPointHandler.java
@@ -13,7 +13,7 @@
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.io.gml.geometry.handler;
+package eu.esdihumboldt.hale.io.gml.geometry._disabled_handler_;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -45,6 +45,7 @@
 import eu.esdihumboldt.hale.io.gml.geometry.GeometryNotSupportedException;
 import eu.esdihumboldt.hale.io.gml.geometry.InterpolationSupportedGeometryHandler;
 import eu.esdihumboldt.hale.io.gml.geometry.constraint.GeometryFactory;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.PointHandler;
 import eu.esdihumboldt.util.geometry.interpolation.ArcByCenterPointInterpolation;
 import eu.esdihumboldt.util.geometry.interpolation.Interpolation;
 

diff --git a/...e/io/gml/geometry/handler/ArcHandler.java → ...ometry/_disabled_handler_/ArcHandler.java b/...e/io/gml/geometry/handler/ArcHandler.java → ...ometry/_disabled_handler_/ArcHandler.java
@@ -13,7 +13,7 @@
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.io.gml.geometry.handler;
+package eu.esdihumboldt.hale.io.gml.geometry._disabled_handler_;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,6 +35,7 @@
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.GeometryType;
 import eu.esdihumboldt.hale.io.gml.geometry.GeometryNotSupportedException;
 import eu.esdihumboldt.hale.io.gml.geometry.constraint.GeometryFactory;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.LineStringHandler;
 import eu.esdihumboldt.util.geometry.interpolation.ArcInterpolation;
 import eu.esdihumboldt.util.geometry.interpolation.Interpolation;
 

diff --git a/...ml/geometry/handler/ArcStringHandler.java → .../_disabled_handler_/ArcStringHandler.java b/...ml/geometry/handler/ArcStringHandler.java → .../_disabled_handler_/ArcStringHandler.java
@@ -13,7 +13,7 @@
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.io.gml.geometry.handler;
+package eu.esdihumboldt.hale.io.gml.geometry._disabled_handler_;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,6 +35,7 @@
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.GeometryType;
 import eu.esdihumboldt.hale.io.gml.geometry.GeometryNotSupportedException;
 import eu.esdihumboldt.hale.io.gml.geometry.constraint.GeometryFactory;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.LineStringHandler;
 import eu.esdihumboldt.util.geometry.interpolation.ArcStringInterpolation;
 import eu.esdihumboldt.util.geometry.interpolation.Interpolation;
 

diff --git a/...y/handler/CircleByCenterPointHandler.java → ..._handler_/CircleByCenterPointHandler.java b/...y/handler/CircleByCenterPointHandler.java → ..._handler_/CircleByCenterPointHandler.java
@@ -13,7 +13,7 @@
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.io.gml.geometry.handler;
+package eu.esdihumboldt.hale.io.gml.geometry._disabled_handler_;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -45,6 +45,7 @@
 import eu.esdihumboldt.hale.io.gml.geometry.GeometryNotSupportedException;
 import eu.esdihumboldt.hale.io.gml.geometry.InterpolationSupportedGeometryHandler;
 import eu.esdihumboldt.hale.io.gml.geometry.constraint.GeometryFactory;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.PointHandler;
 import eu.esdihumboldt.util.geometry.interpolation.CircleByCenterPointInterpolation;
 import eu.esdihumboldt.util.geometry.interpolation.Interpolation;
 

diff --git a/...o/gml/geometry/handler/CircleHandler.java → ...try/_disabled_handler_/CircleHandler.java b/...o/gml/geometry/handler/CircleHandler.java → ...try/_disabled_handler_/CircleHandler.java
@@ -13,7 +13,7 @@
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.io.gml.geometry.handler;
+package eu.esdihumboldt.hale.io.gml.geometry._disabled_handler_;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,6 +35,7 @@
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.GeometryType;
 import eu.esdihumboldt.hale.io.gml.geometry.GeometryNotSupportedException;
 import eu.esdihumboldt.hale.io.gml.geometry.constraint.GeometryFactory;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.LineStringHandler;
 import eu.esdihumboldt.util.geometry.interpolation.CircleInterpolation;
 import eu.esdihumboldt.util.geometry.interpolation.Interpolation;