diff --git a/pom.xml b/pom.xml index a876b24..dbe594e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,43 @@ io.github.oshai jooq-postgis-spatial - 1.0-SNAPSHOT - + 1.0 + jar + jooq-postgis-spatial + jOOQ data type converters and binders for PostGIS spatial database. + https://github.com/oshai/jooq-postgis-spatial + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Ohad Shai + ohadshai@gmail.com + github + https://www.github.com + + + + scm:git:git://github.com/oshai/jooq-postgis-spatial.git + scm:git:ssh://github.com:oshai/jooq-postgis-spatial.git + https://github.com/oshai/jooq-postgis-spatial/tree/master + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + Nexus Release Repository + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2 + + org.jetbrains.kotlin @@ -105,6 +140,40 @@ sign + + + --pinentry-mode + loopback + + + + + + + + maven-source-plugin + ${version.plugin.source} + + + attach-source + compile + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.plugin.javadoc} + + + attach-javadocs + + jar + @@ -116,6 +185,8 @@ 1.8.0 9.4-1201-jdbc4 3.7.3 + 3.4.1 + 3.2.1 1.13 2.2.0 diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/JTS.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/JTS.java index e8dcc9e..54baaa0 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/JTS.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/JTS.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts; import com.vividsolutions.jts.geom.PrecisionModel; diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/DoubleComparator.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/DoubleComparator.java index c3aecc5..21173a7 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/DoubleComparator.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/DoubleComparator.java @@ -1,29 +1,13 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; /** * This utility class is used to testsuite-suite doubles for equality * - * @author Didier H. Besset

Adapted from "Object-oriented implementation of + * @author Didier H. Besset + * + * + * Adapted from "Object-oriented implementation of * numerical methods" */ //TODO: This class should be removed. diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/EventLocator.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/EventLocator.java index 4899009..6527a1e 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/EventLocator.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/EventLocator.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -33,8 +14,10 @@ public class EventLocator { /** * Returns the point on the specified MGeometry where its measure equals the specified position. * + * @param lrs geom + * @param position double * @return a Point Geometry - * @throws MGeometryException + * @throws MGeometryException on problem */ public static Point getPointGeometry(MGeometry lrs, double position) throws MGeometryException { diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinate.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinate.java index fdd8e70..ec8527c 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinate.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinate.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -28,7 +9,8 @@ * (x,y,z) are coordinates in a 3 dimensional space (cartesian for example), and * the fourth is a measure value used for linear referencing. Note that the * measure value is independent of whether the (x,y,z) values are used. For - * example, the z value can not be used while the measure value is used.

+ * example, the z value can not be used while the measure value is used. + * * While this class extends the Coordinate class, it can be used seamlessly as a * substitute in the event that the Measure value is not used. In these cases * the Measure value shall simply be Double.NaN diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequence.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequence.java index daa7f27..45e8263 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequence.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequence.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -59,7 +40,7 @@ public static MCoordinate[] copy(CoordinateSequence coordSeq) { * Copy constructor -- simply aliases the input array, for better * performance. * - * @param coordinates + * @param coordinates c */ public MCoordinateSequence(MCoordinate[] coordinates) { this.coordinates = coordinates; @@ -70,7 +51,7 @@ public MCoordinateSequence(MCoordinate[] coordinates) { * copy of the input array, since the actual class of the Coordinates in the * input array may be different from MCoordinate. * - * @param copyCoords + * @param copyCoords c */ public MCoordinateSequence(Coordinate[] copyCoords) { coordinates = copy(copyCoords); @@ -79,7 +60,7 @@ public MCoordinateSequence(Coordinate[] copyCoords) { /** * Constructor that makes a copy of a CoordinateSequence. * - * @param coordSeq + * @param coordSeq c */ public MCoordinateSequence(CoordinateSequence coordSeq) { coordinates = copy(coordSeq); @@ -140,6 +121,9 @@ public double getY(int index) { } /** + * + * @param index the index + * * @return the measure value of the coordinate in the index */ public double getM(int index) { diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequenceFactory.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequenceFactory.java index 0a5f22b..926a60c 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequenceFactory.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MCoordinateSequenceFactory.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -45,6 +26,8 @@ private MCoordinateSequenceFactory() { /** * Returns the singleton instance of MCoordinateSequenceFactory + * + * @return instance */ public static MCoordinateSequenceFactory instance() { return instance; diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometry.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometry.java index 59697da..8c20d2e 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometry.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometry.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -62,7 +43,9 @@ public interface MGeometry extends Cloneable, Serializable { * @param tolerance distance to the MGeometry within which Coordinate c has to lie * @return the measure value if Coordinate c is within tolerance of the * Geometry, else Double.NaN - *

+ * + * + * * When the geometry is a ring or is self-intersecting more * coordinates may be determined by one coordinate. In that case, * the lowest measure is returned. @@ -140,6 +123,7 @@ public CoordinateSequence[] getCoordinatesBetween(double begin, double end) *

  • [5,3,3,0] - Non-strict Monotone Decreasing * * + * @param strict isStrict * @return true if the coordinates in the CoordinateSequence of the geometry * are monotone. */ @@ -161,7 +145,7 @@ public CoordinateSequence[] getCoordinatesBetween(double begin, double end) /** * Returns this MGeometry as a Geometry. - *

    + *

    * Modifying the returned Geometry will result in internal state changes. * * @return this object as a Geometry. diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryException.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryException.java index f697b1e..81a3861 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryException.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryException.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; /** diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryFactory.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryFactory.java index 5c13d12..73a1933 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryFactory.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MGeometryFactory.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.CoordinateSequence; diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MLineString.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MLineString.java index 4e473fc..c386e03 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MLineString.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MLineString.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -99,6 +80,8 @@ protected void geometryChangedAction() { * @param co input coordinate in the neighbourhood of the MLineString * @param tolerance max. distance that co may be from this MLineString * @return an MCoordinate on this MLineString with appropriate M-value + * @throws MGeometryException on problem + * */ public MCoordinate getClosestPoint(Coordinate co, double tolerance) throws MGeometryException { @@ -503,7 +486,9 @@ public double getMinM() { * CoordinateSequence to the endMeasure. Measure values for * intermediate coordinates are then interpolated proportionally based on * their 2d offset of the overall 2d length of the LineString. - *

    + * + * + * * If the beginMeasure and endMeasure values are equal it is assumed that * all intermediate coordinates shall be the same value. * diff --git a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MultiMLineString.java b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MultiMLineString.java index f495635..6529d20 100644 --- a/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MultiMLineString.java +++ b/src/main/java/net/dmitry/jooq/postgis/spatial/jts/mgeom/MultiMLineString.java @@ -1,23 +1,4 @@ -/* - * This file is part of Hibernate Spatial, an extension to the - * hibernate ORM solution for spatial (geographic) data. - * - * Copyright © 2007-2012 Geovise BVBA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + package net.dmitry.jooq.postgis.spatial.jts.mgeom; import com.vividsolutions.jts.geom.Coordinate; @@ -44,6 +25,9 @@ public class MultiMLineString extends MultiLineString implements MGeometry { * MultiMLineString, or null or an * empty array to create the empty geometry. Elements may be * empty LineStrings, but not nulls. + * + * @param mGap gap + * @param factory factory */ public MultiMLineString(MLineString[] MlineStrings, double mGap, GeometryFactory factory) {