Skip to content

Commit 760a0ae

Browse files
jsmethiejsmethie
committed
Merge remote-tracking branch 'origin/master' into java-11
2 parents 3a4999e + 956d7da commit 760a0ae

File tree

117 files changed

+815
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+815
-558
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>com.runwaysdk</groupId>
2525
<artifactId>runwaysdk-root</artifactId>
26-
<version>3.5.17-SNAPSHOT</version>
26+
<version>3.6.2-SNAPSHOT</version>
2727
<packaging>pom</packaging>
2828

2929
<name>runwaysdk-root</name>

‎runwaysdk-archetype/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.runwaysdk</groupId>
2626
<artifactId>runwaysdk-root</artifactId>
27-
<version>3.5.17-SNAPSHOT</version>
27+
<version>3.6.2-SNAPSHOT</version>
2828
</parent>
2929

3030
<artifactId>runwaysdk-archetype</artifactId>

‎runwaysdk-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.runwaysdk</groupId>
2626
<artifactId>runwaysdk-root</artifactId>
27-
<version>3.5.17-SNAPSHOT</version>
27+
<version>3.6.2-SNAPSHOT</version>
2828
</parent>
2929

3030
<artifactId>runwaysdk-client</artifactId>

‎runwaysdk-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.runwaysdk</groupId>
88
<artifactId>runwaysdk-root</artifactId>
9-
<version>3.5.17-SNAPSHOT</version>
9+
<version>3.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>runwaysdk-common</artifactId>

‎runwaysdk-gis/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.runwaysdk</groupId>
2626
<artifactId>runwaysdk-root</artifactId>
27-
<version>3.5.17-SNAPSHOT</version>
27+
<version>3.6.2-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

@@ -34,6 +34,7 @@
3434
<modules>
3535
<module>runwaysdk-gis-client</module>
3636
<module>runwaysdk-gis-common</module>
37+
<module>runwaysdk-postgis-jdbc-jts</module>
3738
<module>runwaysdk-gis-server</module>
3839
<module>runwaysdk-gis-web</module>
3940
</modules>

‎runwaysdk-gis/runwaysdk-gis-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.runwaysdk</groupId>
2626
<artifactId>runwaysdk-gis</artifactId>
27-
<version>3.5.17-SNAPSHOT</version>
27+
<version>3.6.2-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<artifactId>runwaysdk-gis-client</artifactId>

‎runwaysdk-gis/runwaysdk-gis-client/src/main/java/com/runwaysdk/gis/controller/GISParameterFactory.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import com.runwaysdk.controller.ParseProblemDTO;
3333
import com.runwaysdk.controller.ParameterFactory.PluginIF;
3434
import com.runwaysdk.transport.metadata.AttributeMdDTO;
35-
import com.vividsolutions.jts.geom.LineString;
36-
import com.vividsolutions.jts.geom.MultiLineString;
37-
import com.vividsolutions.jts.geom.MultiPoint;
38-
import com.vividsolutions.jts.geom.MultiPolygon;
39-
import com.vividsolutions.jts.geom.Point;
40-
import com.vividsolutions.jts.geom.Polygon;
35+
import org.locationtech.jts.geom.LineString;
36+
import org.locationtech.jts.geom.MultiLineString;
37+
import org.locationtech.jts.geom.MultiPoint;
38+
import org.locationtech.jts.geom.MultiPolygon;
39+
import org.locationtech.jts.geom.Point;
40+
import org.locationtech.jts.geom.Polygon;
4141

4242
public class GISParameterFactory implements PluginIF
4343
{

‎runwaysdk-gis/runwaysdk-gis-client/src/main/java/com/runwaysdk/gis/form/web/GISJSONVisitorBuilders.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.runwaysdk.gis.constants.GISConstants;
2929
import com.runwaysdk.gis.constants.MdWebPointInfo;
3030
import com.runwaysdk.gis.form.web.field.WebPoint;
31-
import com.vividsolutions.jts.geom.Point;
31+
import org.locationtech.jts.geom.Point;
3232

3333
public class GISJSONVisitorBuilders implements JSONFormVisitor.PluginIF
3434
{

‎runwaysdk-gis/runwaysdk-gis-client/src/main/java/com/runwaysdk/gis/form/web/field/WebPoint.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import com.runwaysdk.form.web.field.WebAttribute;
2323
import com.runwaysdk.gis.AttributePointParseExceptionDTO;
2424
import com.runwaysdk.gis.form.web.metadata.WebPointMd;
25-
import com.vividsolutions.jts.geom.Coordinate;
26-
import com.vividsolutions.jts.geom.GeometryFactory;
27-
import com.vividsolutions.jts.geom.Point;
28-
import com.vividsolutions.jts.io.ParseException;
29-
import com.vividsolutions.jts.io.WKTReader;
25+
import org.locationtech.jts.geom.Coordinate;
26+
import org.locationtech.jts.geom.GeometryFactory;
27+
import org.locationtech.jts.geom.Point;
28+
import org.locationtech.jts.io.ParseException;
29+
import org.locationtech.jts.io.WKTReader;
3030

3131
public class WebPoint extends WebAttribute
3232
{

‎runwaysdk-gis/runwaysdk-gis-client/src/main/java/com/runwaysdk/system/gis/geo/GeoEntityDTOBase.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ public final com.runwaysdk.transport.metadata.AttributeCharacterMdDTO getGeoIdMd
240240
return (com.runwaysdk.transport.metadata.AttributeCharacterMdDTO) getAttributeDTO(GEOID).getAttributeMdDTO();
241241
}
242242

243-
public com.vividsolutions.jts.geom.LineString getGeoLine()
243+
public org.locationtech.jts.geom.LineString getGeoLine()
244244
{
245-
return (com.vividsolutions.jts.geom.LineString)getObjectValue(GEOLINE);
245+
return (org.locationtech.jts.geom.LineString)getObjectValue(GEOLINE);
246246
}
247247

248-
public void setGeoLine(com.vividsolutions.jts.geom.LineString value)
248+
public void setGeoLine(org.locationtech.jts.geom.LineString value)
249249
{
250250
if(value == null)
251251
{
@@ -277,12 +277,12 @@ public final com.runwaysdk.gis.transport.metadata.AttributeLineStringMdDTO getGe
277277
return (com.runwaysdk.gis.transport.metadata.AttributeLineStringMdDTO) getAttributeDTO(GEOLINE).getAttributeMdDTO();
278278
}
279279

280-
public com.vividsolutions.jts.geom.MultiLineString getGeoMultiLine()
280+
public org.locationtech.jts.geom.MultiLineString getGeoMultiLine()
281281
{
282-
return (com.vividsolutions.jts.geom.MultiLineString)getObjectValue(GEOMULTILINE);
282+
return (org.locationtech.jts.geom.MultiLineString)getObjectValue(GEOMULTILINE);
283283
}
284284

285-
public void setGeoMultiLine(com.vividsolutions.jts.geom.MultiLineString value)
285+
public void setGeoMultiLine(org.locationtech.jts.geom.MultiLineString value)
286286
{
287287
if(value == null)
288288
{
@@ -314,12 +314,12 @@ public final com.runwaysdk.gis.transport.metadata.AttributeMultiLineStringMdDTO
314314
return (com.runwaysdk.gis.transport.metadata.AttributeMultiLineStringMdDTO) getAttributeDTO(GEOMULTILINE).getAttributeMdDTO();
315315
}
316316

317-
public com.vividsolutions.jts.geom.MultiPoint getGeoMultiPoint()
317+
public org.locationtech.jts.geom.MultiPoint getGeoMultiPoint()
318318
{
319-
return (com.vividsolutions.jts.geom.MultiPoint)getObjectValue(GEOMULTIPOINT);
319+
return (org.locationtech.jts.geom.MultiPoint)getObjectValue(GEOMULTIPOINT);
320320
}
321321

322-
public void setGeoMultiPoint(com.vividsolutions.jts.geom.MultiPoint value)
322+
public void setGeoMultiPoint(org.locationtech.jts.geom.MultiPoint value)
323323
{
324324
if(value == null)
325325
{
@@ -351,12 +351,12 @@ public final com.runwaysdk.gis.transport.metadata.AttributeMultiPointMdDTO getGe
351351
return (com.runwaysdk.gis.transport.metadata.AttributeMultiPointMdDTO) getAttributeDTO(GEOMULTIPOINT).getAttributeMdDTO();
352352
}
353353

354-
public com.vividsolutions.jts.geom.MultiPolygon getGeoMultiPolygon()
354+
public org.locationtech.jts.geom.MultiPolygon getGeoMultiPolygon()
355355
{
356-
return (com.vividsolutions.jts.geom.MultiPolygon)getObjectValue(GEOMULTIPOLYGON);
356+
return (org.locationtech.jts.geom.MultiPolygon)getObjectValue(GEOMULTIPOLYGON);
357357
}
358358

359-
public void setGeoMultiPolygon(com.vividsolutions.jts.geom.MultiPolygon value)
359+
public void setGeoMultiPolygon(org.locationtech.jts.geom.MultiPolygon value)
360360
{
361361
if(value == null)
362362
{
@@ -388,12 +388,12 @@ public final com.runwaysdk.gis.transport.metadata.AttributeMultiPolygonMdDTO get
388388
return (com.runwaysdk.gis.transport.metadata.AttributeMultiPolygonMdDTO) getAttributeDTO(GEOMULTIPOLYGON).getAttributeMdDTO();
389389
}
390390

391-
public com.vividsolutions.jts.geom.Point getGeoPoint()
391+
public org.locationtech.jts.geom.Point getGeoPoint()
392392
{
393-
return (com.vividsolutions.jts.geom.Point)getObjectValue(GEOPOINT);
393+
return (org.locationtech.jts.geom.Point)getObjectValue(GEOPOINT);
394394
}
395395

396-
public void setGeoPoint(com.vividsolutions.jts.geom.Point value)
396+
public void setGeoPoint(org.locationtech.jts.geom.Point value)
397397
{
398398
if(value == null)
399399
{
@@ -425,12 +425,12 @@ public final com.runwaysdk.gis.transport.metadata.AttributePointMdDTO getGeoPoin
425425
return (com.runwaysdk.gis.transport.metadata.AttributePointMdDTO) getAttributeDTO(GEOPOINT).getAttributeMdDTO();
426426
}
427427

428-
public com.vividsolutions.jts.geom.Polygon getGeoPolygon()
428+
public org.locationtech.jts.geom.Polygon getGeoPolygon()
429429
{
430-
return (com.vividsolutions.jts.geom.Polygon)getObjectValue(GEOPOLYGON);
430+
return (org.locationtech.jts.geom.Polygon)getObjectValue(GEOPOLYGON);
431431
}
432432

433-
public void setGeoPolygon(com.vividsolutions.jts.geom.Polygon value)
433+
public void setGeoPolygon(org.locationtech.jts.geom.Polygon value)
434434
{
435435
if(value == null)
436436
{

0 commit comments

Comments
 (0)